diff options
Diffstat (limited to 'deps/v8/test/common')
| -rw-r--r-- | deps/v8/test/common/wasm/wasm-macro-gen.h | 25 | ||||
| -rw-r--r-- | deps/v8/test/common/wasm/wasm-module-runner.cc | 6 |
2 files changed, 20 insertions, 11 deletions
diff --git a/deps/v8/test/common/wasm/wasm-macro-gen.h b/deps/v8/test/common/wasm/wasm-macro-gen.h index 40718e79aa..83ddaa6b72 100644 --- a/deps/v8/test/common/wasm/wasm-macro-gen.h +++ b/deps/v8/test/common/wasm/wasm-macro-gen.h @@ -557,25 +557,34 @@ inline WasmOpcode LoadStoreOpcodeOf(MachineType type, bool store) { #define WASM_I64_REINTERPRET_F64(x) x, kExprI64ReinterpretF64 //------------------------------------------------------------------------------ +// Numeric operations +//------------------------------------------------------------------------------ +#define WASM_NUMERIC_OP(op) kNumericPrefix, static_cast<byte>(op) +#define WASM_I32_SCONVERT_SAT_F32(x) x, WASM_NUMERIC_OP(kExprI32SConvertSatF32) +#define WASM_I32_UCONVERT_SAT_F32(x) x, WASM_NUMERIC_OP(kExprI32UConvertSatF32) +#define WASM_I32_SCONVERT_SAT_F64(x) x, WASM_NUMERIC_OP(kExprI32SConvertSatF64) +#define WASM_I32_UCONVERT_SAT_F64(x) x, WASM_NUMERIC_OP(kExprI32UConvertSatF64) + +//------------------------------------------------------------------------------ // Memory Operations. //------------------------------------------------------------------------------ #define WASM_GROW_MEMORY(x) x, kExprGrowMemory, 0 #define WASM_MEMORY_SIZE kExprMemorySize, 0 -#define SIG_ENTRY_v_v kWasmFunctionTypeForm, 0, 0 +#define SIG_ENTRY_v_v kWasmFunctionTypeCode, 0, 0 #define SIZEOF_SIG_ENTRY_v_v 3 -#define SIG_ENTRY_v_x(a) kWasmFunctionTypeForm, 1, a, 0 -#define SIG_ENTRY_v_xx(a, b) kWasmFunctionTypeForm, 2, a, b, 0 -#define SIG_ENTRY_v_xxx(a, b, c) kWasmFunctionTypeForm, 3, a, b, c, 0 +#define SIG_ENTRY_v_x(a) kWasmFunctionTypeCode, 1, a, 0 +#define SIG_ENTRY_v_xx(a, b) kWasmFunctionTypeCode, 2, a, b, 0 +#define SIG_ENTRY_v_xxx(a, b, c) kWasmFunctionTypeCode, 3, a, b, c, 0 #define SIZEOF_SIG_ENTRY_v_x 4 #define SIZEOF_SIG_ENTRY_v_xx 5 #define SIZEOF_SIG_ENTRY_v_xxx 6 -#define SIG_ENTRY_x(r) kWasmFunctionTypeForm, 0, 1, r -#define SIG_ENTRY_x_x(r, a) kWasmFunctionTypeForm, 1, a, 1, r -#define SIG_ENTRY_x_xx(r, a, b) kWasmFunctionTypeForm, 2, a, b, 1, r -#define SIG_ENTRY_x_xxx(r, a, b, c) kWasmFunctionTypeForm, 3, a, b, c, 1, r +#define SIG_ENTRY_x(r) kWasmFunctionTypeCode, 0, 1, r +#define SIG_ENTRY_x_x(r, a) kWasmFunctionTypeCode, 1, a, 1, r +#define SIG_ENTRY_x_xx(r, a, b) kWasmFunctionTypeCode, 2, a, b, 1, r +#define SIG_ENTRY_x_xxx(r, a, b, c) kWasmFunctionTypeCode, 3, a, b, c, 1, r #define SIZEOF_SIG_ENTRY_x 4 #define SIZEOF_SIG_ENTRY_x_x 5 #define SIZEOF_SIG_ENTRY_x_xx 6 diff --git a/deps/v8/test/common/wasm/wasm-module-runner.cc b/deps/v8/test/common/wasm/wasm-module-runner.cc index 8150fc08a8..d89d87005e 100644 --- a/deps/v8/test/common/wasm/wasm-module-runner.cc +++ b/deps/v8/test/common/wasm/wasm-module-runner.cc @@ -23,7 +23,7 @@ namespace wasm { namespace testing { uint32_t GetInitialMemSize(const WasmModule* module) { - return WasmModule::kPageSize * module->initial_pages; + return kWasmPageSize * module->initial_pages; } std::unique_ptr<WasmModule> DecodeWasmModuleForTesting( @@ -173,9 +173,9 @@ int32_t InterpretWasmModule(Isolate* isolate, isolate->clear_pending_exception(); *possible_nondeterminism = thread->PossibleNondeterminism(); - if (stack_overflow) return 0xdeadbeef; + if (stack_overflow) return 0xDEADBEEF; - if (thread->state() == WasmInterpreter::TRAPPED) return 0xdeadbeef; + if (thread->state() == WasmInterpreter::TRAPPED) return 0xDEADBEEF; if (interpreter_result == WasmInterpreter::FINISHED) return thread->GetReturnValue().to<int32_t>(); |