More PowerPC target cleanups:

- remove unuseful historical macros and definitions
- fix comments (bugs and cosmetics)


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

1 files changed, 10 insertions, 13 deletions

diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
index 75aefb0..8b3fb03 100644
--- a/target-ppc/cpu.h
+++ b/target-ppc/cpu.h
@@ -30,7 +30,7 @@ typedef uint64_t ppc_gpr_t;
 #define REGX "%016" PRIx64
 #define TARGET_PAGE_BITS 12
 #elif defined(TARGET_PPCEMB)
-/* e500v2 have 36 bits physical address space */
+/* BookE have 36 bits physical address space */
 #define TARGET_PHYS_ADDR_BITS 64
 /* GPR are 64 bits: used by vector extension */
 typedef uint64_t ppc_gpr_t;
@@ -388,19 +388,19 @@ enum {
     PPC_64_BRIDGE   = 0x0000000004000000ULL,
     /* BookE (embedded) PowerPC specification      */
     PPC_BOOKE       = 0x0000000008000000ULL,
-    /* eieio */
+    /* eieio                                       */
     PPC_MEM_EIEIO   = 0x0000000010000000ULL,
-    /* e500 vector instructions */
+    /* e500 vector instructions                    */
     PPC_E500_VECTOR = 0x0000000020000000ULL,
-    /* PowerPC 4xx dedicated instructions     */
+    /* PowerPC 4xx dedicated instructions          */
     PPC_4xx_COMMON  = 0x0000000040000000ULL,
-    /* PowerPC 2.03 specification extensions */
+    /* PowerPC 2.03 specification extensions       */
     PPC_203         = 0x0000000080000000ULL,
-    /* PowerPC 2.03 SPE extension */
+    /* PowerPC 2.03 SPE extension                  */
     PPC_SPE         = 0x0000000100000000ULL,
-    /* PowerPC 2.03 SPE floating-point extension */
+    /* PowerPC 2.03 SPE floating-point extension   */
     PPC_SPEFPU      = 0x0000000200000000ULL,
-    /* SLB management */
+    /* SLB management                              */
     PPC_SLBI        = 0x0000000400000000ULL,
 };
 
@@ -917,8 +917,6 @@ int ppc_dcr_write (ppc_dcr_t *dcr_env, int dcrn, target_ulong val);
 
 /*****************************************************************************/
 /* Registers definitions */
-#define ugpr(n) (env->gpr[n])
-
 #define XER_SO 31
 #define XER_OV 30
 #define XER_CA 29
@@ -1315,7 +1313,6 @@ enum {
                                    /* may change privilege level             */
 #define EXCP_BRANCH        0x11001 /* branch instruction                     */
 #define EXCP_SYSCALL_USER  0x12000 /* System call in user mode only          */
-#define EXCP_INTERRUPT_CRITICAL 0x13000 /* critical IRQ                      */
 
 /* Error codes */
 enum {
@@ -1350,8 +1347,8 @@ enum {
     EXCP_INVAL_FP      = 0x04,  /* Unimplemented mandatory fp instr */
     /* Privileged instruction */
     EXCP_PRIV          = 0x30,
-    EXCP_PRIV_OPC      = 0x01,
-    EXCP_PRIV_REG      = 0x02,
+    EXCP_PRIV_OPC      = 0x01,  /* Privileged operation exception   */
+    EXCP_PRIV_REG      = 0x02,  /* Privileged register exception    */
     /* Trap */
     EXCP_TRAP          = 0x40,
 };