diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2016-08-08 13:06:49 +0800 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2016-08-13 12:47:11 -0700 |
| commit | 474a2d9f5f8a080e30812525729c3a8b7baa61d6 (patch) | |
| tree | f8b14eabb88d2bccdc21b5d4afb10846f679c836 /sim/bfin/machs.h | |
| parent | 752cf9131f9e0fc39f9be5c1933d2f4d5b0b5ac9 (diff) | |
| download | gdb-474a2d9f5f8a080e30812525729c3a8b7baa61d6.zip gdb-474a2d9f5f8a080e30812525729c3a8b7baa61d6.tar.gz gdb-474a2d9f5f8a080e30812525729c3a8b7baa61d6.tar.bz2 | |
sim: bfin: split out common mach/model defines into arch.h [PR sim/20438]
The current machs.h mixes common enums with Blackfin-specific defines.
This causes us troubles with header inclusion order such that we can't
drop the old SIM_CPU typedef (which is duplicated in common code). By
splitting the two up, we can unwind this dependency chain, and drop the
old typedef. It also fixes building with older gcc versions.
Diffstat (limited to 'sim/bfin/machs.h')
| -rw-r--r-- | sim/bfin/machs.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/sim/bfin/machs.h b/sim/bfin/machs.h index 0372982..36819ae 100644 --- a/sim/bfin/machs.h +++ b/sim/bfin/machs.h @@ -21,19 +21,6 @@ #ifndef _BFIN_MACHS_H_ #define _BFIN_MACHS_H_ -typedef enum model_type { -#define P(n) MODEL_BF##n, -#include "proc_list.def" -#undef P - MODEL_MAX -} MODEL_TYPE; - -typedef enum mach_attr { - MACH_BASE, - MACH_BFIN, - MACH_MAX -} MACH_ATTR; - #define CPU_MODEL_NUM(cpu) MODEL_NUM (CPU_MODEL (cpu)) /* XXX: Some of this probably belongs in CPU_MODEL. */ @@ -46,13 +33,6 @@ void bfin_model_cpu_init (SIM_DESC, SIM_CPU *); bu32 bfin_model_get_chipid (SIM_DESC); bu32 bfin_model_get_dspid (SIM_DESC); -enum { -#define I(insn) BFIN_INSN_##insn, -#include "insn_list.def" -#undef I - BFIN_INSN_MAX -}; - #define BFIN_COREMMR_CEC_BASE 0xFFE02100 #define BFIN_COREMMR_CEC_SIZE (4 * 5) #define BFIN_COREMMR_CTIMER_BASE 0xFFE03000 |