Keep call imms in code

Author: chfast

lib/fizzy/execute.cpp

@@ -616,7 +616,7 @@ ExecutionResult execute(Instance& instance, FuncIdx func_idx, const Value* args,
         }
         case Instr::call:
         {
-            const auto called_func_idx = read<uint32_t>(immediates);
+            const auto called_func_idx = read<uint32_t>(pc);
             const auto& called_func_type = instance.module->get_function_type(called_func_idx);
 
             if (!invoke_function(called_func_type, called_func_idx, instance, stack, depth))
@@ -627,7 +627,7 @@ ExecutionResult execute(Instance& instance, FuncIdx func_idx, const Value* args,
         {
             assert(instance.table != nullptr);
 
-            const auto expected_type_idx = read<uint32_t>(immediates);
+            const auto expected_type_idx = read<uint32_t>(pc);
             assert(expected_type_idx < instance.module->typesec.size());
 
             const auto elem_idx = stack.pop().as<uint32_t>();

lib/fizzy/parser_expr.cpp

@@ -690,8 +690,9 @@ parser_result<Code> parse_expr(const uint8_t* pos, const uint8_t* end, FuncIdx f
             update_operand_stack(
                 frame, operand_stack, callee_func_type.inputs, callee_func_type.outputs);
 
-            push(code.immediates, callee_func_idx);
-            break;
+            code.instructions.push_back(opcode);
+            push(code.instructions, callee_func_idx);
+            continue;
         }
 
         case Instr::call_indirect:
@@ -709,13 +710,14 @@ parser_result<Code> parse_expr(const uint8_t* pos, const uint8_t* end, FuncIdx f
             update_operand_stack(
                 frame, operand_stack, callee_func_type.inputs, callee_func_type.outputs);
 
-            push(code.immediates, callee_type_idx);
-
             uint8_t table_idx;
             std::tie(table_idx, pos) = parse_byte(pos, end);
             if (table_idx != 0)
                 throw parser_error{"invalid tableidx encountered with call_indirect"};
-            break;
+
+            code.instructions.push_back(opcode);
+            push(code.instructions, callee_type_idx);
+            continue;
         }
 
         case Instr::local_get: