gwj / at91sam9263 · Commits

Commit bd5ea513986dfe68d1828ddd9df20078e743638f

Authored by aurel32
1 parent 40569b7e

target-ppc: Model e500v{1,2} CPUs more accurately 

The e500v1 chips only have single-precision floating point; don't say we
support the double-precision floating-point instructions on such chips.
Also add an e500v1 -cpu argument for a generic e500v1.

Signed-off-by: Nathan Froyd <froydnj@codesourcery.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6576 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 125 additions and 102 deletions
target-ppc/translate_init.c
  View file @bd5ea51
... ... @@ -4147,23 +4147,43 @@ static void init_proc_e300 (CPUPPCState *env)
4147 4147 ppc6xx_irq_init(env);
4148 4148 }
4149 4149  
4150   -/* e500 core */
4151   -#define POWERPC_INSNS_e500 (PPC_INSNS_BASE | PPC_ISEL | \
4152   - PPC_SPE | PPC_SPE_SINGLE | PPC_SPE_DOUBLE | \
4153   - PPC_WRTEE | PPC_RFDI | \
4154   - PPC_CACHE | PPC_CACHE_LOCK | PPC_CACHE_ICBI | \
4155   - PPC_CACHE_DCBZ | PPC_CACHE_DCBA | \
4156   - PPC_MEM_TLBSYNC | PPC_TLBIVAX | \
4157   - PPC_BOOKE)
4158   -#define POWERPC_MSRM_e500 (0x000000000606FF30ULL)
4159   -#define POWERPC_MMU_e500 (POWERPC_MMU_BOOKE_FSL)
4160   -#define POWERPC_EXCP_e500 (POWERPC_EXCP_BOOKE)
4161   -#define POWERPC_INPUT_e500 (PPC_FLAGS_INPUT_BookE)
4162   -#define POWERPC_BFDM_e500 (bfd_mach_ppc_860)
4163   -#define POWERPC_FLAG_e500 (POWERPC_FLAG_SPE | POWERPC_FLAG_CE | \
4164   - POWERPC_FLAG_UBLE | POWERPC_FLAG_DE | \
4165   - POWERPC_FLAG_BUS_CLK)
4166   -#define check_pow_e500 check_pow_hid0
  4150 +/* e500v1 core */
  4151 +#define POWERPC_INSNS_e500v1 (PPC_INSNS_BASE | PPC_ISEL | \
  4152 + PPC_SPE | PPC_SPE_SINGLE | \
  4153 + PPC_WRTEE | PPC_RFDI | \
  4154 + PPC_CACHE | PPC_CACHE_LOCK | PPC_CACHE_ICBI | \
  4155 + PPC_CACHE_DCBZ | PPC_CACHE_DCBA | \
  4156 + PPC_MEM_TLBSYNC | PPC_TLBIVAX | \
  4157 + PPC_BOOKE)
  4158 +#define POWERPC_MSRM_e500v1 (0x000000000606FF30ULL)
  4159 +#define POWERPC_MMU_e500v1 (POWERPC_MMU_BOOKE_FSL)
  4160 +#define POWERPC_EXCP_e500v1 (POWERPC_EXCP_BOOKE)
  4161 +#define POWERPC_INPUT_e500v1 (PPC_FLAGS_INPUT_BookE)
  4162 +#define POWERPC_BFDM_e500v1 (bfd_mach_ppc_860)
  4163 +#define POWERPC_FLAG_e500v1 (POWERPC_FLAG_SPE | POWERPC_FLAG_CE | \
  4164 + POWERPC_FLAG_UBLE | POWERPC_FLAG_DE | \
  4165 + POWERPC_FLAG_BUS_CLK)
  4166 +#define check_pow_e500v1 check_pow_hid0
  4167 +#define init_proc_e500v1 init_proc_e500
  4168 +
  4169 +/* e500v2 core */
  4170 +#define POWERPC_INSNS_e500v2 (PPC_INSNS_BASE | PPC_ISEL | \
  4171 + PPC_SPE | PPC_SPE_SINGLE | PPC_SPE_DOUBLE | \
  4172 + PPC_WRTEE | PPC_RFDI | \
  4173 + PPC_CACHE | PPC_CACHE_LOCK | PPC_CACHE_ICBI | \
  4174 + PPC_CACHE_DCBZ | PPC_CACHE_DCBA | \
  4175 + PPC_MEM_TLBSYNC | PPC_TLBIVAX | \
  4176 + PPC_BOOKE)
  4177 +#define POWERPC_MSRM_e500v2 (0x000000000606FF30ULL)
  4178 +#define POWERPC_MMU_e500v2 (POWERPC_MMU_BOOKE_FSL)
  4179 +#define POWERPC_EXCP_e500v2 (POWERPC_EXCP_BOOKE)
  4180 +#define POWERPC_INPUT_e500v2 (PPC_FLAGS_INPUT_BookE)
  4181 +#define POWERPC_BFDM_e500v2 (bfd_mach_ppc_860)
  4182 +#define POWERPC_FLAG_e500v2 (POWERPC_FLAG_SPE | POWERPC_FLAG_CE | \
  4183 + POWERPC_FLAG_UBLE | POWERPC_FLAG_DE | \
  4184 + POWERPC_FLAG_BUS_CLK)
  4185 +#define check_pow_e500v2 check_pow_hid0
  4186 +#define init_proc_e500v2 init_proc_e500
