aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorj_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162>2007-11-12 23:29:14 +0000
committerj_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162>2007-11-12 23:29:14 +0000
commit65d6c0f33c1a496d2a782bb0ef2ef18d4ed6b763 (patch)
tree963351c4967cadac20f88ba9654a2c5c116e0a74
parent4f6cf9e839313f2da5a6690363fbe1756c20c2ca (diff)
downloadqemu-65d6c0f33c1a496d2a782bb0ef2ef18d4ed6b763.zip
qemu-65d6c0f33c1a496d2a782bb0ef2ef18d4ed6b763.tar.gz
qemu-65d6c0f33c1a496d2a782bb0ef2ef18d4ed6b763.tar.bz2
PowerPC SPE extension fix: must always preserve GPR high bits when
running in 32 bits mode. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3631 c046a42c-6fe2-441c-8c8c-71466251a162
-rw-r--r--target-ppc/cpu.h2
-rw-r--r--target-ppc/op_template.h4
-rw-r--r--target-ppc/translate.c6
3 files changed, 6 insertions, 6 deletions
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
index a463b45..7589ba2 100644
--- a/target-ppc/cpu.h
+++ b/target-ppc/cpu.h
@@ -530,7 +530,7 @@ struct CPUPPCState {
/* general purpose registers */
ppc_gpr_t gpr[32];
-#if TARGET_GPR_BITS < 64
+#if !defined(TARGET_PPC64)
/* Storage for GPR MSB, used by the SPE extension */
ppc_gpr_t gprh[32];
#endif
diff --git a/target-ppc/op_template.h b/target-ppc/op_template.h
index 26a0662..e6d6afa 100644
--- a/target-ppc/op_template.h
+++ b/target-ppc/op_template.h
@@ -58,7 +58,7 @@ void OPPROTO glue(op_store_T2_gpr_gpr, REG) (void)
#endif
/* General purpose registers containing vector operands moves */
-#if TARGET_GPR_BITS < 64
+#if !defined(TARGET_PPC64)
void OPPROTO glue(op_load_gpr64_T0_gpr, REG) (void)
{
T0_64 = (uint64_t)env->gpr[REG] | ((uint64_t)env->gprh[REG] << 32);
@@ -101,7 +101,7 @@ void OPPROTO glue(op_store_T2_gpr64_gpr, REG) (void)
RETURN();
}
#endif
-#endif /* TARGET_GPR_BITS < 64 */
+#endif /* !defined(TARGET_PPC64) */
/* Altivec registers moves */
void OPPROTO glue(op_load_avr_A0_avr, REG) (void)
diff --git a/target-ppc/translate.c b/target-ppc/translate.c
index d1741b6..8663eab 100644
--- a/target-ppc/translate.c
+++ b/target-ppc/translate.c
@@ -5822,7 +5822,7 @@ GEN_VR_STX(vxl, 0x07, 0x0F);
/*** SPE extension ***/
/* Register moves */
-#if TARGET_GPR_BITS < 64
+#if !defined(TARGET_PPC64)
GEN32(gen_op_load_gpr64_T0, gen_op_load_gpr64_T0_gpr);
GEN32(gen_op_load_gpr64_T1, gen_op_load_gpr64_T1_gpr);
@@ -5836,7 +5836,7 @@ GEN32(gen_op_store_T1_gpr64, gen_op_store_T1_gpr64_gpr);
GEN32(gen_op_store_T2_gpr64, gen_op_store_T2_gpr64_gpr);
#endif
-#else /* TARGET_GPR_BITS < 64 */
+#else /* !defined(TARGET_PPC64) */
/* No specific load/store functions: GPRs are already 64 bits */
#define gen_op_load_gpr64_T0 gen_op_load_gpr_T0
@@ -5851,7 +5851,7 @@ GEN32(gen_op_store_T2_gpr64, gen_op_store_T2_gpr64_gpr);
#define gen_op_store_T2_gpr64 gen_op_store_T2_gpr
#endif
-#endif /* TARGET_GPR_BITS < 64 */
+#endif /* !defined(TARGET_PPC64) */
#define GEN_SPE(name0, name1, opc2, opc3, inval, type) \
GEN_HANDLER(name0##_##name1, 0x04, opc2, opc3, inval, type) \