Merge exit and return arms

solana-labs · Oct 10, 2024 · a77d31d · a77d31d
1 parent 567c873
commit a77d31d
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/disassembler.rs b/src/disassembler.rs
@@ -283,10 +283,10 @@ pub fn disassemble_instruction<C: ContextObject>(
             desc = format!("{name} {function_name}");
         },
         ebpf::CALL_REG   => { name = "callx"; desc = format!("{} r{}", name, if sbpf_version.callx_uses_src_reg() { insn.src } else { insn.imm as u8 }); },
-        ebpf::EXIT       if !sbpf_version.static_syscalls() => { name = "exit"; desc = name.to_string(); },
-        ebpf::EXIT       if sbpf_version.static_syscalls() =>  { name = "return"; desc = name.to_string(); },
-        ebpf::RETURN     if !sbpf_version.static_syscalls() => { name = "exit"; desc = name.to_string(); },
-        ebpf::RETURN     if sbpf_version.static_syscalls() =>  { name = "return"; desc = name.to_string(); },
+        ebpf::EXIT
+        | ebpf::RETURN   if !sbpf_version.static_syscalls() => { name = "exit"; desc = name.to_string(); },
+        ebpf::EXIT
+        | ebpf::RETURN   if sbpf_version.static_syscalls() =>  { name = "return"; desc = name.to_string(); },
 
         _                => { name = "unknown"; desc = format!("{} opcode={:#x}", name, insn.opc); },
     };