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/helper_regs.h | |
| parent | 5a6932d51d1b34b68b3f10fc5ac65598bece88c0 (diff) | |
| download | qemu-b172c56a6d849554f7e43adc95983a9d6c042689.tar.gz | |
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/helper_regs.h')
| -rw-r--r-- | target-ppc/helper_regs.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/target-ppc/helper_regs.h b/target-ppc/helper_regs.h index c52ae9ebc6..03c21c77f6 100644 --- a/target-ppc/helper_regs.h +++ b/target-ppc/helper_regs.h @@ -60,7 +60,7 @@ static always_inline void hreg_swap_gpr_tgpr (CPUPPCState *env) static always_inline void hreg_compute_mem_idx (CPUPPCState *env) { -#if defined (TARGET_PPC64H) +#if defined (TARGET_PPC64) /* Precompute MMU index */ if (msr_pr == 0 && msr_hv != 0) env->mmu_idx = 2; @@ -78,10 +78,7 @@ static always_inline void hreg_compute_hflags (CPUPPCState *env) (1 << MSR_PR) | (1 << MSR_FP) | (1 << MSR_SE) | (1 << MSR_BE) | (1 << MSR_LE); #if defined (TARGET_PPC64) - hflags_mask |= (1ULL << MSR_CM) | (1ULL << MSR_SF); -#if defined (TARGET_PPC64H) - hflags_mask |= 1ULL << MSR_HV; -#endif + hflags_mask |= (1ULL << MSR_CM) | (1ULL << MSR_SF) | (1ULL << MSR_HV); #endif hreg_compute_mem_idx(env); env->hflags = env->msr & hflags_mask; |