dnrops
/
radare2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix RArchOp.refptr from bool to int ##arch

This commit is contained in:
pancake 2022-10-14 00:07:24 +02:00
parent 2e0eb83f9f
commit b6d7e023cc
15 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libr/anal/p/anal_arm_gnu.c
View File

@ -356,7 +356,7 @@ static int arm_op32(RAnal *anal, RAnalOp *op, ut64 addr, const ut8 *data, int le
if ((b[3] & 0xf) == 5) {
op->ptr = 8 + addr + b[0] + ((b[1] & 0xf) << 8);
// XXX: if set it breaks the visual disasm wtf
// op->refptr = true;
op->refptr = 4;
}
case 4:
case 6:

2
libr/core/cmd_anal.c
View File

@ -2249,7 +2249,7 @@ static void core_anal_bytes(RCore *core, const ut8 *buf, int len, int nops, int
r_cons_printf ("%s: %s\n", opname, d);
free (d);
} else {
R_LOG_ERROR ("Unknown opcode");
R_LOG_ERROR ("Unknown opcode at 0x%08"PFMT64x, addr);
}
free (opname);
}

2
libr/core/disasm.c
View File

@ -6535,7 +6535,7 @@ R_API int r_core_print_disasm_json(RCore *core, ut64 addr, ut8 *buf, int nb_byte
}
pj_k (pj, "esil"); // split key and value to allow empty strings
pj_s (pj, R_STRBUF_SAFEGET (&ds->analop.esil));
pj_kb (pj, "refptr", ds->analop.refptr);
pj_ki (pj, "refptr", ds->analop.refptr);
pj_kn (pj, "fcn_addr", f ? f->addr : 0);
pj_kn (pj, "fcn_last", f ? r_anal_function_max_addr (f) - ds->oplen : 0);
pj_ki (pj, "size", ds->analop.size);

2
libr/include/r_arch.h
View File

