Coding style and mask value fix
PATCH 1/1 Coding style and mask value fix
Hello All,
this drops some leading zeroes in masks, fixes the masks for Context and EntryHi, gets rid of some magic constants, simplifies some conditionals, and remove a bogus do_raise_exception which broke delay slot handling.
Thiemo
target-mips/helper.c +4 -4
@@ -40,8 +40,8 @@int ret; ret =-2 ; - tag = (address &0xFFFFE000 ); -ASID = env->CP0_EntryHi &0x000000FF ; + tag = address &0xFFFFE000 ; +ASID = env->CP0_EntryHi &0xFF ;for (i =0 ; i <MIPS_TLB_NB ; i++) { tlb = &env->tlb[i];/* Check ASID, virtual page number & size */
@@ -74,7 +74,7 @@int ret;/* User mode can only access useg */ - user_mode = ((env->hflags &MIPS_HFLAG_MODE ) ==MIPS_HFLAG_UM ) ?1 :0 ; + user_mode = (env->hflags &MIPS_HFLAG_MODE ) ==MIPS_HFLAG_UM ;#if 0 if (logfile) { fprintf(logfile, "user mode %d h %08x\n",
@@ -231,7 +231,7 @@ env->CP0_Context = (env->CP0_Context &0xff800000 ) | ((address >>9 ) &0x007ffff0 ); env->CP0_EntryHi = - (env->CP0_EntryHi &0x000000FF ) | (address &0xFFFFF000 ); + (env->CP0_EntryHi &0xFF ) | (address &0xFFFFE000 ); env->exception_index = exception; env->error_code = error_code; ret =1 ;
target-mips/op_helper.c +9 -12
@@ -331,19 +331,19 @@ rn ="Index" ;break ;case 2 : - val =T0 &0x03FFFFFFF ; + val =T0 &0x3FFFFFFF ; old = env->CP0_EntryLo0; env->CP0_EntryLo0 = val; rn ="EntryLo0" ;break ;case 3 : - val =T0 &0x03FFFFFFF ; + val =T0 &0x3FFFFFFF ; old = env->CP0_EntryLo1; env->CP0_EntryLo1 = val; rn ="EntryLo1" ;break ;case 4 : - val = (env->CP0_Context &0xFF000000 ) | (T0 &0x00FFFFF0 ); + val = (env->CP0_Context &0xFF800000 ) | (T0 &0x007FFFF0 ); old = env->CP0_Context; env->CP0_Context = val; rn ="Context" ;
@@ -367,7 +367,7 @@ rn ="Count" ;break ;case 10 : - val =T0 &0xFFFFF0FF ; + val =T0 &0xFFFFE0FF ; old = env->CP0_EntryHi; env->CP0_EntryHi = val;/* If the ASID changes, flush qemu's TLB. */
@@ -404,20 +404,17 @@ old, val, env->CP0_Cause, old & mask, val & mask, env->CP0_Cause & mask); } -#if 1 if ((val & (1 << CP0St_IE)) && !(old & (1 << CP0St_IE)) && !(env->hflags &MIPS_HFLAG_EXL ) && !(env->hflags &MIPS_HFLAG_ERL ) && - !(env->hflags &MIPS_HFLAG_DM ) && + !(env->hflags &MIPS_HFLAG_DM ) && (env->CP0_Status & env->CP0_Cause & mask)) {if (logfile)fprintf (logfile,"Raise pending IRQs\n" ); env->interrupt_request |=CPU_INTERRUPT_HARD ; -do_raise_exception (EXCP_EXT_INTERRUPT ); - }else if (!(val &0x00000001 ) && (old &0x00000001 )) { + }else if (!(val & (1 << CP0St_IE)) && (old & (1 << CP0St_IE))) { env->interrupt_request &= ~CPU_INTERRUPT_HARD ; } -#endif rn ="Status" ;break ;case 13 :
@@ -606,9 +603,9 @@uint8_t ASID ;int i; - tag = (env->CP0_EntryHi &0xFFFFE000 ); -ASID = env->CP0_EntryHi &0x000000FF ; -for (i =0 ; i <MIPS_TLB_NB ; i++) { + tag = env->CP0_EntryHi &0xFFFFE000 ; +ASID = env->CP0_EntryHi &0xFF ; +for (i =0 ; i <MIPS_TLB_NB ; i++) { tlb = &env->tlb[i];/* Check ASID, virtual page number & size */ if ((tlb->G ==1 || tlb->ASID ==ASID ) && tlb->VPN == tag) {
target-mips/translate.c +1 -1
@@ -1614,7 +1614,7 @@#if defined(CONFIG_USER_ONLY ) ctx.mem_idx =0 ;#else - ctx.mem_idx = (ctx.hflags &MIPS_HFLAG_MODE ) ==MIPS_HFLAG_UM ?0 :1 ; + ctx.mem_idx = !((ctx.hflags &MIPS_HFLAG_MODE ) ==MIPS_HFLAG_UM );#endif ctx.CP0_Status = env->CP0_Status;#ifdef DEBUG_DISAS