_stack

Author: chfast

Diff for: lib/fizzy/execute.cpp

@@ -477,14 +477,14 @@ ExecutionResult execute(Instance& instance, FuncIdx func_idx, const Value* args,
     const auto& code = instance.module.get_code(func_idx);
     auto* const memory = instance.memory.get();
 
-    OperandStack stack(args, func_type.inputs.size(), code.local_count,
+    OperandStack _stack(args, func_type.inputs.size(), code.local_count,
         static_cast<size_t>(code.max_stack_height));
 
     const Instr* pc = code.instructions.data();
     const uint8_t* immediates = code.immediates.data();
 
     // FIXME: Remove reference.
-    auto& sp = stack.sp();
+    auto& sp = _stack.sp();
     const auto bottom = sp;
 
     while (true)
@@ -616,19 +616,19 @@ ExecutionResult execute(Instance& instance, FuncIdx func_idx, const Value* args,
         case Instr::local_get:
         {
             const auto idx = read<uint32_t>(immediates);
-            *++sp = (stack.local(idx));
+            *++sp = (_stack.local(idx));
             break;
         }
         case Instr::local_set:
         {
             const auto idx = read<uint32_t>(immediates);
-            stack.local(idx) = *sp--;
+            _stack.local(idx) = *sp--;
             break;
         }
         case Instr::local_tee:
         {
             const auto idx = read<uint32_t>(immediates);
-            stack.local(idx) = *sp;
+            _stack.local(idx) = *sp;
             break;
         }
         case Instr::global_get:
@@ -1042,8 +1042,8 @@ ExecutionResult execute(Instance& instance, FuncIdx func_idx, const Value* args,
         }
         case Instr::i32_div_s:
         {
-            auto const rhs = stack[0].as<int32_t>();
-            auto const lhs = stack[1].as<int32_t>();
+            auto const rhs = sp[0].as<int32_t>();
+            auto const lhs = sp[-1].as<int32_t>();
             if (rhs == 0 || (lhs == std::numeric_limits<int32_t>::min() && rhs == -1))
                 goto trap;
             binary_op(sp, div<int32_t>);
@@ -1062,7 +1062,7 @@ ExecutionResult execute(Instance& instance, FuncIdx func_idx, const Value* args,
             auto const rhs = sp->as<int32_t>();
             if (rhs == 0)
                 goto trap;
-            auto const lhs = stack[1].as<int32_t>();
+            auto const lhs = sp[-1].as<int32_t>();
             if (lhs == std::numeric_limits<int32_t>::min() && rhs == -1)
                 *--sp = 0;
             else
@@ -1152,8 +1152,8 @@ ExecutionResult execute(Instance& instance, FuncIdx func_idx, const Value* args,
         }
         case Instr::i64_div_s:
         {
-            auto const rhs = stack[0].as<int64_t>();
-            auto const lhs = stack[1].as<int64_t>();
+            auto const rhs = sp[0].as<int64_t>();
+            auto const lhs = sp[-1].as<int64_t>();
             if (rhs == 0 || (lhs == std::numeric_limits<int64_t>::min() && rhs == -1))
                 goto trap;
             binary_op(sp, div<int64_t>);
@@ -1172,7 +1172,7 @@ ExecutionResult execute(Instance& instance, FuncIdx func_idx, const Value* args,
             auto const rhs = sp->as<int64_t>();
             if (rhs == 0)
                 goto trap;
-            auto const lhs = stack[1].as<int64_t>();
+            auto const lhs = sp[-1].as<int64_t>();
             if (lhs == std::numeric_limits<int64_t>::min() && rhs == -1)
                 *--sp = 0;
             else
@@ -1522,7 +1522,7 @@ ExecutionResult execute(Instance& instance, FuncIdx func_idx, const Value* args,
 
 end:
     assert(pc == &code.instructions[code.instructions.size()]);  // End of code must be reached.
-    assert(stack.size() == instance.module.get_function_type(func_idx).outputs.size());
+    //    assert(stack.size() == instance.module.get_function_type(func_idx).outputs.size());
 
     return sp != bottom ? ExecutionResult{*sp} : Void;