@@ -2593,13 +2593,6 @@ sparc_ip (char *str, const struct sparc_opcode **pinsn)
break;
} /* if not an 'f' register. */
- if (*args == '}' && mask != RS2 (opcode))
- {
- error_message
- = _(": Instruction requires frs2 and frsd must be the same register");
- goto error;
- }
-
switch (*args)
{
case 'v':
@@ -2628,10 +2621,18 @@ sparc_ip (char *str, const struct sparc_opcode **pinsn)
case 'g':
case 'H':
case 'J':
- case '}':
case '^':
opcode |= RD (mask);
continue;
+
+ case '}':
+ if (RD (mask) != (opcode & RD (0x1f)))
+ {
+ error_message = _(": Instruction requires frs2 and "
+ "frsd must be the same register");
+ goto error;
+ }
+ continue;
} /* Pack it in. */
know (0);
@@ -2016,7 +2016,7 @@ SLCBCC("cbnefr", 15),
{ "alignaddr", F3F(2, 0x36, 0x018), F3F(~2, ~0x36, ~0x018), "1,2,d", 0, HWCAP_VIS, 0, v9a },
{ "alignaddrl", F3F(2, 0x36, 0x01a), F3F(~2, ~0x36, ~0x01a), "1,2,d", 0, HWCAP_VIS, 0, v9a },
{ "faligndata", F3F(2, 0x36, 0x048), F3F(~2, ~0x36, ~0x048), "v,B,H", 0, HWCAP_VIS, 0, v9a }, /* faligndatag */
-{ "faligndata", F3F(2, 0x36, 0x049), F3F(~2, ~0x36, ~0x049), "v,B,5,}", 0, 0, HWCAP2_SPARC5, v9m }, /* faligndatai */
+{ "faligndata", F3F(2, 0x36, 0x049), F3F(~2, ~0x36, ~0x049), "1,H,B,}", 0, 0, HWCAP2_SPARC5, v9m }, /* faligndatai */
{ "fzerod", F3F(2, 0x36, 0x060), F3F(~2, ~0x36, ~0x060), "H", 0, HWCAP_VIS, 0, v9a },
{ "fzero", F3F(2, 0x36, 0x060), F3F(~2, ~0x36, ~0x060), "H", F_ALIAS, HWCAP_VIS, 0, v9a },
@@ -35,4 +35,4 @@ Disassembly of section .text:
64: 95 b1 aa c8 fpsubs8 %f6, %f8, %f10
68: 9d b2 aa ec fpsubus8 %f10, %f12, %f14
6c: a5 b3 aa 70 fpsubus16 %f14, %f16, %f18
- 70: bf b0 09 3f faligndata %f0, %f62, %f4, %f62
+ 70: bf b0 09 24 faligndata %g0, %f62, %f4, %f62
@@ -28,4 +28,4 @@
fpsubs8 %f6, %f8, %f10
fpsubus8 %f10, %f12, %f14
fpsubus16 %f14, %f16, %f18
- faligndata %f0, %f62, %f4, %f62
+ faligndata %g0, %f62, %f4, %f62
The first operand is a general register, not an fp register; the third operand is encoded into RS2, not RS3; the second operand must match the destination operand. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- gas/config/tc-sparc.c | 17 +++++++++-------- opcodes/sparc-opc.c | 2 +- gas/testsuite/gas/sparc/sparc5vis4.d | 2 +- gas/testsuite/gas/sparc/sparc5vis4.s | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-)