@ -296,7 +296,7 @@ typedef struct r_arch_op_t {
ut64 val; /* reference to value */ /* XXX signed? */
ut32 ptrsize; /* f.ex: zero extends for 8, 16 or 32 bits only */
st64 stackptr; /* stack pointer */
bool refptr; /* if (0) ptr = "reference" else ptr = "load memory of refptr bytes" */
int refptr; /* if (0) ptr = "reference" else ptr = "load memory of refptr bytes" */
RVector /*RArchValue*/ *srcs;
RVector /*RArchValue*/ *dsts;
RList *access; /* RArchValue access information */

2
test/db/cmd/cmd_agf
View File

File diff suppressed because one or more lines are too long

2
test/db/cmd/cmd_json
View File

@ -13,7 +13,7 @@ EXPECT=<<EOF
"ptr": 104,
"val": 104,
"esil": "104,rdi,+=,63,$o,of,:=,63,$s,sf,:=,$z,zf,:=,63,$c,cf,:=,$p,pf,:=,3,$c,af,:=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 0,
"size": 4,

2
test/db/cmd/cmd_meta
View File

@ -174,7 +174,7 @@ EXPECT=<<EOF
{
"offset": 268436232,
"esil": "r1,r9,=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 0,
"size": 4,

8
test/db/cmd/cmd_pd
View File

@ -434,7 +434,7 @@ s 6
pdj -1
EOF
EXPECT=<<EOF
[{"offset":1,"ptr":4248444,"val":4248444,"esil":"4248444,4,esp,-,=[4],4,esp,-=","refptr":false,"fcn_addr":0,"fcn_last":1020,"size":5,"opcode":"push 0x40d37c","disasm":"push 0x40d37c","bytes":"687cd34000","family":"cpu","type":"push","reloc":false,"type_num":13,"type2_num":0}]
[{"offset":1,"ptr":4248444,"val":4248444,"esil":"4248444,4,esp,-,=[4],4,esp,-=","refptr":0,"fcn_addr":0,"fcn_last":1020,"size":5,"opcode":"push 0x40d37c","disasm":"push 0x40d37c","bytes":"687cd34000","family":"cpu","type":"push","reloc":false,"type_num":13,"type2_num":0}]
EOF
RUN
@ -446,7 +446,7 @@ e asm.bits=64
pdj 3 @ main
EOF
EXPECT=<<EOF
[{"offset":4195590,"esil":"rbp,8,rsp,-,=[8],8,rsp,-=","refptr":false,"fcn_addr":0,"fcn_last":0,"size":1,"opcode":"push rbp","disasm":"push rbp","bytes":"55","family":"cpu","type":"rpush","reloc":false,"type_num":268435468,"type2_num":0,"flags":["main","sym.main"]},{"offset":4195591,"esil":"rsp,rbp,=","refptr":false,"fcn_addr":0,"fcn_last":0,"size":3,"opcode":"mov rbp, rsp","disasm":"mov rbp, rsp","bytes":"4889e5","family":"cpu","type":"mov","reloc":false,"type_num":9,"type2_num":0},{"offset":4195594,"ptr":4195780,"val":4195780,"esil":"4195780,rdi,=","refptr":false,"fcn_addr":0,"fcn_last":0,"size":5,"opcode":"mov edi, 0x4005c4","disasm":"mov edi, str.Hello_World","bytes":"bfc4054000","family":"cpu","type":"mov","reloc":false,"type_num":9,"type2_num":0}]
[{"offset":4195590,"esil":"rbp,8,rsp,-,=[8],8,rsp,-=","refptr":0,"fcn_addr":0,"fcn_last":0,"size":1,"opcode":"push rbp","disasm":"push rbp","bytes":"55","family":"cpu","type":"rpush","reloc":false,"type_num":268435468,"type2_num":0,"flags":["main","sym.main"]},{"offset":4195591,"esil":"rsp,rbp,=","refptr":0,"fcn_addr":0,"fcn_last":0,"size":3,"opcode":"mov rbp, rsp","disasm":"mov rbp, rsp","bytes":"4889e5","family":"cpu","type":"mov","reloc":false,"type_num":9,"type2_num":0},{"offset":4195594,"ptr":4195780,"val":4195780,"esil":"4195780,rdi,=","refptr":0,"fcn_addr":0,"fcn_last":0,"size":5,"opcode":"mov edi, 0x4005c4","disasm":"mov edi, str.Hello_World","bytes":"bfc4054000","family":"cpu","type":"mov","reloc":false,"type_num":9,"type2_num":0}]
EOF
RUN
@ -458,7 +458,7 @@ e asm.bits=64
pdj -3 @ 0x0040050f
EOF
EXPECT=<<EOF
[{"offset":4195590,"esil":"rbp,8,rsp,-,=[8],8,rsp,-=","refptr":false,"fcn_addr":0,"fcn_last":0,"size":1,"opcode":"push rbp","disasm":"push rbp","bytes":"55","family":"cpu","type":"rpush","reloc":false,"type_num":268435468,"type2_num":0,"flags":["main","sym.main"]},{"offset":4195591,"esil":"rsp,rbp,=","refptr":false,"fcn_addr":0,"fcn_last":0,"size":3,"opcode":"mov rbp, rsp","disasm":"mov rbp, rsp","bytes":"4889e5","family":"cpu","type":"mov","reloc":false,"type_num":9,"type2_num":0},{"offset":4195594,"ptr":4195780,"val":4195780,"esil":"4195780,rdi,=","refptr":false,"fcn_addr":0,"fcn_last":0,"size":5,"opcode":"mov edi, 0x4005c4","disasm":"mov edi, str.Hello_World","bytes":"bfc4054000","family":"cpu","type":"mov","reloc":false,"type_num":9,"type2_num":0}]
[{"offset":4195590,"esil":"rbp,8,rsp,-,=[8],8,rsp,-=","refptr":0,"fcn_addr":0,"fcn_last":0,"size":1,"opcode":"push rbp","disasm":"push rbp","bytes":"55","family":"cpu","type":"rpush","reloc":false,"type_num":268435468,"type2_num":0,"flags":["main","sym.main"]},{"offset":4195591,"esil":"rsp,rbp,=","refptr":0,"fcn_addr":0,"fcn_last":0,"size":3,"opcode":"mov rbp, rsp","disasm":"mov rbp, rsp","bytes":"4889e5","family":"cpu","type":"mov","reloc":false,"type_num":9,"type2_num":0},{"offset":4195594,"ptr":4195780,"val":4195780,"esil":"4195780,rdi,=","refptr":0,"fcn_addr":0,"fcn_last":0,"size":5,"opcode":"mov edi, 0x4005c4","disasm":"mov edi, str.Hello_World","bytes":"bfc4054000","family":"cpu","type":"mov","reloc":false,"type_num":9,"type2_num":0}]
EOF
RUN
@ -466,7 +466,7 @@ NAME=pdj str in opcode
FILE=bins/java/Hello.class
CMDS=pdj 1 @ 0x000002ae
EXPECT=<<EOF
[{"offset":686,"esil":"","refptr":false,"fcn_addr":0,"fcn_last":0,"size":2,"opcode":"ldc \"World\"","disasm":"ldc \"World\"","bytes":"120b","family":"cpu","type":"push","reloc":false,"type_num":13,"type2_num":2138640}]
[{"offset":686,"esil":"","refptr":0,"fcn_addr":0,"fcn_last":0,"size":2,"opcode":"ldc \"World\"","disasm":"ldc \"World\"","bytes":"120b","family":"cpu","type":"push","reloc":false,"type_num":13,"type2_num":2138640}]
EOF
RUN

2
test/db/cmd/cmd_pd_bytes
View File

@ -54,7 +54,7 @@ wx b8010000004839ca7f00
pDj 5 @ 0
EOF
EXPECT=<<EOF
[{"offset":0,"val":1,"esil":"1,rax,=","refptr":false,"fcn_addr":0,"fcn_last":0,"size":5,"opcode":"mov eax, 1","disasm":"mov eax, 1","bytes":"b801000000","family":"cpu","type":"mov","reloc":false,"type_num":9,"type2_num":0}]
[{"offset":0,"val":1,"esil":"1,rax,=","refptr":0,"fcn_addr":0,"fcn_last":0,"size":5,"opcode":"mov eax, 1","disasm":"mov eax, 1","bytes":"b801000000","family":"cpu","type":"mov","reloc":false,"type_num":9,"type2_num":0}]
EOF
RUN

28
test/db/cmd/cmd_pdr
View File

@ -93,7 +93,7 @@ EXPECT=<<EOF
{
"offset": 0,
"esil": ",",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 14,
"size": 5,
@ -117,7 +117,7 @@ EXPECT=<<EOF
{
"offset": 3,
"esil": "al,rax,+=[1],7,$o,of,:=,7,$s,sf,:=,$z,zf,:=,7,$c,cf,:=,$p,pf,:=,3,$c,af,:=",
"refptr": true,
"refptr": 1,
"fcn_addr": 0,
"fcn_last": 17,
"size": 2,
@ -147,7 +147,7 @@ EXPECT=<<EOF
"ptr": 3238002721,
"val": 3238002721,
"esil": "3238002721,rax,=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 14,
"size": 5,
@ -163,7 +163,7 @@ EXPECT=<<EOF
{
"offset": 10,
"esil": "0x9,rip,=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 17,
"size": 2,
@ -193,7 +193,7 @@ EXPECT=<<EOF
"offset": 9,
"val": 253,
"esil": "0,cf,:=,1,253,-,1,<<,ebx,&,?{,1,cf,:=,},253,ebx,>>,ebx,=,$z,zf,:=,$p,pf,:=,31,$s,sf,:=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 16,
"size": 3,
@ -218,7 +218,7 @@ EXPECT=<<EOF
"ptr": 44,
"val": 44,
"esil": "44,rbx,=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 14,
"size": 5,
@ -241,7 +241,7 @@ EXPECT=<<EOF
{
"offset": 17,
"esil": "0x3,rip,=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 17,
"size": 2,
@ -284,7 +284,7 @@ jmp 3
{
"offset": 0,
"esil": ",",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 14,
"size": 5,
@ -308,7 +308,7 @@ jmp 3
{
"offset": 3,
"esil": "al,rax,+=[1],7,$o,of,:=,7,$s,sf,:=,$z,zf,:=,7,$c,cf,:=,$p,pf,:=,3,$c,af,:=",
"refptr": true,
"refptr": 1,
"fcn_addr": 0,
"fcn_last": 17,
"size": 2,
@ -338,7 +338,7 @@ jmp 3
"ptr": 3238002721,
"val": 3238002721,
"esil": "3238002721,rax,=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 14,
"size": 5,
@ -354,7 +354,7 @@ jmp 3
{
"offset": 10,
"esil": "0x9,rip,=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 17,
"size": 2,
@ -384,7 +384,7 @@ jmp 3
"offset": 9,
"val": 253,
"esil": "0,cf,:=,1,253,-,1,<<,ebx,&,?{,1,cf,:=,},253,ebx,>>,ebx,=,$z,zf,:=,$p,pf,:=,31,$s,sf,:=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 16,
"size": 3,
@ -409,7 +409,7 @@ jmp 3
"ptr": 44,
"val": 44,
"esil": "44,rbx,=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 14,
"size": 5,
@ -432,7 +432,7 @@ jmp 3
{
"offset": 17,
"esil": "0x3,rip,=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 17,
"size": 2,

12
test/db/cmd/cmd_print
View File

@ -440,7 +440,7 @@ wx b8010000004839ca7f
pij 3
EOF
EXPECT=<<EOF
[{"offset":0,"val":1,"esil":"1,rax,=","refptr":false,"fcn_addr":0,"fcn_last":0,"size":5,"opcode":"mov eax, 1","disasm":"mov eax, 1","bytes":"b801000000","family":"cpu","type":"mov","reloc":false,"type_num":9,"type2_num":0},{"offset":5,"esil":"rcx,rdx,==,$z,zf,:=,64,$b,cf,:=,$p,pf,:=,63,$s,sf,:=,rcx,0x8000000000000000,-,!,63,$o,^,of,:=,3,$b,af,:=","refptr":false,"fcn_addr":0,"fcn_last":0,"size":3,"opcode":"cmp rdx, rcx","disasm":"cmp rdx, rcx","bytes":"4839ca","family":"cpu","type":"cmp","reloc":false,"type_num":15,"type2_num":0},{"offset":8,"esil":"sf,of,!,^,zf,!,&,?{,10,rip,=,}","refptr":false,"fcn_addr":0,"fcn_last":0,"size":2,"opcode":"jg 0xa","disasm":"jg 0xa","bytes":"7f00","family":"cpu","type":"cjmp","reloc":false,"type_num":2147483649,"type2_num":0,"jump":10,"fail":10}]
[{"offset":0,"val":1,"esil":"1,rax,=","refptr":0,"fcn_addr":0,"fcn_last":0,"size":5,"opcode":"mov eax, 1","disasm":"mov eax, 1","bytes":"b801000000","family":"cpu","type":"mov","reloc":false,"type_num":9,"type2_num":0},{"offset":5,"esil":"rcx,rdx,==,$z,zf,:=,64,$b,cf,:=,$p,pf,:=,63,$s,sf,:=,rcx,0x8000000000000000,-,!,63,$o,^,of,:=,3,$b,af,:=","refptr":0,"fcn_addr":0,"fcn_last":0,"size":3,"opcode":"cmp rdx, rcx","disasm":"cmp rdx, rcx","bytes":"4839ca","family":"cpu","type":"cmp","reloc":false,"type_num":15,"type2_num":0},{"offset":8,"esil":"sf,of,!,^,zf,!,&,?{,10,rip,=,}","refptr":0,"fcn_addr":0,"fcn_last":0,"size":2,"opcode":"jg 0xa","disasm":"jg 0xa","bytes":"7f00","family":"cpu","type":"cjmp","reloc":false,"type_num":2147483649,"type2_num":0,"jump":10,"fail":10}]
EOF
RUN
@ -503,7 +503,7 @@ e asm.bits=64
pij -3 @ 0x0040050f
EOF
EXPECT=<<EOF
[{"offset":4195590,"esil":"rbp,8,rsp,-,=[8],8,rsp,-=","refptr":false,"fcn_addr":0,"fcn_last":0,"size":1,"opcode":"push rbp","disasm":"push rbp","bytes":"55","family":"cpu","type":"rpush","reloc":false,"type_num":268435468,"type2_num":0,"flags":["main","sym.main"]},{"offset":4195591,"esil":"rsp,rbp,=","refptr":false,"fcn_addr":0,"fcn_last":0,"size":3,"opcode":"mov rbp, rsp","disasm":"mov rbp, rsp","bytes":"4889e5","family":"cpu","type":"mov","reloc":false,"type_num":9,"type2_num":0},{"offset":4195594,"ptr":4195780,"val":4195780,"esil":"4195780,rdi,=","refptr":false,"fcn_addr":0,"fcn_last":0,"size":5,"opcode":"mov edi, 0x4005c4","disasm":"mov edi, str.Hello_World","bytes":"bfc4054000","family":"cpu","type":"mov","reloc":false,"type_num":9,"type2_num":0}]
[{"offset":4195590,"esil":"rbp,8,rsp,-,=[8],8,rsp,-=","refptr":0,"fcn_addr":0,"fcn_last":0,"size":1,"opcode":"push rbp","disasm":"push rbp","bytes":"55","family":"cpu","type":"rpush","reloc":false,"type_num":268435468,"type2_num":0,"flags":["main","sym.main"]},{"offset":4195591,"esil":"rsp,rbp,=","refptr":0,"fcn_addr":0,"fcn_last":0,"size":3,"opcode":"mov rbp, rsp","disasm":"mov rbp, rsp","bytes":"4889e5","family":"cpu","type":"mov","reloc":false,"type_num":9,"type2_num":0},{"offset":4195594,"ptr":4195780,"val":4195780,"esil":"4195780,rdi,=","refptr":0,"fcn_addr":0,"fcn_last":0,"size":5,"opcode":"mov edi, 0x4005c4","disasm":"mov edi, str.Hello_World","bytes":"bfc4054000","family":"cpu","type":"mov","reloc":false,"type_num":9,"type2_num":0}]
EOF
RUN
@ -611,7 +611,7 @@ wx b8010000004839ca7f
pij 3
EOF
EXPECT=<<EOF
[{"offset":0,"val":1,"esil":"1,rax,=","refptr":false,"fcn_addr":0,"fcn_last":0,"size":5,"opcode":"mov eax, 1","disasm":"mov eax, 1","bytes":"b801000000","family":"cpu","type":"mov","reloc":false,"type_num":9,"type2_num":0},{"offset":5,"esil":"rcx,rdx,==,$z,zf,:=,64,$b,cf,:=,$p,pf,:=,63,$s,sf,:=,rcx,0x8000000000000000,-,!,63,$o,^,of,:=,3,$b,af,:=","refptr":false,"fcn_addr":0,"fcn_last":0,"size":3,"opcode":"cmp rdx, rcx","disasm":"cmp rdx, rcx","bytes":"4839ca","family":"cpu","type":"cmp","reloc":false,"type_num":15,"type2_num":0},{"offset":8,"esil":"sf,of,!,^,zf,!,&,?{,10,rip,=,}","refptr":false,"fcn_addr":0,"fcn_last":0,"size":2,"opcode":"jg 0xa","disasm":"jg 0xa","bytes":"7f00","family":"cpu","type":"cjmp","reloc":false,"type_num":2147483649,"type2_num":0,"jump":10,"fail":10}]
[{"offset":0,"val":1,"esil":"1,rax,=","refptr":0,"fcn_addr":0,"fcn_last":0,"size":5,"opcode":"mov eax, 1","disasm":"mov eax, 1","bytes":"b801000000","family":"cpu","type":"mov","reloc":false,"type_num":9,"type2_num":0},{"offset":5,"esil":"rcx,rdx,==,$z,zf,:=,64,$b,cf,:=,$p,pf,:=,63,$s,sf,:=,rcx,0x8000000000000000,-,!,63,$o,^,of,:=,3,$b,af,:=","refptr":0,"fcn_addr":0,"fcn_last":0,"size":3,"opcode":"cmp rdx, rcx","disasm":"cmp rdx, rcx","bytes":"4839ca","family":"cpu","type":"cmp","reloc":false,"type_num":15,"type2_num":0},{"offset":8,"esil":"sf,of,!,^,zf,!,&,?{,10,rip,=,}","refptr":0,"fcn_addr":0,"fcn_last":0,"size":2,"opcode":"jg 0xa","disasm":"jg 0xa","bytes":"7f00","family":"cpu","type":"cjmp","reloc":false,"type_num":2147483649,"type2_num":0,"jump":10,"fail":10}]
EOF
RUN
@ -661,7 +661,7 @@ EXPECT=<<EOF
{
"offset": 3,
"esil": "al,rax,+=[1],7,$o,of,:=,7,$s,sf,:=,$z,zf,:=,7,$c,cf,:=,$p,pf,:=,3,$c,af,:=",
"refptr": true,
"refptr": 1,
"fcn_addr": 0,
"fcn_last": 0,
"size": 2,
@ -677,7 +677,7 @@ EXPECT=<<EOF
{
"offset": 5,
"esil": "rcx,rdx,==,$z,zf,:=,64,$b,cf,:=,$p,pf,:=,63,$s,sf,:=,rcx,0x8000000000000000,-,!,63,$o,^,of,:=,3,$b,af,:=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 0,
"size": 3,
@ -693,7 +693,7 @@ EXPECT=<<EOF
{
"offset": 8,
"esil": "sf,of,!,^,zf,!,&,?{,10,rip,=,}",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 0,
"size": 2,

36
test/db/cmd/midbb
View File

@ -116,7 +116,7 @@ EXPECT=<<EOF
{
"offset": 0,
"esil": ",",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 16,
"size": 5,
@ -135,7 +135,7 @@ EXPECT=<<EOF
{
"offset": 3,
"esil": "al,rax,+=[1],7,$o,of,:=,7,$s,sf,:=,$z,zf,:=,7,$c,cf,:=,$p,pf,:=,3,$c,af,:=",
"refptr": true,
"refptr": 1,
"fcn_addr": 0,
"fcn_last": 17,
"size": 2,
@ -160,7 +160,7 @@ EXPECT=<<EOF
"ptr": 3238002721,
"val": 3238002721,
"esil": "3238002721,rax,=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 15,
"size": 5,
@ -177,7 +177,7 @@ EXPECT=<<EOF
"offset": 9,
"val": 253,
"esil": "0,cf,:=,1,253,-,1,<<,ebx,&,?{,1,cf,:=,},253,ebx,>>,ebx,=,$z,zf,:=,$p,pf,:=,31,$s,sf,:=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 16,
"size": 3,
@ -202,7 +202,7 @@ EXPECT=<<EOF
"ptr": 44,
"val": 44,
"esil": "44,rbx,=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 14,
"size": 5,
@ -225,7 +225,7 @@ EXPECT=<<EOF
{
"offset": 17,
"esil": "0x3,rip,=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 17,
"size": 2,
@ -254,7 +254,7 @@ EXPECT=<<EOF
{
"offset": 0,
"esil": ",",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 14,
"size": 5,
@ -275,7 +275,7 @@ EXPECT=<<EOF
"ptr": 3238002721,
"val": 3238002721,
"esil": "3238002721,rax,=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 14,
"size": 5,
@ -291,7 +291,7 @@ EXPECT=<<EOF
{
"offset": 10,
"esil": "0x9,rip,=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 17,
"size": 2,
@ -317,7 +317,7 @@ EXPECT=<<EOF
"ptr": 44,
"val": 44,
"esil": "44,rbx,=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 14,
"size": 5,
@ -340,7 +340,7 @@ EXPECT=<<EOF
{
"offset": 17,
"esil": "0x3,rip,=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 17,
"size": 2,
@ -373,7 +373,7 @@ EXPECT=<<EOF
{
"offset": 0,
"esil": ",",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 14,
"size": 5,
@ -392,7 +392,7 @@ EXPECT=<<EOF
{
"offset": 3,
"esil": "al,rax,+=[1],7,$o,of,:=,7,$s,sf,:=,$z,zf,:=,7,$c,cf,:=,$p,pf,:=,3,$c,af,:=",
"refptr": true,
"refptr": 1,
"fcn_addr": 0,
"fcn_last": 17,
"size": 2,
@ -417,7 +417,7 @@ EXPECT=<<EOF
"ptr": 3238002721,
"val": 3238002721,
"esil": "3238002721,rax,=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 14,
"size": 5,
@ -433,7 +433,7 @@ EXPECT=<<EOF
{
"offset": 10,
"esil": "0x9,rip,=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 17,
"size": 2,
@ -458,7 +458,7 @@ EXPECT=<<EOF
"offset": 9,
"val": 253,
"esil": "0,cf,:=,1,253,-,1,<<,ebx,&,?{,1,cf,:=,},253,ebx,>>,ebx,=,$z,zf,:=,$p,pf,:=,31,$s,sf,:=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 16,
"size": 3,
@ -483,7 +483,7 @@ EXPECT=<<EOF
"ptr": 44,
"val": 44,
"esil": "44,rbx,=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 14,
"size": 5,
@ -506,7 +506,7 @@ EXPECT=<<EOF
{
"offset": 17,
"esil": "0x3,rip,=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 17,
"size": 2,

16
test/db/cmd/midflags
View File

@ -119,7 +119,7 @@ EXPECT=<<EOF
{
"offset": 0,
"esil": "rbp,8,rsp,-,=[8],8,rsp,-=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 0,
"size": 1,
@ -135,7 +135,7 @@ EXPECT=<<EOF
{
"offset": 1,
"esil": "rsp,rbp,=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 0,
"size": 3,
@ -151,7 +151,7 @@ EXPECT=<<EOF
{
"offset": 4,
"esil": "r15,8,rsp,-,=[8],8,rsp,-=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 0,
"size": 2,
@ -167,7 +167,7 @@ EXPECT=<<EOF
{
"offset": 6,
"esil": "r14,8,rsp,-,=[8],8,rsp,-=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 0,
"size": 2,
@ -200,7 +200,7 @@ EXPECT=<<EOF
{
"offset": 0,
"esil": "rbp,8,rsp,-,=[8],8,rsp,-=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 0,
"size": 1,
@ -216,7 +216,7 @@ EXPECT=<<EOF
{
"offset": 1,
"esil": "rsp,rbp,=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 0,
"size": 3,
@ -232,7 +232,7 @@ EXPECT=<<EOF
{
"offset": 2,
"esil": "esp,rbp,=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 0,
"size": 2,
@ -251,7 +251,7 @@ EXPECT=<<EOF
{
"offset": 4,
"esil": "r15,8,rsp,-,=[8],8,rsp,-=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 0,
"size": 2,

2
test/db/esil/x86_32
View File

@ -2346,7 +2346,7 @@ EXPECT=<<EOF
{
"offset": 0,
"esil": "0,cf,:=,32,eax,%,1,<<,32,eax,/,esp,+,[4],&,?{,1,cf,:=,},32,eax,%,1,<<,32,eax,/,esp,+,|=[4]",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 0,
"size": 4,

8
test/db/formats/elf/helloworld-gcc-elf
View File

@ -551,7 +551,7 @@ EXPECT=<<EOF
{
"offset": 134513408,
"esil": "ebp,ebp,^=,$z,zf,:=,$p,pf,:=,31,$s,sf,:=,0,cf,:=,0,of,:=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 0,
"size": 2,
@ -574,7 +574,7 @@ EXPECT=<<EOF
{
"offset": 134513410,
"esil": "esp,[4],esi,=,4,esp,+=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 0,
"size": 1,
@ -590,7 +590,7 @@ EXPECT=<<EOF
{
"offset": 134513411,
"esil": "esp,ecx,=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 0,
"size": 2,
@ -607,7 +607,7 @@ EXPECT=<<EOF
"offset": 134513413,
"val": 4294967280,
"esil": "4294967280,esp,&=,$z,zf,:=,$p,pf,:=,31,$s,sf,:=,0,cf,:=,0,of,:=",
"refptr": false,
"refptr": 0,
"fcn_addr": 0,
"fcn_last": 0,
"size": 3,