ppc fixes - gcc 3.4 compile fix (initial patch by Jocelyn Mayer)

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

5 files changed, 34 insertions, 52 deletions

diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
index 3198c9b972..123cb3f91b 100644
--- a/target-ppc/cpu.h
+++ b/target-ppc/cpu.h
@@ -26,23 +26,6 @@
 
 //#define USE_OPEN_FIRMWARE
 
-/***                          Sign extend constants                        ***/
-/* 8 to 32 bits */
-static inline int32_t s_ext8 (uint8_t value)
-{
-    int8_t *tmp = &value;
-
-    return *tmp;
-}
-
-/* 16 to 32 bits */
-static inline int32_t s_ext16 (uint16_t value)
-{
-    int16_t *tmp = &value;
-
-    return *tmp;
-}
-
 #include "config.h"
 #include <setjmp.h>
 
diff --git a/target-ppc/helper.c b/target-ppc/helper.c
index f3db55fe4d..21e89008f4 100644
--- a/target-ppc/helper.c
+++ b/target-ppc/helper.c
@@ -655,16 +655,21 @@ void _store_msr (CPUState *env, uint32_t value)
     msr_dr = (value >> MSR_DR) & 0x01;
     msr_ri = (value >> MSR_RI) & 0x01;
     msr_le = (value >> MSR_LE) & 0x01;
+    /* XXX: should enter PM state if msr_pow has been set */
 }
 
+#if defined (CONFIG_USER_ONLY)
 void do_interrupt (CPUState *env)
 {
-#if defined (CONFIG_USER_ONLY)
-    env->exception_index |= 0x100;
+    env->exception_index = -1;
+}
 #else
+void do_interrupt (CPUState *env)
+{
     uint32_t msr;
-    int excp = env->exception_index;
+    int excp;
 
+    excp = env->exception_index;
     msr = _load_msr(env);
 #if defined (DEBUG_EXCEPTIONS)
     if ((excp == EXCP_PROGRAM || excp == EXCP_DSI) && msr_pr == 1) 
@@ -906,6 +911,6 @@ void do_interrupt (CPUState *env)
 #else
     T0 = 0;
 #endif
-#endif
     env->exception_index = -1;
 }
+#endif /* !CONFIG_USER_ONLY */
diff --git a/target-ppc/op.c b/target-ppc/op.c
index b360bb6e11..c6c0989ce9 100644
--- a/target-ppc/op.c
+++ b/target-ppc/op.c
@@ -147,21 +147,6 @@ PPC_OP(set_Rc0)
     } else {
         tmp = 0x02;
     }
