X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fvax-tdep.c;h=c344b4334c85ca04146e809261acba75264db25f;hb=feb129926a8d12656f1ca4b7a8bb10268d3af4fb;hp=f9dd9fa82b95d015c48d62c97148c2b67449e3ed;hpb=0f75e2e37bb2c608d9057dac13a72c4f480c960e;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/vax-tdep.c b/gdb/vax-tdep.c index f9dd9fa82b..c344b4334c 100644 --- a/gdb/vax-tdep.c +++ b/gdb/vax-tdep.c @@ -1,21 +1,22 @@ /* Print VAX instructions for GDB, the GNU debugger. Copyright 1986, 1989, 1991, 1992, 1996 Free Software Foundation, Inc. -This file is part of GDB. + This file is part of GDB. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include "defs.h" #include "symtab.h" @@ -29,6 +30,48 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ static unsigned char *print_insn_arg (); +/* Advance PC across any function entry prologue instructions + to reach some "real" code. */ + +CORE_ADDR +vax_skip_prologue (pc) + CORE_ADDR pc; +{ + register int op = (unsigned char) read_memory_integer (pc, 1); + if (op == 0x11) + pc += 2; /* skip brb */ + if (op == 0x31) + pc += 3; /* skip brw */ + if (op == 0xC2 + && ((unsigned char) read_memory_integer (pc + 2, 1)) == 0x5E) + pc += 3; /* skip subl2 */ + if (op == 0x9E + && ((unsigned char) read_memory_integer (pc + 1, 1)) == 0xAE + && ((unsigned char) read_memory_integer (pc + 3, 1)) == 0x5E) + pc += 4; /* skip movab */ + if (op == 0x9E + && ((unsigned char) read_memory_integer (pc + 1, 1)) == 0xCE + && ((unsigned char) read_memory_integer (pc + 4, 1)) == 0x5E) + pc += 5; /* skip movab */ + if (op == 0x9E + && ((unsigned char) read_memory_integer (pc + 1, 1)) == 0xEE + && ((unsigned char) read_memory_integer (pc + 6, 1)) == 0x5E) + pc += 7; /* skip movab */ + return pc; +} + +/* Return number of args passed to a frame. + Can return -1, meaning no way to tell. */ + +int +vax_frame_num_args (fi) + struct frame_info *fi; +{ + return (0xff & read_memory_integer (FRAME_ARGS_ADDRESS (fi), 1)); +} + + + /* Print the vax instruction at address MEMADDR in debugged memory, from disassembler info INFO. Returns length of the instruction, in bytes. */ @@ -42,23 +85,27 @@ vax_print_insn (memaddr, info) register int i; register unsigned char *p; register char *d; - GDB_FILE *stream = info->stream; - read_memory (memaddr, buffer, MAXLEN); + int status = (*info->read_memory_func) (memaddr, buffer, MAXLEN, info); + if (status != 0) + { + (*info->memory_error_func) (status, memaddr, info); + return -1; + } for (i = 0; i < NOPCODES; i++) if (votstrs[i].detail.code == buffer[0] - || votstrs[i].detail.code == *(unsigned short *)buffer) + || votstrs[i].detail.code == *(unsigned short *) buffer) break; /* Handle undefined instructions. */ if (i == NOPCODES) { - fprintf_unfiltered (stream, "0%o", buffer[0]); + (*info->fprintf_func) (info->stream, "0%o", buffer[0]); return 1; } - fprintf_unfiltered (stream, "%s", votstrs[i].name); + (*info->fprintf_func) (info->stream, "%s", votstrs[i].name); /* Point at first byte of argument data, and at descriptor for first argument. */ @@ -66,24 +113,24 @@ vax_print_insn (memaddr, info) d = votstrs[i].detail.args; if (*d) - fputc_unfiltered (' ', stream); + (*info->fprintf_func) (info->stream, " "); while (*d) { - p = print_insn_arg (d, p, memaddr + (p - buffer), stream); + p = print_insn_arg (d, p, memaddr + (p - buffer), info); d += 2; if (*d) - fprintf_unfiltered (stream, ","); + (*info->fprintf_func) (info->stream, ","); } return p - buffer; } static unsigned char * -print_insn_arg (d, p, addr, stream) +print_insn_arg (d, p, addr, info) char *d; register char *p; CORE_ADDR addr; - GDB_FILE *stream; + disassemble_info *info; { register int regnum = *p & 0xf; float floatlitbuf; @@ -91,10 +138,10 @@ print_insn_arg (d, p, addr, stream) if (*d == 'b') { if (d[1] == 'b') - fprintf_unfiltered (stream, "0x%x", addr + *p++ + 1); + (*info->fprintf_func) (info->stream, "0x%x", addr + *p++ + 1); else { - fprintf_unfiltered (stream, "0x%x", addr + *(short *)p + 2); + (*info->fprintf_func) (info->stream, "0x%x", addr + *(short *) p + 2); p += 2; } } @@ -107,129 +154,145 @@ print_insn_arg (d, p, addr, stream) case 3: /* Literal mode */ if (d[1] == 'd' || d[1] == 'f' || d[1] == 'g' || d[1] == 'h') { - *(int *)&floatlitbuf = 0x4000 + ((p[-1] & 0x3f) << 4); - fprintf_unfiltered (stream, "$%f", floatlitbuf); + *(int *) &floatlitbuf = 0x4000 + ((p[-1] & 0x3f) << 4); + (*info->fprintf_func) (info->stream, "$%f", floatlitbuf); } else - fprintf_unfiltered (stream, "$%d", p[-1] & 0x3f); + (*info->fprintf_func) (info->stream, "$%d", p[-1] & 0x3f); break; case 4: /* Indexed */ - p = (char *) print_insn_arg (d, p, addr + 1, stream); - fprintf_unfiltered (stream, "[%s]", reg_names[regnum]); + p = (char *) print_insn_arg (d, p, addr + 1, info); + (*info->fprintf_func) (info->stream, "[%s]", REGISTER_NAME (regnum)); break; case 5: /* Register */ - fprintf_unfiltered (stream, reg_names[regnum]); + (*info->fprintf_func) (info->stream, REGISTER_NAME (regnum)); break; case 7: /* Autodecrement */ - fputc_unfiltered ('-', stream); + (*info->fprintf_func) (info->stream, "-"); case 6: /* Register deferred */ - fprintf_unfiltered (stream, "(%s)", reg_names[regnum]); + (*info->fprintf_func) (info->stream, "(%s)", REGISTER_NAME (regnum)); break; case 9: /* Autoincrement deferred */ - fputc_unfiltered ('@', stream); + (*info->fprintf_func) (info->stream, "@"); if (regnum == PC_REGNUM) { - fputc_unfiltered ('#', stream); - print_address (*(long *)p, stream); + (*info->fprintf_func) (info->stream, "#"); + info->target = *(long *) p; + (*info->print_address_func) (info->target, info); p += 4; break; } case 8: /* Autoincrement */ if (regnum == PC_REGNUM) { - fputc_unfiltered ('#', stream); + (*info->fprintf_func) (info->stream, "#"); switch (d[1]) { case 'b': - fprintf_unfiltered (stream, "%d", *p++); + (*info->fprintf_func) (info->stream, "%d", *p++); break; case 'w': - fprintf_unfiltered (stream, "%d", *(short *)p); + (*info->fprintf_func) (info->stream, "%d", *(short *) p); p += 2; break; case 'l': - fprintf_unfiltered (stream, "%d", *(long *)p); + (*info->fprintf_func) (info->stream, "%d", *(long *) p); p += 4; break; case 'q': - fprintf_unfiltered (stream, "0x%x%08x", ((long *)p)[1], ((long *)p)[0]); + (*info->fprintf_func) (info->stream, "0x%x%08x", + ((long *) p)[1], ((long *) p)[0]); p += 8; break; case 'o': - fprintf_unfiltered (stream, "0x%x%08x%08x%08x", - ((long *)p)[3], ((long *)p)[2], - ((long *)p)[1], ((long *)p)[0]); + (*info->fprintf_func) (info->stream, "0x%x%08x%08x%08x", + ((long *) p)[3], ((long *) p)[2], + ((long *) p)[1], ((long *) p)[0]); p += 16; break; case 'f': if (INVALID_FLOAT (p, 4)) - fprintf_unfiltered (stream, "<>", *(int *) p); + (*info->fprintf_func) (info->stream, + "<>", + *(int *) p); else - fprintf_unfiltered (stream, "%f", *(float *) p); + (*info->fprintf_func) (info->stream, "%f", *(float *) p); p += 4; break; case 'd': if (INVALID_FLOAT (p, 8)) - fprintf_unfiltered (stream, "<>", - ((long *)p)[1], ((long *)p)[0]); + (*info->fprintf_func) (info->stream, + "<>", + ((long *) p)[1], ((long *) p)[0]); else - fprintf_unfiltered (stream, "%f", *(double *) p); + (*info->fprintf_func) (info->stream, "%f", *(double *) p); p += 8; break; case 'g': - fprintf_unfiltered (stream, "g-float"); + (*info->fprintf_func) (info->stream, "g-float"); p += 8; break; case 'h': - fprintf_unfiltered (stream, "h-float"); + (*info->fprintf_func) (info->stream, "h-float"); p += 16; break; } } else - fprintf_unfiltered (stream, "(%s)+", reg_names[regnum]); + (*info->fprintf_func) (info->stream, "(%s)+", REGISTER_NAME (regnum)); break; case 11: /* Byte displacement deferred */ - fputc_unfiltered ('@', stream); + (*info->fprintf_func) (info->stream, "@"); case 10: /* Byte displacement */ if (regnum == PC_REGNUM) - print_address (addr + *p + 2, stream); + { + info->target = addr + *p + 2; + (*info->print_address_func) (info->target, info); + } else - fprintf_unfiltered (stream, "%d(%s)", *p, reg_names[regnum]); + (*info->fprintf_func) (info->stream, "%d(%s)", *p, REGISTER_NAME (regnum)); p += 1; break; case 13: /* Word displacement deferred */ - fputc_unfiltered ('@', stream); + (*info->fprintf_func) (info->stream, "@"); case 12: /* Word displacement */ if (regnum == PC_REGNUM) - print_address (addr + *(short *)p + 3, stream); + { + info->target = addr + *(short *) p + 3; + (*info->print_address_func) (info->target, info); + } else - fprintf_unfiltered (stream, "%d(%s)", *(short *)p, reg_names[regnum]); + (*info->fprintf_func) (info->stream, "%d(%s)", + *(short *) p, REGISTER_NAME (regnum)); p += 2; break; case 15: /* Long displacement deferred */ - fputc_unfiltered ('@', stream); + (*info->fprintf_func) (info->stream, "@"); case 14: /* Long displacement */ if (regnum == PC_REGNUM) - print_address (addr + *(long *)p + 5, stream); + { + info->target = addr + *(short *) p + 5; + (*info->print_address_func) (info->target, info); + } else - fprintf_unfiltered (stream, "%d(%s)", *(long *)p, reg_names[regnum]); + (*info->fprintf_func) (info->stream, "%d(%s)", + *(long *) p, REGISTER_NAME (regnum)); p += 4; }