4167 4187  
4168 4188 __attribute__ (( unused ))
4169 4189 static void init_proc_e500 (CPUPPCState *env)
... ... @@ -6691,9 +6711,10 @@ enum {
6691 6711 /* e500 family */
6692 6712 /* e500 cores */
6693 6713 #define CPU_POWERPC_e500 CPU_POWERPC_e500v2_v22
  6714 +#define CPU_POWERPC_e500v1 CPU_POWERPC_e500v1_v20
6694 6715 #define CPU_POWERPC_e500v2 CPU_POWERPC_e500v2_v22
6695   - CPU_POWERPC_e500_v10 = 0x80200010,
6696   - CPU_POWERPC_e500_v20 = 0x80200020,
  6716 + CPU_POWERPC_e500v1_v10 = 0x80200010,
  6717 + CPU_POWERPC_e500v1_v20 = 0x80200020,
6697 6718 CPU_POWERPC_e500v2_v10 = 0x80210010,
6698 6719 CPU_POWERPC_e500v2_v11 = 0x80210011,
6699 6720 CPU_POWERPC_e500v2_v20 = 0x80210020,
... ... @@ -6708,15 +6729,15 @@ enum {
6708 6729 #define CPU_POWERPC_MPC8533E_v10 CPU_POWERPC_e500v2_v21
6709 6730 #define CPU_POWERPC_MPC8533E_v11 CPU_POWERPC_e500v2_v22
6710 6731 #define CPU_POWERPC_MPC8540 CPU_POWERPC_MPC8540_v21
6711   -#define CPU_POWERPC_MPC8540_v10 CPU_POWERPC_e500_v10
6712   -#define CPU_POWERPC_MPC8540_v20 CPU_POWERPC_e500_v20
6713   -#define CPU_POWERPC_MPC8540_v21 CPU_POWERPC_e500_v20
  6732 +#define CPU_POWERPC_MPC8540_v10 CPU_POWERPC_e500v1_v10
  6733 +#define CPU_POWERPC_MPC8540_v20 CPU_POWERPC_e500v1_v20
  6734 +#define CPU_POWERPC_MPC8540_v21 CPU_POWERPC_e500v1_v20
6714 6735 #define CPU_POWERPC_MPC8541 CPU_POWERPC_MPC8541_v11
6715   -#define CPU_POWERPC_MPC8541_v10 CPU_POWERPC_e500_v20
6716   -#define CPU_POWERPC_MPC8541_v11 CPU_POWERPC_e500_v20
  6736 +#define CPU_POWERPC_MPC8541_v10 CPU_POWERPC_e500v1_v20
  6737 +#define CPU_POWERPC_MPC8541_v11 CPU_POWERPC_e500v1_v20
6717 6738 #define CPU_POWERPC_MPC8541E CPU_POWERPC_MPC8541E_v11
6718   -#define CPU_POWERPC_MPC8541E_v10 CPU_POWERPC_e500_v20
6719   -#define CPU_POWERPC_MPC8541E_v11 CPU_POWERPC_e500_v20
  6739 +#define CPU_POWERPC_MPC8541E_v10 CPU_POWERPC_e500v1_v20
  6740 +#define CPU_POWERPC_MPC8541E_v11 CPU_POWERPC_e500v1_v20
6720 6741 #define CPU_POWERPC_MPC8543 CPU_POWERPC_MPC8543_v21
6721 6742 #define CPU_POWERPC_MPC8543_v10 CPU_POWERPC_e500v2_v10
6722 6743 #define CPU_POWERPC_MPC8543_v11 CPU_POWERPC_e500v2_v11
... ... @@ -8043,224 +8064,226 @@ static const ppc_def_t ppc_defs[] = {
8043 8064 CPU_POWERPC_MPC8379E, POWERPC_SVR_8379E, e300),
8044 8065 /* e500 family */
8045 8066 /* PowerPC e500 core */
8046   - POWERPC_DEF("e500", CPU_POWERPC_e500, e500),
  8067 + POWERPC_DEF("e500", CPU_POWERPC_e500v2_v22, e500v2),
  8068 + /* PowerPC e500v1 core */
  8069 + POWERPC_DEF("e500v1", CPU_POWERPC_e500v1, e500v1),
8047 8070 /* PowerPC e500 v1.0 core */
8048   - POWERPC_DEF("e500_v10", CPU_POWERPC_e500_v10, e500),
  8071 + POWERPC_DEF("e500_v10", CPU_POWERPC_e500v1_v10, e500v1),
8049 8072 /* PowerPC e500 v2.0 core */
8050   - POWERPC_DEF("e500_v20", CPU_POWERPC_e500_v20, e500),
  8073 + POWERPC_DEF("e500_v20", CPU_POWERPC_e500v1_v20, e500v1),
8051 8074 /* PowerPC e500v2 core */
8052   - POWERPC_DEF("e500v2", CPU_POWERPC_e500v2, e500),
  8075 + POWERPC_DEF("e500v2", CPU_POWERPC_e500v2, e500v2),
8053 8076 /* PowerPC e500v2 v1.0 core */
8054   - POWERPC_DEF("e500v2_v10", CPU_POWERPC_e500v2_v10, e500),
  8077 + POWERPC_DEF("e500v2_v10", CPU_POWERPC_e500v2_v10, e500v2),
8055 8078 /* PowerPC e500v2 v2.0 core */
8056   - POWERPC_DEF("e500v2_v20", CPU_POWERPC_e500v2_v20, e500),
  8079 + POWERPC_DEF("e500v2_v20", CPU_POWERPC_e500v2_v20, e500v2),
8057 8080 /* PowerPC e500v2 v2.1 core */
8058   - POWERPC_DEF("e500v2_v21", CPU_POWERPC_e500v2_v21, e500),
  8081 + POWERPC_DEF("e500v2_v21", CPU_POWERPC_e500v2_v21, e500v2),
8059 8082 /* PowerPC e500v2 v2.2 core */
8060   - POWERPC_DEF("e500v2_v22", CPU_POWERPC_e500v2_v22, e500),
  8083 + POWERPC_DEF("e500v2_v22", CPU_POWERPC_e500v2_v22, e500v2),
8061 8084 /* PowerPC e500v2 v3.0 core */
8062   - POWERPC_DEF("e500v2_v30", CPU_POWERPC_e500v2_v30, e500),
  8085 + POWERPC_DEF("e500v2_v30", CPU_POWERPC_e500v2_v30, e500v2),
8063 8086 /* PowerPC e500 microcontrollers */
8064 8087 /* MPC8533 */
8065 8088 POWERPC_DEF_SVR("MPC8533",
8066   - CPU_POWERPC_MPC8533, POWERPC_SVR_8533, e500),
  8089 + CPU_POWERPC_MPC8533, POWERPC_SVR_8533, e500v2),
8067 8090 /* MPC8533 v1.0 */
8068 8091 POWERPC_DEF_SVR("MPC8533_v10",
8069   - CPU_POWERPC_MPC8533_v10, POWERPC_SVR_8533_v10, e500),
  8092 + CPU_POWERPC_MPC8533_v10, POWERPC_SVR_8533_v10, e500v2),
