From 25663db430bca74d152f6181e7f25edae1acc602 Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Sat, 29 May 2021 03:26:32 +0200 Subject: [PATCH] MIPS/GAS: Use FCSR rather than RA with CFC1/CTC1 Fix an issue caused by commit f9419b056fe2 ("MIPS gas: code cleanup"), , and replace the incorrect use of RA with the CFC1 and CTC1 instructions with FCSR. While the register referred by its number is $31 in both cases, these instructions operate on the floating-point control register file rather than general-purpose registers. gas/ * config/tc-mips.c (FCSR): New macro. (macro) : Use it in place of RA. --- gas/ChangeLog | 5 +++++ gas/config/tc-mips.c | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 49d2ceb058b..1eb7b39890b 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2021-05-29 Maciej W. Rozycki + + * config/tc-mips.c (FCSR): New macro. + (macro) : Use it in place of RA. + 2021-05-28 H.J. Lu PR ld/27905 diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index 9151b222a48..a83a55075ad 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -104,6 +104,8 @@ static char *mips_flags_frag; #define FP 30 #define RA 31 +#define FCSR 31 + #define ILLEGAL_REG (32) #define AT mips_opts.at @@ -13835,18 +13837,18 @@ macro (struct mips_cl_insn *ip, char *str) * or is there a reason for it? */ start_noreorder (); - macro_build (NULL, "cfc1", "t,G", op[2], RA); - macro_build (NULL, "cfc1", "t,G", op[2], RA); + macro_build (NULL, "cfc1", "t,G", op[2], FCSR); + macro_build (NULL, "cfc1", "t,G", op[2], FCSR); macro_build (NULL, "nop", ""); expr1.X_add_number = 3; macro_build (&expr1, "ori", "t,r,i", AT, op[2], BFD_RELOC_LO16); expr1.X_add_number = 2; macro_build (&expr1, "xori", "t,r,i", AT, AT, BFD_RELOC_LO16); - macro_build (NULL, "ctc1", "t,G", AT, RA); + macro_build (NULL, "ctc1", "t,G", AT, FCSR); macro_build (NULL, "nop", ""); macro_build (NULL, mask == M_TRUNCWD ? "cvt.w.d" : "cvt.w.s", "D,S", op[0], op[1]); - macro_build (NULL, "ctc1", "t,G", op[2], RA); + macro_build (NULL, "ctc1", "t,G", op[2], FCSR); macro_build (NULL, "nop", ""); end_noreorder (); break; -- 2.30.2