Commit 5dc4b744 authored by ths's avatar ths
Browse files

Scrap SIGN_EXTEND32.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2251 c046a42c-6fe2-441c-8c8c-71466251a162
parent c570fd16
...@@ -11,10 +11,14 @@ ...@@ -11,10 +11,14 @@
#define BIOS_FILENAME "mips_bios.bin" #define BIOS_FILENAME "mips_bios.bin"
//#define BIOS_FILENAME "system.bin" //#define BIOS_FILENAME "system.bin"
#define KERNEL_LOAD_ADDR SIGN_EXTEND32(0x80010000) #define KERNEL_LOAD_ADDR (int32_t)0x80010000
#define INITRD_LOAD_ADDR SIGN_EXTEND32(0x80800000) #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_iobase[2] = { 0x1f0, 0x170 };
static const int ide_iobase2[2] = { 0x3f6, 0x376 }; static const int ide_iobase2[2] = { 0x3f6, 0x376 };
...@@ -76,7 +80,7 @@ void load_kernel (CPUState *env, int ram_size, const char *kernel_filename, ...@@ -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); kernel_size = load_elf(kernel_filename, VIRT_TO_PHYS_ADDEND, &entry);
if (kernel_size >= 0) { if (kernel_size >= 0) {
if ((entry & ~0x7fffffffULL) == 0x80000000) if ((entry & ~0x7fffffffULL) == 0x80000000)
entry = SIGN_EXTEND32(entry); entry = (int32_t)entry;
env->PC = entry; env->PC = entry;
} else { } else {
kernel_size = load_image(kernel_filename, kernel_size = load_image(kernel_filename,
......
...@@ -15,13 +15,10 @@ typedef unsigned char uint_fast8_t; ...@@ -15,13 +15,10 @@ typedef unsigned char uint_fast8_t;
typedef unsigned int uint_fast16_t; typedef unsigned int uint_fast16_t;
#endif #endif
#ifdef MIPS_HAS_MIPS64
#define SIGN_EXTEND32(val) (((((uint64_t)(val)) & 0xFFFFFFFF) ^ 0x80000000) - 0x80000000)
/* target_ulong size spec */ /* target_ulong size spec */
#ifdef MIPS_HAS_MIPS64
#define TLSZ "%016llx" #define TLSZ "%016llx"
#else #else
#define SIGN_EXTEND32(val) (val)
/* target_ulong size spec */
#define TLSZ "%08x" #define TLSZ "%08x"
#endif #endif
......
...@@ -86,7 +86,7 @@ static int get_physical_address (CPUState *env, target_ulong *physical, ...@@ -86,7 +86,7 @@ static int get_physical_address (CPUState *env, target_ulong *physical,
#endif #endif
if (user_mode && address > 0x7FFFFFFFUL) if (user_mode && address > 0x7FFFFFFFUL)
return TLBRET_BADADDR; return TLBRET_BADADDR;
if (address < SIGN_EXTEND32(0x80000000UL)) { if (address < (int32_t)0x80000000UL) {
if (!(env->hflags & MIPS_HFLAG_ERL)) { if (!(env->hflags & MIPS_HFLAG_ERL)) {
#ifdef MIPS_USES_R4K_TLB #ifdef MIPS_USES_R4K_TLB
ret = map_address(env, physical, prot, address, rw, access_type); ret = map_address(env, physical, prot, address, rw, access_type);
...@@ -98,17 +98,17 @@ static int get_physical_address (CPUState *env, target_ulong *physical, ...@@ -98,17 +98,17 @@ static int get_physical_address (CPUState *env, target_ulong *physical,
*physical = address; *physical = address;
*prot = PAGE_READ | PAGE_WRITE; *prot = PAGE_READ | PAGE_WRITE;
} }
} else if (address < SIGN_EXTEND32(0xA0000000UL)) { } else if (address < (int32_t)0xA0000000UL) {
/* kseg0 */ /* kseg0 */
/* XXX: check supervisor mode */ /* XXX: check supervisor mode */
*physical = address - SIGN_EXTEND32(0x80000000UL); *physical = address - (int32_t)0x80000000UL;
*prot = PAGE_READ | PAGE_WRITE; *prot = PAGE_READ | PAGE_WRITE;
} else if (address < SIGN_EXTEND32(0xC0000000UL)) { } else if (address < (int32_t)0xC0000000UL) {
/* kseg1 */ /* kseg1 */
/* XXX: check supervisor mode */ /* XXX: check supervisor mode */
*physical = address - SIGN_EXTEND32(0xA0000000UL); *physical = address - (int32_t)0xA0000000UL;
*prot = PAGE_READ | PAGE_WRITE; *prot = PAGE_READ | PAGE_WRITE;
} else if (address < SIGN_EXTEND32(0xE0000000UL)) { } else if (address < (int32_t)0xE0000000UL) {
/* kseg2 */ /* kseg2 */
#ifdef MIPS_USES_R4K_TLB #ifdef MIPS_USES_R4K_TLB
ret = map_address(env, physical, prot, address, rw, access_type); ret = map_address(env, physical, prot, address, rw, access_type);
...@@ -299,7 +299,7 @@ void do_interrupt (CPUState *env) ...@@ -299,7 +299,7 @@ void do_interrupt (CPUState *env)
enter_debug_mode: enter_debug_mode:
env->hflags |= MIPS_HFLAG_DM; env->hflags |= MIPS_HFLAG_DM;
/* EJTAG probe trap enable is not implemented... */ /* EJTAG probe trap enable is not implemented... */
env->PC = SIGN_EXTEND32(0xBFC00480); env->PC = (int32_t)0xBFC00480;
break; break;
case EXCP_RESET: case EXCP_RESET:
cpu_reset(env); cpu_reset(env);
...@@ -321,7 +321,7 @@ void do_interrupt (CPUState *env) ...@@ -321,7 +321,7 @@ void do_interrupt (CPUState *env)
} }
env->hflags |= MIPS_HFLAG_ERL; env->hflags |= MIPS_HFLAG_ERL;
env->CP0_Status |= (1 << CP0St_ERL) | (1 << CP0St_BEV); env->CP0_Status |= (1 << CP0St_ERL) | (1 << CP0St_BEV);
env->PC = SIGN_EXTEND32(0xBFC00000); env->PC = (int32_t)0xBFC00000;
break; break;
case EXCP_MCHECK: case EXCP_MCHECK:
cause = 24; cause = 24;
...@@ -389,9 +389,9 @@ void do_interrupt (CPUState *env) ...@@ -389,9 +389,9 @@ void do_interrupt (CPUState *env)
env->CP0_Cause &= ~0x80000000; env->CP0_Cause &= ~0x80000000;
} }
if (env->CP0_Status & (1 << CP0St_BEV)) { if (env->CP0_Status & (1 << CP0St_BEV)) {
env->PC = SIGN_EXTEND32(0xBFC00200); env->PC = (int32_t)0xBFC00200;
} else { } else {
env->PC = SIGN_EXTEND32(0x80000000); env->PC = (int32_t)0x80000000;
} }
env->hflags |= MIPS_HFLAG_EXL; env->hflags |= MIPS_HFLAG_EXL;
env->CP0_Status |= (1 << CP0St_EXL); env->CP0_Status |= (1 << CP0St_EXL);
......
...@@ -328,7 +328,7 @@ void op_store_LO (void) ...@@ -328,7 +328,7 @@ void op_store_LO (void)
/* Arithmetic */ /* Arithmetic */
void op_add (void) void op_add (void)
{ {
T0 = SIGN_EXTEND32((int32_t)T0 + (int32_t)T1); T0 = (int32_t)((int32_t)T0 + (int32_t)T1);
RETURN(); RETURN();
} }
...@@ -342,13 +342,13 @@ void op_addo (void) ...@@ -342,13 +342,13 @@ void op_addo (void)
/* operands of same sign, result different sign */ /* operands of same sign, result different sign */
CALL_FROM_TB1(do_raise_exception_direct, EXCP_OVERFLOW); CALL_FROM_TB1(do_raise_exception_direct, EXCP_OVERFLOW);
} }
T0 = SIGN_EXTEND32(T0); T0 = (int32_t)T0;
RETURN(); RETURN();
} }
void op_sub (void) void op_sub (void)
{ {
T0 = SIGN_EXTEND32((int32_t)T0 - (int32_t)T1); T0 = (int32_t)((int32_t)T0 - (int32_t)T1);
RETURN(); RETURN();
} }
...@@ -362,21 +362,21 @@ void op_subo (void) ...@@ -362,21 +362,21 @@ void op_subo (void)
/* operands of different sign, first operand and result different sign */ /* operands of different sign, first operand and result different sign */
CALL_FROM_TB1(do_raise_exception_direct, EXCP_OVERFLOW); CALL_FROM_TB1(do_raise_exception_direct, EXCP_OVERFLOW);
} }
T0 = SIGN_EXTEND32(T0); T0 = (int32_t)T0;
RETURN(); RETURN();
} }
void op_mul (void) void op_mul (void)
{ {
T0 = SIGN_EXTEND32((int32_t)T0 * (int32_t)T1); T0 = (int32_t)((int32_t)T0 * (int32_t)T1);
RETURN(); RETURN();
} }
void op_div (void) void op_div (void)
{ {
if (T1 != 0) { if (T1 != 0) {
env->LO = SIGN_EXTEND32((int32_t)T0 / (int32_t)T1); env->LO = (int32_t)((int32_t)T0 / (int32_t)T1);
env->HI = SIGN_EXTEND32((int32_t)T0 % (int32_t)T1); env->HI = (int32_t)((int32_t)T0 % (int32_t)T1);
} }
RETURN(); RETURN();
} }
...@@ -384,8 +384,8 @@ void op_div (void) ...@@ -384,8 +384,8 @@ void op_div (void)
void op_divu (void) void op_divu (void)
{ {
if (T1 != 0) { if (T1 != 0) {
env->LO = SIGN_EXTEND32((uint32_t)T0 / (uint32_t)T1); env->LO = (int32_t)((uint32_t)T0 / (uint32_t)T1);
env->HI = SIGN_EXTEND32((uint32_t)T0 % (uint32_t)T1); env->HI = (int32_t)((uint32_t)T0 % (uint32_t)T1);
} }
RETURN(); RETURN();
} }
...@@ -497,19 +497,19 @@ void op_xor (void) ...@@ -497,19 +497,19 @@ void op_xor (void)
void op_sll (void) void op_sll (void)
{ {
T0 = SIGN_EXTEND32((uint32_t)T0 << (uint32_t)T1); T0 = (int32_t)((uint32_t)T0 << (uint32_t)T1);
RETURN(); RETURN();
} }
void op_sra (void) void op_sra (void)
{ {
T0 = SIGN_EXTEND32((int32_t)T0 >> (uint32_t)T1); T0 = (int32_t)((int32_t)T0 >> (uint32_t)T1);
RETURN(); RETURN();
} }
void op_srl (void) void op_srl (void)
{ {
T0 = SIGN_EXTEND32((uint32_t)T0 >> (uint32_t)T1); T0 = (int32_t)((uint32_t)T0 >> (uint32_t)T1);
RETURN(); RETURN();
} }
...@@ -518,8 +518,8 @@ void op_rotr (void) ...@@ -518,8 +518,8 @@ void op_rotr (void)
target_ulong tmp; target_ulong tmp;
if (T1) { if (T1) {
tmp = SIGN_EXTEND32((uint32_t)T0 << (0x20 - (uint32_t)T1)); tmp = (int32_t)((uint32_t)T0 << (0x20 - (uint32_t)T1));
T0 = SIGN_EXTEND32((uint32_t)T0 >> (uint32_t)T1) | tmp; T0 = (int32_t)((uint32_t)T0 >> (uint32_t)T1) | tmp;
} else } else
T0 = T1; T0 = T1;
RETURN(); RETURN();
...@@ -527,19 +527,19 @@ void op_rotr (void) ...@@ -527,19 +527,19 @@ void op_rotr (void)
void op_sllv (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(); RETURN();
} }
void op_srav (void) void op_srav (void)
{ {
T0 = SIGN_EXTEND32((int32_t)T1 >> (T0 & 0x1F)); T0 = (int32_t)((int32_t)T1 >> (T0 & 0x1F));
RETURN(); RETURN();
} }
void op_srlv (void) void op_srlv (void)
{ {
T0 = SIGN_EXTEND32((uint32_t)T1 >> (T0 & 0x1F)); T0 = (int32_t)((uint32_t)T1 >> (T0 & 0x1F));
RETURN(); RETURN();
} }
...@@ -549,8 +549,8 @@ void op_rotrv (void) ...@@ -549,8 +549,8 @@ void op_rotrv (void)
T0 &= 0x1F; T0 &= 0x1F;
if (T0) { if (T0) {
tmp = SIGN_EXTEND32((uint32_t)T1 << (0x20 - T0)); tmp = (int32_t)((uint32_t)T1 << (0x20 - T0));
T0 = SIGN_EXTEND32((uint32_t)T1 >> T0) | tmp; T0 = (int32_t)((uint32_t)T1 >> T0) | tmp;
} else } else
T0 = T1; T0 = T1;
RETURN(); RETURN();
...@@ -842,8 +842,8 @@ static inline uint64_t get_HILO (void) ...@@ -842,8 +842,8 @@ static inline uint64_t get_HILO (void)
static inline void set_HILO (uint64_t HILO) static inline void set_HILO (uint64_t HILO)
{ {
env->LO = SIGN_EXTEND32(HILO & 0xFFFFFFFF); env->LO = (int32_t)(HILO & 0xFFFFFFFF);
env->HI = SIGN_EXTEND32(HILO >> 32); env->HI = (int32_t)(HILO >> 32);
} }
void op_mult (void) void op_mult (void)
...@@ -1032,7 +1032,7 @@ void op_jnz_T2 (void) ...@@ -1032,7 +1032,7 @@ void op_jnz_T2 (void)
/* CP0 functions */ /* CP0 functions */
void op_mfc0_index (void) void op_mfc0_index (void)
{ {
T0 = SIGN_EXTEND32(env->CP0_index); T0 = (int32_t)(env->CP0_index);
RETURN(); RETURN();
} }
...@@ -1062,25 +1062,25 @@ void op_mfc0_context (void) ...@@ -1062,25 +1062,25 @@ void op_mfc0_context (void)
void op_mfc0_pagemask (void) void op_mfc0_pagemask (void)
{ {
T0 = SIGN_EXTEND32(env->CP0_PageMask); T0 = (int32_t)env->CP0_PageMask;
RETURN(); RETURN();
} }
void op_mfc0_pagegrain (void) void op_mfc0_pagegrain (void)
{ {
T0 = SIGN_EXTEND32(env->CP0_PageGrain); T0 = (int32_t)env->CP0_PageGrain;
RETURN(); RETURN();
} }
void op_mfc0_wired (void) void op_mfc0_wired (void)
{ {
T0 = SIGN_EXTEND32(env->CP0_Wired); T0 = (int32_t)env->CP0_Wired;
RETURN(); RETURN();
} }
void op_mfc0_hwrena (void) void op_mfc0_hwrena (void)
{ {
T0 = SIGN_EXTEND32(env->CP0_HWREna); T0 = (int32_t)env->CP0_HWREna;
RETURN(); RETURN();
} }
...@@ -1104,13 +1104,13 @@ void op_mfc0_entryhi (void) ...@@ -1104,13 +1104,13 @@ void op_mfc0_entryhi (void)
void op_mfc0_compare (void) void op_mfc0_compare (void)
{ {
T0 = SIGN_EXTEND32(env->CP0_Compare); T0 = (int32_t)env->CP0_Compare;
RETURN(); RETURN();
} }
void op_mfc0_status (void) void op_mfc0_status (void)
{ {
T0 = SIGN_EXTEND32(env->CP0_Status); T0 = (int32_t)env->CP0_Status;
if (env->hflags & MIPS_HFLAG_UM) if (env->hflags & MIPS_HFLAG_UM)
T0 |= (1 << CP0St_UM); T0 |= (1 << CP0St_UM);
if (env->hflags & MIPS_HFLAG_ERL) if (env->hflags & MIPS_HFLAG_ERL)
...@@ -1122,19 +1122,19 @@ void op_mfc0_status (void) ...@@ -1122,19 +1122,19 @@ void op_mfc0_status (void)
void op_mfc0_intctl (void) void op_mfc0_intctl (void)
{ {
T0 = SIGN_EXTEND32(env->CP0_IntCtl); T0 = (int32_t)env->CP0_IntCtl;
RETURN(); RETURN();
} }
void op_mfc0_srsctl (void) void op_mfc0_srsctl (void)
{ {
T0 = SIGN_EXTEND32(env->CP0_SRSCtl); T0 = (int32_t)env->CP0_SRSCtl;
RETURN(); RETURN();
} }
void op_mfc0_cause (void) void op_mfc0_cause (void)
{ {
T0 = SIGN_EXTEND32(env->CP0_Cause); T0 = (int32_t)env->CP0_Cause;
RETURN(); RETURN();
} }
...@@ -1146,7 +1146,7 @@ void op_mfc0_epc (void) ...@@ -1146,7 +1146,7 @@ void op_mfc0_epc (void)
void op_mfc0_prid (void) void op_mfc0_prid (void)
{ {
T0 = SIGN_EXTEND32(env->CP0_PRid); T0 = (int32_t)env->CP0_PRid;
RETURN(); RETURN();
} }
...@@ -1158,25 +1158,25 @@ void op_mfc0_ebase (void) ...@@ -1158,25 +1158,25 @@ void op_mfc0_ebase (void)
void op_mfc0_config0 (void) void op_mfc0_config0 (void)
{ {
T0 = SIGN_EXTEND32(env->CP0_Config0); T0 = (int32_t)env->CP0_Config0;
RETURN(); RETURN();
} }
void op_mfc0_config1 (void) void op_mfc0_config1 (void)
{ {
T0 = SIGN_EXTEND32(env->CP0_Config1); T0 = (int32_t)env->CP0_Config1;
RETURN(); RETURN();
} }
void op_mfc0_config2 (void) void op_mfc0_config2 (void)
{ {
T0 = SIGN_EXTEND32(env->CP0_Config2); T0 = (int32_t)env->CP0_Config2;
RETURN(); RETURN();
} }
void op_mfc0_config3 (void) void op_mfc0_config3 (void)
{ {
T0 = SIGN_EXTEND32(env->CP0_Config3); T0 = (int32_t)env->CP0_Config3;
RETURN(); RETURN();
} }
...@@ -1188,13 +1188,13 @@ void op_mfc0_lladdr (void) ...@@ -1188,13 +1188,13 @@ void op_mfc0_lladdr (void)
void op_mfc0_watchlo0 (void) void op_mfc0_watchlo0 (void)
{ {
T0 = SIGN_EXTEND32(env->CP0_WatchLo); T0 = (int32_t)env->CP0_WatchLo;
RETURN(); RETURN();
} }
void op_mfc0_watchhi0 (void) void op_mfc0_watchhi0 (void)
{ {
T0 = SIGN_EXTEND32(env->CP0_WatchHi); T0 = (int32_t)env->CP0_WatchHi;
RETURN(); RETURN();
} }
...@@ -1212,7 +1212,7 @@ void op_mfc0_framemask (void) ...@@ -1212,7 +1212,7 @@ void op_mfc0_framemask (void)
void op_mfc0_debug (void) void op_mfc0_debug (void)
{ {
T0 = SIGN_EXTEND32(env->CP0_Debug); T0 = (int32_t)env->CP0_Debug;
if (env->hflags & MIPS_HFLAG_DM) if (env->hflags & MIPS_HFLAG_DM)
T0 |= 1 << CP0DB_DM; T0 |= 1 << CP0DB_DM;
RETURN(); RETURN();
...@@ -1226,31 +1226,31 @@ void op_mfc0_depc (void) ...@@ -1226,31 +1226,31 @@ void op_mfc0_depc (void)
void op_mfc0_performance0 (void) void op_mfc0_performance0 (void)
{ {
T0 = SIGN_EXTEND32(env->CP0_Performance0); T0 = (int32_t)env->CP0_Performance0;
RETURN(); RETURN();
} }
void op_mfc0_taglo (void) void op_mfc0_taglo (void)
{ {
T0 = SIGN_EXTEND32(env->CP0_TagLo); T0 = (int32_t)env->CP0_TagLo;
RETURN(); RETURN();
} }
void op_mfc0_datalo (void) void op_mfc0_datalo (void)
{ {
T0 = SIGN_EXTEND32(env->CP0_DataLo); T0 = (int32_t)env->CP0_DataLo;
RETURN(); RETURN();
} }
void op_mfc0_taghi (void) void op_mfc0_taghi (void)
{ {
T0 = SIGN_EXTEND32(env->CP0_TagHi); T0 = (int32_t)env->CP0_TagHi;
RETURN(); RETURN();
} }
void op_mfc0_datahi (void) void op_mfc0_datahi (void)
{ {
T0 = SIGN_EXTEND32(env->CP0_DataHi); T0 = (int32_t)env->CP0_DataHi;
RETURN();