From b6d7e023cc4526ef2dd471f39ba6a41d87cb0189 Mon Sep 17 00:00:00 2001 From: pancake Date: Fri, 14 Oct 2022 00:07:24 +0200 Subject: [PATCH] Fix RArchOp.refptr from bool to int ##arch --- libr/anal/p/anal_arm_gnu.c | 2 +- libr/core/cmd_anal.c | 2 +- libr/core/disasm.c | 2 +- libr/include/r_arch.h | 2 +- test/db/cmd/cmd_agf | 2 +- test/db/cmd/cmd_json | 2 +- test/db/cmd/cmd_meta | 2 +- test/db/cmd/cmd_pd | 8 +++--- test/db/cmd/cmd_pd_bytes | 2 +- test/db/cmd/cmd_pdr | 28 ++++++++++---------- test/db/cmd/cmd_print | 12 ++++----- test/db/cmd/midbb | 36 +++++++++++++------------- test/db/cmd/midflags | 16 ++++++------ test/db/esil/x86_32 | 2 +- test/db/formats/elf/helloworld-gcc-elf | 8 +++--- 15 files changed, 63 insertions(+), 63 deletions(-) diff --git a/libr/anal/p/anal_arm_gnu.c b/libr/anal/p/anal_arm_gnu.c index 307c0e93d3..147e854a29 100644 --- a/libr/anal/p/anal_arm_gnu.c +++ b/libr/anal/p/anal_arm_gnu.c @@ -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: diff --git a/libr/core/cmd_anal.c b/libr/core/cmd_anal.c index e8572b0983..40368820c8 100644 --- a/libr/core/cmd_anal.c +++ b/libr/core/cmd_anal.c @@ -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); } diff --git a/libr/core/disasm.c b/libr/core/disasm.c index ae9970a05e..c8bd97267c 100644 --- a/libr/core/disasm.c +++ b/libr/core/disasm.c @@ -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); diff --git a/libr/include/r_arch.h b/libr/include/r_arch.h index 474ef9aa95..ca988fd027 100644 --- a/libr/include/r_arch.h +++ b/libr/include/r_arch.h @@ -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 */ diff --git a/test/db/cmd/cmd_agf b/test/db/cmd/cmd_agf index 583086fc95..d9baead45c 100644 --- a/test/db/cmd/cmd_agf +++ b/test/db/cmd/cmd_agf @@ -7,7 +7,7 @@ s 0x0000f190 agfj~reloc.free EOF EXPECT=<>,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=<>,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, diff --git a/test/db/cmd/cmd_print b/test/db/cmd/cmd_print index ec38a06635..6fe188d9ae 100644 --- a/test/db/cmd/cmd_print +++ b/test/db/cmd/cmd_print @@ -440,7 +440,7 @@ wx b8010000004839ca7f pij 3 EOF EXPECT=<>,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=<>,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=<