Fix - signed_off_str (#550)

* Adjusts offset of memory access in disassembler tests. * Fixes minimal negative overflow in signed_off_str().
solana-labs · Dec 29, 2023 · 179a0f9 · 179a0f9
1 parent 2e48d19
commit 179a0f9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/disassembler.rs b/src/disassembler.rs
@@ -45,7 +45,7 @@ fn byteswap_str(name: &str, insn: &ebpf::Insn) -> String {
 #[inline]
 fn signed_off_str(value: i16) -> String {
     if value < 0 {
-        format!("-{:#x}", -value)
+        format!("-{:#x}", -(value as isize))
     } else {
         format!("+{value:#x}")
     }

diff --git a/tests/disassembler.rs b/tests/disassembler.rs
@@ -139,22 +139,22 @@ fn test_lddw() {
 // Example for InstructionType::LoadReg.
 #[test]
 fn test_ldxdw() {
-    disasm!("entrypoint:\n    ldxdw r1, [r2+0x3]\n");
-    disasm!("entrypoint:\n    ldxdw r1, [r2-0x3]\n");
+    disasm!("entrypoint:\n    ldxdw r1, [r2+0x7999]\n");
+    disasm!("entrypoint:\n    ldxdw r1, [r2-0x8000]\n");
 }
 
 // Example for InstructionType::StoreImm.
 #[test]
 fn test_sth() {
-    disasm!("entrypoint:\n    sth [r1+0x2], 3\n");
-    disasm!("entrypoint:\n    sth [r1-0x2], 3\n");
+    disasm!("entrypoint:\n    sth [r1+0x7999], 3\n");
+    disasm!("entrypoint:\n    sth [r1-0x8000], 3\n");
 }
 
 // Example for InstructionType::StoreReg.
 #[test]
 fn test_stxh() {
-    disasm!("entrypoint:\n    stxh [r1+0x2], r3\n");
-    disasm!("entrypoint:\n    stxh [r1-0x2], r3\n");
+    disasm!("entrypoint:\n    stxh [r1+0x7999], r3\n");
+    disasm!("entrypoint:\n    stxh [r1-0x8000], r3\n");
 }
 
 // Test all supported AluBinary mnemonics.