8070 8093 /* MPC8533 v1.1 */
8071 8094 POWERPC_DEF_SVR("MPC8533_v11",
8072   - CPU_POWERPC_MPC8533_v11, POWERPC_SVR_8533_v11, e500),
  8095 + CPU_POWERPC_MPC8533_v11, POWERPC_SVR_8533_v11, e500v2),
8073 8096 /* MPC8533E */
8074 8097 POWERPC_DEF_SVR("MPC8533E",
8075   - CPU_POWERPC_MPC8533E, POWERPC_SVR_8533E, e500),
  8098 + CPU_POWERPC_MPC8533E, POWERPC_SVR_8533E, e500v2),
8076 8099 /* MPC8533E v1.0 */
8077 8100 POWERPC_DEF_SVR("MPC8533E_v10",
8078   - CPU_POWERPC_MPC8533E_v10, POWERPC_SVR_8533E_v10, e500),
  8101 + CPU_POWERPC_MPC8533E_v10, POWERPC_SVR_8533E_v10, e500v2),
8079 8102 POWERPC_DEF_SVR("MPC8533E_v11",
8080   - CPU_POWERPC_MPC8533E_v11, POWERPC_SVR_8533E_v11, e500),
  8103 + CPU_POWERPC_MPC8533E_v11, POWERPC_SVR_8533E_v11, e500v2),
