@@ -220,11 +220,6 @@ void BytecodeInterpreter::unary_operation(Configuration& configuration)
220
220
configuration.stack ().peek () = Value (result);
221
221
}
222
222
223
- #define LOAD_AND_PUSH (read_type, push_type ) \
224
- do { \
225
- return load_and_push<read_type, push_type>(configuration, instruction); \
226
- } while (false )
227
-
228
223
#define POP_AND_STORE (pop_type, store_type ) \
229
224
do { \
230
225
TRAP_IF_NOT (!configuration.stack ().is_empty ()); \
@@ -523,33 +518,33 @@ void BytecodeInterpreter::interpret(Configuration& configuration, InstructionPoi
523
518
return ;
524
519
}
525
520
case Instructions::i32_load.value ():
526
- LOAD_AND_PUSH ( i32 , i32 );
521
+ return load_and_push< i32 , i32 >(configuration, instruction );
527
522
case Instructions::i64_load.value ():
528
- LOAD_AND_PUSH ( i64 , i64 );
523
+ return load_and_push< i64 , i64 >(configuration, instruction );
529
524
case Instructions::f32_load.value ():
530
- LOAD_AND_PUSH ( float , float );
525
+ return load_and_push< float , float >(configuration, instruction );
531
526
case Instructions::f64_load.value ():
532
- LOAD_AND_PUSH ( double , double );
527
+ return load_and_push< double , double >(configuration, instruction );
533
528
case Instructions::i32_load8_s.value ():
534
- LOAD_AND_PUSH ( i8 , i32 );
529
+ return load_and_push< i8 , i32 >(configuration, instruction );
535
530
case Instructions::i32_load8_u.value ():
536
- LOAD_AND_PUSH ( u8 , i32 );
531
+ return load_and_push< u8 , i32 >(configuration, instruction );
537
532
case Instructions::i32_load16_s.value ():
538
- LOAD_AND_PUSH ( i16 , i32 );
533
+ return load_and_push< i16 , i32 >(configuration, instruction );
539
534
case Instructions::i32_load16_u.value ():
540
- LOAD_AND_PUSH ( u16 , i32 );
535
+ return load_and_push< u16 , i32 >(configuration, instruction );
541
536
case Instructions::i64_load8_s.value ():
542
- LOAD_AND_PUSH ( i8 , i64 );
537
+ return load_and_push< i8 , i64 >(configuration, instruction );
543
538
case Instructions::i64_load8_u.value ():
544
- LOAD_AND_PUSH ( u8 , i64 );
539
+ return load_and_push< u8 , i64 >(configuration, instruction );
545
540
case Instructions::i64_load16_s.value ():
546
- LOAD_AND_PUSH ( i16 , i64 );
541
+ return load_and_push< i16 , i64 >(configuration, instruction );
547
542
case Instructions::i64_load16_u.value ():
548
- LOAD_AND_PUSH ( u16 , i64 );
543
+ return load_and_push< u16 , i64 >(configuration, instruction );
549
544
case Instructions::i64_load32_s.value ():
550
- LOAD_AND_PUSH ( i32 , i64 );
545
+ return load_and_push< i32 , i64 >(configuration, instruction );
551
546
case Instructions::i64_load32_u.value ():
552
- LOAD_AND_PUSH ( u32 , i64 );
547
+ return load_and_push< u32 , i64 >(configuration, instruction );
553
548
case Instructions::i32_store.value ():
554
549
POP_AND_STORE (i32 , i32 );
555
550
case Instructions::i64_store.value ():
0 commit comments