Merge commit 'upstream/2.20'

[msp430-binutils.git] / cpu / cris.cpu

diff --git a/cpu/cris.cpu b/cpu/cris.cpu
index 2bb74dde82fb9cc440e187fb4f2a2b8afda69c1b..97b44581e78bba7f4832cf767b289b6393be90f3 100644 (file)
--- a/cpu/cris.cpu
+++ b/cpu/cris.cpu
@@ -1,6 +1,6 @@
 ; CRIS CPU description.  -*- Scheme -*-
 ;
-; Copyright 2003, 2004, 2007 Free Software Foundation, Inc.
+; Copyright 2003, 2004, 2007, 2009 Free Software Foundation, Inc.
 ;
 ; Contributed by Axis Communications AB.
 ;
@@ -439,7 +439,7 @@
 
 (define-pmacro (cris-implemented-writable-specregs-v32)
   "Special writable registers in v32 and their sizes"
-  ((QI 2) (QI 3)
+  ((SI 2) (QI 3)
    (SI 5) (SI 6) (SI 7) (SI 9)
    (SI 10) (SI 11) (SI 12) (SI 13) (SI 14) (SI 15))
 )
@@ -2033,9 +2033,10 @@
  (.pmacro
   (BW)
   (sequence
-    ((BW newval))
-    (set newval Rs)
-    (set Rd (ext SI newval))
+    ((BW tmpops) (SI newval))
+    (set tmpops Rs)
+    (set newval (ext SI tmpops))
+    (set Rd newval)
     (setf-move SI newval)))
 )
 
@@ -2060,9 +2061,10 @@
  (.pmacro
   (BW)
   (sequence
-    ((BW newval))
-    (set newval Rs)
-    (set Rd (zext SI newval))
+    ((BW tmpops) (SI newval))
+    (set tmpops Rs)
+    (set newval (zext SI tmpops))
+    (set Rd newval)
     (setf-move SI newval)))
 )