* config/m68k/m68k.c (sched-int.h, insn-codes.h): New includes.

[pf3gnuchains/gcc-fork.git] / gcc / config / m68k / m68k.h

diff --git a/gcc/config/m68k/m68k.h b/gcc/config/m68k/m68k.h
index a346b81..d8e1d3a 100644 (file)
--- a/gcc/config/m68k/m68k.h
+++ b/gcc/config/m68k/m68k.h
@@ -29,10 +29,6 @@ along with GCC; see the file COPYING3.  If not see
 # define TARGET_VERSION fprintf (stderr, " (68k, MIT syntax)")
 #endif
 
-/* Options 0 and 1 are the Motorola and MIT syntaxes,
-   respectively.  */
-#define ASSEMBLER_DIALECT      !MOTOROLA
-
 /* Handle --with-cpu default option from configure script.  */
 #define OPTION_DEFAULT_SPECS                                           \
   { "cpu",   "%{!mc68000:%{!m68000:%{!m68302:%{!m68010:%{!mc68020:%{!m68020:\
@@ -975,11 +971,17 @@ do { if (cc_prev_status.flags & CC_IN_68881)                      \
 #define ASM_GENERATE_INTERNAL_LABEL(LABEL,PREFIX,NUM)  \
   sprintf (LABEL, "*%s%s%ld", LOCAL_LABEL_PREFIX, PREFIX, (long)(NUM))
 
-#define ASM_OUTPUT_REG_PUSH(FILE,REGNO)                                          \
-  asm_fprintf (FILE, "\tmove%.l %s,{-(%Rsp)|%Rsp@-}\n", reg_names[REGNO])
+#define ASM_OUTPUT_REG_PUSH(FILE,REGNO)                        \
+  asm_fprintf (FILE, (MOTOROLA                         \
+                     ? "\tmove.l %s,-(%Rsp)\n"         \
+                     : "\tmovel %s,%Rsp@-\n"),         \
+              reg_names[REGNO])
 
-#define ASM_OUTPUT_REG_POP(FILE,REGNO)                                      \
-  asm_fprintf (FILE, "\tmove%.l {(%Rsp)+|%Rsp@+},%s\n", reg_names[REGNO])
+#define ASM_OUTPUT_REG_POP(FILE,REGNO)                 \
+  asm_fprintf (FILE, (MOTOROLA                         \
+                     ? "\tmove.l (%Rsp)+,%s\n"         \
+                     : "\tmovel %Rsp@+,%s\n"),         \
+              reg_names[REGNO])
 
 /* The m68k does not use absolute case-vectors, but we must define this macro
    anyway.  */
@@ -1057,8 +1059,6 @@ do { if (cc_prev_status.flags & CC_IN_68881)                      \
    '&' for the letter `d' in an op code, but only on the 68040.
    '/' for register prefix needed by longlong.h.
    '?' for m68k_library_id_string
-   '{' for '{'
-   '}' for '}'
 
    'b' for byte insn (no effect, on the Sun; this is for the ISI).
    'd' to force memory addressing to be absolute, not relative.
@@ -1069,8 +1069,7 @@ do { if (cc_prev_status.flags & CC_IN_68881)                      \
 #define PRINT_OPERAND_PUNCT_VALID_P(CODE)                              \
   ((CODE) == '.' || (CODE) == '#' || (CODE) == '-'                     \
    || (CODE) == '+' || (CODE) == '@' || (CODE) == '!'                  \
-   || (CODE) == '$' || (CODE) == '&' || (CODE) == '/' || (CODE) == '?' \
-   || (CODE) == '{' || (CODE) == '}')
+   || (CODE) == '$' || (CODE) == '&' || (CODE) == '/' || (CODE) == '?')
 
 
 /* See m68k.c for the m68k specific codes.  */
@@ -1149,10 +1148,4 @@ extern M68K_CONST_METHOD m68k_const_method (HOST_WIDE_INT);
 
 extern void m68k_emit_move_double (rtx [2]);
 
-extern enum attr_cpu m68k_sched_cpu;
-
-extern enum attr_opx_type m68k_sched_attr_opx_type (rtx, int);
-extern enum attr_opy_type m68k_sched_attr_opy_type (rtx, int);
-extern int m68k_sched_attr_size (rtx);
-extern enum attr_op_mem m68k_sched_attr_op_mem (rtx);
-extern enum attr_type m68k_sched_branch_type (rtx);
+#define CPU_UNITS_QUERY 1