X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=opcodes%2Frx-dis.c;h=1147d6438f492b054ab047e3e2899bc10741feb1;hb=57e5e645010430b3d73f8c6a757d09f48dc8f8d5;hp=cab0385d3c3d3770d12e6fa862784d5c11b8b718;hpb=f04265eceb78a33e452faa8727562e96af374f39;p=deliverable%2Fbinutils-gdb.git diff --git a/opcodes/rx-dis.c b/opcodes/rx-dis.c index cab0385d3c..1147d6438f 100644 --- a/opcodes/rx-dis.c +++ b/opcodes/rx-dis.c @@ -1,5 +1,5 @@ /* Disassembler code for Renesas RX. - Copyright (C) 2008-2015 Free Software Foundation, Inc. + Copyright (C) 2008-2019 Free Software Foundation, Inc. Contributed by Red Hat. Written by DJ Delorie. @@ -27,22 +27,38 @@ #include "dis-asm.h" #include "opcode/rx.h" +#include + typedef struct { bfd_vma pc; disassemble_info * dis; } RX_Data; +struct private +{ + OPCODES_SIGJMP_BUF bailout; +}; + static int rx_get_byte (void * vdata) { bfd_byte buf[1]; RX_Data *rx_data = (RX_Data *) vdata; + int status; - rx_data->dis->read_memory_func (rx_data->pc, - buf, - 1, - rx_data->dis); + status = rx_data->dis->read_memory_func (rx_data->pc, + buf, + 1, + rx_data->dis); + if (status != 0) + { + struct private *priv = (struct private *) rx_data->dis->private_data; + + rx_data->dis->memory_error_func (status, rx_data->pc, + rx_data->dis); + OPCODES_SIGLONGJMP (priv->bailout, 1); + } rx_data->pc ++; return buf[0]; @@ -50,12 +66,12 @@ rx_get_byte (void * vdata) static char const * size_names[RX_MAX_SIZE] = { - "", ".b", ".ub", ".b", ".w", ".uw", ".w", ".a", ".l", "" + "", ".b", ".ub", ".b", ".w", ".uw", ".w", ".a", ".l", "", "" }; static char const * opsize_names[RX_MAX_SIZE] = { - "", ".b", ".b", ".b", ".w", ".w", ".w", ".a", ".l", "" + "", ".b", ".b", ".b", ".w", ".w", ".w", ".a", ".l", ".d", "" }; static char const * register_names[] = @@ -65,16 +81,16 @@ static char const * register_names[] = "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15", /* control register */ "psw", "pc", "usp", "fpsw", NULL, NULL, NULL, NULL, - "bpsw", "bpc", "isp", "fintv", "intb", NULL, NULL, NULL, + "bpsw", "bpc", "isp", "fintv", "intb", "extb", NULL, NULL, + "a0", "a1", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; static char const * condition_names[] = { /* condition codes */ "eq", "ne", "c", "nc", "gtu", "leu", "pz", "n", - "ge", "lt", "gt", "le", "o", "no", "always", "never" + "ge", "lt", "gt", "le", "o", "no", "", "" }; static const char * flag_names[] = @@ -85,6 +101,34 @@ static const char * flag_names[] = "", "", "", "", "", "", "", "", }; +static const char * double_register_names[] = +{ + "dr0", "dr1", "dr2", "dr3", "dr4", "dr5", "dr6", "dr7", + "dr8", "dr9", "dr10", "dr11", "dr12", "dr13", "dr14", "dr15", +}; + +static const char * double_register_high_names[] = +{ + "drh0", "drh1", "drh2", "drh3", "drh4", "drh5", "drh6", "drh7", + "drh8", "drh9", "drh10", "drh11", "drh12", "drh13", "drh14", "drh15", +}; + +static const char * double_register_low_names[] = +{ + "drl0", "drl1", "drl2", "drl3", "drl4", "drl5", "drl6", "drl7", + "drl8", "drl9", "drl10", "drl11", "drl12", "drl13", "drl14", "drl15", +}; + +static const char * double_control_register_names[] = +{ + "dpsw", "dcmr", "decnt", "depc", +}; + +static const char * double_condition_names[] = +{ + "", "un", "eq", "", "lt", "", "le", +}; + int print_insn_rx (bfd_vma addr, disassemble_info * dis) { @@ -92,10 +136,18 @@ print_insn_rx (bfd_vma addr, disassemble_info * dis) RX_Data rx_data; RX_Opcode_Decoded opcode; const char * s; + struct private priv; + dis->private_data = (PTR) &priv; rx_data.pc = addr; rx_data.dis = dis; + if (OPCODES_SIGSETJMP (priv.bailout) != 0) + { + /* Error return. */ + return -1; + } + rv = rx_decode_opcode (addr, &opcode, rx_get_byte, &rx_data); dis->bytes_per_line = 10; @@ -162,13 +214,30 @@ print_insn_rx (bfd_vma addr, disassemble_info * dis) PR (PS, "%s", opsize_names[opcode.size]); break; + case 'b': + s ++; + if (*s == 'f') { + int imm = opcode.op[2].addend; + int slsb, dlsb, width; + dlsb = (imm >> 5) & 0x1f; + slsb = (imm & 0x1f); + slsb = (slsb >= 0x10?(slsb ^ 0x1f) + 1:slsb); + slsb = dlsb - slsb; + slsb = (slsb < 0?-slsb:slsb); + width = ((imm >> 10) & 0x1f) - dlsb; + PR (PS, "#%d, #%d, #%d, %s, %s", + slsb, dlsb, width, + register_names[opcode.op[1].reg], + register_names[opcode.op[0].reg]); + } + break; case '0': case '1': case '2': oper = opcode.op + *s - '0'; if (do_size) { - if (oper->type == RX_Operand_Indirect) + if (oper->type == RX_Operand_Indirect || oper->type == RX_Operand_Zero_Indirect) PR (PS, "%s", size_names[oper->size]); } else @@ -189,10 +258,10 @@ print_insn_rx (bfd_vma addr, disassemble_info * dis) PR (PS, "%s", register_names[oper->reg]); break; case RX_Operand_Indirect: - if (oper->addend) - PR (PS, "%d[%s]", oper->addend, register_names[oper->reg]); - else - PR (PS, "[%s]", register_names[oper->reg]); + PR (PS, "%d[%s]", oper->addend, register_names[oper->reg]); + break; + case RX_Operand_Zero_Indirect: + PR (PS, "[%s]", register_names[oper->reg]); break; case RX_Operand_Postinc: PR (PS, "[%s+]", register_names[oper->reg]); @@ -206,6 +275,21 @@ print_insn_rx (bfd_vma addr, disassemble_info * dis) case RX_Operand_Flag: PR (PS, "%s", flag_names[oper->reg]); break; + case RX_Operand_DoubleReg: + PR (PS, "%s", double_register_names[oper->reg]); + break; + case RX_Operand_DoubleRegH: + PR (PS, "%s", double_register_high_names[oper->reg]); + break; + case RX_Operand_DoubleRegL: + PR (PS, "%s", double_register_low_names[oper->reg]); + break; + case RX_Operand_DoubleCReg: + PR (PS, "%s", double_control_register_names[oper->reg]); + break; + case RX_Operand_DoubleCond: + PR (PS, "%s", double_condition_names[oper->reg]); + break; default: PR (PS, "[???]"); break;