From ba329d4d4084c49019b3c9b908bf4b79176dfe99 Mon Sep 17 00:00:00 2001
From: dbanks12 <david@aztec-labs.com>
Date: Thu, 14 Aug 2025 21:14:23 +0000
Subject: [PATCH] feat!: misc avm bugfixes - old msm opcode and missing revert
 opcode

---
 barretenberg/cpp/src/barretenberg/vm2/common/opcodes.cpp       | 3 ---
 barretenberg/cpp/src/barretenberg/vm2/common/opcodes.hpp       | 1 -
 barretenberg/cpp/src/barretenberg/vm2/simulation/execution.cpp | 3 +++
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/barretenberg/cpp/src/barretenberg/vm2/common/opcodes.cpp b/barretenberg/cpp/src/barretenberg/vm2/common/opcodes.cpp
index 235d115a32ba..37697c7eb6a6 100644
--- a/barretenberg/cpp/src/barretenberg/vm2/common/opcodes.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm2/common/opcodes.cpp
@@ -357,9 +357,6 @@ std::ostream& operator<<(std::ostream& os, const ExecutionOpCode& op)
     case ExecutionOpCode::ECADD:
         os << "ECADD";
         break;
-    case ExecutionOpCode::MSM:
-        os << "MSM";
-        break;
     case ExecutionOpCode::TORADIXBE:
         os << "TORADIXBE";
         break;
diff --git a/barretenberg/cpp/src/barretenberg/vm2/common/opcodes.hpp b/barretenberg/cpp/src/barretenberg/vm2/common/opcodes.hpp
index fd0a1366c4a1..418955445b2a 100644
--- a/barretenberg/cpp/src/barretenberg/vm2/common/opcodes.hpp
+++ b/barretenberg/cpp/src/barretenberg/vm2/common/opcodes.hpp
@@ -149,7 +149,6 @@ enum class ExecutionOpCode {
     SHA256COMPRESSION,
     KECCAKF1600,
     ECADD,
-    MSM,
     TORADIXBE,
 };
 
diff --git a/barretenberg/cpp/src/barretenberg/vm2/simulation/execution.cpp b/barretenberg/cpp/src/barretenberg/vm2/simulation/execution.cpp
index 201764f4f9e1..c80f527425ae 100644
--- a/barretenberg/cpp/src/barretenberg/vm2/simulation/execution.cpp
+++ b/barretenberg/cpp/src/barretenberg/vm2/simulation/execution.cpp
@@ -1291,6 +1291,9 @@ void Execution::dispatch_opcode(ExecutionOpCode opcode,
     case ExecutionOpCode::RETURN:
         call_with_operands(&Execution::ret, context, resolved_operands);
         break;
+    case ExecutionOpCode::REVERT:
+        call_with_operands(&Execution::revert, context, resolved_operands);
+        break;
     case ExecutionOpCode::JUMP:
         call_with_operands(&Execution::jump, context, resolved_operands);
         break;