diff options
| author | Michael Eager <eager@eagercon.com> | 2012-11-29 21:09:01 +0000 |
|---|---|---|
| committer | Michael Eager <eager@eagercon.com> | 2012-11-29 21:09:01 +0000 |
| commit | 94dda8b768b96328d755a95ca10c77f3860519b9 (patch) | |
| tree | 4d5f4b2ac1e3721ecbb540a94d18210899e9189c /gas | |
| parent | 4983028c3a5e15579946e69ab63db20d1dd78a79 (diff) | |
| download | gdb-94dda8b768b96328d755a95ca10c77f3860519b9.zip gdb-94dda8b768b96328d755a95ca10c77f3860519b9.tar.gz gdb-94dda8b768b96328d755a95ca10c77f3860519b9.tar.bz2 | |
opcodes/Changelog:
* microblaze-opc.h: Rename INST_TYPE_RD_R1_SPECIAL to
INST_TYPE_R1_R2_SPECIAL
* microblaze-dis.c (print_insn_microblaze): Same.
gas/Changelog
* gas/config/tc-microblaze.c: Rename INST_TYPE_RD_R1_SPECIAL to
INST_TYPE_R1_R2_SPECIAL, don't set RD for wic.
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 5 | ||||
| -rw-r--r-- | gas/config/tc-microblaze.c | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index a419017..5ce145f 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2012-11-29 David Holsgrove <david.holsgrove@xilinx.com> + + * config/tc-microblaze.c: Rename INST_TYPE_RD_R1_SPECIAL to + INST_TYPE_R1_R2_SPECIAL, don't set RD for wic. + 2012-11-28 Julian Brown <julian@codesourcery.com> * config/tc-arm.c (md_apply_fix): Fix conversion of BL to BLX for diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c index 5a427a0..e9c7846 100644 --- a/gas/config/tc-microblaze.c +++ b/gas/config/tc-microblaze.c @@ -1358,16 +1358,16 @@ md_assemble (char * str) output = frag_more (isize); break; - case INST_TYPE_RD_R1_SPECIAL: + case INST_TYPE_R1_R2_SPECIAL: if (strcmp (op_end, "")) - op_end = parse_reg (op_end + 1, ®1); /* Get rd. */ + op_end = parse_reg (op_end + 1, ®1); /* Get r1. */ else { as_fatal (_("Error in statement syntax")); reg1 = 0; } if (strcmp (op_end, "")) - op_end = parse_reg (op_end + 1, ®2); /* Get r1. */ + op_end = parse_reg (op_end + 1, ®2); /* Get r2. */ else { as_fatal (_("Error in statement syntax")); @@ -1381,7 +1381,6 @@ md_assemble (char * str) as_fatal (_("Cannot use special register with this instruction")); /* insn wic ra, rb => wic ra, ra, rb. */ - inst |= (reg1 << RD_LOW) & RD_MASK; inst |= (reg1 << RA_LOW) & RA_MASK; inst |= (reg2 << RB_LOW) & RB_MASK; |