X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=cpu%2Ffrv.cpu;h=cdb169eddc1c11d99df72a32e14f86e6d07de391;hb=7d458ea516b58c98214406859d57965879019215;hp=b6c4f809bd6eabf2e4f4481d30249423714ee1d6;hpb=3fa5b97b27c907bf60b30bc0b7d7de56561b19c7;p=deliverable%2Fbinutils-gdb.git

diff --git a/cpu/frv.cpu b/cpu/frv.cpu
index b6c4f809bd..cdb169eddc 100644
--- a/cpu/frv.cpu
+++ b/cpu/frv.cpu
@@ -1984,7 +1984,7 @@
 		(set (ifield f-u12-l) (and (ifield f-u12) #x3f))
 		)
       (sequence () ; extract
-		(set (ifield f-u12) (or (sll (ifield f-u12-h) 6)
+		(set (ifield f-u12) (or (mul (ifield f-u12-h) 64)
 					(ifield f-u12-l)))
 		)
 )
@@ -2016,7 +2016,7 @@
 
 (df  f-label16    "18 bit pc relative signed offset" (PCREL-ADDR) 15 16 INT
      ((value pc) (sra WI (sub WI value pc) (const 2)))
-     ((value pc) (add WI (sll WI value (const 2)) pc))
+     ((value pc) (add WI (mul WI value (const 4)) pc))
 )
 
 (df   f-labelH6   "upper 6  bits of label24"  () 30  6 INT #f #f)
@@ -2034,9 +2034,9 @@
       ; extract
       (sequence ()
 		(set (ifield f-label24)
-		     (add (sll (or (sll (ifield f-labelH6) (const 18))
+		     (add (mul (or (mul (ifield f-labelH6) (sll 1 18))
 				   (ifield f-labelL18))
-			       (const 2))
+			       (const 4))
 			  pc)))
 )