-    env->crf[0] = tmp;
-    RETURN();
-}
-
-PPC_OP(set_Rc0_ov)
-{
-    uint32_t tmp;
-
-    if (Ts0 < 0) {
-        tmp = 0x08;
-    } else if (Ts0 > 0) {
-        tmp = 0x04;
-    } else {
-        tmp = 0x02;
-    }
     tmp |= xer_ov;
     env->crf[0] = tmp;
     RETURN();
@@ -1062,14 +1047,14 @@ PPC_OP(eqv)
 /* extend sign byte */
 PPC_OP(extsb)
 {
-    Ts0 = s_ext8(Ts0);
+    Ts0 = (int8_t)(Ts0);
     RETURN();
 }
 
 /* extend sign half word */
 PPC_OP(extsh)
 {
-    Ts0 = s_ext16(Ts0);
+    Ts0 = (int16_t)(Ts0);
     RETURN();
 }
 
diff --git a/target-ppc/op_helper.c b/target-ppc/op_helper.c
index 073ca37e16..433f6b1284 100644
--- a/target-ppc/op_helper.c
+++ b/target-ppc/op_helper.c
@@ -377,7 +377,7 @@ void do_fnabs (void)
 
 void do_check_reservation (void)
 {
-    if ((env->reserve & ~(ICACHE_LINE_SIZE - 1)) == T0)
+    if ((env->reserve & ~0x03) == T0)
         env->reserve = -1;
 }
 
diff --git a/target-ppc/translate.c b/target-ppc/translate.c
index 3974ecc732..4de116f185 100644
--- a/target-ppc/translate.c
+++ b/target-ppc/translate.c
@@ -179,6 +179,11 @@ static void gen_##name (DisasContext *ctx)
 
 typedef struct opcode_t {
     unsigned char opc1, opc2, opc3;
+#if HOST_LONG_BITS == 64 /* Explicitely align to 64 bits */
+    unsigned char pad[5];
+#else
+    unsigned char pad[1];
+#endif
     opc_handler_t handler;
 } opcode_t;
 
@@ -192,7 +197,7 @@ static inline uint32_t name (uint32_t opcode)                                 \
 #define EXTRACT_SHELPER(name, shift, nb)                                      \
 static inline int32_t name (uint32_t opcode)                                  \
 {                                                                             \
-    return s_ext16((opcode >> (shift)) & ((1 << (nb)) - 1));                  \
+    return (int16_t)((opcode >> (shift)) & ((1 << (nb)) - 1));                \
 }
 
 /* Opcode part 1 */
@@ -285,10 +290,11 @@ static inline uint32_t MASK (uint32_t start, uint32_t end)
 #endif
 
 #define GEN_OPCODE(name, op1, op2, op3, invl, _typ)                           \
-OPCODES_SECTION static opcode_t opc_##name = {                                \
+OPCODES_SECTION opcode_t opc_##name = {                                       \
     .opc1 = op1,                                                              \
     .opc2 = op2,                                                              \
     .opc3 = op3,                                                              \
+    .pad  = { 0, },                                                           \
     .handler = {                                                              \
         .inval   = invl,                                                      \
         .type = _typ,                                                         \
@@ -297,10 +303,11 @@ OPCODES_SECTION static opcode_t opc_##name = {                                \
 }
 
 #define GEN_OPCODE_MARK(name)                                                 \
-OPCODES_SECTION static opcode_t opc_##name = {                                \
+OPCODES_SECTION opcode_t opc_##name = {                                       \
     .opc1 = 0xFF,                                                             \
     .opc2 = 0xFF,                                                             \
     .opc3 = 0xFF,                                                             \
+    .pad  = { 0, },                                                           \
     .handler = {                                                              \
         .inval   = 0x00000000,                                                \
         .type = 0x00,                                                         \
@@ -361,7 +368,7 @@ GEN_HANDLER(name, opc1, opc2, opc3, inval, PPC_INTEGER)                       \
     gen_op_load_gpr_T1(rB(ctx->opcode));                                      \
     gen_op_##name();                                                          \
     if (Rc(ctx->opcode) != 0)                                                 \
-        gen_op_set_Rc0_ov();                                                  \
+        gen_op_set_Rc0();                                                     \
     gen_op_store_T0_gpr(rD(ctx->opcode));                                     \
 }
 
@@ -380,7 +387,7 @@ GEN_HANDLER(name, opc1, opc2, opc3, 0x0000F800, PPC_INTEGER)                  \
     gen_op_load_gpr_T0(rA(ctx->opcode));                                      \
     gen_op_##name();                                                          \
     if (Rc(ctx->opcode) != 0)                                                 \
-        gen_op_set_Rc0_ov();                                                  \
+        gen_op_set_Rc0();                                                     \
     gen_op_store_T0_gpr(rD(ctx->opcode));                                     \
 }
 
@@ -1558,7 +1565,7 @@ static inline void gen_bcond(DisasContext *ctx, int type)
         gen_op_dec_ctr();                                                     
     switch(type) {
     case BCOND_IM:
-        li = s_ext16(BD(ctx->opcode));
+        li = (int32_t)((int16_t)(BD(ctx->opcode)));
         if (AA(ctx->opcode) == 0) {
             target = ctx->nip + li - 4;
         } else {
@@ -2160,11 +2167,6 @@ GEN_HANDLER(mtspr, 0x1F, 0x13, 0x0E, 0x00000001, PPC_MISC)
     case DECR:
         gen_op_store_decr();
         break;
-#if 0
-    case HID0:
-        gen_op_store_hid0();
-        break;
-#endif
     default:
         gen_op_store_spr(sprn);
         break;
@@ -2894,7 +2896,7 @@ static ppc_def_t ppc_defs[] =
 
 static int create_ppc_proc (opc_handler_t **ppc_opcodes, unsigned long pvr)
 {
-    opcode_t *opc;
+    opcode_t *opc, *start, *end;
     int i, flags;
 
     fill_new_table(ppc_opcodes, 0x40);
@@ -2906,7 +2908,14 @@ static int create_ppc_proc (opc_handler_t **ppc_opcodes, unsigned long pvr)
         }
     }
     
-    for (opc = &opc_start + 1; opc != &opc_end; opc++) {
+    if (&opc_start < &opc_end) {
+	start = &opc_start;
+	end = &opc_end;
+    } else {
+	start = &opc_end;
+	end = &opc_start;
+    }
+    for (opc = start + 1; opc != end; opc++) {
         if ((opc->handler.type & flags) != 0)
             if (register_insn(ppc_opcodes, opc) < 0) {
                 printf("*** ERROR initializing PPC instruction "