sim: enable common sim_cpu usage everywhere
All ports should be migrated now. Drop the SIM_HAVE_COMMON_SIM_CPU
knob and require it be used everywhere now.
diff --git a/sim/aarch64/sim-main.h b/sim/aarch64/sim-main.h
index 0da730d..211685f 100644
--- a/sim/aarch64/sim-main.h
+++ b/sim/aarch64/sim-main.h
@@ -22,8 +22,6 @@
#ifndef _SIM_MAIN_H
#define _SIM_MAIN_H
-#define SIM_HAVE_COMMON_SIM_CPU
-
#include "sim-basics.h"
#include "sim-types.h"
#include "sim-base.h"
diff --git a/sim/arm/sim-main.h b/sim/arm/sim-main.h
index ba44314..bdc5019 100644
--- a/sim/arm/sim-main.h
+++ b/sim/arm/sim-main.h
@@ -19,8 +19,6 @@
#ifndef SIM_MAIN_H
#define SIM_MAIN_H
-#define SIM_HAVE_COMMON_SIM_CPU
-
#include "sim-basics.h"
#include "sim-base.h"
#include "bfd.h"
diff --git a/sim/avr/sim-main.h b/sim/avr/sim-main.h
index 63f43dd..97129ec 100644
--- a/sim/avr/sim-main.h
+++ b/sim/avr/sim-main.h
@@ -19,8 +19,6 @@
#ifndef SIM_MAIN_H
#define SIM_MAIN_H
-#define SIM_HAVE_COMMON_SIM_CPU
-
#include "sim-basics.h"
#include "sim-base.h"
diff --git a/sim/bfin/sim-main.h b/sim/bfin/sim-main.h
index 48e54c8..a3855f3 100644
--- a/sim/bfin/sim-main.h
+++ b/sim/bfin/sim-main.h
@@ -21,8 +21,6 @@
#ifndef _BFIN_MAIN_SIM_H_
#define _BFIN_MAIN_SIM_H_
-#define SIM_HAVE_COMMON_SIM_CPU
-
#include "sim-basics.h"
#include "arch.h"
#include "sim-base.h"
diff --git a/sim/bpf/sim-main.h b/sim/bpf/sim-main.h
index 5a29360..0de4d41 100644
--- a/sim/bpf/sim-main.h
+++ b/sim/bpf/sim-main.h
@@ -19,8 +19,6 @@
#ifndef SIM_MAIN_H
#define SIM_MAIN_H
-#define SIM_HAVE_COMMON_SIM_CPU
-
#include "sim-basics.h"
#include "cgen-types.h"
#include "bpf-desc.h"
diff --git a/sim/common/sim-cpu.c b/sim/common/sim-cpu.c
index 951e937..024bd05 100644
--- a/sim/common/sim-cpu.c
+++ b/sim/common/sim-cpu.c
@@ -46,20 +46,14 @@
sim_cpu *
sim_cpu_alloc_extra (SIM_DESC sd, size_t extra_bytes)
{
- sim_cpu *cpu;
+ sim_cpu *cpu = zalloc (sizeof (*cpu));
#ifndef CGEN_ARCH
# define cgen_cpu_max_extra_bytes(sd) 0
#endif
-#ifdef SIM_HAVE_COMMON_SIM_CPU
- cpu = zalloc (sizeof (*cpu));
-
extra_bytes += cgen_cpu_max_extra_bytes (sd);
if (extra_bytes)
CPU_ARCH_DATA (cpu) = zalloc (extra_bytes);
-#else
- cpu = zalloc (sizeof (*cpu) + cgen_cpu_max_extra_bytes (sd));
-#endif
return cpu;
}
@@ -81,10 +75,7 @@
void
sim_cpu_free (sim_cpu *cpu)
{
-#ifdef SIM_HAVE_COMMON_SIM_CPU
free (CPU_ARCH_DATA (cpu));
-#endif
-
free (cpu);
}
diff --git a/sim/common/sim-cpu.h b/sim/common/sim-cpu.h
index e895664..83244e0 100644
--- a/sim/common/sim-cpu.h
+++ b/sim/common/sim-cpu.h
@@ -126,7 +126,6 @@
} sim_cpu_base;
-#ifdef SIM_HAVE_COMMON_SIM_CPU
struct _sim_cpu {
/* All the common state. */
sim_cpu_base base;
@@ -142,7 +141,6 @@
void *arch_data;
#define CPU_ARCH_DATA(cpu) ((cpu)->arch_data)
};
-#endif
/* Create all cpus. */
extern SIM_RC sim_cpu_alloc_all_extra (SIM_DESC, int, size_t);
diff --git a/sim/cr16/sim-main.h b/sim/cr16/sim-main.h
index 7ac6bd2..667db19 100644
--- a/sim/cr16/sim-main.h
+++ b/sim/cr16/sim-main.h
@@ -19,8 +19,6 @@
#ifndef SIM_MAIN_H
#define SIM_MAIN_H
-#define SIM_HAVE_COMMON_SIM_CPU
-
#include "sim-basics.h"
typedef long int word;
diff --git a/sim/cris/sim-main.h b/sim/cris/sim-main.h
index f60c454..e946489 100644
--- a/sim/cris/sim-main.h
+++ b/sim/cris/sim-main.h
@@ -24,8 +24,6 @@
#ifndef SIM_MAIN_H
#define SIM_MAIN_H
-#define SIM_HAVE_COMMON_SIM_CPU
-
/* This is a global setting. Different cpu families can't mix-n-match -scache
and -pbb. However some cpu families may use -simple while others use
one of -scache/-pbb. */
diff --git a/sim/d10v/sim-main.h b/sim/d10v/sim-main.h
index 5327e7e..3d7b732 100644
--- a/sim/d10v/sim-main.h
+++ b/sim/d10v/sim-main.h
@@ -19,8 +19,6 @@
#ifndef SIM_MAIN_H
#define SIM_MAIN_H
-#define SIM_HAVE_COMMON_SIM_CPU
-
#include "sim-basics.h"
typedef long int word;
diff --git a/sim/example-synacor/sim-main.h b/sim/example-synacor/sim-main.h
index 11566d2..258d618 100644
--- a/sim/example-synacor/sim-main.h
+++ b/sim/example-synacor/sim-main.h
@@ -21,8 +21,6 @@
#ifndef SIM_MAIN_H
#define SIM_MAIN_H
-#define SIM_HAVE_COMMON_SIM_CPU
-
#include "sim-basics.h"
#include "sim-base.h"
diff --git a/sim/frv/sim-main.h b/sim/frv/sim-main.h
index 3e40bd5..5fbf94d 100644
--- a/sim/frv/sim-main.h
+++ b/sim/frv/sim-main.h
@@ -22,8 +22,6 @@
/* Main header for the frv. */
-#define SIM_HAVE_COMMON_SIM_CPU
-
/* This is a global setting. Different cpu families can't mix-n-match -scache
and -pbb. However some cpu families may use -simple while others use
one of -scache/-pbb. ???? */
diff --git a/sim/ft32/sim-main.h b/sim/ft32/sim-main.h
index 3a002ef..e160a12 100644
--- a/sim/ft32/sim-main.h
+++ b/sim/ft32/sim-main.h
@@ -21,8 +21,6 @@
#ifndef SIM_MAIN_H
#define SIM_MAIN_H
-#define SIM_HAVE_COMMON_SIM_CPU
-
#include "sim-basics.h"
#include "sim-base.h"
#include "bfd.h"
diff --git a/sim/h8300/sim-main.h b/sim/h8300/sim-main.h
index d0a04f5..84bb346 100644
--- a/sim/h8300/sim-main.h
+++ b/sim/h8300/sim-main.h
@@ -5,8 +5,6 @@
#ifndef SIM_MAIN_H
#define SIM_MAIN_H
-#define SIM_HAVE_COMMON_SIM_CPU
-
#define DEBUG
/* These define the size of main memory for the simulator.
diff --git a/sim/iq2000/sim-main.h b/sim/iq2000/sim-main.h
index bb927fc..ccc3fc8 100644
--- a/sim/iq2000/sim-main.h
+++ b/sim/iq2000/sim-main.h
@@ -4,8 +4,6 @@
#ifndef SIM_MAIN_H
#define SIM_MAIN_H
-#define SIM_HAVE_COMMON_SIM_CPU
-
/* This is a global setting. Different cpu families can't mix-n-match -scache
and -pbb. However some cpu families may use -simple while others use
one of -scache/-pbb. ???? */
diff --git a/sim/lm32/sim-main.h b/sim/lm32/sim-main.h
index 17c817c..6ae757f08 100644
--- a/sim/lm32/sim-main.h
+++ b/sim/lm32/sim-main.h
@@ -23,8 +23,6 @@
#ifndef SIM_MAIN_H
#define SIM_MAIN_H
-#define SIM_HAVE_COMMON_SIM_CPU
-
#define WITH_SCACHE_PBB 1
#include "symcat.h"
diff --git a/sim/m32r/sim-main.h b/sim/m32r/sim-main.h
index fcde7fe..6d69ecf 100644
--- a/sim/m32r/sim-main.h
+++ b/sim/m32r/sim-main.h
@@ -3,8 +3,6 @@
#ifndef SIM_MAIN_H
#define SIM_MAIN_H
-#define SIM_HAVE_COMMON_SIM_CPU
-
/* This is a global setting. Different cpu families can't mix-n-match -scache
and -pbb. However some cpu families may use -simple while others use
one of -scache/-pbb. */
diff --git a/sim/m68hc11/sim-main.h b/sim/m68hc11/sim-main.h
index 26293bc..e47bd83 100644
--- a/sim/m68hc11/sim-main.h
+++ b/sim/m68hc11/sim-main.h
@@ -20,8 +20,6 @@
#ifndef _SIM_MAIN_H
#define _SIM_MAIN_H
-#define SIM_HAVE_COMMON_SIM_CPU
-
#include "sim-basics.h"
#include "sim-base.h"
diff --git a/sim/mcore/sim-main.h b/sim/mcore/sim-main.h
index 82a720b..fc4625b 100644
--- a/sim/mcore/sim-main.h
+++ b/sim/mcore/sim-main.h
@@ -19,8 +19,6 @@
#ifndef SIM_MAIN_H
#define SIM_MAIN_H
-#define SIM_HAVE_COMMON_SIM_CPU
-
#include "sim-basics.h"
typedef long int word;
diff --git a/sim/microblaze/sim-main.h b/sim/microblaze/sim-main.h
index df85a6f..160f101 100644
--- a/sim/microblaze/sim-main.h
+++ b/sim/microblaze/sim-main.h
@@ -18,8 +18,6 @@
#ifndef MICROBLAZE_SIM_MAIN
#define MICROBLAZE_SIM_MAIN
-#define SIM_HAVE_COMMON_SIM_CPU
-
#include "microblaze.h"
#include "sim-basics.h"
#include "sim-base.h"
diff --git a/sim/mips/sim-main.h b/sim/mips/sim-main.h
index d4e6a2f..ea203c4 100644
--- a/sim/mips/sim-main.h
+++ b/sim/mips/sim-main.h
@@ -20,8 +20,6 @@
#ifndef SIM_MAIN_H
#define SIM_MAIN_H
-#define SIM_HAVE_COMMON_SIM_CPU
-
#define SIM_CORE_SIGNAL(SD,CPU,CIA,MAP,NR_BYTES,ADDR,TRANSFER,ERROR) \
mips_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), (TRANSFER), (ERROR))
diff --git a/sim/mn10300/sim-main.h b/sim/mn10300/sim-main.h
index 37e5ce0..77a7ba8 100644
--- a/sim/mn10300/sim-main.h
+++ b/sim/mn10300/sim-main.h
@@ -22,8 +22,6 @@
#ifndef SIM_MAIN_H
#define SIM_MAIN_H
-#define SIM_HAVE_COMMON_SIM_CPU
-
#define SIM_ENGINE_HALT_HOOK(SD,LAST_CPU,CIA) /* disable this hook */
#include "sim-basics.h"
diff --git a/sim/moxie/sim-main.h b/sim/moxie/sim-main.h
index 7db12e0..c4be80e 100644
--- a/sim/moxie/sim-main.h
+++ b/sim/moxie/sim-main.h
@@ -20,8 +20,6 @@
#ifndef SIM_MAIN_H
#define SIM_MAIN_H
-#define SIM_HAVE_COMMON_SIM_CPU
-
#include "sim-basics.h"
#include "sim-base.h"
#include "bfd.h"
diff --git a/sim/msp430/sim-main.h b/sim/msp430/sim-main.h
index 9d5a7b3..5603d41 100644
--- a/sim/msp430/sim-main.h
+++ b/sim/msp430/sim-main.h
@@ -21,8 +21,6 @@
#ifndef _MSP430_MAIN_SIM_H_
#define _MSP430_MAIN_SIM_H_
-#define SIM_HAVE_COMMON_SIM_CPU
-
#include "sim-basics.h"
#include "msp430-sim.h"
#include "sim-base.h"
diff --git a/sim/or1k/sim-main.h b/sim/or1k/sim-main.h
index bf3558d..1b6939d 100644
--- a/sim/or1k/sim-main.h
+++ b/sim/or1k/sim-main.h
@@ -19,8 +19,6 @@
#ifndef SIM_MAIN_H
#define SIM_MAIN_H
-#define SIM_HAVE_COMMON_SIM_CPU
-
#define WITH_SCACHE_PBB 1
#include "ansidecl.h"
diff --git a/sim/pru/sim-main.h b/sim/pru/sim-main.h
index a217eee..ada1e38 100644
--- a/sim/pru/sim-main.h
+++ b/sim/pru/sim-main.h
@@ -19,8 +19,6 @@
#ifndef PRU_SIM_MAIN
#define PRU_SIM_MAIN
-#define SIM_HAVE_COMMON_SIM_CPU
-
#include <stdint.h>
#include <stddef.h>
#include "pru.h"
diff --git a/sim/riscv/sim-main.h b/sim/riscv/sim-main.h
index aeeb0ad..48ea452 100644
--- a/sim/riscv/sim-main.h
+++ b/sim/riscv/sim-main.h
@@ -21,8 +21,6 @@
#ifndef SIM_MAIN_H
#define SIM_MAIN_H
-#define SIM_HAVE_COMMON_SIM_CPU
-
#include "sim-basics.h"
#include "machs.h"
#include "sim-base.h"
diff --git a/sim/sh/sim-main.h b/sim/sh/sim-main.h
index 5504ad2..6008b69 100644
--- a/sim/sh/sim-main.h
+++ b/sim/sh/sim-main.h
@@ -19,8 +19,6 @@
#ifndef SIM_MAIN_H
#define SIM_MAIN_H
-#define SIM_HAVE_COMMON_SIM_CPU
-
#include "sim-basics.h"
#include "sim-base.h"
diff --git a/sim/v850/sim-main.h b/sim/v850/sim-main.h
index 970a148..abf2ed7 100644
--- a/sim/v850/sim-main.h
+++ b/sim/v850/sim-main.h
@@ -1,8 +1,6 @@
#ifndef SIM_MAIN_H
#define SIM_MAIN_H
-#define SIM_HAVE_COMMON_SIM_CPU
-
/* The v850 has 32bit words, numbered 31 (MSB) to 0 (LSB) */
#define WITH_TARGET_WORD_MSB 31
