From e96578fe6c0fd15f812f00478bcc1c0feb2532ae Mon Sep 17 00:00:00 2001
From: Dave Thaler <dthaler1968@gmail.com>
Date: Thu, 14 Mar 2024 14:43:55 -0700
Subject: [PATCH] Address more PR feedback

Signed-off-by: Dave Thaler <dthaler1968@gmail.com>
---
 src/asm_parse.cpp         | 11 ++---------
 src/asm_syntax.hpp        |  2 +-
 src/test/test_marshal.cpp |  6 ++++++
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/asm_parse.cpp b/src/asm_parse.cpp
index 25e13ba96..474446fbd 100644
--- a/src/asm_parse.cpp
+++ b/src/asm_parse.cpp
@@ -191,18 +191,11 @@ Instruction parse_instruction(const std::string& line, const std::map<std::strin
             .is_load = false,
         };
     }
-    if (regex_match(text, m, regex("lock " DEREF PAREN(REG PLUSMINUS IMM) " " ATOMICOP " " REG))) {
+    if (regex_match(text, m, regex("lock " DEREF PAREN(REG PLUSMINUS IMM) " " ATOMICOP " " REG "( fetch)?"))) {
         Atomic::Op op = str_to_atomicop.at(m[5]);
         return Atomic{
             .op = op,
-            .fetch = (op == Atomic::Op::XCHG || op == Atomic::Op::CMPXCHG),
-            .access = deref(m[1], m[2], m[3], m[4]),
-            .valreg = reg(m[6])};
-    }
-    if (regex_match(text, m, regex("lock " DEREF PAREN(REG PLUSMINUS IMM) " " ATOMICOP " " REG " fetch"))) {
-        return Atomic{
-            .op = str_to_atomicop.at(m[5]),
-            .fetch = true,
+            .fetch = m[7].matched || op == Atomic::Op::XCHG || op == Atomic::Op::CMPXCHG,
             .access = deref(m[1], m[2], m[3], m[4]),
             .valreg = reg(m[6])};
     }
diff --git a/src/asm_syntax.hpp b/src/asm_syntax.hpp
index a1b5a9284..f98e6dc31 100644
--- a/src/asm_syntax.hpp
+++ b/src/asm_syntax.hpp
@@ -249,7 +249,7 @@ struct Atomic {
     };
 
     Op op;
-    bool fetch;
+    bool fetch{};
     Deref access;
     Reg valreg;
     constexpr bool operator==(const Atomic&) const = default;
diff --git a/src/test/test_marshal.cpp b/src/test/test_marshal.cpp
index 0e36872a0..02ee4c4ff 100644
--- a/src/test/test_marshal.cpp
+++ b/src/test/test_marshal.cpp
@@ -446,7 +446,13 @@ TEST_CASE("disasm_marshal", "[disasm][marshal]") {
                 compare_marshal_unmarshal(Atomic{.op = Atomic::Op::AND, .fetch = true, .access = access, .valreg = Reg{1}});
                 compare_marshal_unmarshal(Atomic{.op = Atomic::Op::XOR, .fetch = false, .access = access, .valreg = Reg{1}});
                 compare_marshal_unmarshal(Atomic{.op = Atomic::Op::XOR, .fetch = true, .access = access, .valreg = Reg{1}});
+                check_marshal_unmarshal_fail(
+                    Atomic{.op = Atomic::Op::XCHG, .fetch = false, .access = access, .valreg = Reg{1}},
+                    "0: unsupported immediate\n");
                 compare_marshal_unmarshal(Atomic{.op = Atomic::Op::XCHG, .fetch = true, .access = access, .valreg = Reg{1}});
+                check_marshal_unmarshal_fail(
+                    Atomic{.op = Atomic::Op::CMPXCHG, .fetch = false, .access = access, .valreg = Reg{1}},
+                    "0: unsupported immediate\n");
                 compare_marshal_unmarshal(Atomic{.op = Atomic::Op::CMPXCHG, .fetch = true, .access = access, .valreg = Reg{1}});
             }
         }