diff options
| -rw-r--r-- | opcodes/ChangeLog | 10 | ||||
| -rw-r--r-- | opcodes/mips-dis.c | 11 |
2 files changed, 19 insertions, 2 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 8c3c3e74ac4..b3e2cec71db 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -2,6 +2,16 @@ * Makefile.am (LIBIBERTY): Define. +Fri May 19 12:29:27 EDT 2000 Diego Novillo <dnovillo@redhat.com> + + * mips-dis.c (REGISTER_NAMES): Rename to STD_REGISTER_NAMES. + (STD_REGISTER_NAMES): New name for REGISTER_NAMES. + (reg_names): Rename to std_reg_names. Change it to a char ** + static variable. + (std_reg_names): New name for reg_names. + (set_mips_isa_type): Set reg_names to point to std_reg_names by + default. + 2000-05-16 Frank Ch. Eigler <fche@redhat.com> * fr30-desc.h: Partially regenerated to account for changed diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c index 11e322c2bba..fa33821f32c 100644 --- a/opcodes/mips-dis.c +++ b/opcodes/mips-dis.c @@ -50,7 +50,7 @@ static int _print_insn_mips PARAMS ((bfd_vma, unsigned long int, /* FIXME: This should be shared with gdb somehow. */ -#define REGISTER_NAMES \ +#define STD_REGISTER_NAMES \ { "zero", "at", "v0", "v1", "a0", "a1", "a2", "a3", \ "t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7", \ "s0", "s1", "s2", "s3", "s4", "s5", "s6", "s7", \ @@ -64,13 +64,17 @@ static int _print_insn_mips PARAMS ((bfd_vma, unsigned long int, "epc", "prid"\ } -static CONST char * CONST reg_names[] = REGISTER_NAMES; +static CONST char * CONST std_reg_names[] = STD_REGISTER_NAMES; /* The mips16 register names. */ static const char * const mips16_reg_names[] = { "s0", "s1", "v0", "v1", "a0", "a1", "a2", "a3" }; + +/* Scalar register names. set_mips_isa_type() decides which register name + table to use. */ +static CONST char * CONST *reg_names = NULL; /* subroutine */ static void @@ -255,6 +259,9 @@ set_mips_isa_type (mach, isa, cputype) int target_processor = 0; int mips_isa = 0; + /* Use standard MIPS register names by default. */ + reg_names = std_reg_names; + switch (mach) { case bfd_mach_mips3000: |