* (REG_CLASS_FROM_CONSTRAINT): Only define if not already defined.

[pf3gnuchains/gcc-fork.git] / gcc / caller-save.c

diff --git a/gcc/caller-save.c b/gcc/caller-save.c
index 920bafd..53f3aa5 100644 (file)
--- a/gcc/caller-save.c
+++ b/gcc/caller-save.c
@@ -21,6 +21,8 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
+#include "tm.h"
 #include "rtl.h"
 #include "insn-config.h"
 #include "flags.h"
@@ -191,10 +193,9 @@ init_caller_save ()
   test_mem = gen_rtx_MEM (VOIDmode, address);
   savepat = gen_rtx_SET (VOIDmode, test_mem, test_reg);
   restpat = gen_rtx_SET (VOIDmode, test_reg, test_mem);
-  saveinsn = emit_insn (savepat);
-  restinsn = emit_insn (restpat);
 
-  start_sequence ();
+  saveinsn = gen_rtx_INSN (VOIDmode, 0, 0, 0, 0, 0, savepat, -1, 0, 0);
+  restinsn = gen_rtx_INSN (VOIDmode, 0, 0, 0, 0, 0, restpat, -1, 0, 0);
 
   for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
     for (mode = 0 ; mode < MAX_MACHINE_MODE; mode++)
@@ -208,6 +209,10 @@ init_caller_save ()
          PUT_MODE (test_reg, mode);
          PUT_MODE (test_mem, mode);
 
+         /* Force re-recognition of the modified insns.  */
+         INSN_CODE (saveinsn) = -1;
+         INSN_CODE (restinsn) = -1;
+
          reg_save_code[i][mode] = recog_memoized (saveinsn);
          reg_restore_code[i][mode] = recog_memoized (restinsn);
 
@@ -234,6 +239,7 @@ init_caller_save ()
          reg_save_code[i][mode] = -1;
          reg_restore_code[i][mode] = -1;
        }
+
   for (i = 0; i < FIRST_PSEUDO_REGISTER; i++)
     for (j = 1; j <= MOVE_MAX_WORDS; j++)
       if (reg_save_code [i][regno_save_mode[i][j]] == -1)
@@ -245,8 +251,6 @@ init_caller_save ()
              SET_HARD_REG_BIT (call_fixed_reg_set, i);
            }
        }
-
-  end_sequence ();
 }
 \f
 /* Initialize save areas by showing that we haven't allocated any yet.  */