* ieee-float.c: Moved to ../libiberty.
* ieee-float.h: Moved to ../include. * Makefile.in: Update accordingly. * i386-pinsn.c (print_insn), m68k-pinsn.c (print_insn): Convert to stubs that call disassemblers in ../opcodes/*-dis.c. * m68k-tdep.c: Removed definition of ext_format ext_format_68881; it is now in ../opcodes/m68881-ext.c. * mips-tdep.c (mips_skip_prologue): Try to skip more of the prologue (some callers _do_ care). * mips-pinsn.c (print_insn), z8k-tdep.c (print_insn): Convert to new interface of ../opcodes/*-dis.c. * ch-exp.y: Add #include <ctype.h>.
This commit is contained in:
Per Bothner
parent
2e8adbd7f4
commit
00cea52f92
|
|
@ -121,8 +121,6 @@ i386v4-nat.c
|
|||
i387-tdep.c
|
||||
i960-pinsn.c
|
||||
i960-tdep.c
|
||||
ieee-float.c
|
||||
ieee-float.h
|
||||
infcmd.c
|
||||
inferior.h
|
||||
inflow.c
|
||||
|
|
|
|||
|
|
@ -1,3 +1,18 @@
|
|||
Thu Mar 18 14:26:57 1993 Per Bothner (bothner@rtl.cygnus.com)
|
||||
|
||||
* ieee-float.c: Moved to ../libiberty.
|
||||
* ieee-float.h: Moved to ../include.
|
||||
* Makefile.in: Update accordingly.
|
||||
* i386-pinsn.c (print_insn), m68k-pinsn.c (print_insn):
|
||||
Convert to stubs that call disassemblers in ../opcodes/*-dis.c.
|
||||
* m68k-tdep.c: Removed definition of ext_format ext_format_68881;
|
||||
it is now in ../opcodes/m68881-ext.c.
|
||||
* mips-tdep.c (mips_skip_prologue): Try to skip more of the
|
||||
prologue (some callers _do_ care).
|
||||
* mips-pinsn.c (print_insn), z8k-tdep.c (print_insn): Convert to
|
||||
new interface of ../opcodes/*-dis.c.
|
||||
* ch-exp.y: Add #include <ctype.h>.
|
||||
|
||||
Thu Mar 18 11:57:49 1993 Jim Kingdon (kingdon@cygnus.com)
|
||||
|
||||
* xcoffexec.c (exec_close): Don't close exec_bfd twice.
|
||||
|
|
|
|||
|
|
@ -285,7 +285,7 @@ SFILES_MAINDIR = \
|
|||
utils.c valarith.c valops.c valprint.c values.c c-exp.y m2-exp.y \
|
||||
mem-break.c target.c \
|
||||
dbxread.c coffread.c elfread.c dwarfread.c stabsread.c \
|
||||
ieee-float.c language.c parse.c buildsym.c objfiles.c \
|
||||
language.c parse.c buildsym.c objfiles.c \
|
||||
minsyms.c mipsread.c maint.c ch-exp.y c-lang.c ch-lang.c m2-lang.c \
|
||||
complaints.c typeprint.c c-typeprint.c ch-typeprint.c m2-typeprint.c \
|
||||
c-valprint.c cp-valprint.c ch-valprint.c m2-valprint.c
|
||||
|
|
@ -343,7 +343,7 @@ SFILES_KGDB = $(SFILES) stuff.c kdb-start.c
|
|||
# Header files that are not named in config/* Makefile fragments go here.
|
||||
HFILES= breakpoint.h buildsym.h call-cmds.h command.h defs.h \
|
||||
environ.h expression.h frame.h gdbcmd.h gdbcore.h gdbtypes.h \
|
||||
gdb-stabs.h ieee-float.h inferior.h language.h \
|
||||
ieee-float.h inferior.h language.h \
|
||||
minimon.h objfiles.h parser-defs.h partial-stab.h \
|
||||
serial.h signals.h solib.h symfile.h symtab.h stabsread.h \
|
||||
target.h terminal.h typeprint.h xcoffsolib.h value.h \
|
||||
|
|
@ -389,7 +389,7 @@ OBS = version.o main.o blockframe.o breakpoint.o findvar.o stack.o source.o \
|
|||
symtab.o symfile.o symmisc.o infcmd.o infrun.o remote.o \
|
||||
command.o utils.o expprint.o environ.o gdbtypes.o \
|
||||
copying.o $(DEPFILES) mem-break.o target.o \
|
||||
ieee-float.o putenv.o parse.o language.o $(YYOBJ) \
|
||||
putenv.o parse.o language.o $(YYOBJ) \
|
||||
buildsym.o objfiles.o minsyms.o maint.o demangle.o \
|
||||
dbxread.o coffread.o elfread.o dwarfread.o mipsread.o \
|
||||
stabsread.o core.o c-lang.o ch-lang.o m2-lang.o complaints.o \
|
||||
|
|
|
|||
|
|
@ -54,6 +54,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
|
|||
%{
|
||||
|
||||
#include "defs.h"
|
||||
#include <ctype.h>
|
||||
#include "expression.h"
|
||||
#include "language.h"
|
||||
#include "value.h"
|
||||
|
|
|
|||
12
gdb/depend
12
gdb/depend
|
|
@ -133,9 +133,7 @@ i960-pinsn.o : i960-pinsn.c defs.h ${srcdir}/../include/ansidecl.h xm.h config.s
|
|||
gdbtypes.h expression.h
|
||||
i960-tdep.o : i960-tdep.c defs.h ${srcdir}/../include/ansidecl.h xm.h config.status nm.h ${srcdir}/../include/fopen-same.h \
|
||||
tm.h config.status symtab.h ${srcdir}/../include/obstack.h value.h gdbtypes.h expression.h frame.h \
|
||||
ieee-float.h
|
||||
ieee-float.o : ieee-float.c defs.h ${srcdir}/../include/ansidecl.h xm.h config.status nm.h ${srcdir}/../include/fopen-same.h \
|
||||
tm.h config.status ieee-float.h
|
||||
${srcdir}/../include/ieee-float.h
|
||||
infcmd.o : infcmd.c defs.h ${srcdir}/../include/ansidecl.h xm.h config.status nm.h ${srcdir}/../include/fopen-same.h \
|
||||
tm.h config.status symtab.h ${srcdir}/../include/obstack.h gdbtypes.h frame.h inferior.h breakpoint.h \
|
||||
value.h expression.h environ.h gdbcmd.h command.h gdbcore.h ${srcdir}/../include/bfd.h \
|
||||
|
|
@ -171,9 +169,9 @@ m2-valprint.o : m2-valprint.c defs.h ${srcdir}/../include/ansidecl.h xm.h config
|
|||
tm.h config.status ${srcdir}/../include/obstack.h symtab.h gdbtypes.h valprint.h
|
||||
m68k-pinsn.o : m68k-pinsn.c defs.h ${srcdir}/../include/ansidecl.h xm.h config.status nm.h ${srcdir}/../include/fopen-same.h \
|
||||
tm.h config.status symtab.h ${srcdir}/../include/obstack.h ${srcdir}/../include/opcode/m68k.h gdbcore.h ${srcdir}/../include/bfd.h \
|
||||
ieee-float.h
|
||||
${srcdir}/../include/ieee-float.h
|
||||
m68k-tdep.o : m68k-tdep.c defs.h ${srcdir}/../include/ansidecl.h xm.h config.status nm.h ${srcdir}/../include/fopen-same.h \
|
||||
tm.h config.status ieee-float.h frame.h symtab.h ${srcdir}/../include/obstack.h
|
||||
tm.h config.status ${srcdir}/../include/ieee-float.h frame.h symtab.h ${srcdir}/../include/obstack.h
|
||||
m88k-nat.o : m88k-nat.c defs.h ${srcdir}/../include/ansidecl.h xm.h config.status nm.h ${srcdir}/../include/fopen-same.h \
|
||||
tm.h config.status frame.h inferior.h symtab.h ${srcdir}/../include/obstack.h breakpoint.h value.h \
|
||||
gdbtypes.h expression.h gdbcore.h ${srcdir}/../include/bfd.h /usr/include/setjmp.h
|
||||
|
|
@ -255,7 +253,7 @@ remote-mm.o : remote-mm.c defs.h ${srcdir}/../include/ansidecl.h xm.h config.sta
|
|||
gdbtypes.h expression.h ${srcdir}/../include/wait.h terminal.h minimon.h target.h ${srcdir}/../include/bfd.h
|
||||
remote-nindy.o : remote-nindy.c defs.h ${srcdir}/../include/ansidecl.h xm.h config.status nm.h ${srcdir}/../include/fopen-same.h \
|
||||
tm.h config.status frame.h inferior.h symtab.h ${srcdir}/../include/obstack.h breakpoint.h value.h \
|
||||
gdbtypes.h expression.h target.h ${srcdir}/../include/bfd.h gdbcore.h command.h ieee-float.h \
|
||||
gdbtypes.h expression.h target.h ${srcdir}/../include/bfd.h gdbcore.h command.h ${srcdir}/../include/ieee-float.h \
|
||||
${srcdir}/../include/wait.h ${srcdir}/nindy-share/ttycntl.h ${srcdir}/nindy-share/demux.h ${srcdir}/nindy-share/env.h \
|
||||
${srcdir}/nindy-share/stop.h
|
||||
remote-st2000.o : remote-st2000.c defs.h ${srcdir}/../include/ansidecl.h xm.h config.status nm.h ${srcdir}/../include/fopen-same.h \
|
||||
|
|
@ -295,7 +293,7 @@ sparc-pinsn.o : sparc-pinsn.c defs.h ${srcdir}/../include/ansidecl.h xm.h config
|
|||
target.h
|
||||
sparc-tdep.o : sparc-tdep.c defs.h ${srcdir}/../include/ansidecl.h xm.h config.status nm.h ${srcdir}/../include/fopen-same.h \
|
||||
tm.h config.status frame.h inferior.h symtab.h ${srcdir}/../include/obstack.h breakpoint.h value.h \
|
||||
gdbtypes.h expression.h target.h ${srcdir}/../include/bfd.h ieee-float.h gdbcore.h
|
||||
gdbtypes.h expression.h target.h ${srcdir}/../include/bfd.h ${srcdir}/../include/ieee-float.h gdbcore.h
|
||||
stabsread.o : stabsread.c defs.h ${srcdir}/../include/ansidecl.h xm.h config.status nm.h ${srcdir}/../include/fopen-same.h \
|
||||
tm.h config.status ${srcdir}/../include/bfd.h ${srcdir}/../include/obstack.h symtab.h gdbtypes.h symfile.h \
|
||||
${srcdir}/../include/demangle.h objfiles.h ${srcdir}/../include/aout/stab_gnu.h ${srcdir}/../include/aout/stab.def \
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@
|
|||
*** 200,206 ****
|
||||
mem-break.c target.c \
|
||||
dbxread.c coffread.c elfread.c dwarfread.c xcoffread.c stabsread.c \
|
||||
ieee-float.c language.c parse.c buildsym.c objfiles.c \
|
||||
language.c parse.c buildsym.c objfiles.c \
|
||||
! minsyms.c mipsread.c maint.c
|
||||
|
||||
# Source files in subdirectories (which will be handled separately by
|
||||
|
|
@ -71,7 +71,7 @@
|
|||
--- 207,213 ----
|
||||
mem-break.c target.c \
|
||||
dbxread.c coffread.c elfread.c dwarfread.c xcoffread.c stabsread.c \
|
||||
ieee-float.c language.c parse.c buildsym.c objfiles.c \
|
||||
language.c parse.c buildsym.c objfiles.c \
|
||||
! minsyms.c mipsread.c maint.c energize.c
|
||||
|
||||
# Source files in subdirectories (which will be handled separately by
|
||||
|
|
@ -80,7 +80,7 @@
|
|||
*** 289,295 ****
|
||||
command.o utils.o expprint.o environ.o version.o gdbtypes.o \
|
||||
copying.o $(DEPFILES) mem-break.o target.o \
|
||||
ieee-float.o putenv.o parse.o language.o $(YYOBJ) \
|
||||
putenv.o parse.o language.o $(YYOBJ) \
|
||||
! buildsym.o objfiles.o minsyms.o maint.o demangle.o \
|
||||
dbxread.o coffread.o elfread.o dwarfread.o xcoffread.o mipsread.o \
|
||||
stabsread.o core.o
|
||||
|
|
@ -88,7 +88,7 @@
|
|||
--- 296,302 ----
|
||||
command.o utils.o expprint.o environ.o version.o gdbtypes.o \
|
||||
copying.o $(DEPFILES) mem-break.o target.o \
|
||||
ieee-float.o putenv.o parse.o language.o $(YYOBJ) \
|
||||
putenv.o parse.o language.o $(YYOBJ) \
|
||||
! buildsym.o objfiles.o minsyms.o maint.o demangle.o energize.o \
|
||||
dbxread.o coffread.o elfread.o dwarfread.o xcoffread.o mipsread.o \
|
||||
stabsread.o core.o
|
||||
|
|
|
|||
1884
gdb/i386-pinsn.c
1884
gdb/i386-pinsn.c
File diff suppressed because it is too large
Load Diff
149
gdb/ieee-float.c
149
gdb/ieee-float.c
|
|
@ -1,149 +0,0 @@
|
|||
/* IEEE floating point support routines, for GDB, the GNU Debugger.
|
||||
Copyright (C) 1991 Free Software Foundation, Inc.
|
||||
|
||||
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 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., 675 Mass Ave, Cambridge, MA 02139, USA. */
|
||||
|
||||
#include "defs.h"
|
||||
#include "ieee-float.h"
|
||||
#include <math.h> /* ldexp */
|
||||
|
||||
/* Convert an IEEE extended float to a double.
|
||||
FROM is the address of the extended float.
|
||||
Store the double in *TO. */
|
||||
|
||||
void
|
||||
ieee_extended_to_double (ext_format, from, to)
|
||||
const struct ext_format *ext_format;
|
||||
char *from;
|
||||
double *to;
|
||||
{
|
||||
unsigned char *ufrom = (unsigned char *)from;
|
||||
double dto;
|
||||
unsigned long mant0, mant1, exponent;
|
||||
|
||||
memcpy (&mant0, &from[MANBYTE_H], 4);
|
||||
memcpy (&mant1, &from[MANBYTE_L], 4);
|
||||
exponent = ((ufrom[EXPBYTE_H] & (unsigned char)~SIGNMASK) << 8) | ufrom[EXPBYTE_L];
|
||||
|
||||
#if 0
|
||||
/* We can't do anything useful with a NaN anyway, so ignore its
|
||||
difference. It will end up as Infinity or something close. */
|
||||
if (exponent == EXT_EXP_NAN) {
|
||||
/* We have a NaN source. */
|
||||
dto = 0.123456789; /* Not much else useful to do -- we don't know if
|
||||
the host system even *has* NaNs, nor how to
|
||||
generate an innocuous one if it does. */
|
||||
} else
|
||||
#endif
|
||||
if (exponent == 0 && mant0 == 0 && mant1 == 0) {
|
||||
dto = 0;
|
||||
} else {
|
||||
/* Build the result algebraically. Might go infinite, underflow, etc;
|
||||
who cares. */
|
||||
mant0 |= 0x80000000;
|
||||
dto = ldexp ((double)mant0, exponent - EXT_EXP_BIAS - 31);
|
||||
dto += ldexp ((double)mant1, exponent - EXT_EXP_BIAS - 31 - 32);
|
||||
if (ufrom[EXPBYTE_H] & SIGNMASK) /* If negative... */
|
||||
dto = -dto; /* ...negate. */
|
||||
}
|
||||
*to = dto;
|
||||
}
|
||||
|
||||
/* The converse: convert the double *FROM to an extended float
|
||||
and store where TO points. */
|
||||
|
||||
void
|
||||
double_to_ieee_extended (ext_format, from, to)
|
||||
const struct ext_format *ext_format;
|
||||
double *from;
|
||||
char *to;
|
||||
{
|
||||
double dfrom = *from;
|
||||
unsigned long twolongs[2];
|
||||
unsigned long mant0, mant1, exponent;
|
||||
unsigned char tobytes[8];
|
||||
|
||||
memset (to, 0, TOTALSIZE);
|
||||
if (dfrom == 0)
|
||||
return; /* Result is zero */
|
||||
if (dfrom != dfrom) {
|
||||
/* From is NaN */
|
||||
to[EXPBYTE_H] = (unsigned char)(EXT_EXP_NAN >> 8);
|
||||
to[EXPBYTE_L] = (unsigned char)EXT_EXP_NAN;
|
||||
to[MANBYTE_H] = 1; /* Be sure it's not infinity, but NaN value is irrel */
|
||||
return; /* Result is NaN */
|
||||
}
|
||||
if (dfrom < 0)
|
||||
to[SIGNBYTE] |= SIGNMASK; /* Set negative sign */
|
||||
/* How to tell an infinity from an ordinary number? FIXME-someday */
|
||||
|
||||
/* The following code assumes that the host has IEEE doubles. FIXME-someday.
|
||||
It also assumes longs are 32 bits! FIXME-someday. */
|
||||
memcpy (twolongs, from, 8);
|
||||
memcpy (tobytes, from, 8);
|
||||
#if HOST_BYTE_ORDER == BIG_ENDIAN
|
||||
exponent = ((tobytes[1] & 0xF0) >> 4) | (tobytes[0] & 0x7F) << 4;
|
||||
mant0 = (twolongs[0] << 11) | twolongs[1] >> 21;
|
||||
mant1 = (twolongs[1] << 11);
|
||||
#else
|
||||
exponent = ((tobytes[6] & 0xF0) >> 4) | (tobytes[7] & 0x7F) << 4;
|
||||
mant0 = (twolongs[1] << 11) | twolongs[0] >> 21;
|
||||
mant1 = (twolongs[0] << 11);
|
||||
#endif
|
||||
|
||||
/* Fiddle with leading 1-bit, implied in double, explicit in extended. */
|
||||
if (exponent == 0)
|
||||
mant0 &= 0x7FFFFFFF;
|
||||
else
|
||||
mant0 |= 0x80000000;
|
||||
|
||||
exponent -= DBL_EXP_BIAS; /* Get integer exp */
|
||||
exponent += EXT_EXP_BIAS; /* Offset for extended */
|
||||
|
||||
/* OK, now store it in extended format. */
|
||||
to[EXPBYTE_H] |= (unsigned char)(exponent >> 8); /* Retain sign */
|
||||
to[EXPBYTE_L] = (unsigned char) exponent;
|
||||
|
||||
memcpy (&to[MANBYTE_H], &mant0, 4);
|
||||
memcpy (&to[MANBYTE_L], &mant1, 4);
|
||||
}
|
||||
|
||||
|
||||
#ifdef IEEE_DEBUG
|
||||
|
||||
/* Test some numbers to see that extended/double conversion works for them. */
|
||||
|
||||
ieee_test (n)
|
||||
int n;
|
||||
{
|
||||
union { double d; int i[2]; } di;
|
||||
double result;
|
||||
int i;
|
||||
char exten[16];
|
||||
extern struct ext_format ext_format_68881;
|
||||
|
||||
for (i = 0; i < n; i++) {
|
||||
di.i[0] = (random() << 16) | (random() & 0xffff);
|
||||
di.i[1] = (random() << 16) | (random() & 0xffff);
|
||||
double_to_ieee_extended (&ext_format_68881, &di.d, exten);
|
||||
ieee_extended_to_double (&ext_format_68881, exten, &result);
|
||||
if (di.d != result)
|
||||
printf ("Differ: %x %x %g => %x %x %g\n", di.d, di.d, result, result);
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
@ -1,63 +0,0 @@
|
|||
/* IEEE floating point support declarations, for GDB, the GNU Debugger.
|
||||
Copyright (C) 1991 Free Software Foundation, Inc.
|
||||
|
||||
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 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., 675 Mass Ave, Cambridge, MA 02139, USA. */
|
||||
|
||||
#if !defined (IEEE_FLOAT_H)
|
||||
#define IEEE_FLOAT_H 1
|
||||
|
||||
/* Parameters for extended float format: */
|
||||
|
||||
struct ext_format {
|
||||
unsigned totalsize; /* Total size of extended number */
|
||||
unsigned signbyte; /* Byte number of sign bit */
|
||||
unsigned char signmask; /* Mask for sign bit */
|
||||
unsigned expbyte_h; /* High byte of exponent */
|
||||
unsigned expbyte_l; /* Low byte of exponent */
|
||||
unsigned manbyte_h; /* High byte of mantissa */
|
||||
unsigned manbyte_l; /* Low byte of mantissa */
|
||||
};
|
||||
|
||||
#define TOTALSIZE ext_format->totalsize
|
||||
#define SIGNBYTE ext_format->signbyte
|
||||
#define SIGNMASK ext_format->signmask
|
||||
#define EXPBYTE_H ext_format->expbyte_h
|
||||
#define EXPBYTE_L ext_format->expbyte_l
|
||||
#define MANBYTE_H ext_format->manbyte_h
|
||||
#define MANBYTE_L ext_format->manbyte_l
|
||||
|
||||
/* Actual ext_format structs for various machines are in the *-tdep.c file
|
||||
for each machine. */
|
||||
|
||||
#define EXT_EXP_NAN 0x7FFF /* Exponent value that indicates NaN */
|
||||
#define EXT_EXP_BIAS 0x3FFF /* Amount added to "true" exponent for ext */
|
||||
#define DBL_EXP_BIAS 0x3FF /* Ditto, for doubles */
|
||||
|
||||
/* Convert an IEEE extended float to a double.
|
||||
FROM is the address of the extended float.
|
||||
Store the double in *TO. */
|
||||
|
||||
extern void
|
||||
ieee_extended_to_double PARAMS ((const struct ext_format *, char *, double *));
|
||||
|
||||
/* The converse: convert the double *FROM to an extended float
|
||||
and store where TO points. */
|
||||
|
||||
extern void
|
||||
double_to_ieee_extended PARAMS ((const struct ext_format *, double *, char *));
|
||||
|
||||
#endif /* defined (IEEE_FLOAT_H) */
|
||||
803
gdb/m68k-pinsn.c
803
gdb/m68k-pinsn.c
|
|
@ -18,71 +18,10 @@ along with this program; if not, write to the Free Software
|
|||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
|
||||
|
||||
#include "defs.h"
|
||||
#include "symtab.h"
|
||||
#include "gdbcore.h"
|
||||
#include "ieee-float.h"
|
||||
|
||||
/* 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 "opcode/m68k.h"
|
||||
|
||||
|
||||
/* Local function prototypes */
|
||||
|
||||
static int
|
||||
fetch_arg PARAMS ((unsigned char *, int, int));
|
||||
|
||||
static void
|
||||
print_base PARAMS ((int, int, FILE *));
|
||||
|
||||
static unsigned char *
|
||||
print_indexed PARAMS ((int, unsigned char *, CORE_ADDR, FILE *));
|
||||
|
||||
static unsigned char *
|
||||
print_insn_arg PARAMS ((char *, unsigned char *, unsigned char *, CORE_ADDR,
|
||||
FILE *));
|
||||
#include "dis-asm.h"
|
||||
|
||||
/* 68k instructions are never longer than this many bytes. */
|
||||
#define MAXLEN 22
|
||||
|
||||
const char * const fpcr_names[] = {
|
||||
"", "fpiar", "fpsr", "fpiar/fpsr", "fpcr",
|
||||
"fpiar/fpcr", "fpsr/fpcr", "fpiar/fpsr/fpcr"};
|
||||
|
||||
/* 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 BYTE_SHIFT (BITS_PER_BYTE * ((sizeof (int)) - 1))
|
||||
#define WORD_SHIFT (BITS_PER_BYTE * ((sizeof (int)) - 2))
|
||||
#define LONG_SHIFT (BITS_PER_BYTE * ((sizeof (int)) - 4))
|
||||
|
||||
#define NEXTBYTE(p) (p += 2, ((int)(p[-1]) << BYTE_SHIFT) >> BYTE_SHIFT)
|
||||
|
||||
#define NEXTWORD(p) \
|
||||
(p += 2, (((int)((p[-2] << 8) + p[-1])) << WORD_SHIFT) >> WORD_SHIFT)
|
||||
|
||||
#define NEXTLONG(p) \
|
||||
(p += 4, (((int)((((((p[-4] << 8) + p[-3]) << 8) + p[-2]) << 8) + p[-1])) \
|
||||
<< LONG_SHIFT) >> LONG_SHIFT)
|
||||
|
||||
/* Ecch -- assumes host == target float formats. FIXME. */
|
||||
#define NEXTSINGLE(p) \
|
||||
(p += 4, *((float *)(p - 4)))
|
||||
|
||||
#define NEXTDOUBLE(p) \
|
||||
(p += 8, *((double *)(p - 8)))
|
||||
|
||||
/* Print the m68k instruction at address MEMADDR in debugged memory,
|
||||
on STREAM. Returns length of the instruction, in bytes. */
|
||||
|
|
@ -98,742 +37,10 @@ print_insn (memaddr, stream)
|
|||
register char *d;
|
||||
register int bestmask;
|
||||
int best;
|
||||
disassemble_info info;
|
||||
|
||||
GDB_INIT_DISASSEMBLE_INFO(info, stream);
|
||||
|
||||
read_memory (memaddr, (char *) buffer, MAXLEN);
|
||||
|
||||
bestmask = 0;
|
||||
best = -1;
|
||||
for (i = 0; i < numopcodes; i++)
|
||||
{
|
||||
register unsigned int opcode = m68k_opcodes[i].opcode;
|
||||
register unsigned int match = m68k_opcodes[i].match;
|
||||
if (((0xff & buffer[0] & (match >> 24)) == (0xff & (opcode >> 24)))
|
||||
&& ((0xff & buffer[1] & (match >> 16)) == (0xff & (opcode >> 16)))
|
||||
&& ((0xff & buffer[2] & (match >> 8)) == (0xff & (opcode >> 8)))
|
||||
&& ((0xff & buffer[3] & match) == (0xff & opcode)))
|
||||
{
|
||||
/* 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)
|
||||
if (d[1] == 'D')
|
||||
break;
|
||||
|
||||
/* Don't use for printout the variants of most floating
|
||||
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)
|
||||
if (d[1] == 't')
|
||||
break;
|
||||
|
||||
if (*d == 0 && match > bestmask)
|
||||
{
|
||||
best = i;
|
||||
bestmask = match;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Handle undefined instructions. */
|
||||
if (best < 0)
|
||||
{
|
||||
fprintf_filtered (stream, "0%o", (buffer[0] << 8) + buffer[1]);
|
||||
return 2;
|
||||
}
|
||||
|
||||
fprintf_filtered (stream, "%s", m68k_opcodes[best].name);
|
||||
|
||||
/* 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)
|
||||
{
|
||||
if (d[0] == '#')
|
||||
{
|
||||
if (d[1] == 'l' && p - buffer < 6)
|
||||
p = buffer + 6;
|
||||
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;
|
||||
}
|
||||
|
||||
d = m68k_opcodes[best].args;
|
||||
|
||||
if (*d)
|
||||
fputs_filtered (" ", stream);
|
||||
|
||||
while (*d)
|
||||
{
|
||||
p = print_insn_arg (d, buffer, p, memaddr + p - buffer, stream);
|
||||
d += 2;
|
||||
if (*d && *(d - 2) != 'I' && *d != 'k')
|
||||
fputs_filtered (",", stream);
|
||||
}
|
||||
return p - buffer;
|
||||
}
|
||||
|
||||
static unsigned char *
|
||||
print_insn_arg (d, buffer, p, addr, stream)
|
||||
char *d;
|
||||
unsigned char *buffer;
|
||||
register unsigned char *p;
|
||||
CORE_ADDR addr; /* PC for this arg to be relative to */
|
||||
FILE *stream;
|
||||
{
|
||||
register int val;
|
||||
register int place = d[1];
|
||||
int regno;
|
||||
register const char *regname;
|
||||
register unsigned char *p1;
|
||||
double flval;
|
||||
int flt_p;
|
||||
|
||||
switch (*d)
|
||||
{
|
||||
case 'c': /* cache identifier */
|
||||
{
|
||||
static char *cacheFieldName[] = { "NOP", "dc", "ic", "bc" };
|
||||
val = fetch_arg (buffer, place, 2);
|
||||
fprintf_filtered (stream, cacheFieldName[val]);
|
||||
break;
|
||||
}
|
||||
|
||||
case 'a': /* address register indirect only. Cf. case '+'. */
|
||||
{
|
||||
fprintf_filtered (stream,
|
||||
"%s@",
|
||||
reg_names [fetch_arg (buffer, place, 3) + 8]);
|
||||
break;
|
||||
}
|
||||
|
||||
case '_': /* 32-bit absolute address for move16. */
|
||||
{
|
||||
val = NEXTLONG (p);
|
||||
fprintf_filtered (stream, "@#");
|
||||
print_address (val, stream);
|
||||
break;
|
||||
}
|
||||
|
||||
case 'C':
|
||||
fprintf_filtered (stream, "ccr");
|
||||
break;
|
||||
|
||||
case 'S':
|
||||
fprintf_filtered (stream, "sr");
|
||||
break;
|
||||
|
||||
case 'U':
|
||||
fprintf_filtered (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}};
|
||||
|
||||
val = fetch_arg (buffer, place, 12);
|
||||
for (regno = sizeof names / sizeof names[0] - 1; regno >= 0; regno--)
|
||||
if (names[regno].value == val)
|
||||
{
|
||||
fprintf_filtered (stream, names[regno].name);
|
||||
break;
|
||||
}
|
||||
if (regno < 0)
|
||||
fprintf_filtered (stream, "%d", val);
|
||||
}
|
||||
break;
|
||||
|
||||
case 'Q':
|
||||
val = fetch_arg (buffer, place, 3);
|
||||
/* 0 means 8, except for the bkpt instruction... */
|
||||
if (val == 0 && d[1] != 's')
|
||||
val = 8;
|
||||
fprintf_filtered (stream, "#%d", val);
|
||||
break;
|
||||
|
||||
case 'M':
|
||||
val = fetch_arg (buffer, place, 8);
|
||||
if (val & 0x80)
|
||||
val = val - 0x100;
|
||||
fprintf_filtered (stream, "#%d", val);
|
||||
break;
|
||||
|
||||
case 'T':
|
||||
val = fetch_arg (buffer, place, 4);
|
||||
fprintf_filtered (stream, "#%d", val);
|
||||
break;
|
||||
|
||||
case 'D':
|
||||
fprintf_filtered (stream, "%s", reg_names[fetch_arg (buffer, place, 3)]);
|
||||
break;
|
||||
|
||||
case 'A':
|
||||
fprintf_filtered (stream, "%s",
|
||||
reg_names[fetch_arg (buffer, place, 3) + 010]);
|
||||
break;
|
||||
|
||||
case 'R':
|
||||
fprintf_filtered (stream, "%s", reg_names[fetch_arg (buffer, place, 4)]);
|
||||
break;
|
||||
|
||||
case 'r':
|
||||
fprintf_filtered (stream, "%s@", reg_names[fetch_arg (buffer, place, 4)]);
|
||||
break;
|
||||
|
||||
case 'F':
|
||||
fprintf_filtered (stream, "fp%d", fetch_arg (buffer, place, 3));
|
||||
break;
|
||||
|
||||
case 'O':
|
||||
val = fetch_arg (buffer, place, 6);
|
||||
if (val & 0x20)
|
||||
fprintf_filtered (stream, "%s", reg_names [val & 7]);
|
||||
else
|
||||
fprintf_filtered (stream, "%d", val);
|
||||
break;
|
||||
|
||||
case '+':
|
||||
fprintf_filtered (stream, "%s@+",
|
||||
reg_names[fetch_arg (buffer, place, 3) + 8]);
|
||||
break;
|
||||
|
||||
case '-':
|
||||
fprintf_filtered (stream, "%s@-",
|
||||
reg_names[fetch_arg (buffer, place, 3) + 8]);
|
||||
break;
|
||||
|
||||
case 'k':
|
||||
if (place == 'k')
|
||||
fprintf_filtered (stream, "{%s}", reg_names[fetch_arg (buffer, place, 3)]);
|
||||
else if (place == 'C')
|
||||
{
|
||||
val = fetch_arg (buffer, place, 7);
|
||||
if ( val > 63 ) /* This is a signed constant. */
|
||||
val -= 128;
|
||||
fprintf_filtered (stream, "{#%d}", val);
|
||||
}
|
||||
else
|
||||
error ("Invalid arg format in opcode table: \"%c%c\".",
|
||||
*d, place);
|
||||
break;
|
||||
|
||||
case '#':
|
||||
case '^':
|
||||
p1 = buffer + (*d == '#' ? 2 : 4);
|
||||
if (place == 's')
|
||||
val = fetch_arg (buffer, place, 4);
|
||||
else if (place == 'C')
|
||||
val = fetch_arg (buffer, place, 7);
|
||||
else if (place == '8')
|
||||
val = fetch_arg (buffer, place, 3);
|
||||
else if (place == '3')
|
||||
val = fetch_arg (buffer, place, 8);
|
||||
else if (place == 'b')
|
||||
val = NEXTBYTE (p1);
|
||||
else if (place == 'w')
|
||||
val = NEXTWORD (p1);
|
||||
else if (place == 'l')
|
||||
val = NEXTLONG (p1);
|
||||
else
|
||||
error ("Invalid arg format in opcode table: \"%c%c\".",
|
||||
*d, place);
|
||||
fprintf_filtered (stream, "#%d", val);
|
||||
break;
|
||||
|
||||
case 'B':
|
||||
if (place == 'b')
|
||||
val = NEXTBYTE (p);
|
||||
else if (place == 'B')
|
||||
val = NEXTBYTE (buffer); /* from the opcode word */
|
||||
else if (place == 'w' || place == 'W')
|
||||
val = NEXTWORD (p);
|
||||
else if (place == 'l' || place == 'L')
|
||||
val = NEXTLONG (p);
|
||||
else if (place == 'g')
|
||||
{
|
||||
val = NEXTBYTE (buffer);
|
||||
if (val == 0)
|
||||
val = NEXTWORD (p);
|
||||
else if (val == -1)
|
||||
val = NEXTLONG (p);
|
||||
}
|
||||
else if (place == 'c')
|
||||
{
|
||||
if (buffer[1] & 0x40) /* If bit six is one, long offset */
|
||||
val = NEXTLONG (p);
|
||||
else
|
||||
val = NEXTWORD (p);
|
||||
}
|
||||
else
|
||||
error ("Invalid arg format in opcode table: \"%c%c\".",
|
||||
*d, place);
|
||||
|
||||
print_address (addr + val, stream);
|
||||
break;
|
||||
|
||||
case 'd':
|
||||
val = NEXTWORD (p);
|
||||
fprintf_filtered (stream, "%s@(%d)",
|
||||
reg_names[fetch_arg (buffer, place, 3)], val);
|
||||
break;
|
||||
|
||||
case 's':
|
||||
fprintf_filtered (stream, "%s",
|
||||
fpcr_names[fetch_arg (buffer, place, 3)]);
|
||||
break;
|
||||
|
||||
case 'I':
|
||||
val = fetch_arg (buffer, 'd', 3); /* Get coprocessor ID... */
|
||||
if (val != 1) /* Unusual coprocessor ID? */
|
||||
fprintf_filtered (stream, "(cpid=%d) ", val);
|
||||
if (place == 'i')
|
||||
p += 2; /* Skip coprocessor extended operands */
|
||||
break;
|
||||
|
||||
case '*':
|
||||
case '~':
|
||||
case '%':
|
||||
case ';':
|
||||
case '@':
|
||||
case '!':
|
||||
case '$':
|
||||
case '?':
|
||||
case '/':
|
||||
case '&':
|
||||
case '`':
|
||||
|
||||
if (place == 'd')
|
||||
{
|
||||
val = fetch_arg (buffer, 'x', 6);
|
||||
val = ((val & 7) << 3) + ((val >> 3) & 7);
|
||||
}
|
||||
else
|
||||
val = fetch_arg (buffer, 's', 6);
|
||||
|
||||
/* Get register number assuming address register. */
|
||||
regno = (val & 7) + 8;
|
||||
regname = reg_names[regno];
|
||||
switch (val >> 3)
|
||||
{
|
||||
case 0:
|
||||
fprintf_filtered (stream, "%s", reg_names[val]);
|
||||
break;
|
||||
|
||||
case 1:
|
||||
fprintf_filtered (stream, "%s", regname);
|
||||
break;
|
||||
|
||||
case 2:
|
||||
fprintf_filtered (stream, "%s@", regname);
|
||||
break;
|
||||
|
||||
case 3:
|
||||
fprintf_filtered (stream, "%s@+", regname);
|
||||
break;
|
||||
|
||||
case 4:
|
||||
fprintf_filtered (stream, "%s@-", regname);
|
||||
break;
|
||||
|
||||
case 5:
|
||||
val = NEXTWORD (p);
|
||||
fprintf_filtered (stream, "%s@(%d)", regname, val);
|
||||
break;
|
||||
|
||||
case 6:
|
||||
p = print_indexed (regno, p, addr, stream);
|
||||
break;
|
||||
|
||||
case 7:
|
||||
switch (val & 7)
|
||||
{
|
||||
case 0:
|
||||
val = NEXTWORD (p);
|
||||
fprintf_filtered (stream, "@#");
|
||||
print_address (val, stream);
|
||||
break;
|
||||
|
||||
case 1:
|
||||
val = NEXTLONG (p);
|
||||
fprintf_filtered (stream, "@#");
|
||||
print_address (val, stream);
|
||||
break;
|
||||
|
||||
case 2:
|
||||
val = NEXTWORD (p);
|
||||
print_address (addr + val, stream);
|
||||
break;
|
||||
|
||||
case 3:
|
||||
p = print_indexed (-1, p, addr, stream);
|
||||
break;
|
||||
|
||||
case 4:
|
||||
flt_p = 1; /* Assume it's a float... */
|
||||
switch( place )
|
||||
{
|
||||
case 'b':
|
||||
val = NEXTBYTE (p);
|
||||
flt_p = 0;
|
||||
break;
|
||||
|
||||
case 'w':
|
||||
val = NEXTWORD (p);
|
||||
flt_p = 0;
|
||||
break;
|
||||
|
||||
case 'l':
|
||||
val = NEXTLONG (p);
|
||||
flt_p = 0;
|
||||
break;
|
||||
|
||||
case 'f':
|
||||
flval = NEXTSINGLE(p);
|
||||
break;
|
||||
|
||||
case 'F':
|
||||
flval = NEXTDOUBLE(p);
|
||||
break;
|
||||
|
||||
#ifdef HAVE_68881
|
||||
case 'x':
|
||||
ieee_extended_to_double (&ext_format_68881,
|
||||
(char *)p, &flval);
|
||||
p += 12;
|
||||
break;
|
||||
#endif
|
||||
|
||||
case 'p':
|
||||
p += 12;
|
||||
flval = 0; /* FIXME, handle packed decimal someday. */
|
||||
break;
|
||||
|
||||
default:
|
||||
error ("Invalid arg format in opcode table: \"%c%c\".",
|
||||
*d, place);
|
||||
}
|
||||
if ( flt_p ) /* Print a float? */
|
||||
fprintf_filtered (stream, "#%g", flval);
|
||||
else
|
||||
fprintf_filtered (stream, "#%d", val);
|
||||
break;
|
||||
|
||||
default:
|
||||
fprintf_filtered (stream, "<invalid address mode 0%o>", val);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case 'L':
|
||||
case 'l':
|
||||
if (place == 'w')
|
||||
{
|
||||
char doneany;
|
||||
p1 = buffer + 2;
|
||||
val = NEXTWORD (p1);
|
||||
/* Move the pointer ahead if this point is farther ahead
|
||||
than the last. */
|
||||
p = p1 > p ? p1 : p;
|
||||
if (val == 0)
|
||||
{
|
||||
fputs_filtered ("#0", stream);
|
||||
break;
|
||||
}
|
||||
if (*d == 'l')
|
||||
{
|
||||
register int newval = 0;
|
||||
for (regno = 0; regno < 16; ++regno)
|
||||
if (val & (0x8000 >> regno))
|
||||
newval |= 1 << regno;
|
||||
val = newval;
|
||||
}
|
||||
val &= 0xffff;
|
||||
doneany = 0;
|
||||
for (regno = 0; regno < 16; ++regno)
|
||||
if (val & (1 << regno))
|
||||
{
|
||||
int first_regno;
|
||||
if (doneany)
|
||||
fputs_filtered ("/", stream);
|
||||
doneany = 1;
|
||||
fprintf_filtered (stream, "%s", reg_names[regno]);
|
||||
first_regno = regno;
|
||||
while (val & (1 << (regno + 1)))
|
||||
++regno;
|
||||
if (regno > first_regno)
|
||||
fprintf_filtered (stream, "-%s", reg_names[regno]);
|
||||
}
|
||||
}
|
||||
else if (place == '3')
|
||||
{
|
||||
/* `fmovem' insn. */
|
||||
char doneany;
|
||||
val = fetch_arg (buffer, place, 8);
|
||||
if (val == 0)
|
||||
{
|
||||
fputs_filtered ("#0", stream);
|
||||
break;
|
||||
}
|
||||
if (*d == 'l')
|
||||
{
|
||||
register int newval = 0;
|
||||
for (regno = 0; regno < 8; ++regno)
|
||||
if (val & (0x80 >> regno))
|
||||
newval |= 1 << regno;
|
||||
val = newval;
|
||||
}
|
||||
val &= 0xff;
|
||||
doneany = 0;
|
||||
for (regno = 0; regno < 8; ++regno)
|
||||
if (val & (1 << regno))
|
||||
{
|
||||
int first_regno;
|
||||
if (doneany)
|
||||
fputs_filtered ("/", stream);
|
||||
doneany = 1;
|
||||
fprintf_filtered (stream, "fp%d", regno);
|
||||
first_regno = regno;
|
||||
while (val & (1 << (regno + 1)))
|
||||
++regno;
|
||||
if (regno > first_regno)
|
||||
fprintf_filtered (stream, "-fp%d", regno);
|
||||
}
|
||||
}
|
||||
else
|
||||
goto de_fault;
|
||||
break;
|
||||
|
||||
default: de_fault:
|
||||
error ("Invalid arg format in opcode table: \"%c\".", *d);
|
||||
}
|
||||
|
||||
return (unsigned char *) p;
|
||||
}
|
||||
|
||||
/* Fetch BITS bits from a position in the instruction specified by CODE.
|
||||
CODE is a "place to put an argument", or 'x' for a destination
|
||||
that is a general address (mode and register).
|
||||
BUFFER contains the instruction. */
|
||||
|
||||
static int
|
||||
fetch_arg (buffer, code, bits)
|
||||
unsigned char *buffer;
|
||||
int code;
|
||||
int bits;
|
||||
{
|
||||
register int val;
|
||||
switch (code)
|
||||
{
|
||||
case 's':
|
||||
val = buffer[1];
|
||||
break;
|
||||
|
||||
case 'd': /* Destination, for register or quick. */
|
||||
val = (buffer[0] << 8) + buffer[1];
|
||||
val >>= 9;
|
||||
break;
|
||||
|
||||
case 'x': /* Destination, for general arg */
|
||||
val = (buffer[0] << 8) + buffer[1];
|
||||
val >>= 6;
|
||||
break;
|
||||
|
||||
case 'k':
|
||||
val = (buffer[3] >> 4);
|
||||
break;
|
||||
|
||||
case 'C':
|
||||
val = buffer[3];
|
||||
break;
|
||||
|
||||
case '1':
|
||||
val = (buffer[2] << 8) + buffer[3];
|
||||
val >>= 12;
|
||||
break;
|
||||
|
||||
case '2':
|
||||
val = (buffer[2] << 8) + buffer[3];
|
||||
val >>= 6;
|
||||
break;
|
||||
|
||||
case '3':
|
||||
case 'j':
|
||||
val = (buffer[2] << 8) + buffer[3];
|
||||
break;
|
||||
|
||||
case '4':
|
||||
val = (buffer[4] << 8) + buffer[5];
|
||||
val >>= 12;
|
||||
break;
|
||||
|
||||
case '5':
|
||||
val = (buffer[4] << 8) + buffer[5];
|
||||
val >>= 6;
|
||||
break;
|
||||
|
||||
case '6':
|
||||
val = (buffer[4] << 8) + buffer[5];
|
||||
break;
|
||||
|
||||
case '7':
|
||||
val = (buffer[2] << 8) + buffer[3];
|
||||
val >>= 7;
|
||||
break;
|
||||
|
||||
case '8':
|
||||
val = (buffer[2] << 8) + buffer[3];
|
||||
val >>= 10;
|
||||
break;
|
||||
|
||||
case 'e':
|
||||
val = (buffer[1] >> 6);
|
||||
break;
|
||||
|
||||
default:
|
||||
abort ();
|
||||
}
|
||||
|
||||
switch (bits)
|
||||
{
|
||||
case 2:
|
||||
return val & 3;
|
||||
case 3:
|
||||
return val & 7;
|
||||
case 4:
|
||||
return val & 017;
|
||||
case 5:
|
||||
return val & 037;
|
||||
case 6:
|
||||
return val & 077;
|
||||
case 7:
|
||||
return val & 0177;
|
||||
case 8:
|
||||
return val & 0377;
|
||||
case 12:
|
||||
return val & 07777;
|
||||
default:
|
||||
abort ();
|
||||
}
|
||||
}
|
||||
|
||||
/* Print an indexed argument. The base register is BASEREG (-1 for pc).
|
||||
P points to extension word, in buffer.
|
||||
ADDR is the nominal core address of that extension word. */
|
||||
|
||||
static unsigned char *
|
||||
print_indexed (basereg, p, addr, stream)
|
||||
int basereg;
|
||||
unsigned char *p;
|
||||
CORE_ADDR addr;
|
||||
FILE *stream;
|
||||
{
|
||||
register int word;
|
||||
static char *scales[] = {"", "*2", "*4", "*8"};
|
||||
register int base_disp;
|
||||
register int outer_disp;
|
||||
char buf[40];
|
||||
|
||||
word = NEXTWORD (p);
|
||||
|
||||
/* Generate the text for the index register.
|
||||
Where this will be output is not yet determined. */
|
||||
sprintf (buf, "[%s.%c%s]",
|
||||
reg_names[(word >> 12) & 0xf],
|
||||
(word & 0x800) ? 'l' : 'w',
|
||||
scales[(word >> 9) & 3]);
|
||||
|
||||
/* Handle the 68000 style of indexing. */
|
||||
|
||||
if ((word & 0x100) == 0)
|
||||
{
|
||||
print_base (basereg,
|
||||
((word & 0x80) ? word | 0xff00 : word & 0xff)
|
||||
+ ((basereg == -1) ? addr : 0),
|
||||
stream);
|
||||
fputs_filtered (buf, stream);
|
||||
return p;
|
||||
}
|
||||
|
||||
/* Handle the generalized kind. */
|
||||
/* First, compute the displacement to add to the base register. */
|
||||
|
||||
if (word & 0200)
|
||||
basereg = -2;
|
||||
if (word & 0100)
|
||||
buf[0] = 0;
|
||||
base_disp = 0;
|
||||
switch ((word >> 4) & 3)
|
||||
{
|
||||
case 2:
|
||||
base_disp = NEXTWORD (p);
|
||||
break;
|
||||
case 3:
|
||||
base_disp = NEXTLONG (p);
|
||||
}
|
||||
if (basereg == -1)
|
||||
base_disp += addr;
|
||||
|
||||
/* Handle single-level case (not indirect) */
|
||||
|
||||
if ((word & 7) == 0)
|
||||
{
|
||||
print_base (basereg, base_disp, stream);
|
||||
fputs_filtered (buf, stream);
|
||||
return p;
|
||||
}
|
||||
|
||||
/* Two level. Compute displacement to add after indirection. */
|
||||
|
||||
outer_disp = 0;
|
||||
switch (word & 3)
|
||||
{
|
||||
case 2:
|
||||
outer_disp = NEXTWORD (p);
|
||||
break;
|
||||
case 3:
|
||||
outer_disp = NEXTLONG (p);
|
||||
}
|
||||
|
||||
fprintf_filtered (stream, "%d(", outer_disp);
|
||||
print_base (basereg, base_disp, stream);
|
||||
|
||||
/* If postindexed, print the closeparen before the index. */
|
||||
if (word & 4)
|
||||
fprintf_filtered (stream, ")%s", buf);
|
||||
/* If preindexed, print the closeparen after the index. */
|
||||
else
|
||||
fprintf_filtered (stream, "%s)", buf);
|
||||
|
||||
return p;
|
||||
}
|
||||
|
||||
/* Print a base register REGNO and displacement DISP, on STREAM.
|
||||
REGNO = -1 for pc, -2 for none (suppressed). */
|
||||
|
||||
static void
|
||||
print_base (regno, disp, stream)
|
||||
int regno;
|
||||
int disp;
|
||||
FILE *stream;
|
||||
{
|
||||
if (regno == -2)
|
||||
fprintf_filtered (stream, "%d", disp);
|
||||
else if (regno == -1)
|
||||
fprintf_filtered (stream, "0x%x", disp);
|
||||
else
|
||||
fprintf_filtered (stream, "%d(%s)", disp, reg_names[regno]);
|
||||
return print_insn_m68k (memaddr, buffer, &info);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,10 +32,15 @@ print_insn (memaddr, stream)
|
|||
FILE *stream;
|
||||
{
|
||||
unsigned char buffer[MAXLEN];
|
||||
disassemble_info info;
|
||||
|
||||
GDB_INIT_DISASSEMBLE_INFO(info, stream);
|
||||
|
||||
read_memory (memaddr, buffer, MAXLEN);
|
||||
|
||||
/* print_insn_mips is in opcodes/mips-dis.c. */
|
||||
return print_insn_mips (memaddr, buffer, stream,
|
||||
TARGET_BYTE_ORDER == BIG_ENDIAN);
|
||||
if (TARGET_BYTE_ORDER == BIG_ENDIAN)
|
||||
print_insn_big_mips (memaddr, buffer, &info);
|
||||
else
|
||||
print_insn_little_mips (memaddr, buffer, &info);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -209,15 +209,18 @@ print_insn (memaddr, stream)
|
|||
FILE *stream;
|
||||
{
|
||||
char temp[20];
|
||||
disassemble_info info;
|
||||
|
||||
GDB_INIT_DISASSEMBLE_INFO(info, stream);
|
||||
|
||||
read_memory (memaddr, temp, 20);
|
||||
if (BIG)
|
||||
{
|
||||
return print_insn_z8001 (memaddr, temp, stream);
|
||||
return print_insn_z8001 (memaddr, temp, &info);
|
||||
}
|
||||
else
|
||||
{
|
||||
return print_insn_z8002 (memaddr, temp, stream);
|
||||
return print_insn_z8002 (memaddr, temp, &info);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue