[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH ppc-next v2 11/52] target-ppc: Turn "ppc32" and "ppc64
From: |
Andreas Färber |
Subject: |
[Qemu-ppc] [PATCH ppc-next v2 11/52] target-ppc: Turn "ppc32" and "ppc64" CPUs into aliases |
Date: |
Mon, 18 Feb 2013 10:16:10 +0100 |
Signed-off-by: Andreas Färber <address@hidden>
---
target-ppc/translate_init.c | 36 +++++-------------------------------
1 Datei geändert, 5 Zeilen hinzugefügt(+), 31 Zeilen entfernt(-)
diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
index f239e9c..eda0f10 100644
--- a/target-ppc/translate_init.c
+++ b/target-ppc/translate_init.c
@@ -6798,32 +6798,6 @@ static void init_proc_620 (CPUPPCState *env)
}
#endif /* defined (TARGET_PPC64) */
-/* Default 32 bits PowerPC target will be 604 */
-#define CPU_POWERPC_PPC32 CPU_POWERPC_604
-#define POWERPC_INSNS_PPC32 POWERPC_INSNS_604
-#define POWERPC_INSNS2_PPC32 POWERPC_INSNS2_604
-#define POWERPC_MSRM_PPC32 POWERPC_MSRM_604
-#define POWERPC_MMU_PPC32 POWERPC_MMU_604
-#define POWERPC_EXCP_PPC32 POWERPC_EXCP_604
-#define POWERPC_INPUT_PPC32 POWERPC_INPUT_604
-#define POWERPC_BFDM_PPC32 POWERPC_BFDM_604
-#define POWERPC_FLAG_PPC32 POWERPC_FLAG_604
-#define check_pow_PPC32 check_pow_604
-#define init_proc_PPC32 init_proc_604
-
-/* Default 64 bits PowerPC target will be 970 FX */
-#define CPU_POWERPC_PPC64 CPU_POWERPC_970FX
-#define POWERPC_INSNS_PPC64 POWERPC_INSNS_970FX
-#define POWERPC_INSNS2_PPC64 POWERPC_INSNS2_970FX
-#define POWERPC_MSRM_PPC64 POWERPC_MSRM_970FX
-#define POWERPC_MMU_PPC64 POWERPC_MMU_970FX
-#define POWERPC_EXCP_PPC64 POWERPC_EXCP_970FX
-#define POWERPC_INPUT_PPC64 POWERPC_INPUT_970FX
-#define POWERPC_BFDM_PPC64 POWERPC_BFDM_970FX
-#define POWERPC_FLAG_PPC64 POWERPC_FLAG_970FX
-#define check_pow_PPC64 check_pow_970FX
-#define init_proc_PPC64 init_proc_970FX
-
/*****************************************************************************/
/* PVR definitions for most known PowerPC */
enum {
@@ -9111,11 +9085,6 @@ static const ppc_def_t ppc_defs[] = {
/* PA PA6T */
POWERPC_DEF("PA6T", CPU_POWERPC_PA6T, PA6T)
#endif
- /* Generic PowerPCs */
-#if defined (TARGET_PPC64)
- POWERPC_DEF("ppc64", CPU_POWERPC_PPC64, PPC64)
-#endif
- POWERPC_DEF("ppc32", CPU_POWERPC_PPC32, PPC32)
};
typedef struct PowerPCCPUAlias {
@@ -9213,6 +9182,11 @@ static const PowerPCCPUAlias ppc_cpu_aliases[] = {
{ "RSC2", "POWER2" },
{ "P2SC", "POWER2" },
+ /* Generic PowerPCs */
+#if defined(TARGET_PPC64)
+ { "ppc64", "970fx" },
+#endif
+ { "ppc32", "604" },
{ "ppc", "ppc32" },
{ "default", "ppc" },
};
--
1.7.10.4
- [Qemu-ppc] [PATCH ppc-next v2 00/52] PowerPCCPU subclasses, remixed, Andreas Färber, 2013/02/18
- [Qemu-ppc] [PATCH ppc-next v2 01/52] target-ppc: Fix "G2leGP3" PVR, Andreas Färber, 2013/02/18
- [Qemu-ppc] [PATCH ppc-next v2 03/52] target-ppc: Drop nested TARGET_PPC64 guard for POWER7, Andreas Färber, 2013/02/18
- [Qemu-ppc] [PATCH ppc-next v2 06/52] target-ppc: Make -cpu "ppc" an alias to "ppc32", Andreas Färber, 2013/02/18
- [Qemu-ppc] [PATCH ppc-next v2 02/52] target-ppc: Update error handling in ppc_cpu_realize(), Andreas Färber, 2013/02/18
- [Qemu-ppc] [PATCH ppc-next v2 08/52] target-ppc: Extract MGT823/MPC8xx as aliases, Andreas Färber, 2013/02/18
- [Qemu-ppc] [PATCH ppc-next v2 07/52] target-ppc: Extract MPC5xx aliases, Andreas Färber, 2013/02/18
- [Qemu-ppc] [PATCH ppc-next v2 10/52] target-ppc: Extract 440 aliases, Andreas Färber, 2013/02/18
- [Qemu-ppc] [PATCH ppc-next v2 11/52] target-ppc: Turn "ppc32" and "ppc64" CPUs into aliases,
Andreas Färber <=
- [Qemu-ppc] [PATCH ppc-next v2 12/52] target-ppc: Extract 74x7[A] aliases, Andreas Färber, 2013/02/18
- [Qemu-ppc] [PATCH ppc-next v2 14/52] target-ppc: Extract 74x1 aliases, Andreas Färber, 2013/02/18
- [Qemu-ppc] [PATCH ppc-next v2 20/52] target-ppc: Extract 750 aliases, Andreas Färber, 2013/02/18
- [Qemu-ppc] [PATCH ppc-next v2 24/52] target-ppc: Extract 603r alias, Andreas Färber, 2013/02/18
- [Qemu-ppc] [PATCH ppc-next v2 27/52] target-ppc: Extract e500v1/e500v2 aliases, Andreas Färber, 2013/02/18
- [Qemu-ppc] [PATCH ppc-next v2 21/52] target-ppc: Extract 740/750 aliases, Andreas Färber, 2013/02/18
- [Qemu-ppc] [PATCH ppc-next v2 28/52] target-ppc: Extract MPC83xx aliases, Andreas Färber, 2013/02/18
- [Qemu-ppc] [PATCH ppc-next v2 31/52] target-ppc: Extract MPC82xx alias, Andreas Färber, 2013/02/18
- [Qemu-ppc] [PATCH ppc-next v2 34/52] target-ppc: Extract MPC82xx_HiP{3, 4} aliases, Andreas Färber, 2013/02/18
- [Qemu-ppc] [PATCH ppc-next v2 36/52] target-ppc: Extract MPC5200/MPC5200B aliases, Andreas Färber, 2013/02/18