Index: arm.md
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/arm/arm.md,v
retrieving revision 1.145
diff -p -r1.145 arm.md
*** arm.md	24 Oct 2003 09:25:30 -0000	1.145
--- arm.md	12 Nov 2003 16:12:18 -0000
***************
*** 4007,4013 ****
     (set (match_dup 2)
  	(ashiftrt:SI (match_operand 0 "" "") (const_int 8)))
     ;; store the high byte
!    (set (match_dup 4) (subreg:QI (match_dup 2) 0))]	;explicit subreg safe
    "TARGET_ARM"
    "
    {
--- 4007,4013 ----
     (set (match_dup 2)
  	(ashiftrt:SI (match_operand 0 "" "") (const_int 8)))
     ;; store the high byte
!    (set (match_dup 4) (match_dup 5))]
    "TARGET_ARM"
    "
    {
***************
*** 4023,4029 ****
      operands[1] = adjust_address (operands[1], QImode, 0);
      operands[3] = gen_lowpart (QImode, operands[0]);
      operands[0] = gen_lowpart (SImode, operands[0]);
!     operands[2] = gen_reg_rtx (SImode); 
    }"
  )
  
--- 4023,4030 ----
      operands[1] = adjust_address (operands[1], QImode, 0);
      operands[3] = gen_lowpart (QImode, operands[0]);
      operands[0] = gen_lowpart (SImode, operands[0]);
!     operands[2] = gen_reg_rtx (SImode);
!     operands[5] = gen_lowpart (QImode, operands[2]);
    }"
  )
  
***************
*** 4031,4037 ****
    [(set (match_dup 4) (match_dup 3))
     (set (match_dup 2)
  	(ashiftrt:SI (match_operand 0 "" "") (const_int 8)))
!    (set (match_operand 1 "" "")	(subreg:QI (match_dup 2) 3))]
    "TARGET_ARM"
    "
    {
--- 4032,4038 ----
    [(set (match_dup 4) (match_dup 3))
     (set (match_dup 2)
  	(ashiftrt:SI (match_operand 0 "" "") (const_int 8)))
!    (set (match_operand 1 "" "")	(match_dup 5))]
    "TARGET_ARM"
    "
    {
***************
*** 4048,4060 ****
      operands[3] = gen_lowpart (QImode, operands[0]);
      operands[0] = gen_lowpart (SImode, operands[0]);
      operands[2] = gen_reg_rtx (SImode);
    }"
  )
  
  ;; Subroutine to store a half word integer constant into memory.
  (define_expand "storeinthi"
    [(set (match_operand 0 "" "")
! 	(subreg:QI (match_operand 1 "" "") 0))
     (set (match_dup 3) (match_dup 2))]
    "TARGET_ARM"
    "
--- 4049,4062 ----
      operands[3] = gen_lowpart (QImode, operands[0]);
      operands[0] = gen_lowpart (SImode, operands[0]);
      operands[2] = gen_reg_rtx (SImode);
+     operands[5] = gen_lowpart (QImode, operands[2]);
    }"
  )
  
  ;; Subroutine to store a half word integer constant into memory.
  (define_expand "storeinthi"
    [(set (match_operand 0 "" "")
! 	(match_operand 1 "" ""))
     (set (match_dup 3) (match_dup 2))]
    "TARGET_ARM"
    "
***************
*** 4095,4100 ****
--- 4097,4103 ----
      operands[3] = adjust_address (op0, QImode, 1);
      operands[0] = adjust_address (operands[0], QImode, 0);
      operands[2] = gen_lowpart (QImode, operands[2]);
+     operands[1] = gen_lowpart (QImode, operands[1]);
    }"
  )
  
***************
*** 4415,4425 ****
     (set (match_dup 3)
  	(ashiftrt:SI (match_dup 2) (const_int 16)))
     (set (match_operand:HI 0 "s_register_operand" "")
! 	(subreg:HI (match_dup 3) 0))]
    "TARGET_ARM"
    "
    operands[2] = gen_reg_rtx (SImode);
    operands[3] = gen_reg_rtx (SImode);
    "
  )
  
--- 4418,4429 ----
     (set (match_dup 3)
  	(ashiftrt:SI (match_dup 2) (const_int 16)))
     (set (match_operand:HI 0 "s_register_operand" "")
! 	(match_dup 4))]
    "TARGET_ARM"
    "
    operands[2] = gen_reg_rtx (SImode);
    operands[3] = gen_reg_rtx (SImode);
+   operands[4] = gen_lowpart (HImode, operands[3]);
    "
  )