X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=opcodes%2Fm68k-dis.c;h=7eab05e118b3c90424fa9f74a602b406c8132d34;hb=088d5b730997bf1dfe1f5c3278d3951b58172b1f;hp=265c113c3cc6f7c13e60bb7583f1d0e316092400;hpb=05545edc03d841f44b1a7aef9f53471681c433e5;p=deliverable%2Fbinutils-gdb.git diff --git a/opcodes/m68k-dis.c b/opcodes/m68k-dis.c index 265c113c3c..7eab05e118 100644 --- a/opcodes/m68k-dis.c +++ b/opcodes/m68k-dis.c @@ -13,42 +13,36 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "dis-asm.h" -#include "ieee-float.h" - -extern CONST struct ext_format ext_format_68881; - -/* Opcode/m68k.h is a massive table. As a kludge, break it up into - two pieces. This makes nonportable C -- FIXME -- it assumes that - two data items declared near each other will be contiguous in - memory. This kludge can be removed, FIXME, when GCC is fixed to not - be a hog about initializers. */ - -#ifdef __GNUC__ -#define BREAK_UP_BIG_DECL }; \ - struct m68k_opcode m68k_opcodes_2[] = { -#define AND_OTHER_PART sizeof (m68k_opcodes_2) -#endif +#include "floatformat.h" #include "opcode/m68k.h" - /* Local function prototypes */ static int fetch_arg PARAMS ((unsigned char *, int, int, disassemble_info *)); static void -print_base PARAMS ((int, int, disassemble_info*)); +print_base PARAMS ((int, bfd_vma, disassemble_info*)); static unsigned char * print_indexed PARAMS ((int, unsigned char *, bfd_vma, disassemble_info *)); -static unsigned char * -print_insn_arg PARAMS ((char *, unsigned char *, unsigned char *, bfd_vma, - disassemble_info *)); +static int +print_insn_arg PARAMS ((const char *, unsigned char *, unsigned char *, + bfd_vma, disassemble_info *)); + +CONST char * CONST fpcr_names[] = { + "", "%fpiar", "%fpsr", "%fpiar/%fpsr", "%fpcr", + "%fpiar/%fpcr", "%fpsr/%fpcr", "%fpiar/%fpsr/%fpcr"}; + +static char *const reg_names[] = { + "%d0", "%d1", "%d2", "%d3", "%d4", "%d5", "%d6", "%d7", + "%a0", "%a1", "%a2", "%a3", "%a4", "%a5", "%fp", "%sp", + "%ps", "%pc"}; /* Sign-extend an (unsigned char). */ #if __STDC__ == 1 @@ -57,32 +51,20 @@ print_insn_arg PARAMS ((char *, unsigned char *, unsigned char *, bfd_vma, #define COERCE_SIGNED_CHAR(ch) ((int)(((ch) ^ 0x80) & 0xFF) - 128) #endif -CONST char * CONST fpcr_names[] = { - "", "fpiar", "fpsr", "fpiar/fpsr", "fpcr", - "fpiar/fpcr", "fpsr/fpcr", "fpiar/fpsr/fpcr"}; - -static char *reg_names[] = { - "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7", "a0", - "a1", "a2", "a3", "a4", "a5", "fp", "sp", "ps", "pc"}; - -/* Define accessors for 68K's 1, 2, and 4-byte signed quantities. - The _SHIFT values move the quantity to the high order end of an - `int' value, so it will sign-extend. Probably a few more casts - are needed to make it compile without warnings on finicky systems. */ -#define BITS_PER_BYTE 8 -#define WORD_SHIFT (BITS_PER_BYTE * ((sizeof (int)) - 2)) -#define LONG_SHIFT (BITS_PER_BYTE * ((sizeof (int)) - 4)) - +/* Get a 1 byte signed integer. */ #define NEXTBYTE(p) (p += 2, FETCH_DATA (info, p), COERCE_SIGNED_CHAR(p[-1])) +/* Get a 2 byte signed integer. */ +#define COERCE16(x) ((int) (((x) ^ 0x8000) - 0x8000)) #define NEXTWORD(p) \ (p += 2, FETCH_DATA (info, p), \ - (((int)((p[-2] << 8) + p[-1])) << WORD_SHIFT) >> WORD_SHIFT) + COERCE16 ((p[-2] << 8) + p[-1])) +/* Get a 4 byte signed integer. */ +#define COERCE32(x) ((int) (((x) ^ 0x80000000) - 0x80000000)) #define NEXTLONG(p) \ (p += 4, FETCH_DATA (info, p), \ - (((int)((((((p[-4] << 8) + p[-3]) << 8) + p[-2]) << 8) + p[-1])) \ - << LONG_SHIFT) >> LONG_SHIFT) + (COERCE32 ((((((p[-4] << 8) + p[-3]) << 8) + p[-2]) << 8) + p[-1]))) /* NEXTSINGLE and NEXTDOUBLE handle alignment problems, but not * byte-swapping or other float format differences. FIXME! */ @@ -161,18 +143,24 @@ fetch_data (info, addr) return 1; } -static void -m68k_opcode_error(info, code, place) +/* This function is used to print to the bit-bucket. */ +static int +#ifdef __STDC__ +dummy_printer (FILE * file, const char * format, ...) +#else +dummy_printer (file) FILE *file; +#endif + { return 0; } + +void +dummy_print_address (vma, info) + bfd_vma vma; struct disassemble_info *info; - int code, place; { - (*info->fprintf_func)(info->stream, - "", - code, place); } /* Print the m68k instruction at address MEMADDR in debugged memory, - on STREAM. Returns length of the instruction, in bytes. */ + on INFO->STREAM. Returns length of the instruction, in bytes. */ int print_insn_m68k (memaddr, info) @@ -181,11 +169,15 @@ print_insn_m68k (memaddr, info) { register int i; register unsigned char *p; - register char *d; + unsigned char *save_p; + register const char *d; register unsigned long bestmask; - int best; + const struct m68k_opcode *best = 0; struct private priv; bfd_byte *buffer = priv.the_buffer; + fprintf_ftype save_printer = info->fprintf_func; + void (*save_print_address) PARAMS((bfd_vma, struct disassemble_info*)) + = info->print_address_func; info->private_data = (PTR) &priv; priv.max_fetched = priv.the_buffer; @@ -195,12 +187,13 @@ print_insn_m68k (memaddr, info) return -1; bestmask = 0; - best = -1; FETCH_DATA (info, buffer + 2); - for (i = 0; i < numopcodes; i++) + for (i = 0; i < m68k_numopcodes; i++) { - register unsigned long opcode = m68k_opcodes[i].opcode; - register unsigned long match = m68k_opcodes[i].match; + const struct m68k_opcode *opc = &m68k_opcodes[i]; + unsigned long opcode = opc->opcode; + unsigned long match = opc->match; + if (((0xff & buffer[0] & (match >> 24)) == (0xff & (opcode >> 24))) && ((0xff & buffer[1] & (match >> 16)) == (0xff & (opcode >> 16))) /* Only fetch the next two bytes if we need to. */ @@ -214,7 +207,7 @@ print_insn_m68k (memaddr, info) /* Don't use for printout the variants of divul and divsl that have the same register number in two places. The more general variants will match instead. */ - for (d = m68k_opcodes[i].args; *d; d += 2) + for (d = opc->args; *d; d += 2) if (d[1] == 'D') break; @@ -222,35 +215,33 @@ print_insn_m68k (memaddr, info) point coprocessor instructions which use the same register number in two places, as above. */ if (*d == 0) - for (d = m68k_opcodes[i].args; *d; d += 2) + for (d = opc->args; *d; d += 2) if (d[1] == 't') break; if (*d == 0 && match > bestmask) { - best = i; + best = opc; bestmask = match; } } } - /* Handle undefined instructions. */ - if (best < 0) - { - (*info->fprintf_func) (info->stream, "0%o", - (buffer[0] << 8) + buffer[1]); - return 2; - } - - (*info->fprintf_func) (info->stream, "%s", m68k_opcodes[best].name); + if (best == 0) + goto invalid; /* Point at first word of argument data, and at descriptor for first argument. */ p = buffer + 2; - /* Why do this this way? -MelloN */ - for (d = m68k_opcodes[best].args; *d; d += 2) + /* Figure out how long the fixed-size portion of the instruction is. + The only place this is stored in the opcode table is + in the arguments--look for arguments which specify fields in the 2nd + or 3rd words of the instruction. */ + for (d = best->args; *d; d += 2) { + /* I don't think it is necessary to be checking d[0] here; I suspect + all this could be moved to the case statement below. */ if (d[0] == '#') { if (d[1] == 'l' && p - buffer < 6) @@ -258,41 +249,107 @@ print_insn_m68k (memaddr, info) else if (p - buffer < 4 && d[1] != 'C' && d[1] != '8' ) p = buffer + 4; } - if (d[1] >= '1' && d[1] <= '3' && p - buffer < 4) - p = buffer + 4; - if (d[1] >= '4' && d[1] <= '6' && p - buffer < 6) - p = buffer + 6; if ((d[0] == 'L' || d[0] == 'l') && d[1] == 'w' && p - buffer < 4) p = buffer + 4; + switch (d[1]) + { + case '1': + case '2': + case '3': + case '7': + case '8': + case '9': + case 'i': + if (p - buffer < 4) + p = buffer + 4; + break; + case '4': + case '5': + case '6': + if (p - buffer < 6) + p = buffer + 6; + break; + default: + break; + } } + /* Some opcodes like pflusha and lpstop are exceptions; they take no + arguments but are two words long. Recognize them by looking at + the lower 16 bits of the mask. */ + if (p - buffer < 4 && (best->match & 0xFFFF) != 0) + p = buffer + 4; FETCH_DATA (info, p); - d = m68k_opcodes[best].args; + d = best->args; + + /* We can the operands twice. The first time we don't print anything, + but look for errors. */ + + save_p = p; + info->print_address_func = dummy_print_address; + info->fprintf_func = (fprintf_ftype)dummy_printer; + for ( ; *d; d += 2) + { + int eaten = print_insn_arg (d, buffer, p, memaddr + p - buffer, info); + if (eaten >= 0) + p += eaten; + else if (eaten == -1) + goto invalid; + else + { + (*info->fprintf_func)(info->stream, + "\n", + best->name, + best->args); + goto invalid; + } + + } + p = save_p; + info->fprintf_func = save_printer; + info->print_address_func = save_print_address; + + d = best->args; + + (*info->fprintf_func) (info->stream, "%s", best->name); if (*d) (*info->fprintf_func) (info->stream, " "); while (*d) { - p = print_insn_arg (d, buffer, p, memaddr + p - buffer, info); + p += print_insn_arg (d, buffer, p, memaddr + p - buffer, info); d += 2; if (*d && *(d - 2) != 'I' && *d != 'k') (*info->fprintf_func) (info->stream, ","); } return p - buffer; + + invalid: + /* Handle undefined instructions. */ + info->fprintf_func = save_printer; + info->print_address_func = save_print_address; + (*info->fprintf_func) (info->stream, "0%o", + (buffer[0] << 8) + buffer[1]); + return 2; } -static unsigned char * -print_insn_arg (d, buffer, p, addr, info) - char *d; +/* Returns number of bytes "eaten" by the operand, or + return -1 if an invalid operand was found, or -2 if + an opcode tabe error was found. */ + +static int +print_insn_arg (d, buffer, p0, addr, info) + const char *d; unsigned char *buffer; - register unsigned char *p; + unsigned char *p0; bfd_vma addr; /* PC for this arg to be relative to */ disassemble_info *info; { register int val = 0; register int place = d[1]; + register unsigned char *p = p0; int regno; register CONST char *regname; register unsigned char *p1; @@ -303,7 +360,7 @@ print_insn_arg (d, buffer, p, addr, info) { case 'c': /* cache identifier */ { - static char *cacheFieldName[] = { "NOP", "dc", "ic", "bc" }; + static char *const cacheFieldName[] = { "nc", "dc", "ic", "bc" }; val = fetch_arg (buffer, place, 2, info); (*info->fprintf_func) (info->stream, cacheFieldName[val]); break; @@ -321,38 +378,41 @@ print_insn_arg (d, buffer, p, addr, info) case '_': /* 32-bit absolute address for move16. */ { val = NEXTLONG (p); - (*info->fprintf_func) (info->stream, "@#"); - print_address (val, info->stream); + (*info->print_address_func) (val, info); break; } case 'C': - (*info->fprintf_func) (info->stream, "ccr"); + (*info->fprintf_func) (info->stream, "%%ccr"); break; case 'S': - (*info->fprintf_func) (info->stream, "sr"); + (*info->fprintf_func) (info->stream, "%%sr"); break; case 'U': - (*info->fprintf_func) (info->stream, "usp"); + (*info->fprintf_func) (info->stream, "%%usp"); break; case 'J': { - static struct { char *name; int value; } names[] - = {{"sfc", 0x000}, {"dfc", 0x001}, {"cacr", 0x002}, - {"tc", 0x003}, {"itt0",0x004}, {"itt1", 0x005}, - {"dtt0",0x006}, {"dtt1",0x007}, - {"usp", 0x800}, {"vbr", 0x801}, {"caar", 0x802}, - {"msp", 0x803}, {"isp", 0x804}, {"mmusr",0x805}, - {"urp", 0x806}, {"srp", 0x807}}; + static const struct { char *name; int value; } names[] + = {{"%sfc", 0x000}, {"%dfc", 0x001}, {"%cacr", 0x002}, + {"%tc", 0x003}, {"%itt0",0x004}, {"%itt1", 0x005}, + {"%dtt0",0x006}, {"%dtt1",0x007}, {"%buscr",0x008}, + {"%usp", 0x800}, {"%vbr", 0x801}, {"%caar", 0x802}, + {"%msp", 0x803}, {"%ibsp", 0x804}, + + /* Should we be calling this psr like we do in case 'Y'? */ + {"%mmusr",0x805}, + + {"%urp", 0x806}, {"%srp", 0x807}, {"%pcr", 0x808}}; val = fetch_arg (buffer, place, 12, info); for (regno = sizeof names / sizeof names[0] - 1; regno >= 0; regno--) if (names[regno].value == val) { - (*info->fprintf_func) (info->stream, names[regno].name); + (*info->fprintf_func) (info->stream, "%s", names[regno].name); break; } if (regno < 0) @@ -398,14 +458,16 @@ print_insn_arg (d, buffer, p, addr, info) break; case 'r': - (*info->fprintf_func) - (info->stream, "%s@", - reg_names[fetch_arg (buffer, place, 4, info)]); + regno = fetch_arg (buffer, place, 4, info); + if (regno > 7) + (*info->fprintf_func) (info->stream, "%s@", reg_names[regno]); + else + (*info->fprintf_func) (info->stream, "@(%s)", reg_names[regno]); break; case 'F': (*info->fprintf_func) - (info->stream, "fp%d", + (info->stream, "%%fp%d", fetch_arg (buffer, place, 3, info)); break; @@ -442,7 +504,7 @@ print_insn_arg (d, buffer, p, addr, info) (*info->fprintf_func) (info->stream, "{#%d}", val); } else - m68k_opcode_error (info, *d, place); + return -2; break; case '#': @@ -458,12 +520,12 @@ print_insn_arg (d, buffer, p, addr, info) val = fetch_arg (buffer, place, 8, info); else if (place == 'b') val = NEXTBYTE (p1); - else if (place == 'w') + else if (place == 'w' || place == 'W') val = NEXTWORD (p1); else if (place == 'l') val = NEXTLONG (p1); else - m68k_opcode_error (info, *d, place); + return -2; (*info->fprintf_func) (info->stream, "#%d", val); break; @@ -474,7 +536,7 @@ print_insn_arg (d, buffer, p, addr, info) val = COERCE_SIGNED_CHAR(buffer[1]); else if (place == 'w' || place == 'W') val = NEXTWORD (p); - else if (place == 'l' || place == 'L') + else if (place == 'l' || place == 'L' || place == 'C') val = NEXTLONG (p); else if (place == 'g') { @@ -492,9 +554,9 @@ print_insn_arg (d, buffer, p, addr, info) val = NEXTWORD (p); } else - m68k_opcode_error (info, *d, place); + return -2; - print_address (addr + val, info->stream); + (*info->print_address_func) (addr + val, info); break; case 'd': @@ -515,8 +577,6 @@ print_insn_arg (d, buffer, p, addr, info) if (val != 1) /* Unusual coprocessor ID? */ (*info->fprintf_func) (info->stream, "(cpid=%d) ", val); - if (place == 'i') - p += 2; /* Skip coprocessor extended operands */ break; case '*': @@ -530,6 +590,7 @@ print_insn_arg (d, buffer, p, addr, info) case '/': case '&': case '`': + case '|': if (place == 'd') { @@ -578,19 +639,17 @@ print_insn_arg (d, buffer, p, addr, info) { case 0: val = NEXTWORD (p); - (*info->fprintf_func) (info->stream, "@#"); - print_address (val, info->stream); + (*info->print_address_func) (val, info); break; case 1: val = NEXTLONG (p); - (*info->fprintf_func) (info->stream, "@#"); - print_address (val, info->stream); + (*info->print_address_func) (val, info); break; case 2: val = NEXTWORD (p); - print_address (addr + val, info->stream); + (*info->print_address_func) (addr + val, info); break; case 3: @@ -625,8 +684,9 @@ print_insn_arg (d, buffer, p, addr, info) break; case 'x': - ieee_extended_to_double (&ext_format_68881, - (char *)p, &flval); + FETCH_DATA (info, p + 12); + floatformat_to_double (&floatformat_m68881_ext, + (char *) p, &flval); p += 12; break; @@ -635,7 +695,7 @@ print_insn_arg (d, buffer, p, addr, info) break; default: - m68k_opcode_error (info, *d, place); + return -1; } if ( flt_p ) /* Print a float? */ (*info->fprintf_func) (info->stream, "#%g", flval); @@ -644,9 +704,7 @@ print_insn_arg (d, buffer, p, addr, info) break; default: - (*info->fprintf_func) (info->stream, - "", - (unsigned) val); + return -1; } } break; @@ -719,23 +777,89 @@ print_insn_arg (d, buffer, p, addr, info) if (doneany) (*info->fprintf_func) (info->stream, "/"); doneany = 1; - (*info->fprintf_func) (info->stream, "fp%d", regno); + (*info->fprintf_func) (info->stream, "%%fp%d", regno); first_regno = regno; while (val & (1 << (regno + 1))) ++regno; if (regno > first_regno) - (*info->fprintf_func) (info->stream, "-fp%d", regno); + (*info->fprintf_func) (info->stream, "-%%fp%d", regno); } } else - goto de_fault; + return -2; + break; + + case 'X': + place = '8'; + case 'Y': + case 'Z': + case 'W': + case '0': + case '1': + case '2': + case '3': + { + int val = fetch_arg (buffer, place, 5, info); + char *name = 0; + switch (val) + { + case 2: name = "%tt0"; break; + case 3: name = "%tt1"; break; + case 0x10: name = "%tc"; break; + case 0x11: name = "%drp"; break; + case 0x12: name = "%srp"; break; + case 0x13: name = "%crp"; break; + case 0x14: name = "%cal"; break; + case 0x15: name = "%val"; break; + case 0x16: name = "%scc"; break; + case 0x17: name = "%ac"; break; + case 0x18: name = "%psr"; break; + case 0x19: name = "%pcsr"; break; + case 0x1c: + case 0x1d: + { + int break_reg = ((buffer[3] >> 2) & 7); + (*info->fprintf_func) + (info->stream, val == 0x1c ? "%%bad%d" : "%%bac%d", + break_reg); + } + break; + default: + (*info->fprintf_func) (info->stream, "", val); + } + if (name) + (*info->fprintf_func) (info->stream, "%s", name); + } + break; + + case 'f': + { + int fc = fetch_arg (buffer, place, 5, info); + if (fc == 1) + (*info->fprintf_func) (info->stream, "%%dfc"); + else if (fc == 0) + (*info->fprintf_func) (info->stream, "%%sfc"); + else + (*info->fprintf_func) (info->stream, "", fc); + } + break; + + case 'V': + (*info->fprintf_func) (info->stream, "%%val"); + break; + + case 't': + { + int level = fetch_arg (buffer, place, 3, info); + (*info->fprintf_func) (info->stream, "%d", level); + } break; - default: de_fault: - m68k_opcode_error (info, *d, ' '); + default: + return -2; } - return (unsigned char *) p; + return p - p0; } /* Fetch BITS bits from a position in the instruction specified by CODE. @@ -873,16 +997,17 @@ print_indexed (basereg, p, addr, info) disassemble_info *info; { register int word; - static char *scales[] = {"", "*2", "*4", "*8"}; - register int base_disp; - register int outer_disp; + static char *const scales[] = {"", ":2", ":4", ":8"}; + bfd_vma base_disp; + bfd_vma outer_disp; char buf[40]; + char vmabuf[50]; word = NEXTWORD (p); /* Generate the text for the index register. Where this will be output is not yet determined. */ - sprintf (buf, "[%s.%c%s]", + sprintf (buf, "%s:%c%s", reg_names[(word >> 12) & 0xf], (word & 0x800) ? 'l' : 'w', scales[(word >> 9) & 3]); @@ -891,11 +1016,13 @@ print_indexed (basereg, p, addr, info) if ((word & 0x100) == 0) { - print_base (basereg, - ((word & 0x80) ? word | 0xff00 : word & 0xff) - + ((basereg == -1) ? addr : 0), - info); - (*info->fprintf_func) (info->stream, "%s", buf); + word &= 0xff; + if ((word & 0x80) != 0) + word -= 0x100; + if (basereg == -1) + word += addr; + print_base (basereg, word, info); + (*info->fprintf_func) (info->stream, ",%s)", buf); return p; } @@ -903,9 +1030,14 @@ print_indexed (basereg, p, addr, info) /* First, compute the displacement to add to the base register. */ if (word & 0200) - basereg = -2; + { + if (basereg == -1) + basereg = -3; + else + basereg = -2; + } if (word & 0100) - buf[0] = 0; + buf[0] = '\0'; base_disp = 0; switch ((word >> 4) & 3) { @@ -923,7 +1055,9 @@ print_indexed (basereg, p, addr, info) if ((word & 7) == 0) { print_base (basereg, base_disp, info); - (*info->fprintf_func) (info->stream, "%s", buf); + if (buf[0] != '\0') + (*info->fprintf_func) (info->stream, ",%s", buf); + (*info->fprintf_func) (info->stream, ")"); return p; } @@ -939,15 +1073,17 @@ print_indexed (basereg, p, addr, info) outer_disp = NEXTLONG (p); } - (*info->fprintf_func) (info->stream, "%d(", outer_disp); print_base (basereg, base_disp, info); - - /* If postindexed, print the closeparen before the index. */ - if (word & 4) - (*info->fprintf_func) (info->stream, ")%s", buf); - /* If preindexed, print the closeparen after the index. */ - else - (*info->fprintf_func) (info->stream, "%s)", buf); + if ((word & 4) == 0 && buf[0] != '\0') + { + (*info->fprintf_func) (info->stream, ",%s", buf); + buf[0] = '\0'; + } + sprintf_vma (vmabuf, outer_disp); + (*info->fprintf_func) (info->stream, ")@(%s", vmabuf); + if (buf[0] != '\0') + (*info->fprintf_func) (info->stream, ",%s", buf); + (*info->fprintf_func) (info->stream, ")"); return p; } @@ -958,13 +1094,26 @@ print_indexed (basereg, p, addr, info) static void print_base (regno, disp, info) int regno; - int disp; + bfd_vma disp; disassemble_info *info; { - if (regno == -2) - (*info->fprintf_func) (info->stream, "%d", disp); - else if (regno == -1) - (*info->fprintf_func) (info->stream, "0x%x", (unsigned) disp); + if (regno == -1) + { + (*info->fprintf_func) (info->stream, "%%pc@("); + (*info->print_address_func) (disp, info); + } else - (*info->fprintf_func) (info->stream, "%d(%s)", disp, reg_names[regno]); + { + char buf[50]; + + if (regno == -2) + (*info->fprintf_func) (info->stream, "@("); + else if (regno == -3) + (*info->fprintf_func) (info->stream, "%%zpc@("); + else + (*info->fprintf_func) (info->stream, "%s@(", reg_names[regno]); + + sprintf_vma (buf, disp); + (*info->fprintf_func) (info->stream, "%s", buf); + } }