X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=opcodes%2Fmcore-dis.c;h=584e38787cf713011b27949e13044c910bc5aefa;hb=refs%2Fheads%2Fconcurrent-displaced-stepping-2020-04-01;hp=39412663e540b7a1e566e06fe2da81c7e1003908;hpb=91d6fa6a035cc7d0b7be5c99c194a64cb80924b0;p=deliverable%2Fbinutils-gdb.git diff --git a/opcodes/mcore-dis.c b/opcodes/mcore-dis.c index 39412663e5..584e38787c 100644 --- a/opcodes/mcore-dis.c +++ b/opcodes/mcore-dis.c @@ -1,6 +1,5 @@ /* Disassemble Motorola M*Core instructions. - Copyright 1993, 1999, 2000, 2001, 2002, 2005, 2007, 2009 - Free Software Foundation, Inc. + Copyright (C) 1993-2020 Free Software Foundation, Inc. This file is part of the GNU opcodes library. @@ -21,11 +20,12 @@ #include "sysdep.h" #include +#include "libiberty.h" #define STATIC_TABLE #define DEFINE_TABLE #include "mcore-opc.h" -#include "dis-asm.h" +#include "disassemble.h" /* Mask for each mcore_opclass: */ static const unsigned short imsk[] = { @@ -89,15 +89,14 @@ static const char *crname[] = { static const unsigned isiz[] = { 2, 0, 1, 0 }; int -print_insn_mcore (memaddr, info) - bfd_vma memaddr; - struct disassemble_info *info; +print_insn_mcore (bfd_vma memaddr, + struct disassemble_info *info) { unsigned char ibytes[4]; fprintf_ftype print_func = info->fprintf_func; void *stream = info->stream; unsigned short inst; - const mcore_opcode_info *op; + unsigned int i; int status; info->bytes_per_chunk = 2; @@ -118,19 +117,19 @@ print_insn_mcore (memaddr, info) abort (); /* Just a linear search of the table. */ - for (op = mcore_table; op->name != 0; op++) - if (op->inst == (inst & imsk[op->opclass])) + for (i = 0; i < ARRAY_SIZE (mcore_table); i++) + if (mcore_table[i].inst == (inst & imsk[mcore_table[i].opclass])) break; - if (op->name == 0) + if (i == ARRAY_SIZE (mcore_table)) (*print_func) (stream, ".short 0x%04x", inst); else { const char *name = grname[inst & 0x0F]; - (*print_func) (stream, "%s", op->name); + (*print_func) (stream, "%s", mcore_table[i].name); - switch (op->opclass) + switch (mcore_table[i].opclass) { case O0: break; @@ -197,18 +196,14 @@ print_insn_mcore (memaddr, info) case BR: { - long val = inst & 0x3FF; + uint32_t val = ((inst & 0x3FF) ^ 0x400) - 0x400; - if (inst & 0x400) - val |= 0xFFFFFC00; + val = memaddr + 2 + (val << 1); + (*print_func) (stream, "\t0x%x", val); - (*print_func) (stream, "\t0x%lx", (long)(memaddr + 2 + (val << 1))); - - if (strcmp (op->name, "bsr") == 0) + if (strcmp (mcore_table[i].name, "bsr") == 0) { /* For bsr, we'll try to get a symbol for the target. */ - val = memaddr + 2 + (val << 1); - if (info->print_address_func && val != 0) { (*print_func) (stream, "\t// "); @@ -220,20 +215,22 @@ print_insn_mcore (memaddr, info) case BL: { - long val; - val = (inst & 0x000F); - (*print_func) (stream, "\t%s, 0x%lx", + uint32_t val = inst & 0x000F; + (*print_func) (stream, "\t%s, 0x%x", grname[(inst >> 4) & 0xF], - (long) (memaddr - (val << 1))); + (uint32_t) (memaddr - (val << 1))); } break; case LR: { - unsigned long val; + uint32_t val; - val = (memaddr + 2 + ((inst & 0xFF) << 2)) & 0xFFFFFFFC; + val = (memaddr + 2 + ((inst & 0xFF) << 2)) & ~3; + /* We are not reading an instruction, so allow + reads to extend beyond the next symbol. */ + info->stop_vma = 0; status = info->read_memory_func (val, ibytes, 4, info); if (status != 0) { @@ -242,28 +239,31 @@ print_insn_mcore (memaddr, info) } if (info->endian == BFD_ENDIAN_LITTLE) - val = (ibytes[3] << 24) | (ibytes[2] << 16) - | (ibytes[1] << 8) | (ibytes[0]); + val = (((unsigned) ibytes[3] << 24) | (ibytes[2] << 16) + | (ibytes[1] << 8) | (ibytes[0])); else - val = (ibytes[0] << 24) | (ibytes[1] << 16) - | (ibytes[2] << 8) | (ibytes[3]); + val = (((unsigned) ibytes[0] << 24) | (ibytes[1] << 16) + | (ibytes[2] << 8) | (ibytes[3])); /* Removed [] around literal value to match ABI syntax 12/95. */ - (*print_func) (stream, "\t%s, 0x%lX", grname[(inst >> 8) & 0xF], val); + (*print_func) (stream, "\t%s, 0x%X", grname[(inst >> 8) & 0xF], val); if (val == 0) - (*print_func) (stream, "\t// from address pool at 0x%lx", - (long) (memaddr + 2 - + ((inst & 0xFF) << 2)) & 0xFFFFFFFC); + (*print_func) (stream, "\t// from address pool at 0x%x", + (uint32_t) (memaddr + 2 + + ((inst & 0xFF) << 2)) & ~3); } break; case LJ: { - unsigned long val; + uint32_t val; - val = (memaddr + 2 + ((inst & 0xFF) << 2)) & 0xFFFFFFFC; + val = (memaddr + 2 + ((inst & 0xFF) << 2)) & ~3; + /* We are not reading an instruction, so allow + reads to extend beyond the next symbol. */ + info->stop_vma = 0; status = info->read_memory_func (val, ibytes, 4, info); if (status != 0) { @@ -272,14 +272,14 @@ print_insn_mcore (memaddr, info) } if (info->endian == BFD_ENDIAN_LITTLE) - val = (ibytes[3] << 24) | (ibytes[2] << 16) - | (ibytes[1] << 8) | (ibytes[0]); + val = (((unsigned) ibytes[3] << 24) | (ibytes[2] << 16) + | (ibytes[1] << 8) | (ibytes[0])); else - val = (ibytes[0] << 24) | (ibytes[1] << 16) - | (ibytes[2] << 8) | (ibytes[3]); + val = (((unsigned) ibytes[0] << 24) | (ibytes[1] << 16) + | (ibytes[2] << 8) | (ibytes[3])); /* Removed [] around literal value to match ABI syntax 12/95. */ - (*print_func) (stream, "\t0x%lX", val); + (*print_func) (stream, "\t0x%X", val); /* For jmpi/jsri, we'll try to get a symbol for the target. */ if (info->print_address_func && val != 0) { @@ -288,9 +288,9 @@ print_insn_mcore (memaddr, info) } else { - (*print_func) (stream, "\t// from address pool at 0x%lx", - (long) (memaddr + 2 - + ((inst & 0xFF) << 2)) & 0xFFFFFFFC); + (*print_func) (stream, "\t// from address pool at 0x%x", + (uint32_t) (memaddr + 2 + + ((inst & 0xFF) << 2)) & ~3); } } break;