| Index: runtime/vm/unit_test.h
|
| diff --git a/runtime/vm/unit_test.h b/runtime/vm/unit_test.h
|
| index 9047f02ea9d1bef37f126c283654651b4818a293..61d0715918f8aea08c8de0292ae3a4b808375a40 100644
|
| --- a/runtime/vm/unit_test.h
|
| +++ b/runtime/vm/unit_test.h
|
| @@ -174,10 +174,11 @@
|
| reinterpret_cast<name>(entry)(double_arg)
|
| #define EXECUTE_TEST_CODE_INTPTR_INTPTR(name, entry, pointer_arg) \
|
| reinterpret_cast<name>(entry)(pointer_arg)
|
| +#define EXECUTE_TEST_CODE_INT32_INTPTR(name, entry, pointer_arg) \
|
| + reinterpret_cast<name>(entry)(pointer_arg)
|
| #else
|
| // Not running on ARM or MIPS hardware, call simulator to execute code.
|
| #if defined(ARCH_IS_64_BIT)
|
| -// TODO(zra): Supply more macros for 64-bit as tests are added for ARM64.
|
| #define EXECUTE_TEST_CODE_INT64(name, entry) \
|
| static_cast<int64_t>(Simulator::Current()->Call( \
|
| bit_cast<int64_t, uword>(entry), 0, 0, 0, 0))
|
| @@ -189,6 +190,11 @@
|
| bit_cast<int64_t, uword>(entry), \
|
| bit_cast<int64_t, intptr_t>(pointer_arg), \
|
| 0, 0, 0))
|
| +#define EXECUTE_TEST_CODE_INT32_INTPTR(name, entry, pointer_arg) \
|
| + static_cast<int32_t>(Simulator::Current()->Call( \
|
| + bit_cast<int64_t, uword>(entry), \
|
| + bit_cast<int64_t, intptr_t>(pointer_arg), \
|
| + 0, 0, 0))
|
| #else
|
| #define EXECUTE_TEST_CODE_INT32(name, entry) \
|
| static_cast<int32_t>(Simulator::Current()->Call( \
|
| @@ -201,6 +207,11 @@
|
| bit_cast<int32_t, uword>(entry), \
|
| bit_cast<int32_t, intptr_t>(pointer_arg), \
|
| 0, 0, 0))
|
| +#define EXECUTE_TEST_CODE_INT32_INTPTR(name, entry, pointer_arg) \
|
| + static_cast<int32_t>(Simulator::Current()->Call( \
|
| + bit_cast<int32_t, uword>(entry), \
|
| + bit_cast<int32_t, intptr_t>(pointer_arg), \
|
| + 0, 0, 0))
|
| #endif // defined(ARCH_IS_64_BIT)
|
| #define EXECUTE_TEST_CODE_INT64_LL(name, entry, long_arg0, long_arg1) \
|
| static_cast<int64_t>(Simulator::Current()->Call( \
|
|
|