Resolve merge conflicts

Signed-off-by: Dave Thaler <[email protected]>
vbpf · Jan 25, 2024 · e47e4bf · e47e4bf
1 parent 37965cf
commit e47e4bf
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/src/asm_marshal.cpp b/src/asm_marshal.cpp
@@ -258,7 +258,7 @@ struct MarshalVisitor {
 
     vector<ebpf_inst> operator()(Atomic const& b) {
         return {ebpf_inst{
-            .opcode = static_cast<uint8_t>(INST_CLS_ST | 0x1 | INST_MODE_ATOMIC | width_to_opcode(b.access.width)),
+            .opcode = static_cast<uint8_t>(INST_CLS_STX | INST_MODE_ATOMIC | width_to_opcode(b.access.width)),
             .dst = b.access.basereg.v,
             .src = b.valreg.v,
             .offset = static_cast<int16_t>(b.access.offset),

diff --git a/src/asm_unmarshal.cpp b/src/asm_unmarshal.cpp
@@ -287,8 +287,6 @@ struct Unmarshaller {
                 ((inst.opcode & INST_SIZE_MASK) != INST_SIZE_W &&
                  (inst.opcode & INST_SIZE_MASK) != INST_SIZE_DW))
                 throw InvalidInstruction(pc, inst.opcode);
-            if (inst.imm != 0)
-                throw InvalidInstruction(pc, "Unsupported atomic instruction");
             return Atomic{
                 .op = getAtomicOp(pc, inst),
                 .access =