Index: msp430.md
===================================================================
--- msp430.md	(revision 1)
+++ msp430.md	(revision 5)
@@ -2952,7 +2952,6 @@
 "{
     if(INTVAL(operands[2]) != 1 || INTVAL(operands[3]) <= 0)
       FAIL;
-    operands[3] = GEN_INT(1<<INTVAL(operands[3]));
 }")
 
 (define_insn "*extv" 
@@ -2961,12 +2960,16 @@
 			(match_operand 2 "const_int_operand" "i,i,i,i,i,i,i,i")
 			(match_operand 3 "const_int_operand" "P,P,i,i,P,P,i,i")))]
  ""
-"bit.b\\t%3, %1
-\\tclr.b\\t%0
-\\tadc.b\\t%0"
+"* {
+    operands[3] = GEN_INT(1<<INTVAL(operands[3]));
+    return \"bit.b\\t%3, %1\\n\"
+\"\\tclr.b\\t%0\\n\"
+\"\\tadc.b\\t%0\\n\"
+;}"
   [(set_attr "length" "3,4,4,5,5,6,6,7")
      (set_attr "cc" "set_czn")])
 
+
 (define_expand "extzv"
  [(set (match_operand:QI 0 "nonimmediate_operand_msp430" "")
        (zero_extract:QI (match_operand:QI 1 "nonimmediate_operand_msp430" "") 
@@ -2976,7 +2979,6 @@
 "{
     if(INTVAL(operands[2]) != 1 || INTVAL(operands[3]) <= 0) 
       FAIL;
-    operands[3] = GEN_INT(1<<INTVAL(operands[3]));
 }")
 
 (define_insn "*extzv" 
@@ -2985,9 +2987,12 @@
 			(match_operand 2 "const_int_operand" "i,i,i,i,i,i,i,i")
 			(match_operand 3 "const_int_operand" "P,P,i,i,P,P,i,i")))]
  ""
-"bit.b\\t%3, %1
-\\tclr.b\\t%0
-\\tadc.b\\t%0"
+"* {
+    operands[3] = GEN_INT(1<<INTVAL(operands[3]));
+    return \"bit.b\\t%3, %1\\n\"
+\"\\tclr.b\\t%0\\n\"
+\"\\tadc.b\\t%0\\n\"
+;}"
   [(set_attr "length" "3,4,4,5,5,6,6,7")
      (set_attr "cc" "set_czn")])
 ;;=======================================================================