RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-16 22:45:07 +00:00
Code Issues Activity Actions

LibWasm: Replace memory read macros with templated functions

Browse source
This commit is contained in:
Ali Mohammad Pur 2021-08-10 23:39:26 +04:30 • committed by Andreas Kling
parent 563b402f04
commit ad3de4648a
1 changed files with 14 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

33
Userland/Libraries/LibWasm/AbstractMachine/BytecodeInterpreter.cpp
View file

@ -220,11 +220,6 @@ void BytecodeInterpreter::unary_operation(Configuration& configuration)
configuration.stack().peek() = Value(result); configuration.stack().peek() = Value(result);
} }
#define LOAD_AND_PUSH(read_type, push_type) \
do { \
return load_and_push<read_type, push_type>(configuration, instruction); \
} while (false)
#define POP_AND_STORE(pop_type, store_type) \ #define POP_AND_STORE(pop_type, store_type) \
do { \ do { \
TRAP_IF_NOT(!configuration.stack().is_empty()); \ TRAP_IF_NOT(!configuration.stack().is_empty()); \
@ -523,33 +518,33 @@ void BytecodeInterpreter::interpret(Configuration& configuration, InstructionPoi
return; return;
} }
case Instructions::i32_load.value(): case Instructions::i32_load.value():
LOAD_AND_PUSH(i32, i32); return load_and_push<i32, i32>(configuration, instruction);
case Instructions::i64_load.value(): case Instructions::i64_load.value():
LOAD_AND_PUSH(i64, i64); return load_and_push<i64, i64>(configuration, instruction);
case Instructions::f32_load.value(): case Instructions::f32_load.value():
LOAD_AND_PUSH(float, float); return load_and_push<float, float>(configuration, instruction);
case Instructions::f64_load.value(): case Instructions::f64_load.value():
LOAD_AND_PUSH(double, double); return load_and_push<double, double>(configuration, instruction);
case Instructions::i32_load8_s.value(): case Instructions::i32_load8_s.value():
LOAD_AND_PUSH(i8, i32); return load_and_push<i8, i32>(configuration, instruction);
case Instructions::i32_load8_u.value(): case Instructions::i32_load8_u.value():
LOAD_AND_PUSH(u8, i32); return load_and_push<u8, i32>(configuration, instruction);
case Instructions::i32_load16_s.value(): case Instructions::i32_load16_s.value():
LOAD_AND_PUSH(i16, i32); return load_and_push<i16, i32>(configuration, instruction);
case Instructions::i32_load16_u.value(): case Instructions::i32_load16_u.value():
LOAD_AND_PUSH(u16, i32); return load_and_push<u16, i32>(configuration, instruction);
case Instructions::i64_load8_s.value(): case Instructions::i64_load8_s.value():
LOAD_AND_PUSH(i8, i64); return load_and_push<i8, i64>(configuration, instruction);
case Instructions::i64_load8_u.value(): case Instructions::i64_load8_u.value():
LOAD_AND_PUSH(u8, i64); return load_and_push<u8, i64>(configuration, instruction);
case Instructions::i64_load16_s.value(): case Instructions::i64_load16_s.value():
LOAD_AND_PUSH(i16, i64); return load_and_push<i16, i64>(configuration, instruction);
case Instructions::i64_load16_u.value(): case Instructions::i64_load16_u.value():
LOAD_AND_PUSH(u16, i64); return load_and_push<u16, i64>(configuration, instruction);
case Instructions::i64_load32_s.value(): case Instructions::i64_load32_s.value():
LOAD_AND_PUSH(i32, i64); return load_and_push<i32, i64>(configuration, instruction);
case Instructions::i64_load32_u.value(): case Instructions::i64_load32_u.value():
LOAD_AND_PUSH(u32, i64); return load_and_push<u32, i64>(configuration, instruction);
case Instructions::i32_store.value(): case Instructions::i32_store.value():
POP_AND_STORE(i32, i32); POP_AND_STORE(i32, i32);
case Instructions::i64_store.value(): case Instructions::i64_store.value():