diff options
| author | j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-11-17 01:37:44 +0000 |
|---|---|---|
| committer | j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-11-17 01:37:44 +0000 |
| commit | b172c56a6d849554f7e43adc95983a9d6c042689 (patch) | |
| tree | 7a1043042fcad843192b301a7cbcd1aa774a8e43 /target-ppc/cpu.h | |
| parent | 5a6932d51d1b34b68b3f10fc5ac65598bece88c0 (diff) | |
Always make all PowerPC exception definitions visible.
Always make the hypervisor timers available.
Remove all TARGET_PPC64H checks, keeping a few if (0) tests for cases
that cannot be properly handled with the current PowerPC CPU definition.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3656 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'target-ppc/cpu.h')
| -rw-r--r-- | target-ppc/cpu.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index d40bb40703..7705ca20c9 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -180,20 +180,14 @@ enum { /* Vectors 38 to 63 are reserved */ /* Exceptions defined in the PowerPC server specification */ POWERPC_EXCP_RESET = 64, /* System reset exception */ -#if defined(TARGET_PPC64) /* PowerPC 64 */ POWERPC_EXCP_DSEG = 65, /* Data segment exception */ POWERPC_EXCP_ISEG = 66, /* Instruction segment exception */ -#endif /* defined(TARGET_PPC64) */ -#if defined(TARGET_PPC64H) /* PowerPC 64 with hypervisor mode support */ POWERPC_EXCP_HDECR = 67, /* Hypervisor decrementer exception */ -#endif /* defined(TARGET_PPC64H) */ POWERPC_EXCP_TRACE = 68, /* Trace exception */ -#if defined(TARGET_PPC64H) /* PowerPC 64 with hypervisor mode support */ POWERPC_EXCP_HDSI = 69, /* Hypervisor data storage exception */ POWERPC_EXCP_HISI = 70, /* Hypervisor instruction storage exception */ POWERPC_EXCP_HDSEG = 71, /* Hypervisor data segment exception */ POWERPC_EXCP_HISEG = 72, /* Hypervisor instruction segment exception */ -#endif /* defined(TARGET_PPC64H) */ POWERPC_EXCP_VPU = 73, /* Vector unavailable exception */ /* 40x specific exceptions */ POWERPC_EXCP_PIT = 74, /* Programmable interval timer interrupt */ @@ -736,12 +730,10 @@ void cpu_ppc_store_atbl (CPUPPCState *env, uint32_t value); void cpu_ppc_store_atbu (CPUPPCState *env, uint32_t value); uint32_t cpu_ppc_load_decr (CPUPPCState *env); void cpu_ppc_store_decr (CPUPPCState *env, uint32_t value); -#if defined(TARGET_PPC64H) uint32_t cpu_ppc_load_hdecr (CPUPPCState *env); void cpu_ppc_store_hdecr (CPUPPCState *env, uint32_t value); uint64_t cpu_ppc_load_purr (CPUPPCState *env); void cpu_ppc_store_purr (CPUPPCState *env, uint64_t value); -#endif uint32_t cpu_ppc601_load_rtcl (CPUPPCState *env); uint32_t cpu_ppc601_load_rtcu (CPUPPCState *env); #if !defined(CONFIG_USER_ONLY) |