Revert last commit, build problems.

[platform/upstream/binutils.git] / sim / m32r / arch.h

diff --git a/sim/m32r/arch.h b/sim/m32r/arch.h
index 42ccb8c..89aed24 100644 (file)
--- a/sim/m32r/arch.h
+++ b/sim/m32r/arch.h
@@ -1,8 +1,10 @@
 /* Simulator header for m32r.
 
-Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-This file is part of the GNU Simulators.
+Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+
+This file is part of the GNU simulators.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -23,32 +25,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef M32R_ARCH_H
 #define M32R_ARCH_H
 
-#define MAX_INSNS 166
-
 #define TARGET_BIG_ENDIAN 1
 
-/* Shorthand macro for fetching registers.  */
-#define CPU(x) (CPU_CGEN_HW (current_cpu)->x)
-
-/* Macros to determine which cpus are supported.  */
-#define HAVE_CPU_M32R
-/* start-sanitize-m32rx */
-#define HAVE_CPU_M32RX
-/* end-sanitize-m32rx */
-
-/* Enum declaration for mode types.  */
-typedef enum mode_type {
-  MODE_VM, MODE_BI, MODE_QI, MODE_HI,
-  MODE_SI, MODE_DI, MODE_UBI, MODE_UQI,
-  MODE_UHI, MODE_USI, MODE_UDI, MODE_SF,
-  MODE_DF, MODE_XF, MODE_TF, MODE_MAX
-} MODE_TYPE;
-
-#define MAX_MODES ((int) MODE_MAX)
-
-/* Return name of instruction numbered INSN.  */
-#define INSN_NAME(insn) (m32r_cgen_insn_table_entries[insn].name)
-
 /* Enum declaration for model types.  */
 typedef enum model_type {
   MODEL_M32R_D, MODEL_TEST, MODEL_M32RX, MODEL_MAX
@@ -58,10 +36,12 @@ typedef enum model_type {
 
 /* Enum declaration for unit types.  */
 typedef enum unit_type {
-  UNIT_NONE, UNIT_M32R_D_U_STORE, UNIT_M32R_D_U_LOAD, UNIT_M32R_D_U_EXEC,
-  UNIT_TEST_U_EXEC, UNIT_M32RX_U_EXEC, UNIT_MAX
+  UNIT_NONE, UNIT_M32R_D_U_STORE, UNIT_M32R_D_U_LOAD, UNIT_M32R_D_U_CTI
+ , UNIT_M32R_D_U_MAC, UNIT_M32R_D_U_CMP, UNIT_M32R_D_U_EXEC, UNIT_TEST_U_EXEC
+ , UNIT_M32RX_U_STORE, UNIT_M32RX_U_LOAD, UNIT_M32RX_U_CTI, UNIT_M32RX_U_MAC
+ , UNIT_M32RX_U_CMP, UNIT_M32RX_U_EXEC, UNIT_MAX
 } UNIT_TYPE;
 
-#define MAX_UNITS (1)
+#define MAX_UNITS (2)
 
 #endif /* M32R_ARCH_H */