8081 8104 /* MPC8540 */
8082 8105 POWERPC_DEF_SVR("MPC8540",
8083   - CPU_POWERPC_MPC8540, POWERPC_SVR_8540, e500),
  8106 + CPU_POWERPC_MPC8540, POWERPC_SVR_8540, e500v1),
8084 8107 /* MPC8540 v1.0 */
8085 8108 POWERPC_DEF_SVR("MPC8540_v10",
8086   - CPU_POWERPC_MPC8540_v10, POWERPC_SVR_8540_v10, e500),
  8109 + CPU_POWERPC_MPC8540_v10, POWERPC_SVR_8540_v10, e500v1),
8087 8110 /* MPC8540 v2.0 */
8088 8111 POWERPC_DEF_SVR("MPC8540_v20",
8089   - CPU_POWERPC_MPC8540_v20, POWERPC_SVR_8540_v20, e500),
  8112 + CPU_POWERPC_MPC8540_v20, POWERPC_SVR_8540_v20, e500v1),
8090 8113 /* MPC8540 v2.1 */
8091 8114 POWERPC_DEF_SVR("MPC8540_v21",
8092   - CPU_POWERPC_MPC8540_v21, POWERPC_SVR_8540_v21, e500),
  8115 + CPU_POWERPC_MPC8540_v21, POWERPC_SVR_8540_v21, e500v1),
8093 8116 /* MPC8541 */
8094 8117 POWERPC_DEF_SVR("MPC8541",
8095   - CPU_POWERPC_MPC8541, POWERPC_SVR_8541, e500),
  8118 + CPU_POWERPC_MPC8541, POWERPC_SVR_8541, e500v1),
8096 8119 /* MPC8541 v1.0 */
8097 8120 POWERPC_DEF_SVR("MPC8541_v10",
8098   - CPU_POWERPC_MPC8541_v10, POWERPC_SVR_8541_v10, e500),
  8121 + CPU_POWERPC_MPC8541_v10, POWERPC_SVR_8541_v10, e500v1),
8099 8122 /* MPC8541 v1.1 */
8100 8123 POWERPC_DEF_SVR("MPC8541_v11",
8101   - CPU_POWERPC_MPC8541_v11, POWERPC_SVR_8541_v11, e500),
  8124 + CPU_POWERPC_MPC8541_v11, POWERPC_SVR_8541_v11, e500v1),
8102 8125 /* MPC8541E */
8103 8126 POWERPC_DEF_SVR("MPC8541E",
8104   - CPU_POWERPC_MPC8541E, POWERPC_SVR_8541E, e500),
  8127 + CPU_POWERPC_MPC8541E, POWERPC_SVR_8541E, e500v1),
8105 8128 /* MPC8541E v1.0 */
8106 8129 POWERPC_DEF_SVR("MPC8541E_v10",
8107   - CPU_POWERPC_MPC8541E_v10, POWERPC_SVR_8541E_v10, e500),
  8130 + CPU_POWERPC_MPC8541E_v10, POWERPC_SVR_8541E_v10, e500v1),
8108 8131 /* MPC8541E v1.1 */
8109 8132 POWERPC_DEF_SVR("MPC8541E_v11",
8110   - CPU_POWERPC_MPC8541E_v11, POWERPC_SVR_8541E_v11, e500),
  8133 + CPU_POWERPC_MPC8541E_v11, POWERPC_SVR_8541E_v11, e500v1),
