From e5a0403b9ed9f0dc99d72b00345db04acf72267b Mon Sep 17 00:00:00 2001 From: cgd Date: Fri, 13 Feb 2004 04:55:41 +0000 Subject: [PATCH] 2004-02-12 Chris Demetriou * config/mips/mips.md (casesi_internal, casesi_internal_di): Use ".set macro" to avoid warnings about multi-instruction macros, since they're intentional. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@77749 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/config/mips/mips.md | 22 ++++++++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7d843f9c12f..b0b659eb322 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2004-02-12 Chris Demetriou + + * config/mips/mips.md (casesi_internal, casesi_internal_di): + Use ".set macro" to avoid warnings about multi-instruction + macros, since they're intentional. + 2004-02-12 Geoffrey Keating * config/darwin.h: Add include guards. Remove old, now incorrect, diff --git a/gcc/config/mips/mips.md b/gcc/config/mips/mips.md index a1b083fa27b..3caa677e69d 100644 --- a/gcc/config/mips/mips.md +++ b/gcc/config/mips/mips.md @@ -8123,8 +8123,15 @@ srl\t%M0,%M1,%2\n\ (clobber (match_operand:SI 2 "register_operand" "=d")) (clobber (reg:SI 31))] "TARGET_EMBEDDED_PIC" - "%(bal\t%S1\;sll\t%2,%0,2\n%~%S1:\;addu\t%2,%2,$31%)\;\ -lw\t%2,%1-%S1(%2)\;addu\t%2,%2,$31\;%*j\t%2%/" + { + if (set_nomacro) + return "%(bal\\t%S1\;sll\\t%2,%0,2\\n%~%S1:\;addu\\t%2,%2,$31%)\;\\ +.set macro\;lw\\t%2,%1-%S1(%2)\;.set nomacro\;addu\\t%2,%2,$31\\n\\t%*j\\t%2%/"; + return + "%(bal\\t%S1\;sll\\t%2,%0,2\\n%~%S1:\;addu\\t%2,%2,$31%)\;\\ +lw\\t%2,%1-%S1(%2)\;addu\\t%2,%2,$31\\n\\t%*j\\t%2%/" + ; + } [(set_attr "type" "jump") (set_attr "mode" "none") (set_attr "length" "24")]) @@ -8140,8 +8147,15 @@ lw\t%2,%1-%S1(%2)\;addu\t%2,%2,$31\;%*j\t%2%/" (clobber (match_operand:DI 2 "register_operand" "=d")) (clobber (reg:DI 31))] "TARGET_EMBEDDED_PIC" - "%(bal\t%S1\;sll\t%2,%0,3\n%~%S1:\;daddu\t%2,%2,$31%)\;\ -ld\t%2,%1-%S1(%2)\;daddu\t%2,%2,$31\;%*j\t%2%/" + { + if (set_nomacro) + return "%(bal\\t%S1\;sll\\t%2,%0,3\\n%~%S1:\;daddu\\t%2,%2,$31%)\;\\ +.set macro\;ld\\t%2,%1-%S1(%2)\;.set nomacro\;daddu\\t%2,%2,$31\\n\\t%*j\\t%2%/"; + return + "%(bal\\t%S1\;sll\\t%2,%0,3\\n%~%S1:\;daddu\\t%2,%2,$31%)\;\\ +ld\\t%2,%1-%S1(%2)\;daddu\\t%2,%2,$31\\n\\t%*j\\t%2%/" + ; + } [(set_attr "type" "jump") (set_attr "mode" "none") (set_attr "length" "24")]) -- 2.11.0