Re: add h8sx support to h8300

[Alexandre Oliva <aoliva@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 479 bytes --]

On Jun 21, 2004, Kazu Hirata <kazu@cs.umass.edu> wrote:

> Hi Alex,
>> Bootstrapped on i686-pc-linux-gnu native, and cross-built and tested
>> for target h8300-elf.  Ok to install?

> The H8 portion is OK.

Ok to check it in along with these additional bits, that were
accidentally left out of the patch I posted yesterday?  The changelog
already describes the results after applying the patch, leaving them
out of the patch was caused by human error while merging the changes.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: gcc-h8sx-shifts.patch --]
[-- Type: text/x-patch, Size: 4361 bytes --]

Index: gcc/config/h8300/h8300.md
===================================================================
RCS file: /cvs/cvsfiles/gnupro/gcc/config/h8300/h8300.md,v
retrieving revision 1.5
diff -u -p -r1.5 h8300.md
--- gcc/config/h8300/h8300.md 21 Jun 2004 12:16:04 -0000 1.5
+++ gcc/config/h8300/h8300.md 21 Jun 2004 18:51:01 -0000
@@ -2829,21 +2829,21 @@
 	(ashift:QI (match_operand:QI 1 "register_operand" "")
 		   (match_operand:QI 2 "nonmemory_operand" "")))]
   ""
-  "expand_a_shift (QImode, ASHIFT, operands); DONE;")
+  "if (expand_a_shift (QImode, ASHIFT, operands)) DONE;")
 
 (define_expand "ashrqi3"
   [(set (match_operand:QI 0 "register_operand" "")
 	(ashiftrt:QI (match_operand:QI 1 "register_operand" "")
 		     (match_operand:QI 2 "nonmemory_operand" "")))]
   ""
-  "expand_a_shift (QImode, ASHIFTRT, operands); DONE;")
+  "if (expand_a_shift (QImode, ASHIFTRT, operands)) DONE;")
 
 (define_expand "lshrqi3"
   [(set (match_operand:QI 0 "register_operand" "")
 	(lshiftrt:QI (match_operand:QI 1 "register_operand" "")
 		     (match_operand:QI 2 "nonmemory_operand" "")))]
   ""
-  "expand_a_shift (QImode, LSHIFTRT, operands); DONE;")
+  "if (expand_a_shift (QImode, LSHIFTRT, operands)) DONE;")
 
 (define_insn ""
   [(set (match_operand:QI 0 "h8300_dst_operand" "=rQ")
@@ -2885,21 +2885,21 @@
 	(ashift:HI (match_operand:HI 1 "register_operand" "")
 		   (match_operand:QI 2 "nonmemory_operand" "")))]
   ""
-  "expand_a_shift (HImode, ASHIFT, operands); DONE;")
+  "if (expand_a_shift (HImode, ASHIFT, operands)) DONE;")
 
 (define_expand "lshrhi3"
   [(set (match_operand:HI 0 "register_operand" "")
 	(lshiftrt:HI (match_operand:HI 1 "register_operand" "")
 		     (match_operand:QI 2 "nonmemory_operand" "")))]
   ""
-  "expand_a_shift (HImode, LSHIFTRT, operands); DONE;")
+  "if (expand_a_shift (HImode, LSHIFTRT, operands)) DONE;")
 
 (define_expand "ashrhi3"
   [(set (match_operand:HI 0 "register_operand" "")
 	(ashiftrt:HI (match_operand:HI 1 "register_operand" "")
 		     (match_operand:QI 2 "nonmemory_operand" "")))]
   ""
-  "expand_a_shift (HImode, ASHIFTRT, operands); DONE;")
+  "if (expand_a_shift (HImode, ASHIFTRT, operands)) DONE;")
 
 (define_insn ""
   [(set (match_operand:HI 0 "h8300_dst_operand" "=rQ")
@@ -2941,21 +2941,21 @@
 	(ashift:SI (match_operand:SI 1 "register_operand" "")
 		   (match_operand:QI 2 "nonmemory_operand" "")))]
   ""
-  "expand_a_shift (SImode, ASHIFT, operands); DONE;")
+  "if (expand_a_shift (SImode, ASHIFT, operands)) DONE;")
 
 (define_expand "lshrsi3"
   [(set (match_operand:SI 0 "register_operand" "")
 	(lshiftrt:SI (match_operand:SI 1 "register_operand" "")
 		     (match_operand:QI 2 "nonmemory_operand" "")))]
   ""
-  "expand_a_shift (SImode, LSHIFTRT, operands); DONE;")
+  "if (expand_a_shift (SImode, LSHIFTRT, operands)) DONE;")
 
 (define_expand "ashrsi3"
   [(set (match_operand:SI 0 "register_operand" "")
 	(ashiftrt:SI (match_operand:SI 1 "register_operand" "")
 		     (match_operand:QI 2 "nonmemory_operand" "")))]
   ""
-  "expand_a_shift (SImode, ASHIFTRT, operands); DONE;")
+  "if (expand_a_shift (SImode, ASHIFTRT, operands)) DONE;")
 
 (define_insn ""
   [(set (match_operand:SI 0 "h8300_dst_operand" "=rQ")
Index: gcc/config/h8300/h8300.c
===================================================================
RCS file: /cvs/cvsfiles/gnupro/gcc/config/h8300/h8300.c,v
retrieving revision 1.5
diff -u -p -r1.5 h8300.c
--- gcc/config/h8300/h8300.c	21 Jun 2004 12:16:04 -0000	1.5
+++ gcc/config/h8300/h8300.c	21 Jun 2004 19:18:01 -0000
@@ -480,7 +480,7 @@ h8300_reg_class_from_letter (int c)
       return DESTINATION_REGS;
 
     case 'D':
-      if (!regs_ever_live[FP_REG])
+      if (!regs_ever_live[HFP_REG] && !regs_ever_live[FP_REG])
 	return NO_REGS;
       return GENERAL_REGS;
 
@@ -4056,7 +4056,7 @@ nshift_operator (rtx x, enum machine_mod
 bool
 expand_a_shift (enum machine_mode mode, int code, rtx operands[])
 {
-  switch (h8sx_classify_shift (mode, ROTATE, operands[2]))
+  switch (h8sx_classify_shift (mode, code, operands[2]))
     {
     case H8SX_SHIFT_BINARY:
       operands[1] = force_reg (mode, operands[1]);
@@ -5204,6 +5204,7 @@ expand_a_rotate (enum rtx_code code, rtx
 
   if (h8sx_classify_shift (mode, ROTATE, rotate_amount) == H8SX_SHIFT_UNARY)
     return false;
+
   /* We rotate in place.  */
   emit_move_insn (dst, src);
 

[-- Attachment #3: Type: text/plain, Size: 188 bytes --]


-- 
Alexandre Oliva             http://www.ic.unicamp.br/~oliva/
Red Hat Compiler Engineer   aoliva@{redhat.com, gcc.gnu.org}
Free Software Evangelist  oliva@{lsd.ic.unicamp.br, gnu.org}