8111 8134 /* MPC8543 */
8112 8135 POWERPC_DEF_SVR("MPC8543",
8113   - CPU_POWERPC_MPC8543, POWERPC_SVR_8543, e500),
  8136 + CPU_POWERPC_MPC8543, POWERPC_SVR_8543, e500v2),
8114 8137 /* MPC8543 v1.0 */
8115 8138 POWERPC_DEF_SVR("MPC8543_v10",
8116   - CPU_POWERPC_MPC8543_v10, POWERPC_SVR_8543_v10, e500),
  8139 + CPU_POWERPC_MPC8543_v10, POWERPC_SVR_8543_v10, e500v2),
8117 8140 /* MPC8543 v1.1 */
8118 8141 POWERPC_DEF_SVR("MPC8543_v11",
8119   - CPU_POWERPC_MPC8543_v11, POWERPC_SVR_8543_v11, e500),
  8142 + CPU_POWERPC_MPC8543_v11, POWERPC_SVR_8543_v11, e500v2),
8120 8143 /* MPC8543 v2.0 */
8121 8144 POWERPC_DEF_SVR("MPC8543_v20",
8122   - CPU_POWERPC_MPC8543_v20, POWERPC_SVR_8543_v20, e500),
  8145 + CPU_POWERPC_MPC8543_v20, POWERPC_SVR_8543_v20, e500v2),
8123 8146 /* MPC8543 v2.1 */
8124 8147 POWERPC_DEF_SVR("MPC8543_v21",
8125   - CPU_POWERPC_MPC8543_v21, POWERPC_SVR_8543_v21, e500),
  8148 + CPU_POWERPC_MPC8543_v21, POWERPC_SVR_8543_v21, e500v2),
8126 8149 /* MPC8543E */
8127 8150 POWERPC_DEF_SVR("MPC8543E",
8128   - CPU_POWERPC_MPC8543E, POWERPC_SVR_8543E, e500),
  8151 + CPU_POWERPC_MPC8543E, POWERPC_SVR_8543E, e500v2),
8129 8152 /* MPC8543E v1.0 */
8130 8153 POWERPC_DEF_SVR("MPC8543E_v10",
8131   - CPU_POWERPC_MPC8543E_v10, POWERPC_SVR_8543E_v10, e500),
  8154 + CPU_POWERPC_MPC8543E_v10, POWERPC_SVR_8543E_v10, e500v2),
8132 8155 /* MPC8543E v1.1 */
8133 8156 POWERPC_DEF_SVR("MPC8543E_v11",
8134   - CPU_POWERPC_MPC8543E_v11, POWERPC_SVR_8543E_v11, e500),
  8157 + CPU_POWERPC_MPC8543E_v11, POWERPC_SVR_8543E_v11, e500v2),
8135 8158 /* MPC8543E v2.0 */
8136 8159 POWERPC_DEF_SVR("MPC8543E_v20",
8137   - CPU_POWERPC_MPC8543E_v20, POWERPC_SVR_8543E_v20, e500),
  8160 + CPU_POWERPC_MPC8543E_v20, POWERPC_SVR_8543E_v20, e500v2),
8138 8161 /* MPC8543E v2.1 */
8139 8162 POWERPC_DEF_SVR("MPC8543E_v21",
8140   - CPU_POWERPC_MPC8543E_v21, POWERPC_SVR_8543E_v21, e500),
  8163 + CPU_POWERPC_MPC8543E_v21, POWERPC_SVR_8543E_v21, e500v2),
8141 8164 /* MPC8544 */
8142 8165 POWERPC_DEF_SVR("MPC8544",
8143   - CPU_POWERPC_MPC8544, POWERPC_SVR_8544, e500),
  8166 + CPU_POWERPC_MPC8544, POWERPC_SVR_8544, e500v2),
8144 8167 /* MPC8544 v1.0 */
8145 8168 POWERPC_DEF_SVR("MPC8544_v10",
8146   - CPU_POWERPC_MPC8544_v10, POWERPC_SVR_8544_v10, e500),
  8169 + CPU_POWERPC_MPC8544_v10, POWERPC_SVR_8544_v10, e500v2),
8147 8170 /* MPC8544 v1.1 */
8148 8171 POWERPC_DEF_SVR("MPC8544_v11",
8149   - CPU_POWERPC_MPC8544_v11, POWERPC_SVR_8544_v11, e500),
  8172 + CPU_POWERPC_MPC8544_v11, POWERPC_SVR_8544_v11, e500v2),
