fix tests

radareorg · Jul 3, 2024 · 0a9a42d · 0a9a42d
1 parent 1cefbc9
commit 0a9a42d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/test/db/anal/x86_32 b/test/db/anal/x86_32
@@ -476,7 +476,7 @@ s 0x00402ade
 pd 4~printf
 EOF
 EXPECT=<<EOF
-  0x00402ae8      call dword [sym.imp.msvcrt.dll_printf] ; 0x402d48 ; esp=0x177ff8 ; eip=0x2d08 reloc.msvcrt.dll_printf
+  0x00402ae8      call dword [sym.imp.msvcrt.dll_printf] ; 0x402d48 ; esp=0x177ff8 ; [0x00177ff8:4] = 0x402aee ; eip=0x2d08 reloc.msvcrt.dll_printf
                     ; int printf("  - RT_MANIFEST resource located\n")
 EOF
 RUN

diff --git a/test/db/anal/x86_64 b/test/db/anal/x86_64
@@ -3242,7 +3242,7 @@ s 0x00003cb8-0x30
 pd 20~env
 EOF
 EXPECT=<<EOF
-0x00003cb8      call sym.imp.getenv ; rsp=0x177fe8 -> 0x464c457f ; rip=0x3430 -> 0x97fa25ff
+0x00003cb8      call sym.imp.getenv ; rsp=0x177fe8 -> 0x464c457f ; [0x00177fe8:8] = 0x3cbd ; rip=0x3430 -> 0x97fa25ff
                     ; char *getenv("COLUMNS")
 EOF
 RUN

diff --git a/test/db/cmd/cmd_pd b/test/db/cmd/cmd_pd
@@ -1364,7 +1364,7 @@ e asm.emu=1
 pdJ 1 @ 0x08048566
 EOF
 EXPECT=<<EOF
-[{"offset":134514022,"esil":{"expr":"134513556,eip,4,esp,-=,esp,=[4],eip,=","esp":18446744073709551612,"eip":134513556},"text":"            0x08048566      e829feffff     call sym.imp.printf         ; esp=0xfffffffffffffffc ; eip=0x8048394 -> 0xa00c25ff"},{"offset":134514022,"text":"                                                                       ; int printf(-1)"}]
+[{"offset":134514022,"esil":{"expr":"134513556,eip,4,esp,-=,esp,=[4],eip,=","esp":18446744073709551612,"eip":134513556},"text":"            0x08048566      e829feffff     call sym.imp.printf         ; esp=0xfffffffffffffffc ; [0xfffffffc:4] = 0x804856b ; eip=0x8048394 -> 0xa00c25ff"},{"offset":134514022,"text":"                                                                       ; int printf(-1)"}]
 EOF
 RUN
 

diff --git a/test/db/cmd/cmd_pd2 b/test/db/cmd/cmd_pd2
@@ -413,7 +413,7 @@ EXPECT=<<EOF
         ,=< 0x00005b02      7d0a           jge 0x5b0e                  ; rip=0x5b0e -> 0x8d4890f4 ; likely
        ,==< 0x00005b04      7f08           jg 0x5b0e                   ; rip=0x5b0e -> 0x8d4890f4 ; likely
       ,===< 0x00005b06      eb00           jmp 0x5b08                  ; rip=0x5b08 -> 0xc30a15ff
-      `---> 0x00005b08      ff150ac30100   call qword [reloc.__libc_start_main] ; [0x21e18:8]=0 ; rsp=0xfffffffffffffff8 -> 0x4c457fff ; rip=0x0
+      `---> 0x00005b08      ff150ac30100   call qword [reloc.__libc_start_main] ; [0x21e18:8]=0 ; rsp=0xfffffffffffffff8 -> 0x4c457fff ; [0xfffffffffffffff8:8] = 0x5b0e ; rip=0x0
        ||                                                              ; int __libc_start_main(func: unk_size_format, -1, char **: unk_size-1, func: unk_size_format, func: unk_size_format, func: unk_size_format, -1)
 EOF
 RUN

diff --git a/test/db/esil/apple b/test/db/esil/apple
@@ -9,7 +9,7 @@ e emu.str=false
 pd 4~!--
 EOF
 EXPECT=<<EOF
-            0x000028ec      b0402de9       push {r4, r5, r7, lr}       ; sp=0x177ff0
+            0x000028ec      b0402de9       push {r4, r5, r7, lr}       ; sp=0x177ff0 ; [0x00177ff0:4] = 0x0 ; [0x00177ff4:4] = 0x0 ; [0x00177ff8:4] = 0x0 ; [0x00177ffc:4] = 0x0
             0x000028f0      08708de2       add r7, sp, 8               ; r7=0x177ff8
             0x000028f4      05dd4de2       sub sp, sp, 0x140           ; sp=0x177eb0
             0x000028f8      07d0cde3       bic sp, sp, 7               ; sp=0x177eb0

diff --git a/test/db/formats/elf/riscv b/test/db/formats/elf/riscv
@@ -672,13 +672,13 @@ EXPECT=<<EOF
 |           ; var int64_t var_18h @ s0-0x18
 |           ; arg int64_t argv @ sp+0x20
 |           0x00010150      130101fe       addi sp, sp, -32            ; sp=0x177fe0
-|           0x00010154      233c1100       sd ra, 24(sp)
-|           0x00010158      23388100       sd s0, 16(sp)
+|           0x00010154      233c1100       sd ra, 24(sp)               ; [0x00177ff8:8] = 0x0
+|           0x00010158      23388100       sd s0, 16(sp)               ; [0x00177ff0:8] = 0x178000
 |           0x0001015c      13040102       addi s0, sp, 32             ; s0=0x178000
 |           0x00010160      9307b007       li a5, 123                  ; a5=0x7b
-|           0x00010164      2326f4fe       sw a5, -20(s0)
+|           0x00010164      2326f4fe       sw a5, -20(s0)              ; [0x00177fec:4] = 0x7b
 |           0x00010168      9307f0ff       li a5, -1                   ; a5=0xffffffffffffffff
-|           0x0001016c      2324f4fe       sw a5, -24(s0)
+|           0x0001016c      2324f4fe       sw a5, -24(s0)              ; [0x00177fe8:4] = 0xffffffff
 |           ; CODE XREFS from main @ 0x101c8(x), 0x101d8(x)
 |      ..-> 0x00010170      b7170200       lui a5, 0x21                ; a5=0x21000
 |      ::   0x00010174      1385874f       addi a0, a5, 1272           ; a0=0x214f8 "Enter your guess : " section..rodata