diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8e5b2976a06f79aef46f8dc21725bd441266dec8..ae5510e82a6c6b9c4b7fc2a37a8f7f661128f210 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-18  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* config/h8300/h8300.c (general_operand_src): Always check
+	MODE.
+	(general_operand_dst): Likewise.
+
 2003-02-18  Roger Sayle  <roger@eyesopen.com>
 
 	* convert.c (convert_to_real): Also optimize (float)log(x) into
diff --git a/gcc/config/h8300/h8300.c b/gcc/config/h8300/h8300.c
index ed5b3a081486f88e93a0f128f6391c223f556673..e8de91dd08e1a4993ac561b727b11daaaee8bf93 100644
--- a/gcc/config/h8300/h8300.c
+++ b/gcc/config/h8300/h8300.c
@@ -723,7 +723,9 @@ general_operand_src (op, mode)
      rtx op;
      enum machine_mode mode;
 {
-  if (GET_CODE (op) == MEM && GET_CODE (XEXP (op, 0)) == POST_INC)
+  if (GET_MODE (op) == mode
+      && GET_CODE (op) == MEM
+      && GET_CODE (XEXP (op, 0)) == POST_INC)
     return 1;
   return general_operand (op, mode);
 }
@@ -736,7 +738,9 @@ general_operand_dst (op, mode)
      rtx op;
      enum machine_mode mode;
 {
-  if (GET_CODE (op) == MEM && GET_CODE (XEXP (op, 0)) == PRE_DEC)
+  if (GET_MODE (op) == mode
+      && GET_CODE (op) == MEM
+      && GET_CODE (XEXP (op, 0)) == PRE_DEC)
     return 1;
   return general_operand (op, mode);
 }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d38552d9ff1fc7f43609b9b5d6b7143b62219975..9d41b1af62a010abbc9382693b6114f31fff6aa5 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-18  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* gcc.c-torture/execute/20030218-1.c: New.
+
 2003-02-18  Aldy Hernandez  <aldyh@redhat.com>
 
         * gcc.dg/20030218-1.c: New.
diff --git a/gcc/testsuite/gcc.c-torture/execute/20030218-1.c b/gcc/testsuite/gcc.c-torture/execute/20030218-1.c
new file mode 100644
index 0000000000000000000000000000000000000000..8dde79451feb519cf1c9391ab8c8dbb73c462a42
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/20030218-1.c
@@ -0,0 +1,25 @@
+/*  On H8, the predicate general_operand_src(op,mode) used to ignore
+    mode when op is a (mem (post_inc ...)).  As a result, the pattern
+    for extendhisi2 was recognized as extendqisi2.  */
+
+extern void abort ();
+extern void exit (int);
+
+short *q;
+
+long
+foo (short *p)
+{
+  long b = *p;
+  q = p + 1;
+  return b;
+}
+
+int
+main ()
+{
+  short a = 0xff00;
+  if (foo (&a) != (long) (short) 0xff00)
+    abort ();
+  exit (0);
+}