8150 8173 /* MPC8544E */
8151 8174 POWERPC_DEF_SVR("MPC8544E",
8152   - CPU_POWERPC_MPC8544E, POWERPC_SVR_8544E, e500),
  8175 + CPU_POWERPC_MPC8544E, POWERPC_SVR_8544E, e500v2),
8153 8176 /* MPC8544E v1.0 */
8154 8177 POWERPC_DEF_SVR("MPC8544E_v10",
8155   - CPU_POWERPC_MPC8544E_v10, POWERPC_SVR_8544E_v10, e500),
  8178 + CPU_POWERPC_MPC8544E_v10, POWERPC_SVR_8544E_v10, e500v2),
8156 8179 /* MPC8544E v1.1 */
8157 8180 POWERPC_DEF_SVR("MPC8544E_v11",
8158   - CPU_POWERPC_MPC8544E_v11, POWERPC_SVR_8544E_v11, e500),
  8181 + CPU_POWERPC_MPC8544E_v11, POWERPC_SVR_8544E_v11, e500v2),
8159 8182 /* MPC8545 */
8160 8183 POWERPC_DEF_SVR("MPC8545",
8161   - CPU_POWERPC_MPC8545, POWERPC_SVR_8545, e500),
  8184 + CPU_POWERPC_MPC8545, POWERPC_SVR_8545, e500v2),
8162 8185 /* MPC8545 v2.0 */
8163 8186 POWERPC_DEF_SVR("MPC8545_v20",
8164   - CPU_POWERPC_MPC8545_v20, POWERPC_SVR_8545_v20, e500),
  8187 + CPU_POWERPC_MPC8545_v20, POWERPC_SVR_8545_v20, e500v2),
8165 8188 /* MPC8545 v2.1 */
8166 8189 POWERPC_DEF_SVR("MPC8545_v21",
8167   - CPU_POWERPC_MPC8545_v21, POWERPC_SVR_8545_v21, e500),
  8190 + CPU_POWERPC_MPC8545_v21, POWERPC_SVR_8545_v21, e500v2),
8168 8191 /* MPC8545E */
8169 8192 POWERPC_DEF_SVR("MPC8545E",
8170   - CPU_POWERPC_MPC8545E, POWERPC_SVR_8545E, e500),
  8193 + CPU_POWERPC_MPC8545E, POWERPC_SVR_8545E, e500v2),
8171 8194 /* MPC8545E v2.0 */
8172 8195 POWERPC_DEF_SVR("MPC8545E_v20",
8173   - CPU_POWERPC_MPC8545E_v20, POWERPC_SVR_8545E_v20, e500),
  8196 + CPU_POWERPC_MPC8545E_v20, POWERPC_SVR_8545E_v20, e500v2),
8174 8197 /* MPC8545E v2.1 */
8175 8198 POWERPC_DEF_SVR("MPC8545E_v21",
8176   - CPU_POWERPC_MPC8545E_v21, POWERPC_SVR_8545E_v21, e500),
  8199 + CPU_POWERPC_MPC8545E_v21, POWERPC_SVR_8545E_v21, e500v2),
8177 8200 /* MPC8547E */
8178 8201 POWERPC_DEF_SVR("MPC8547E",
8179   - CPU_POWERPC_MPC8547E, POWERPC_SVR_8547E, e500),
  8202 + CPU_POWERPC_MPC8547E, POWERPC_SVR_8547E, e500v2),
8180 8203 /* MPC8547E v2.0 */
8181 8204 POWERPC_DEF_SVR("MPC8547E_v20",
8182   - CPU_POWERPC_MPC8547E_v20, POWERPC_SVR_8547E_v20, e500),
  8205 + CPU_POWERPC_MPC8547E_v20, POWERPC_SVR_8547E_v20, e500v2),
8183 8206 /* MPC8547E v2.1 */
8184 8207 POWERPC_DEF_SVR("MPC8547E_v21",
8185   - CPU_POWERPC_MPC8547E_v21, POWERPC_SVR_8547E_v21, e500),
  8208 + CPU_POWERPC_MPC8547E_v21, POWERPC_SVR_8547E_v21, e500v2),
8186 8209 /* MPC8548 */
8187 8210 POWERPC_DEF_SVR("MPC8548",
8188   - CPU_POWERPC_MPC8548, POWERPC_SVR_8548, e500),
  8211 + CPU_POWERPC_MPC8548, POWERPC_SVR_8548, e500v2),
