config.gcc: Unify V850 architecture options and add support for newer V850 architectures.

[gcc.git] / gcc / config / v850 / v850.md

diff --git a/gcc/config/v850/v850.md b/gcc/config/v850/v850.md
index 88e42c65e904849f482af18c203b00497b1c5ab9..cae929da79469d7ec22c7e5b34bf026059602755 100644 (file)
--- a/gcc/config/v850/v850.md
+++ b/gcc/config/v850/v850.md
@@ -232,7 +232,7 @@
 
 (define_insn "*movsi_high"
   [(set (match_operand:SI 0 "register_operand" "=r")
-       (high:SI (match_operand 1 "" "")))]
+       (high:SI (match_operand 1 "immediate_operand" "i")))]
   ""
   "movhi hi(%1),%.,%0"
   [(set_attr "length" "4")
@@ -543,8 +543,13 @@
        (mod:SI (match_dup 1)
                (match_dup 2)))
    (clobber (reg:CC CC_REGNUM))]
-  "TARGET_V850E"
-  "div %2,%0,%3"
+  "TARGET_V850E || TARGET_V850E2_ALL"
+  {
+   if (TARGET_V850E2_ALL)
+     return "divq %2,%0,%3";
+   else
+     return "div %2,%0,%3";
+  }
   [(set_attr "length" "4")
    (set_attr "cc" "clobber")
    (set_attr "type" "div")])
@@ -557,8 +562,13 @@
        (umod:SI (match_dup 1)
                 (match_dup 2)))
    (clobber (reg:CC CC_REGNUM))]
-  "TARGET_V850E"
-  "divu %2,%0,%3"
+  "TARGET_V850E || TARGET_V850E2_ALL"
+  {
+    if (TARGET_V850E2_ALL)
+      return "divqu %2,%0,%3";
+   else
+      return "divu %2,%0,%3";
+  }
   [(set_attr "length" "4")
    (set_attr "cc" "clobber")
    (set_attr "type" "div")])
@@ -574,7 +584,7 @@
        (mod:HI (match_dup 1)
                (match_dup 2)))
    (clobber (reg:CC CC_REGNUM))]
-  "TARGET_V850E"
+  "TARGET_V850E || TARGET_V850E2_ALL"
   "divh %2,%0,%3"
   [(set_attr "length" "4")
    (set_attr "cc" "clobber")
@@ -591,7 +601,7 @@
        (umod:HI (match_dup 1)
                 (match_dup 2)))
    (clobber (reg:CC CC_REGNUM))]
-  "TARGET_V850E"
+  "TARGET_V850E || TARGET_V850E2_ALL"
   "zxh %0 ; divhu %2,%0,%3"
   [(set_attr "length" "4")
    (set_attr "cc" "clobber")
@@ -1501,7 +1511,7 @@
 ;; EXTEND INSTRUCTIONS
 ;; ----------------------------------------------------------------------
 
-(define_insn ""
+(define_insn "*zero_extendhisi2_v850e"
   [(set (match_operand:SI 0 "register_operand" "=r,r,r,r")
        (zero_extend:SI
         (match_operand:HI 1 "nonimmediate_operand" "0,r,T,m")))
@@ -1515,17 +1525,29 @@
   [(set_attr "length" "2,4,2,4")
    (set_attr "cc" "none_0hit,set_zn,none_0hit,none_0hit")])
 
-(define_insn "zero_extendhisi2"
+(define_insn "*zero_extendhisi2_v850"
   [(set (match_operand:SI 0 "register_operand" "=r")
        (zero_extend:SI
        (match_operand:HI 1 "register_operand" "r")))
-   (clobber (reg:CC CC_REGNUM))]
+   (clobber (reg:CC CC_REGNUM))]  ;; A lie, but we have to match the expander
   ""
   "andi 65535,%1,%0"
   [(set_attr "length" "4")
    (set_attr "cc" "set_zn")])
 
-(define_insn ""
+(define_expand "zero_extendhisi2"
+  [(parallel [(set (match_operand:SI 0 "register_operand")
+                  (zero_extend:SI
+                   (match_operand:HI 1 "nonimmediate_operand")))
+             (clobber (reg:CC CC_REGNUM))])]
+  ""
+  {
+    if (! (TARGET_V850E || TARGET_V850E2_ALL))
+      operands[1] = force_reg (HImode, operands[1]);
+  }
+)
+
+(define_insn "*zero_extendqisi2_v850e"
   [(set (match_operand:SI 0 "register_operand" "=r,r,r,r")
        (zero_extend:SI
        (match_operand:QI 1 "nonimmediate_operand" "0,r,T,m")))
@@ -1539,16 +1561,28 @@
   [(set_attr "length" "2,4,2,4")
    (set_attr "cc" "none_0hit,set_zn,none_0hit,none_0hit")])
 
-(define_insn "zero_extendqisi2"
+(define_insn "*zero_extendqisi2_v850"
   [(set (match_operand:SI 0 "register_operand" "=r")
        (zero_extend:SI
-       (match_operand:QI 1 "register_operand" "r")))
-   (clobber (reg:CC CC_REGNUM))]
+        (match_operand:QI 1 "register_operand" "r")))
+   (clobber (reg:CC CC_REGNUM))] ;; A lie, but we have to match the expander
   ""
   "andi 255,%1,%0"
   [(set_attr "length" "4")
    (set_attr "cc" "set_zn")])
 
+(define_expand "zero_extendqisi2"
+  [(parallel [(set (match_operand:SI 0 "register_operand")
+                  (zero_extend:SI
+                    (match_operand:QI 1 "nonimmediate_operand")))
+             (clobber (reg:CC CC_REGNUM))])]
+  ""
+  {
+    if (! (TARGET_V850E || TARGET_V850E2_ALL))
+      operands[1] = force_reg (QImode, operands[1]);
+  }
+)
+
 ;;- sign extension instructions
 
 ;; ??? The extendhisi2 pattern should not emit shifts for v850e?