Remove synonymous in PowerPC MSR bits definitions.

Fix MSR EP bit buggy definition.
Remove unuseful MSR flags.
Fix MSR bits and flags definitions for most supported PowerPC implementations.
Add MSR definitions/flags constistency checks and optional dump.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3354 c046a42c-6fe2-441c-8c8c-71466251a162

1 files changed, 10 insertions, 10 deletions

diff --git a/target-ppc/helper.c b/target-ppc/helper.c
index 9caeb25..c4eab18 100644
--- a/target-ppc/helper.c
+++ b/target-ppc/helper.c
@@ -1964,7 +1964,7 @@ target_ulong do_load_msr (CPUPPCState *env)
         ((target_ulong)msr_ap   << MSR_AP)   |
         ((target_ulong)msr_sa   << MSR_SA)   |
         ((target_ulong)msr_key  << MSR_KEY)  |
-        ((target_ulong)msr_pow  << MSR_POW)  | /* POW / WE */
+        ((target_ulong)msr_pow  << MSR_POW)  |
         ((target_ulong)msr_tgpr << MSR_TGPR) | /* TGPR / CE */
         ((target_ulong)msr_ile  << MSR_ILE)  |
         ((target_ulong)msr_ee   << MSR_EE)   |
@@ -1976,10 +1976,10 @@ target_ulong do_load_msr (CPUPPCState *env)
         ((target_ulong)msr_be   << MSR_BE)   | /* BE / DE */
         ((target_ulong)msr_fe1  << MSR_FE1)  |
         ((target_ulong)msr_al   << MSR_AL)   |
-        ((target_ulong)msr_ip   << MSR_IP)   |
-        ((target_ulong)msr_ir   << MSR_IR)   | /* IR / IS */
-        ((target_ulong)msr_dr   << MSR_DR)   | /* DR / DS */
-        ((target_ulong)msr_pe   << MSR_PE)   | /* PE / EP */
+        ((target_ulong)msr_ep   << MSR_EP)   |
+        ((target_ulong)msr_ir   << MSR_IR)   |
+        ((target_ulong)msr_dr   << MSR_DR)   |
+        ((target_ulong)msr_pe   << MSR_PE)   |
         ((target_ulong)msr_px   << MSR_PX)   | /* PX / PMM */
         ((target_ulong)msr_ri   << MSR_RI)   |
         ((target_ulong)msr_le   << MSR_LE);
@@ -2017,7 +2017,7 @@ int do_store_msr (CPUPPCState *env, target_ulong value)
     msr_ap   = (value >> MSR_AP)   & 1;
     msr_sa   = (value >> MSR_SA)   & 1;
     msr_key  = (value >> MSR_KEY)  & 1;
-    msr_pow  = (value >> MSR_POW)  & 1; /* POW / WE */
+    msr_pow  = (value >> MSR_POW)  & 1;
     msr_tgpr = (value >> MSR_TGPR) & 1; /* TGPR / CE */
     msr_ile  = (value >> MSR_ILE)  & 1;
     msr_ee   = (value >> MSR_EE)   & 1;
@@ -2029,10 +2029,10 @@ int do_store_msr (CPUPPCState *env, target_ulong value)
     msr_be   = (value >> MSR_BE)   & 1; /* BE / DE */
     msr_fe1  = (value >> MSR_FE1)  & 1;
     msr_al   = (value >> MSR_AL)   & 1;
-    msr_ip   = (value >> MSR_IP)   & 1;
-    msr_ir   = (value >> MSR_IR)   & 1; /* IR / IS */
-    msr_dr   = (value >> MSR_DR)   & 1; /* DR / DS */
-    msr_pe   = (value >> MSR_PE)   & 1; /* PE / EP */
+    msr_ep   = (value >> MSR_EP)   & 1;
+    msr_ir   = (value >> MSR_IR)   & 1;
+    msr_dr   = (value >> MSR_DR)   & 1;
+    msr_pe   = (value >> MSR_PE)   & 1;
     msr_px   = (value >> MSR_PX)   & 1; /* PX / PMM */
     msr_ri   = (value >> MSR_RI)   & 1;
     msr_le   = (value >> MSR_LE)   & 1;