8189 8212 /* MPC8548 v1.0 */
8190 8213 POWERPC_DEF_SVR("MPC8548_v10",
8191   - CPU_POWERPC_MPC8548_v10, POWERPC_SVR_8548_v10, e500),
  8214 + CPU_POWERPC_MPC8548_v10, POWERPC_SVR_8548_v10, e500v2),
8192 8215 /* MPC8548 v1.1 */
8193 8216 POWERPC_DEF_SVR("MPC8548_v11",
8194   - CPU_POWERPC_MPC8548_v11, POWERPC_SVR_8548_v11, e500),
  8217 + CPU_POWERPC_MPC8548_v11, POWERPC_SVR_8548_v11, e500v2),
8195 8218 /* MPC8548 v2.0 */
8196 8219 POWERPC_DEF_SVR("MPC8548_v20",
8197   - CPU_POWERPC_MPC8548_v20, POWERPC_SVR_8548_v20, e500),
  8220 + CPU_POWERPC_MPC8548_v20, POWERPC_SVR_8548_v20, e500v2),
8198 8221 /* MPC8548 v2.1 */
8199 8222 POWERPC_DEF_SVR("MPC8548_v21",
8200   - CPU_POWERPC_MPC8548_v21, POWERPC_SVR_8548_v21, e500),
  8223 + CPU_POWERPC_MPC8548_v21, POWERPC_SVR_8548_v21, e500v2),
8201 8224 /* MPC8548E */
8202 8225 POWERPC_DEF_SVR("MPC8548E",
8203   - CPU_POWERPC_MPC8548E, POWERPC_SVR_8548E, e500),
  8226 + CPU_POWERPC_MPC8548E, POWERPC_SVR_8548E, e500v2),
8204 8227 /* MPC8548E v1.0 */
8205 8228 POWERPC_DEF_SVR("MPC8548E_v10",
8206   - CPU_POWERPC_MPC8548E_v10, POWERPC_SVR_8548E_v10, e500),
  8229 + CPU_POWERPC_MPC8548E_v10, POWERPC_SVR_8548E_v10, e500v2),
8207 8230 /* MPC8548E v1.1 */
8208 8231 POWERPC_DEF_SVR("MPC8548E_v11",
8209   - CPU_POWERPC_MPC8548E_v11, POWERPC_SVR_8548E_v11, e500),
  8232 + CPU_POWERPC_MPC8548E_v11, POWERPC_SVR_8548E_v11, e500v2),
8210 8233 /* MPC8548E v2.0 */
8211 8234 POWERPC_DEF_SVR("MPC8548E_v20",
8212   - CPU_POWERPC_MPC8548E_v20, POWERPC_SVR_8548E_v20, e500),
  8235 + CPU_POWERPC_MPC8548E_v20, POWERPC_SVR_8548E_v20, e500v2),
8213 8236 /* MPC8548E v2.1 */
8214 8237 POWERPC_DEF_SVR("MPC8548E_v21",
8215   - CPU_POWERPC_MPC8548E_v21, POWERPC_SVR_8548E_v21, e500),
  8238 + CPU_POWERPC_MPC8548E_v21, POWERPC_SVR_8548E_v21, e500v2),
8216 8239 /* MPC8555 */
8217 8240 POWERPC_DEF_SVR("MPC8555",
8218   - CPU_POWERPC_MPC8555, POWERPC_SVR_8555, e500),
  8241 + CPU_POWERPC_MPC8555, POWERPC_SVR_8555, e500v2),
8219 8242 /* MPC8555 v1.0 */
8220 8243 POWERPC_DEF_SVR("MPC8555_v10",
8221   - CPU_POWERPC_MPC8555_v10, POWERPC_SVR_8555_v10, e500),
  8244 + CPU_POWERPC_MPC8555_v10, POWERPC_SVR_8555_v10, e500v2),
8222 8245 /* MPC8555 v1.1 */
8223 8246 POWERPC_DEF_SVR("MPC8555_v11",
8224   - CPU_POWERPC_MPC8555_v11, POWERPC_SVR_8555_v11, e500),
  8247 + CPU_POWERPC_MPC8555_v11, POWERPC_SVR_8555_v11, e500v2),
