[2/3,nios2] add splitters for io-variant memory access insns

Message ID 341e5ed0-d4ae-fdb9-7b1d-d098362c817f@codesourcery.com
State New
Headers show
Series
  • [1/3,nios2] fix code size regressions with constant integer addresses
Related show

Commit Message

Sandra Loosemore Dec. 8, 2017, 4:30 a.m.
I previously neglected to add address splitters for the io-variant 
memory read and write insns, as I did for all the other insns that take 
memory operands.  In the examples I looked at, I found there was still 
valid code coming out, but it seemed like an accident that it was 
falling through to a case that handled it.  I've committed this patch to 
fix it properly.

-Sandra

Patch

Index: gcc/config/nios2/nios2.md
===================================================================
--- gcc/config/nios2/nios2.md	(revision 255266)
+++ gcc/config/nios2/nios2.md	(working copy)
@@ -318,12 +318,18 @@ 
 (define_mode_attr bhw [(QI "b") (HI "h") (SI "w")])
 (define_mode_attr bhw_uns [(QI "bu") (HI "hu") (SI "w")])
 
-(define_insn "ld<bhw_uns>io"
+(define_insn_and_split "ld<bhw_uns>io"
   [(set (match_operand:BHW 0 "register_operand" "=r")
         (unspec_volatile:BHW
           [(match_operand:BHW 1 "ldstio_memory_operand" "w")] UNSPECV_LDXIO))]
   ""
   "ld<bhw_uns>io\\t%0, %1"
+  "nios2_large_constant_memory_operand_p (operands[1])"
+  [(set (match_dup 0) 
+        (unspec_volatile:BHW [(match_dup 1)] UNSPECV_LDXIO))]
+  {
+    operands[1] = nios2_split_large_constant_memory_operand (operands[1]);
+  }
   [(set_attr "type" "ld")])
 
 (define_expand "ld<bh>io"
@@ -337,21 +343,32 @@ 
   DONE;
 })
 
-(define_insn "ld<bh>io_signed"
+(define_insn_and_split "ld<bh>io_signed"
   [(set (match_operand:SI 0 "register_operand" "=r")
         (sign_extend:SI
           (unspec_volatile:BH
             [(match_operand:BH 1 "ldstio_memory_operand" "w")] UNSPECV_LDXIO)))]
   ""
   "ld<bh>io\\t%0, %1"
+  "nios2_large_constant_memory_operand_p (operands[1])"
+  [(set (match_dup 0) 
+        (sign_extend:SI (unspec_volatile:BH [(match_dup 1)] UNSPECV_LDXIO)))]
+  {
+    operands[1] = nios2_split_large_constant_memory_operand (operands[1]);
+  }
   [(set_attr "type" "ld")])
 
-(define_insn "st<bhw>io"
+(define_insn_and_split "st<bhw>io"
   [(set (match_operand:BHW 0 "ldstio_memory_operand" "=w")
         (unspec_volatile:BHW
           [(match_operand:BHW 1 "reg_or_0_operand" "rM")] UNSPECV_STXIO))]
   ""
   "st<bhw>io\\t%z1, %0"
+  "nios2_large_constant_memory_operand_p (operands[0])"
+  [(set (match_dup 0) (unspec_volatile:BHW [(match_dup 1)] UNSPECV_STXIO))]
+  {
+    operands[0] = nios2_split_large_constant_memory_operand (operands[0]);
+  }
   [(set_attr "type" "st")])
 
 
Index: gcc/config/nios2/predicates.md
===================================================================
--- gcc/config/nios2/predicates.md	(revision 255266)
+++ gcc/config/nios2/predicates.md	(working copy)
@@ -146,6 +146,8 @@ 
         return (REG_P (XEXP (addr, 0))
                 && CONST_INT_P (XEXP (addr, 1))
                 && SMALL_INT12 (INTVAL (XEXP (addr, 1))));
+      else if (CONST_INT_P (addr))
+        return SMALL_INT12 (INTVAL (addr));
       return false;
     }
   return memory_operand (op, mode);