sim: move many common settings from CPPFLAGS to config.h

[binutils-gdb.git] / sim / m32r / model2.c

diff --git a/sim/m32r/model2.c b/sim/m32r/model2.c
index 7dc7d616f966484704b9a431627197452dc03ec2..093391b434ba3a33b4c73c7ebd34b59028929293 100644 (file)
--- a/sim/m32r/model2.c
+++ b/sim/m32r/model2.c
@@ -2,7 +2,7 @@
 
 THIS FILE IS MACHINE GENERATED WITH CGEN.
 
-Copyright 1996-2010 Free Software Foundation, Inc.
+Copyright 1996-2016 Free Software Foundation, Inc.
 
 This file is part of the GNU simulators.
 
@@ -17,8 +17,7 @@ This file is part of the GNU simulators.
    License for more details.
 
    You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation, Inc.,
-   51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+   with this program; if not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -1998,7 +1997,7 @@ model_m32r2_neg (SIM_CPU *current_cpu, void *sem_arg)
 static int
 model_m32r2_nop (SIM_CPU *current_cpu, void *sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg);
   const IDESC * UNUSED idesc = abuf->idesc;
   int cycles = 0;
@@ -2076,7 +2075,7 @@ model_m32r2_rach_dsi (SIM_CPU *current_cpu, void *sem_arg)
 static int
 model_m32r2_rte (SIM_CPU *current_cpu, void *sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg);
   const IDESC * UNUSED idesc = abuf->idesc;
   int cycles = 0;
@@ -2790,7 +2789,7 @@ model_m32r2_pcmpbz (SIM_CPU *current_cpu, void *sem_arg)
 static int
 model_m32r2_sadd (SIM_CPU *current_cpu, void *sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg);
   const IDESC * UNUSED idesc = abuf->idesc;
   int cycles = 0;
@@ -2896,7 +2895,7 @@ model_m32r2_maclh1 (SIM_CPU *current_cpu, void *sem_arg)
 static int
 model_m32r2_sc (SIM_CPU *current_cpu, void *sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg);
   const IDESC * UNUSED idesc = abuf->idesc;
   int cycles = 0;
@@ -2915,7 +2914,7 @@ model_m32r2_sc (SIM_CPU *current_cpu, void *sem_arg)
 static int
 model_m32r2_snc (SIM_CPU *current_cpu, void *sem_arg)
 {
-#define FLD(f) abuf->fields.fmt_empty.f
+#define FLD(f) abuf->fields.sfmt_empty.f
   const ARGBUF * UNUSED abuf = SEM_ARGBUF ((SEM_ARG) sem_arg);
   const IDESC * UNUSED idesc = abuf->idesc;
   int cycles = 0;
@@ -3193,7 +3192,7 @@ m32r2_model_init (SIM_CPU *cpu)
 #define TIMING_DATA(td) 0
 #endif
 
-static const MODEL m32r2_models[] =
+static const SIM_MODEL m32r2_models[] =
 {
   { "m32r2", & m32r2_mach, MODEL_M32R2, TIMING_DATA (& m32r2_timing[0]), m32r2_model_init },
   { 0 }
@@ -3201,7 +3200,7 @@ static const MODEL m32r2_models[] =
 
 /* The properties of this cpu's implementation.  */
 
-static const MACH_IMP_PROPERTIES m32r2f_imp_properties =
+static const SIM_MACH_IMP_PROPERTIES m32r2f_imp_properties =
 {
   sizeof (SIM_CPU),
 #if WITH_SCACHE
@@ -3243,7 +3242,7 @@ m32r2_init_cpu (SIM_CPU *cpu)
 #endif
 }
 
-const MACH m32r2_mach =
+const SIM_MACH m32r2_mach =
 {
   "m32r2", "m32r2", MACH_M32R2,
   32, 32, & m32r2_models[0], & m32r2f_imp_properties,