summaryrefslogtreecommitdiff
path: root/opcodes
diff options
context:
space:
mode:
authorChris Demetriou <cgd@google.com>2003-01-02 22:04:55 +0000
committerChris Demetriou <cgd@google.com>2003-01-02 22:04:55 +0000
commit8ced4dfd0657ae8dfa69d7bf5481347dbf5bb239 (patch)
tree85f506bc2022df693f906f5f6a236997a8d841c6 /opcodes
parente9d44a708102d70c8dc668f98f1156574027f7c1 (diff)
downloadgdb-8ced4dfd0657ae8dfa69d7bf5481347dbf5bb239.tar.gz
2003-01-02 Chris Demetriou <cgd@broadcom.com>
* mips-dis.c (print_insn_args): Use position extracted by "+A" to calculate size for "+B". Redo code for "+C" so it shares the same style as "+A" and "+B" now do.
Diffstat (limited to 'opcodes')
-rw-r--r--opcodes/ChangeLog6
-rw-r--r--opcodes/mips-dis.c18
2 files changed, 15 insertions, 9 deletions
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 342eb91e43b..18a16d36fc1 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,5 +1,11 @@
2003-01-02 Chris Demetriou <cgd@broadcom.com>
+ * mips-dis.c (print_insn_args): Use position extracted by "+A"
+ to calculate size for "+B". Redo code for "+C" so it shares
+ the same style as "+A" and "+B" now do.
+
+2003-01-02 Chris Demetriou <cgd@broadcom.com>
+
* mips-dis.c: Update copyright years.
(print_insn_arg): Rename to...
(print_insn_args): This, returning void. Process the whole
diff --git a/opcodes/mips-dis.c b/opcodes/mips-dis.c
index cbf87ce8ccc..176ffeb4694 100644
--- a/opcodes/mips-dis.c
+++ b/opcodes/mips-dis.c
@@ -672,6 +672,9 @@ print_insn_args (d, l, pc, info)
struct disassemble_info *info;
{
int op, delta;
+ unsigned int lsb, msb, msbd;
+
+ lsb = 0;
for (; *d != '\0'; d++)
{
@@ -697,21 +700,18 @@ print_insn_args (d, l, pc, info)
return;
case 'A':
- (*info->fprintf_func) (info->stream, "0x%x",
- (l >> OP_SH_SHAMT) & OP_MASK_SHAMT);
+ lsb = (l >> OP_SH_SHAMT) & OP_MASK_SHAMT;
+ (*info->fprintf_func) (info->stream, "0x%x", lsb);
break;
case 'B':
- (*info->fprintf_func) (info->stream, "0x%x",
- (((l >> OP_SH_INSMSB) & OP_MASK_INSMSB)
- - ((l >> OP_SH_SHAMT) & OP_MASK_SHAMT)
- + 1));
+ msb = (l >> OP_SH_INSMSB) & OP_MASK_INSMSB;
+ (*info->fprintf_func) (info->stream, "0x%x", msb - lsb + 1);
break;
case 'C':
- (*info->fprintf_func) (info->stream, "0x%x",
- (((l >> OP_SH_EXTMSBD) & OP_MASK_EXTMSBD)
- + 1));
+ msbd = (l >> OP_SH_EXTMSBD) & OP_MASK_EXTMSBD;
+ (*info->fprintf_func) (info->stream, "0x%x", msbd + 1);
break;
case 'D':