diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index ca3a4ffce971aab61b7b30bdb8f17c48fbed72ea..1f779b2ff69987e4ba94ae95ce1122d36756b79d 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -11,10 +11,14 @@
 
 #define BIOS_FILENAME "mips_bios.bin"
 //#define BIOS_FILENAME "system.bin"
-#define KERNEL_LOAD_ADDR SIGN_EXTEND32(0x80010000)
-#define INITRD_LOAD_ADDR SIGN_EXTEND32(0x80800000)
+#define KERNEL_LOAD_ADDR (int32_t)0x80010000
+#ifdef MIPS_HAS_MIPS64
+#define INITRD_LOAD_ADDR (int64_t)0x80800000
+#else
+#define INITRD_LOAD_ADDR (int32_t)0x80800000
+#endif
 
-#define VIRT_TO_PHYS_ADDEND (-SIGN_EXTEND32(0x80000000LL))
+#define VIRT_TO_PHYS_ADDEND (-((int64_t)(int32_t)0x80000000))
 
 static const int ide_iobase[2] = { 0x1f0, 0x170 };
 static const int ide_iobase2[2] = { 0x3f6, 0x376 };
@@ -76,7 +80,7 @@ void load_kernel (CPUState *env, int ram_size, const char *kernel_filename,
     kernel_size = load_elf(kernel_filename, VIRT_TO_PHYS_ADDEND, &entry);
     if (kernel_size >= 0) {
         if ((entry & ~0x7fffffffULL) == 0x80000000)
-            entry = SIGN_EXTEND32(entry);
+            entry = (int32_t)entry;
         env->PC = entry;
     } else {
         kernel_size = load_image(kernel_filename,
diff --git a/target-mips/cpu.h b/target-mips/cpu.h
index 710748c69ba08262e93cb64e6e672118d26ea1a6..8f0f598b6da92866044989db1e34e219fb8d17b6 100644
--- a/target-mips/cpu.h
+++ b/target-mips/cpu.h
@@ -15,13 +15,10 @@ typedef unsigned char           uint_fast8_t;
 typedef unsigned int            uint_fast16_t;
 #endif
 
-#ifdef MIPS_HAS_MIPS64
-#define SIGN_EXTEND32(val) (((((uint64_t)(val)) & 0xFFFFFFFF) ^ 0x80000000) - 0x80000000)
 /* target_ulong size spec */
+#ifdef MIPS_HAS_MIPS64
 #define TLSZ "%016llx"
 #else
-#define SIGN_EXTEND32(val) (val)
-/* target_ulong size spec */
 #define TLSZ "%08x"
 #endif
 
diff --git a/target-mips/helper.c b/target-mips/helper.c
index 0e3eb6c7c9fdfc1c1068edcedd6acbb056ce6ec5..e70dc1a99e791ed73b58e3137d3227bc04d514de 100644
--- a/target-mips/helper.c
+++ b/target-mips/helper.c
@@ -86,7 +86,7 @@ static int get_physical_address (CPUState *env, target_ulong *physical,
 #endif
     if (user_mode && address > 0x7FFFFFFFUL)
         return TLBRET_BADADDR;
-    if (address < SIGN_EXTEND32(0x80000000UL)) {
+    if (address < (int32_t)0x80000000UL) {
         if (!(env->hflags & MIPS_HFLAG_ERL)) {
 #ifdef MIPS_USES_R4K_TLB
             ret = map_address(env, physical, prot, address, rw, access_type);
@@ -98,17 +98,17 @@ static int get_physical_address (CPUState *env, target_ulong *physical,
             *physical = address;
             *prot = PAGE_READ | PAGE_WRITE;
         }
-    } else if (address < SIGN_EXTEND32(0xA0000000UL)) {
+    } else if (address < (int32_t)0xA0000000UL) {
         /* kseg0 */
         /* XXX: check supervisor mode */
-        *physical = address - SIGN_EXTEND32(0x80000000UL);
+        *physical = address - (int32_t)0x80000000UL;
         *prot = PAGE_READ | PAGE_WRITE;
-    } else if (address < SIGN_EXTEND32(0xC0000000UL)) {
+    } else if (address < (int32_t)0xC0000000UL) {
         /* kseg1 */
         /* XXX: check supervisor mode */
-        *physical = address - SIGN_EXTEND32(0xA0000000UL);
+        *physical = address - (int32_t)0xA0000000UL;
         *prot = PAGE_READ | PAGE_WRITE;
-    } else if (address < SIGN_EXTEND32(0xE0000000UL)) {
+    } else if (address < (int32_t)0xE0000000UL) {
         /* kseg2 */
 #ifdef MIPS_USES_R4K_TLB
         ret = map_address(env, physical, prot, address, rw, access_type);
@@ -299,7 +299,7 @@ void do_interrupt (CPUState *env)
     enter_debug_mode:
         env->hflags |= MIPS_HFLAG_DM;
         /* EJTAG probe trap enable is not implemented... */
-        env->PC = SIGN_EXTEND32(0xBFC00480);
+        env->PC = (int32_t)0xBFC00480;
         break;
     case EXCP_RESET:
         cpu_reset(env);
@@ -321,7 +321,7 @@ void do_interrupt (CPUState *env)
         }
         env->hflags |= MIPS_HFLAG_ERL;
 	env->CP0_Status |= (1 << CP0St_ERL) | (1 << CP0St_BEV);
-        env->PC = SIGN_EXTEND32(0xBFC00000);
+        env->PC = (int32_t)0xBFC00000;
         break;
     case EXCP_MCHECK:
         cause = 24;
@@ -389,9 +389,9 @@ void do_interrupt (CPUState *env)
             env->CP0_Cause &= ~0x80000000;
         }
         if (env->CP0_Status & (1 << CP0St_BEV)) {
-            env->PC = SIGN_EXTEND32(0xBFC00200);
+            env->PC = (int32_t)0xBFC00200;
         } else {
-            env->PC = SIGN_EXTEND32(0x80000000);
+            env->PC = (int32_t)0x80000000;
         }
         env->hflags |= MIPS_HFLAG_EXL;
         env->CP0_Status |= (1 << CP0St_EXL);
diff --git a/target-mips/op.c b/target-mips/op.c
index 4b6c20c49c05455015a83e31ad7f16102a8b826e..27fb3ef59af4bf24a633a783f9fdd877dc9bd3df 100644
--- a/target-mips/op.c
+++ b/target-mips/op.c
@@ -328,7 +328,7 @@ void op_store_LO (void)
 /* Arithmetic */
 void op_add (void)
 {
-    T0 = SIGN_EXTEND32((int32_t)T0 + (int32_t)T1);
+    T0 = (int32_t)((int32_t)T0 + (int32_t)T1);
     RETURN();
 }
 
@@ -342,13 +342,13 @@ void op_addo (void)
         /* operands of same sign, result different sign */
         CALL_FROM_TB1(do_raise_exception_direct, EXCP_OVERFLOW);
     }
-    T0 = SIGN_EXTEND32(T0);
+    T0 = (int32_t)T0;
     RETURN();
 }
 
 void op_sub (void)
 {
-    T0 = SIGN_EXTEND32((int32_t)T0 - (int32_t)T1);
+    T0 = (int32_t)((int32_t)T0 - (int32_t)T1);
     RETURN();
 }
 
@@ -362,21 +362,21 @@ void op_subo (void)
         /* operands of different sign, first operand and result different sign */
         CALL_FROM_TB1(do_raise_exception_direct, EXCP_OVERFLOW);
     }
-    T0 = SIGN_EXTEND32(T0);
+    T0 = (int32_t)T0;
     RETURN();
 }
 
 void op_mul (void)
 {
-    T0 = SIGN_EXTEND32((int32_t)T0 * (int32_t)T1);
+    T0 = (int32_t)((int32_t)T0 * (int32_t)T1);
     RETURN();
 }
 
 void op_div (void)
 {
     if (T1 != 0) {
-        env->LO = SIGN_EXTEND32((int32_t)T0 / (int32_t)T1);
-        env->HI = SIGN_EXTEND32((int32_t)T0 % (int32_t)T1);
+        env->LO = (int32_t)((int32_t)T0 / (int32_t)T1);
+        env->HI = (int32_t)((int32_t)T0 % (int32_t)T1);
     }
     RETURN();
 }
@@ -384,8 +384,8 @@ void op_div (void)
 void op_divu (void)
 {
     if (T1 != 0) {
-        env->LO = SIGN_EXTEND32((uint32_t)T0 / (uint32_t)T1);
-        env->HI = SIGN_EXTEND32((uint32_t)T0 % (uint32_t)T1);
+        env->LO = (int32_t)((uint32_t)T0 / (uint32_t)T1);
+        env->HI = (int32_t)((uint32_t)T0 % (uint32_t)T1);
     }
     RETURN();
 }
@@ -497,19 +497,19 @@ void op_xor (void)
 
 void op_sll (void)
 {
-    T0 = SIGN_EXTEND32((uint32_t)T0 << (uint32_t)T1);
+    T0 = (int32_t)((uint32_t)T0 << (uint32_t)T1);
     RETURN();
 }
 
 void op_sra (void)
 {
-    T0 = SIGN_EXTEND32((int32_t)T0 >> (uint32_t)T1);
+    T0 = (int32_t)((int32_t)T0 >> (uint32_t)T1);
     RETURN();
 }
 
 void op_srl (void)
 {
-    T0 = SIGN_EXTEND32((uint32_t)T0 >> (uint32_t)T1);
+    T0 = (int32_t)((uint32_t)T0 >> (uint32_t)T1);
     RETURN();
 }
 
@@ -518,8 +518,8 @@ void op_rotr (void)
     target_ulong tmp;
 
     if (T1) {
-       tmp = SIGN_EXTEND32((uint32_t)T0 << (0x20 - (uint32_t)T1));
-       T0 = SIGN_EXTEND32((uint32_t)T0 >> (uint32_t)T1) | tmp;
+       tmp = (int32_t)((uint32_t)T0 << (0x20 - (uint32_t)T1));
+       T0 = (int32_t)((uint32_t)T0 >> (uint32_t)T1) | tmp;
     } else
        T0 = T1;
     RETURN();
@@ -527,19 +527,19 @@ void op_rotr (void)
 
 void op_sllv (void)
 {
-    T0 = SIGN_EXTEND32((uint32_t)T1 << ((uint32_t)T0 & 0x1F));
+    T0 = (int32_t)((uint32_t)T1 << ((uint32_t)T0 & 0x1F));
     RETURN();
 }
 
 void op_srav (void)
 {
-    T0 = SIGN_EXTEND32((int32_t)T1 >> (T0 & 0x1F));
+    T0 = (int32_t)((int32_t)T1 >> (T0 & 0x1F));
     RETURN();
 }
 
 void op_srlv (void)
 {
-    T0 = SIGN_EXTEND32((uint32_t)T1 >> (T0 & 0x1F));
+    T0 = (int32_t)((uint32_t)T1 >> (T0 & 0x1F));
     RETURN();
 }
 
@@ -549,8 +549,8 @@ void op_rotrv (void)
 
     T0 &= 0x1F;
     if (T0) {
-       tmp = SIGN_EXTEND32((uint32_t)T1 << (0x20 - T0));
-       T0 = SIGN_EXTEND32((uint32_t)T1 >> T0) | tmp;
+       tmp = (int32_t)((uint32_t)T1 << (0x20 - T0));
+       T0 = (int32_t)((uint32_t)T1 >> T0) | tmp;
     } else
        T0 = T1;
     RETURN();
@@ -842,8 +842,8 @@ static inline uint64_t get_HILO (void)
 
 static inline void set_HILO (uint64_t HILO)
 {
-    env->LO = SIGN_EXTEND32(HILO & 0xFFFFFFFF);
-    env->HI = SIGN_EXTEND32(HILO >> 32);
+    env->LO = (int32_t)(HILO & 0xFFFFFFFF);
+    env->HI = (int32_t)(HILO >> 32);
 }
 
 void op_mult (void)
@@ -1032,7 +1032,7 @@ void op_jnz_T2 (void)
 /* CP0 functions */
 void op_mfc0_index (void)
 {
-    T0 = SIGN_EXTEND32(env->CP0_index);
+    T0 = (int32_t)(env->CP0_index);
     RETURN();
 }
 
@@ -1062,25 +1062,25 @@ void op_mfc0_context (void)
 
 void op_mfc0_pagemask (void)
 {
-    T0 = SIGN_EXTEND32(env->CP0_PageMask);
+    T0 = (int32_t)env->CP0_PageMask;
     RETURN();
 }
 
 void op_mfc0_pagegrain (void)
 {
-    T0 = SIGN_EXTEND32(env->CP0_PageGrain);
+    T0 = (int32_t)env->CP0_PageGrain;
     RETURN();
 }
 
 void op_mfc0_wired (void)
 {
-    T0 = SIGN_EXTEND32(env->CP0_Wired);
+    T0 = (int32_t)env->CP0_Wired;
     RETURN();
 }
 
 void op_mfc0_hwrena (void)
 {
-    T0 = SIGN_EXTEND32(env->CP0_HWREna);
+    T0 = (int32_t)env->CP0_HWREna;
     RETURN();
 }
 
@@ -1104,13 +1104,13 @@ void op_mfc0_entryhi (void)
 
 void op_mfc0_compare (void)
 {
-    T0 = SIGN_EXTEND32(env->CP0_Compare);
+    T0 = (int32_t)env->CP0_Compare;
     RETURN();
 }
 
 void op_mfc0_status (void)
 {
-    T0 = SIGN_EXTEND32(env->CP0_Status);
+    T0 = (int32_t)env->CP0_Status;
     if (env->hflags & MIPS_HFLAG_UM)
         T0 |= (1 << CP0St_UM);
     if (env->hflags & MIPS_HFLAG_ERL)
@@ -1122,19 +1122,19 @@ void op_mfc0_status (void)
 
 void op_mfc0_intctl (void)
 {
-    T0 = SIGN_EXTEND32(env->CP0_IntCtl);
+    T0 = (int32_t)env->CP0_IntCtl;
     RETURN();
 }
 
 void op_mfc0_srsctl (void)
 {
-    T0 = SIGN_EXTEND32(env->CP0_SRSCtl);
+    T0 = (int32_t)env->CP0_SRSCtl;
     RETURN();
 }
 
 void op_mfc0_cause (void)
 {
-    T0 = SIGN_EXTEND32(env->CP0_Cause);
+    T0 = (int32_t)env->CP0_Cause;
     RETURN();
 }
 
@@ -1146,7 +1146,7 @@ void op_mfc0_epc (void)
 
 void op_mfc0_prid (void)
 {
-    T0 = SIGN_EXTEND32(env->CP0_PRid);
+    T0 = (int32_t)env->CP0_PRid;
     RETURN();
 }
 
@@ -1158,25 +1158,25 @@ void op_mfc0_ebase (void)
 
 void op_mfc0_config0 (void)
 {
-    T0 = SIGN_EXTEND32(env->CP0_Config0);
+    T0 = (int32_t)env->CP0_Config0;
     RETURN();
 }
 
 void op_mfc0_config1 (void)
 {
-    T0 = SIGN_EXTEND32(env->CP0_Config1);
+    T0 = (int32_t)env->CP0_Config1;
     RETURN();
 }
 
 void op_mfc0_config2 (void)
 {
-    T0 = SIGN_EXTEND32(env->CP0_Config2);
+    T0 = (int32_t)env->CP0_Config2;
     RETURN();
 }
 
 void op_mfc0_config3 (void)
 {
-    T0 = SIGN_EXTEND32(env->CP0_Config3);
+    T0 = (int32_t)env->CP0_Config3;
     RETURN();
 }
 
@@ -1188,13 +1188,13 @@ void op_mfc0_lladdr (void)
 
 void op_mfc0_watchlo0 (void)
 {
-    T0 = SIGN_EXTEND32(env->CP0_WatchLo);
+    T0 = (int32_t)env->CP0_WatchLo;
     RETURN();
 }
 
 void op_mfc0_watchhi0 (void)
 {
-    T0 = SIGN_EXTEND32(env->CP0_WatchHi);
+    T0 = (int32_t)env->CP0_WatchHi;
     RETURN();
 }
 
@@ -1212,7 +1212,7 @@ void op_mfc0_framemask (void)
 
 void op_mfc0_debug (void)
 {
-    T0 = SIGN_EXTEND32(env->CP0_Debug);
+    T0 = (int32_t)env->CP0_Debug;
     if (env->hflags & MIPS_HFLAG_DM)
         T0 |= 1 << CP0DB_DM;
     RETURN();
@@ -1226,31 +1226,31 @@ void op_mfc0_depc (void)
 
 void op_mfc0_performance0 (void)
 {
-    T0 = SIGN_EXTEND32(env->CP0_Performance0);
+    T0 = (int32_t)env->CP0_Performance0;
     RETURN();
 }
 
 void op_mfc0_taglo (void)
 {
-    T0 = SIGN_EXTEND32(env->CP0_TagLo);
+    T0 = (int32_t)env->CP0_TagLo;
     RETURN();
 }
 
 void op_mfc0_datalo (void)
 {
-    T0 = SIGN_EXTEND32(env->CP0_DataLo);
+    T0 = (int32_t)env->CP0_DataLo;
     RETURN();
 }
 
 void op_mfc0_taghi (void)
 {
-    T0 = SIGN_EXTEND32(env->CP0_TagHi);
+    T0 = (int32_t)env->CP0_TagHi;
     RETURN();
 }
 
 void op_mfc0_datahi (void)
 {
-    T0 = SIGN_EXTEND32(env->CP0_DataHi);
+    T0 = (int32_t)env->CP0_DataHi;
     RETURN();
 }
 
@@ -1262,7 +1262,7 @@ void op_mfc0_errorepc (void)
 
 void op_mfc0_desave (void)
 {
-    T0 = SIGN_EXTEND32(env->CP0_DESAVE);
+    T0 = (int32_t)env->CP0_DESAVE;
     RETURN();
 }
 
@@ -1276,7 +1276,7 @@ void op_mtc0_entrylo0 (void)
 {
     /* Large physaddr not implemented */
     /* 1k pages not implemented */
-    env->CP0_EntryLo0 = T0 & SIGN_EXTEND32(0x3FFFFFFFUL);
+    env->CP0_EntryLo0 = T0 & (int32_t)0x3FFFFFFF;
     RETURN();
 }
 
@@ -1284,7 +1284,7 @@ void op_mtc0_entrylo1 (void)
 {
     /* Large physaddr not implemented */
     /* 1k pages not implemented */
-    env->CP0_EntryLo1 = T0 & SIGN_EXTEND32(0x3FFFFFFFUL);
+    env->CP0_EntryLo1 = T0 & (int32_t)0x3FFFFFFF;
     RETURN();
 }
 
@@ -1334,7 +1334,7 @@ void op_mtc0_entryhi (void)
 
     /* 1k pages not implemented */
     /* Ignore MIPS64 TLB for now */
-    val = T0 & SIGN_EXTEND32(0xFFFFE0FF);
+    val = T0 & (int32_t)0xFFFFE0FF;
     old = env->CP0_EntryHi;
     env->CP0_EntryHi = val;
     /* If the ASID changes, flush qemu's TLB.  */
@@ -1353,7 +1353,7 @@ void op_mtc0_status (void)
 {
     uint32_t val, old, mask;
 
-    val = T0 & SIGN_EXTEND32(0xFA78FF01);
+    val = T0 & (int32_t)0xFA78FF01;
     old = env->CP0_Status;
     if (T0 & (1 << CP0St_UM))
         env->hflags |= MIPS_HFLAG_UM;
@@ -1431,7 +1431,7 @@ void op_mtc0_ebase (void)
 {
     /* vectored interrupts not implemented */
     /* Multi-CPU not implemented */
-    env->CP0_EBase = SIGN_EXTEND32(0x80000000) | (T0 & 0x3FFFF000);
+    env->CP0_EBase = (int32_t)0x80000000 | (T0 & 0x3FFFF000);
     RETURN();
 }
 
@@ -1501,7 +1501,7 @@ void op_mtc0_performance0 (void)
 
 void op_mtc0_taglo (void)
 {
-    env->CP0_TagLo = T0 & SIGN_EXTEND32(0xFFFFFCF6);
+    env->CP0_TagLo = T0 & (int32_t)0xFFFFFCF6;
     RETURN();
 }
 
diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
index b719f036abf05d1c3699b4275249c06ffe495fb9..a518e5ca42a2f8812083953562530fd5602de411 100644
--- a/target-mips/op_helper.c
+++ b/target-mips/op_helper.c
@@ -167,8 +167,8 @@ static inline uint64_t get_HILO (void)
 
 static inline void set_HILO (uint64_t HILO)
 {
-    env->LO = SIGN_EXTEND32(HILO & 0xFFFFFFFF);
-    env->HI = SIGN_EXTEND32(HILO >> 32);
+    env->LO = (int32_t)(HILO & 0xFFFFFFFF);
+    env->HI = (int32_t)(HILO >> 32);
 }
 
 void do_mult (void)
@@ -305,12 +305,12 @@ void cpu_mips_tlb_flush (CPUState *env, int flush_global)
 /* CP0 helpers */
 void do_mfc0_random (void)
 {
-    T0 = SIGN_EXTEND32(cpu_mips_get_random(env));
+    T0 = (int32_t)cpu_mips_get_random(env);
 }
 
 void do_mfc0_count (void)
 {
-    T0 = SIGN_EXTEND32(cpu_mips_get_count(env));
+    T0 = (int32_t)cpu_mips_get_count(env);
 }
 
 void do_mtc0_status_debug(uint32_t old, uint32_t val)
@@ -433,7 +433,7 @@ static void fill_tlb (int idx)
 
     /* XXX: detect conflicting TLBs and raise a MCHECK exception when needed */
     tlb = &env->tlb[idx];
-    tlb->VPN = env->CP0_EntryHi & SIGN_EXTEND32(0xFFFFE000);
+    tlb->VPN = env->CP0_EntryHi & (int32_t)0xFFFFE000;
     tlb->ASID = env->CP0_EntryHi & 0xFF;
     size = env->CP0_PageMask >> 13;
     size = 4 * (size + 1);
@@ -478,7 +478,7 @@ void do_tlbp (void)
     uint8_t ASID;
     int i;
 
-    tag = env->CP0_EntryHi & SIGN_EXTEND32(0xFFFFE000);
+    tag = env->CP0_EntryHi & (int32_t)0xFFFFE000;
     ASID = env->CP0_EntryHi & 0xFF;
     for (i = 0; i < MIPS_TLB_NB; i++) {
         tlb = &env->tlb[i];
diff --git a/target-mips/translate.c b/target-mips/translate.c
index 1252e81a966d7c9e6b874dc66b70aaa7370cc861..a501a178f5e6b4d70efb0f72e3b2f54fea9e431c 100644
--- a/target-mips/translate.c
+++ b/target-mips/translate.c
@@ -1420,7 +1420,7 @@ static void gen_compute_branch (DisasContext *ctx, uint32_t opc,
     case OPC_J:
     case OPC_JAL:
         /* Jump to immediate */
-        btarget = ((ctx->pc + 4) & SIGN_EXTEND32(0xF0000000)) | offset;
+        btarget = ((ctx->pc + 4) & (int32_t)0xF0000000) | offset;
         break;
     case OPC_JR:
     case OPC_JALR:
@@ -4097,14 +4097,14 @@ void cpu_reset (CPUMIPSState *env)
     } else {
         env->CP0_ErrorEPC = env->PC;
     }
-    env->PC = SIGN_EXTEND32(0xBFC00000);
+    env->PC = (int32_t)0xBFC00000;
 #if defined (MIPS_USES_R4K_TLB)
     env->CP0_random = MIPS_TLB_NB - 1;
     env->tlb_in_use = MIPS_TLB_NB;
 #endif
     env->CP0_Wired = 0;
     /* SMP not implemented */
-    env->CP0_EBase = SIGN_EXTEND32(0x80000000);
+    env->CP0_EBase = (int32_t)0x80000000;
     env->CP0_Config0 = MIPS_CONFIG0;
     env->CP0_Config1 = MIPS_CONFIG1;
     env->CP0_Config2 = MIPS_CONFIG2;