languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-06 12:57:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "[vm] Fix building simriscv64 on Mac."

Browse source 
This reverts commit 651eb6d9c4.

Reason for revert: broke all tests on vm-kernel-precomp-mac-release-simarm64 bot.

Original change's description:
> [vm] Fix building simriscv64 on Mac.
>
> TEST=local
> Change-Id: I1a385ffb3fa26ee9a11af6a3088864c49aa8f03a
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/247900
> Reviewed-by: Daco Harkes <dacoharkes@google.com>
> Commit-Queue: Ryan Macnak <rmacnak@google.com>

TBR=rmacnak@google.com,dacoharkes@google.com

Change-Id: Id5ca3b9aadf53dc2e68f41f00339948f36234111
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/251880
Reviewed-by: Alexander Markov <alexmarkov@google.com>
Commit-Queue: Alexander Markov <alexmarkov@google.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
This commit is contained in:
Alexander Markov 2022-07-18 21:39:13 +00:00 committed by Commit Bot
parent 89e43f0406
commit 788f0dbda6
3 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
runtime/vm/compiler/ffi/abi.cc
View file

@ -92,23 +92,19 @@ static_assert(offsetof(AbiAlignmentUint64, i) == 8,
#error Unknown arch
#endif
#if defined(USING_SIMULATOR)
#define ABI_ENUM_VALUE3 kNone
const char* target_abi_name = "none";
#else
#define ABI_ENUM_VALUE1(os, arch) k##os##arch
#define ABI_ENUM_VALUE2(os, arch) ABI_ENUM_VALUE1(os, arch)
#define ABI_ENUM_VALUE3 ABI_ENUM_VALUE2(DART_TARGET_OS_NAME, TARGET_ARCH_NAME)
#define STRINGIFY2(s) STRINGIFY(s)
#define STRINGIFY(s) #s
const char* target_abi_name =
STRINGIFY2(DART_TARGET_OS_NAME_LC) "_" STRINGIFY2(TARGET_ARCH_NAME_LC);
#endif
Abi TargetAbi() {
return Abi::ABI_ENUM_VALUE3;
}
#define STRINGIFY2(s) STRINGIFY(s)
#define STRINGIFY(s) #s
const char* target_abi_name =
STRINGIFY2(DART_TARGET_OS_NAME_LC) "_" STRINGIFY2(TARGET_ARCH_NAME_LC);
} // namespace ffi

2
runtime/vm/compiler/ffi/abi.h
View file

@ -40,8 +40,6 @@ enum class Abi {
kWindowsArm64,
kWindowsIA32,
kWindowsX64,
kNone, // E.g., simulators.
};
const int64_t num_abis = static_cast<int64_t>(Abi::kWindowsX64) + 1;

7
runtime/vm/simulator_riscv.cc
View file

@ -1601,10 +1601,9 @@ void Simulator::InterpretECALL(Instr instr) {
// Fake instruction generated by Assembler::SimulatorPrintObject.
if (true || IsTracingExecution()) {
uintx_t raw = get_xreg(instr.rs1());
Object& obj =
Object::Handle(static_cast<ObjectPtr>(static_cast<uword>(raw)));
THR_Print("%" Px ": %s = %s\n", static_cast<uword>(pc_),
cpu_reg_names[instr.rs1()], obj.ToCString());
Object& obj = Object::Handle(static_cast<ObjectPtr>(raw));
THR_Print("%" Px ": %s = %s\n", pc_, cpu_reg_names[instr.rs1()],
obj.ToCString());
FLAG_trace_sim_after = 1;
}
pc_ += instr.length();