ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/rx: Collect all bytes during disassembly 

Collected, to be used in the next patch.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Yoshinori Sato <ysato@users.sourceforge.jp>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20190531134315.4109-23-richard.henderson@linaro.org>
Acked-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
Richard Henderson 2019-05-23 08:14:24 -07:00 committed by Philippe Mathieu-Daudé
parent 67eb12d8d6
commit 05a8599fcc
1 changed files with 42 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
target/rx/disas.c
View File

@ -25,43 +25,59 @@ typedef struct DisasContext {
disassemble_info *dis; disassemble_info *dis;
uint32_t addr; uint32_t addr;
uint32_t pc; uint32_t pc;
uint8_t len;
uint8_t bytes[8];
} DisasContext; } DisasContext;
static uint32_t decode_load_bytes(DisasContext *ctx, uint32_t insn, static uint32_t decode_load_bytes(DisasContext *ctx, uint32_t insn,
int i, int n) int i, int n)
{ {
bfd_byte buf; uint32_t addr = ctx->addr;
g_assert(ctx->len == i);
g_assert(n <= ARRAY_SIZE(ctx->bytes));
while (++i <= n) { while (++i <= n) {
ctx->dis->read_memory_func(ctx->addr++, &buf, 1, ctx->dis); ctx->dis->read_memory_func(addr++, &ctx->bytes[i - 1], 1, ctx->dis);
insn |= buf << (32 - i * 8); insn |= ctx->bytes[i - 1] << (32 - i * 8);
} }
ctx->addr = addr;
ctx->len = n;
return insn; return insn;
} }
static int32_t li(DisasContext *ctx, int sz) static int32_t li(DisasContext *ctx, int sz)
{ {
int32_t addr; uint32_t addr = ctx->addr;
bfd_byte buf[4]; uintptr_t len = ctx->len;
addr = ctx->addr;
switch (sz) { switch (sz) {
case 1: case 1:
g_assert(len + 1 <= ARRAY_SIZE(ctx->bytes));
ctx->addr += 1; ctx->addr += 1;
ctx->dis->read_memory_func(addr, buf, 1, ctx->dis); ctx->len += 1;
return (int8_t)buf[0]; ctx->dis->read_memory_func(addr, ctx->bytes + len, 1, ctx->dis);
return (int8_t)ctx->bytes[len];
case 2: case 2:
g_assert(len + 2 <= ARRAY_SIZE(ctx->bytes));
ctx->addr += 2; ctx->addr += 2;
ctx->dis->read_memory_func(addr, buf, 2, ctx->dis); ctx->len += 2;
return ldsw_le_p(buf); ctx->dis->read_memory_func(addr, ctx->bytes + len, 2, ctx->dis);
return ldsw_le_p(ctx->bytes + len);
case 3: case 3:
g_assert(len + 3 <= ARRAY_SIZE(ctx->bytes));
ctx->addr += 3; ctx->addr += 3;
ctx->dis->read_memory_func(addr, buf, 3, ctx->dis); ctx->len += 3;
return (int8_t)buf[2] << 16 | lduw_le_p(buf); ctx->dis->read_memory_func(addr, ctx->bytes + len, 3, ctx->dis);
return (int8_t)ctx->bytes[len + 2] << 16 | lduw_le_p(ctx->bytes + len);
case 0: case 0:
g_assert(len + 4 <= ARRAY_SIZE(ctx->bytes));
ctx->addr += 4; ctx->addr += 4;
ctx->dis->read_memory_func(addr, buf, 4, ctx->dis); ctx->len += 4;
return ldl_le_p(buf); ctx->dis->read_memory_func(addr, ctx->bytes + len, 4, ctx->dis);
return ldl_le_p(ctx->bytes + len);
default: default:
g_assert_not_reached(); g_assert_not_reached();
} }
@ -110,7 +126,7 @@ static const char psw[] = {
static void rx_index_addr(DisasContext *ctx, char out[8], int ld, int mi) static void rx_index_addr(DisasContext *ctx, char out[8], int ld, int mi)
{ {
uint32_t addr = ctx->addr; uint32_t addr = ctx->addr;
uint8_t buf[2]; uintptr_t len = ctx->len;
uint16_t dsp; uint16_t dsp;
switch (ld) { switch (ld) {
@ -119,14 +135,18 @@ static void rx_index_addr(DisasContext *ctx, char out[8], int ld, int mi)
out[0] = '\0'; out[0] = '\0';
return; return;
case 1: case 1:
g_assert(len + 1 <= ARRAY_SIZE(ctx->bytes));
ctx->addr += 1; ctx->addr += 1;
ctx->dis->read_memory_func(addr, buf, 1, ctx->dis); ctx->len += 1;
dsp = buf[0]; ctx->dis->read_memory_func(addr, ctx->bytes + len, 1, ctx->dis);
dsp = ctx->bytes[len];
break; break;
case 2: case 2:
g_assert(len + 2 <= ARRAY_SIZE(ctx->bytes));
ctx->addr += 2; ctx->addr += 2;
ctx->dis->read_memory_func(addr, buf, 2, ctx->dis); ctx->len += 2;
dsp = lduw_le_p(buf); ctx->dis->read_memory_func(addr, ctx->bytes + len, 2, ctx->dis);
dsp = lduw_le_p(ctx->bytes + len);
break; break;
default: default:
g_assert_not_reached(); g_assert_not_reached();
@ -1392,8 +1412,10 @@ int print_insn_rx(bfd_vma addr, disassemble_info *dis)
DisasContext ctx; DisasContext ctx;
uint32_t insn; uint32_t insn;
int i; int i;
ctx.dis = dis; ctx.dis = dis;
ctx.pc = ctx.addr = addr; ctx.pc = ctx.addr = addr;
ctx.len = 0;
insn = decode_load(&ctx); insn = decode_load(&ctx);
if (!decode(&ctx, insn)) { if (!decode(&ctx, insn)) {