8225 8248 /* MPC8555E */
8226 8249 POWERPC_DEF_SVR("MPC8555E",
8227   - CPU_POWERPC_MPC8555E, POWERPC_SVR_8555E, e500),
  8250 + CPU_POWERPC_MPC8555E, POWERPC_SVR_8555E, e500v2),
8228 8251 /* MPC8555E v1.0 */
8229 8252 POWERPC_DEF_SVR("MPC8555E_v10",
8230   - CPU_POWERPC_MPC8555E_v10, POWERPC_SVR_8555E_v10, e500),
  8253 + CPU_POWERPC_MPC8555E_v10, POWERPC_SVR_8555E_v10, e500v2),
8231 8254 /* MPC8555E v1.1 */
8232 8255 POWERPC_DEF_SVR("MPC8555E_v11",
8233   - CPU_POWERPC_MPC8555E_v11, POWERPC_SVR_8555E_v11, e500),
  8256 + CPU_POWERPC_MPC8555E_v11, POWERPC_SVR_8555E_v11, e500v2),
8234 8257 /* MPC8560 */
8235 8258 POWERPC_DEF_SVR("MPC8560",
8236   - CPU_POWERPC_MPC8560, POWERPC_SVR_8560, e500),
  8259 + CPU_POWERPC_MPC8560, POWERPC_SVR_8560, e500v2),
8237 8260 /* MPC8560 v1.0 */
8238 8261 POWERPC_DEF_SVR("MPC8560_v10",
8239   - CPU_POWERPC_MPC8560_v10, POWERPC_SVR_8560_v10, e500),
  8262 + CPU_POWERPC_MPC8560_v10, POWERPC_SVR_8560_v10, e500v2),
8240 8263 /* MPC8560 v2.0 */
8241 8264 POWERPC_DEF_SVR("MPC8560_v20",
8242   - CPU_POWERPC_MPC8560_v20, POWERPC_SVR_8560_v20, e500),
  8265 + CPU_POWERPC_MPC8560_v20, POWERPC_SVR_8560_v20, e500v2),
8243 8266 /* MPC8560 v2.1 */
8244 8267 POWERPC_DEF_SVR("MPC8560_v21",
8245   - CPU_POWERPC_MPC8560_v21, POWERPC_SVR_8560_v21, e500),
  8268 + CPU_POWERPC_MPC8560_v21, POWERPC_SVR_8560_v21, e500v2),
8246 8269 /* MPC8567 */
8247 8270 POWERPC_DEF_SVR("MPC8567",
8248   - CPU_POWERPC_MPC8567, POWERPC_SVR_8567, e500),
  8271 + CPU_POWERPC_MPC8567, POWERPC_SVR_8567, e500v2),
8249 8272 /* MPC8567E */
8250 8273 POWERPC_DEF_SVR("MPC8567E",
8251   - CPU_POWERPC_MPC8567E, POWERPC_SVR_8567E, e500),
  8274 + CPU_POWERPC_MPC8567E, POWERPC_SVR_8567E, e500v2),
8252 8275 /* MPC8568 */
8253 8276 POWERPC_DEF_SVR("MPC8568",
8254   - CPU_POWERPC_MPC8568, POWERPC_SVR_8568, e500),
  8277 + CPU_POWERPC_MPC8568, POWERPC_SVR_8568, e500v2),
8255 8278 /* MPC8568E */
8256 8279 POWERPC_DEF_SVR("MPC8568E",
8257   - CPU_POWERPC_MPC8568E, POWERPC_SVR_8568E, e500),
  8280 + CPU_POWERPC_MPC8568E, POWERPC_SVR_8568E, e500v2),
8258 8281 /* MPC8572 */
8259 8282 POWERPC_DEF_SVR("MPC8572",
8260   - CPU_POWERPC_MPC8572, POWERPC_SVR_8572, e500),
  8283 + CPU_POWERPC_MPC8572, POWERPC_SVR_8572, e500v2),
8261 8284 /* MPC8572E */
8262 8285 POWERPC_DEF_SVR("MPC8572E",
8263   - CPU_POWERPC_MPC8572E, POWERPC_SVR_8572E, e500),
  8286 + CPU_POWERPC_MPC8572E, POWERPC_SVR_8572E, e500v2),
8264 8287 /* e600 family */
8265 8288 /* PowerPC e600 core */
8266 8289 POWERPC_DEF("e600", CPU_POWERPC_e600, 7400),
... ...