* vax-tdep.c (vax_print_insn, print_insn_arg): Use info functions
for printing. From Valeriy Ushakov <uwe@ptc.spbu.ru>.
This commit is contained in:
parent
0db3fe94c3
commit
94cff946b8
|
@ -1,3 +1,8 @@
|
||||||
|
Sun Dec 1 00:41:47 1996 Peter Schauer (pes@regent.e-technik.tu-muenchen.de)
|
||||||
|
|
||||||
|
* vax-tdep.c (vax_print_insn, print_insn_arg): Use info functions
|
||||||
|
for printing. From Valeriy Ushakov <uwe@ptc.spbu.ru>.
|
||||||
|
|
||||||
Sun Dec 1 00:18:59 1996 Peter Schauer (pes@regent.e-technik.tu-muenchen.de)
|
Sun Dec 1 00:18:59 1996 Peter Schauer (pes@regent.e-technik.tu-muenchen.de)
|
||||||
|
|
||||||
Add support for Irix 6.2 native O32 and N32 ABI.
|
Add support for Irix 6.2 native O32 and N32 ABI.
|
||||||
|
|
106
gdb/vax-tdep.c
106
gdb/vax-tdep.c
|
@ -42,9 +42,13 @@ vax_print_insn (memaddr, info)
|
||||||
register int i;
|
register int i;
|
||||||
register unsigned char *p;
|
register unsigned char *p;
|
||||||
register char *d;
|
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++)
|
for (i = 0; i < NOPCODES; i++)
|
||||||
if (votstrs[i].detail.code == buffer[0]
|
if (votstrs[i].detail.code == buffer[0]
|
||||||
|
@ -54,11 +58,11 @@ vax_print_insn (memaddr, info)
|
||||||
/* Handle undefined instructions. */
|
/* Handle undefined instructions. */
|
||||||
if (i == NOPCODES)
|
if (i == NOPCODES)
|
||||||
{
|
{
|
||||||
fprintf_unfiltered (stream, "0%o", buffer[0]);
|
(*info->fprintf_func) (info->stream, "0%o", buffer[0]);
|
||||||
return 1;
|
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,
|
/* Point at first byte of argument data,
|
||||||
and at descriptor for first argument. */
|
and at descriptor for first argument. */
|
||||||
|
@ -66,24 +70,24 @@ vax_print_insn (memaddr, info)
|
||||||
d = votstrs[i].detail.args;
|
d = votstrs[i].detail.args;
|
||||||
|
|
||||||
if (*d)
|
if (*d)
|
||||||
fputc_unfiltered (' ', stream);
|
(*info->fprintf_func) (info->stream, " ");
|
||||||
|
|
||||||
while (*d)
|
while (*d)
|
||||||
{
|
{
|
||||||
p = print_insn_arg (d, p, memaddr + (p - buffer), stream);
|
p = print_insn_arg (d, p, memaddr + (p - buffer), info);
|
||||||
d += 2;
|
d += 2;
|
||||||
if (*d)
|
if (*d)
|
||||||
fprintf_unfiltered (stream, ",");
|
(*info->fprintf_func) (info->stream, ",");
|
||||||
}
|
}
|
||||||
return p - buffer;
|
return p - buffer;
|
||||||
}
|
}
|
||||||
|
|
||||||
static unsigned char *
|
static unsigned char *
|
||||||
print_insn_arg (d, p, addr, stream)
|
print_insn_arg (d, p, addr, info)
|
||||||
char *d;
|
char *d;
|
||||||
register char *p;
|
register char *p;
|
||||||
CORE_ADDR addr;
|
CORE_ADDR addr;
|
||||||
GDB_FILE *stream;
|
disassemble_info *info;
|
||||||
{
|
{
|
||||||
register int regnum = *p & 0xf;
|
register int regnum = *p & 0xf;
|
||||||
float floatlitbuf;
|
float floatlitbuf;
|
||||||
|
@ -91,10 +95,10 @@ print_insn_arg (d, p, addr, stream)
|
||||||
if (*d == 'b')
|
if (*d == 'b')
|
||||||
{
|
{
|
||||||
if (d[1] == 'b')
|
if (d[1] == 'b')
|
||||||
fprintf_unfiltered (stream, "0x%x", addr + *p++ + 1);
|
(*info->fprintf_func) (info->stream, "0x%x", addr + *p++ + 1);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
fprintf_unfiltered (stream, "0x%x", addr + *(short *)p + 2);
|
(*info->fprintf_func) (info->stream, "0x%x", addr + *(short *)p + 2);
|
||||||
p += 2;
|
p += 2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -108,63 +112,65 @@ print_insn_arg (d, p, addr, stream)
|
||||||
if (d[1] == 'd' || d[1] == 'f' || d[1] == 'g' || d[1] == 'h')
|
if (d[1] == 'd' || d[1] == 'f' || d[1] == 'g' || d[1] == 'h')
|
||||||
{
|
{
|
||||||
*(int *)&floatlitbuf = 0x4000 + ((p[-1] & 0x3f) << 4);
|
*(int *)&floatlitbuf = 0x4000 + ((p[-1] & 0x3f) << 4);
|
||||||
fprintf_unfiltered (stream, "$%f", floatlitbuf);
|
(*info->fprintf_func) (info->stream, "$%f", floatlitbuf);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
fprintf_unfiltered (stream, "$%d", p[-1] & 0x3f);
|
(*info->fprintf_func) (info->stream, "$%d", p[-1] & 0x3f);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 4: /* Indexed */
|
case 4: /* Indexed */
|
||||||
p = (char *) print_insn_arg (d, p, addr + 1, stream);
|
p = (char *) print_insn_arg (d, p, addr + 1, info);
|
||||||
fprintf_unfiltered (stream, "[%s]", reg_names[regnum]);
|
(*info->fprintf_func) (info->stream, "[%s]", reg_names[regnum]);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 5: /* Register */
|
case 5: /* Register */
|
||||||
fprintf_unfiltered (stream, reg_names[regnum]);
|
(*info->fprintf_func) (info->stream, reg_names[regnum]);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 7: /* Autodecrement */
|
case 7: /* Autodecrement */
|
||||||
fputc_unfiltered ('-', stream);
|
(*info->fprintf_func) (info->stream, "-");
|
||||||
case 6: /* Register deferred */
|
case 6: /* Register deferred */
|
||||||
fprintf_unfiltered (stream, "(%s)", reg_names[regnum]);
|
(*info->fprintf_func) (info->stream, "(%s)", reg_names[regnum]);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 9: /* Autoincrement deferred */
|
case 9: /* Autoincrement deferred */
|
||||||
fputc_unfiltered ('@', stream);
|
(*info->fprintf_func) (info->stream, "@");
|
||||||
if (regnum == PC_REGNUM)
|
if (regnum == PC_REGNUM)
|
||||||
{
|
{
|
||||||
fputc_unfiltered ('#', stream);
|
(*info->fprintf_func) (info->stream, "#");
|
||||||
print_address (*(long *)p, stream);
|
info->target = *(long *)p;
|
||||||
|
(*info->print_address_func) (info->target, info);
|
||||||
p += 4;
|
p += 4;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 8: /* Autoincrement */
|
case 8: /* Autoincrement */
|
||||||
if (regnum == PC_REGNUM)
|
if (regnum == PC_REGNUM)
|
||||||
{
|
{
|
||||||
fputc_unfiltered ('#', stream);
|
(*info->fprintf_func) (info->stream, "#");
|
||||||
switch (d[1])
|
switch (d[1])
|
||||||
{
|
{
|
||||||
case 'b':
|
case 'b':
|
||||||
fprintf_unfiltered (stream, "%d", *p++);
|
(*info->fprintf_func) (info->stream, "%d", *p++);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'w':
|
case 'w':
|
||||||
fprintf_unfiltered (stream, "%d", *(short *)p);
|
(*info->fprintf_func) (info->stream, "%d", *(short *)p);
|
||||||
p += 2;
|
p += 2;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'l':
|
case 'l':
|
||||||
fprintf_unfiltered (stream, "%d", *(long *)p);
|
(*info->fprintf_func) (info->stream, "%d", *(long *)p);
|
||||||
p += 4;
|
p += 4;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'q':
|
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;
|
p += 8;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'o':
|
case 'o':
|
||||||
fprintf_unfiltered (stream, "0x%x%08x%08x%08x",
|
(*info->fprintf_func) (info->stream, "0x%x%08x%08x%08x",
|
||||||
((long *)p)[3], ((long *)p)[2],
|
((long *)p)[3], ((long *)p)[2],
|
||||||
((long *)p)[1], ((long *)p)[0]);
|
((long *)p)[1], ((long *)p)[0]);
|
||||||
p += 16;
|
p += 16;
|
||||||
|
@ -172,64 +178,78 @@ print_insn_arg (d, p, addr, stream)
|
||||||
|
|
||||||
case 'f':
|
case 'f':
|
||||||
if (INVALID_FLOAT (p, 4))
|
if (INVALID_FLOAT (p, 4))
|
||||||
fprintf_unfiltered (stream, "<<invalid float 0x%x>>", *(int *) p);
|
(*info->fprintf_func) (info->stream,
|
||||||
|
"<<invalid float 0x%x>>",
|
||||||
|
*(int *) p);
|
||||||
else
|
else
|
||||||
fprintf_unfiltered (stream, "%f", *(float *) p);
|
(*info->fprintf_func) (info->stream, "%f", *(float *) p);
|
||||||
p += 4;
|
p += 4;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'd':
|
case 'd':
|
||||||
if (INVALID_FLOAT (p, 8))
|
if (INVALID_FLOAT (p, 8))
|
||||||
fprintf_unfiltered (stream, "<<invalid float 0x%x%08x>>",
|
(*info->fprintf_func) (info->stream,
|
||||||
|
"<<invalid float 0x%x%08x>>",
|
||||||
((long *)p)[1], ((long *)p)[0]);
|
((long *)p)[1], ((long *)p)[0]);
|
||||||
else
|
else
|
||||||
fprintf_unfiltered (stream, "%f", *(double *) p);
|
(*info->fprintf_func) (info->stream, "%f", *(double *) p);
|
||||||
p += 8;
|
p += 8;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'g':
|
case 'g':
|
||||||
fprintf_unfiltered (stream, "g-float");
|
(*info->fprintf_func) (info->stream, "g-float");
|
||||||
p += 8;
|
p += 8;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'h':
|
case 'h':
|
||||||
fprintf_unfiltered (stream, "h-float");
|
(*info->fprintf_func) (info->stream, "h-float");
|
||||||
p += 16;
|
p += 16;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
fprintf_unfiltered (stream, "(%s)+", reg_names[regnum]);
|
(*info->fprintf_func) (info->stream, "(%s)+", reg_names[regnum]);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 11: /* Byte displacement deferred */
|
case 11: /* Byte displacement deferred */
|
||||||
fputc_unfiltered ('@', stream);
|
(*info->fprintf_func) (info->stream, "@");
|
||||||
case 10: /* Byte displacement */
|
case 10: /* Byte displacement */
|
||||||
if (regnum == PC_REGNUM)
|
if (regnum == PC_REGNUM)
|
||||||
print_address (addr + *p + 2, stream);
|
{
|
||||||
|
info->target = addr + *p + 2;
|
||||||
|
(*info->print_address_func) (info->target, info);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
fprintf_unfiltered (stream, "%d(%s)", *p, reg_names[regnum]);
|
(*info->fprintf_func) (info->stream, "%d(%s)", *p, reg_names[regnum]);
|
||||||
p += 1;
|
p += 1;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 13: /* Word displacement deferred */
|
case 13: /* Word displacement deferred */
|
||||||
fputc_unfiltered ('@', stream);
|
(*info->fprintf_func) (info->stream, "@");
|
||||||
case 12: /* Word displacement */
|
case 12: /* Word displacement */
|
||||||
if (regnum == PC_REGNUM)
|
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
|
else
|
||||||
fprintf_unfiltered (stream, "%d(%s)", *(short *)p, reg_names[regnum]);
|
(*info->fprintf_func) (info->stream, "%d(%s)",
|
||||||
|
*(short *)p, reg_names[regnum]);
|
||||||
p += 2;
|
p += 2;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 15: /* Long displacement deferred */
|
case 15: /* Long displacement deferred */
|
||||||
fputc_unfiltered ('@', stream);
|
(*info->fprintf_func) (info->stream, "@");
|
||||||
case 14: /* Long displacement */
|
case 14: /* Long displacement */
|
||||||
if (regnum == PC_REGNUM)
|
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
|
else
|
||||||
fprintf_unfiltered (stream, "%d(%s)", *(long *)p, reg_names[regnum]);
|
(*info->fprintf_func) (info->stream, "%d(%s)",
|
||||||
|
*(long *)p, reg_names[regnum]);
|
||||||
p += 4;
|
p += 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue