Implement Nop

Signed-off-by: Laszlo Voros <[email protected]>
Samsung · Jan 27, 2025 · 38b674d · 38b674d
1 parent acf00db
commit 38b674d
Show file tree

Hide file tree

Showing 7 changed files with 104 additions and 2 deletions.
diff --git a/src/interpreter/ByteCode.h b/src/interpreter/ByteCode.h
@@ -29,6 +29,7 @@ namespace Walrus {
 
 class FunctionType;
 
+#if defined(NDEBUG)
 #define FOR_EACH_BYTECODE_OP(F) \
     F(Unreachable)              \
     F(Throw)                    \
@@ -78,6 +79,58 @@ class FunctionType;
     F(Store32)                  \
     F(Store64)                  \
     F(FillOpcodeTable)
+#else /* !NDEBUG */
+#define FOR_EACH_BYTECODE_OP(F) \
+    F(Nop)                      \
+    F(Unreachable)              \
+    F(Throw)                    \
+    F(End)                      \
+    F(BrTable)                  \
+    F(Call)                     \
+    F(CallIndirect)             \
+    F(Select)                   \
+    F(MemorySize)               \
+    F(MemoryGrow)               \
+    F(MemoryInit)               \
+    F(DataDrop)                 \
+    F(MemoryCopy)               \
+    F(MemoryFill)               \
+    F(TableInit)                \
+    F(ElemDrop)                 \
+    F(TableCopy)                \
+    F(TableGet)                 \
+    F(TableSet)                 \
+    F(TableGrow)                \
+    F(TableSize)                \
+    F(TableFill)                \
+    F(RefFunc)                  \
+    F(MoveI32)                  \
+    F(MoveF32)                  \
+    F(MoveI64)                  \
+    F(MoveF64)                  \
+    F(MoveV128)                 \
+    F(I32ReinterpretF32)        \
+    F(I64ReinterpretF64)        \
+    F(F32ReinterpretI32)        \
+    F(F64ReinterpretI64)        \
+    F(Jump)                     \
+    F(JumpIfTrue)               \
+    F(JumpIfFalse)              \
+    F(GlobalGet32)              \
+    F(GlobalGet64)              \
+    F(GlobalGet128)             \
+    F(GlobalSet32)              \
+    F(GlobalSet64)              \
+    F(GlobalSet128)             \
+    F(Const32)                  \
+    F(Const64)                  \
+    F(Const128)                 \
+    F(Load32)                   \
+    F(Load64)                   \
+    F(Store32)                  \
+    F(Store64)                  \
+    F(FillOpcodeTable)
+#endif /* NDEBUG */
 
 #define FOR_EACH_BYTECODE_BINARY_OP(F)            \
     F(I32Add, add, int32_t, int32_t)              \
@@ -2476,6 +2529,22 @@ class Throw : public ByteCode {
     uint32_t m_offsetsSize;
 };
 
+class Nop : public ByteCode {
+public:
+    Nop()
+        : ByteCode(Opcode::NopOpcode)
+    {
+    }
+
+#if !defined(NDEBUG)
+    void dump(size_t pos)
+    {
+        printf("nop");
+    }
+#endif /* !NDEBUG*/
+
+protected:
+};
 class Unreachable : public ByteCode {
 public:
     Unreachable()

diff --git a/src/interpreter/Interpreter.cpp b/src/interpreter/Interpreter.cpp
@@ -1447,6 +1447,15 @@ ByteCodeStackOffset* Interpreter::interpret(ExecutionState& state,
         NEXT_INSTRUCTION();
     }
 
+#if !defined(NDEBUG)
+    DEFINE_OPCODE(Nop)
+        :
+    {
+        ADD_PROGRAM_COUNTER(Nop);
+        NEXT_INSTRUCTION();
+    }
+#endif /* !NDEBUG */
+
     DEFINE_OPCODE(End)
         :
     {

diff --git a/src/jit/Backend.cpp b/src/jit/Backend.cpp
@@ -1345,6 +1345,12 @@ void JITCompiler::compileFunction(JITFunction* jitFunc, bool isExternal)
                 m_context.appendTrapJump(ExecutionContext::GenericTrap, sljit_emit_jump(m_compiler, SLJIT_JUMP));
                 break;
             }
+#if !defined(NDEBUG)
+            case ByteCode::NopOpcode: {
+                sljit_emit_op0(m_compiler, SLJIT_NOP);
+                break;
+            }
+#endif /* !NDEBUG */
             case ByteCode::EndOpcode: {
                 emitEnd(m_compiler, item->asInstruction());
                 break;

diff --git a/src/jit/ByteCodeParser.cpp b/src/jit/ByteCodeParser.cpp
@@ -1404,6 +1404,12 @@ static void compileFunction(JITCompiler* compiler)
             compiler->append(byteCode, group, opcode, 0, 0);
             break;
         }
+#if !defined(NDEBUG)
+        case ByteCode::NopOpcode: {
+            compiler->append(byteCode, group, opcode, 0, 0);
+            break;
+        }
+#endif /* !NDEBUG */
         case ByteCode::JumpOpcode: {
             Jump* jump = reinterpret_cast<Jump*>(byteCode);
             compiler->appendBranch(jump, opcode, labels[COMPUTE_OFFSET(idx, jump->offset())], 0);

diff --git a/src/jit/RegisterAlloc.cpp b/src/jit/RegisterAlloc.cpp
@@ -20,6 +20,12 @@
 #include "jit/Compiler.h"
 #include <set>
 
+#if defined(NDEBUG)
+#define NOP_CHECK false
+#else /* !NDEBUG */
+#define NOP_CHECK instr->opcode() == ByteCode::NopOpcode
+#endif /* NDEBUG */
+
 #if (defined SLJIT_SEPARATE_VECTOR_REGISTERS && SLJIT_SEPARATE_VECTOR_REGISTERS)
 #define VECTOR_SELECT(COND, VECTOR, FLOAT) \
     if (COND) {                            \
@@ -688,7 +694,7 @@ void JITCompiler::allocateRegisters()
             ASSERT(instr->opcode() == ByteCode::EndOpcode || instr->opcode() == ByteCode::ThrowOpcode
                    || instr->opcode() == ByteCode::CallOpcode || instr->opcode() == ByteCode::CallIndirectOpcode
                    || instr->opcode() == ByteCode::ElemDropOpcode || instr->opcode() == ByteCode::DataDropOpcode
-                   || instr->opcode() == ByteCode::JumpOpcode || instr->opcode() == ByteCode::UnreachableOpcode);
+                   || instr->opcode() == ByteCode::JumpOpcode || instr->opcode() == ByteCode::UnreachableOpcode || NOP_CHECK);
 
             if (!hasResult) {
                 continue;
@@ -1021,7 +1027,7 @@ void JITCompiler::allocateRegistersSimple()
             ASSERT(instr->opcode() == ByteCode::EndOpcode || instr->opcode() == ByteCode::ThrowOpcode
                    || instr->opcode() == ByteCode::CallOpcode || instr->opcode() == ByteCode::CallIndirectOpcode
                    || instr->opcode() == ByteCode::ElemDropOpcode || instr->opcode() == ByteCode::DataDropOpcode
-                   || instr->opcode() == ByteCode::JumpOpcode || instr->opcode() == ByteCode::UnreachableOpcode);
+                   || instr->opcode() == ByteCode::JumpOpcode || instr->opcode() == ByteCode::UnreachableOpcode || NOP_CHECK);
             continue;
         }
 

diff --git a/src/parser/WASMParser.cpp b/src/parser/WASMParser.cpp
@@ -2334,6 +2334,9 @@ class WASMBinaryReader : public wabt::WASMBinaryReaderDelegate {
 
     virtual void OnNopExpr() override
     {
+#if !defined(NDEBUG)
+        pushByteCode(Walrus::Nop(), WASMOpcode::NopOpcode);
+#endif /* !NDEBUG */
     }
 
     virtual void OnReturnExpr() override

diff --git a/third_party/wabt/src/walrus/binary-reader-walrus.cc b/third_party/wabt/src/walrus/binary-reader-walrus.cc
@@ -844,6 +844,9 @@ class BinaryReaderDelegateWalrus: public BinaryReaderDelegate {
     }
     Result OnNopExpr() override {
         CHECK_RESULT(m_validator.OnNop(GetLocation()));
+#if !defined(NDEBUG)
+        m_externalDelegate->OnNopExpr();
+#endif /* !NDEBUG */
         return Result::Ok;
     }
     Result OnRethrowExpr(Index depth) override {