From 94dda8b768b96328d755a95ca10c77f3860519b9 Mon Sep 17 00:00:00 2001 From: Michael Eager Date: Thu, 29 Nov 2012 21:09:01 +0000 Subject: 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. --- gas/config/tc-microblaze.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gas/config') 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; -- cgit v1.1