Revision 3d9fb9fe target-mips/helper.c

b/target-mips/helper.c
40 40
    int ret;
41 41

  
42 42
    ret = -2;
43
    tag = (address & 0xFFFFE000);
44
    ASID = env->CP0_EntryHi & 0x000000FF;
43
    tag = address & 0xFFFFE000;
44
    ASID = env->CP0_EntryHi & 0xFF;
45 45
    for (i = 0; i < MIPS_TLB_NB; i++) {
46 46
        tlb = &env->tlb[i];
47 47
        /* Check ASID, virtual page number & size */
......
74 74
    int ret;
75 75

  
76 76
    /* User mode can only access useg */
77
    user_mode = ((env->hflags & MIPS_HFLAG_MODE) == MIPS_HFLAG_UM) ? 1 : 0;
77
    user_mode = (env->hflags & MIPS_HFLAG_MODE) == MIPS_HFLAG_UM;
78 78
#if 0
79 79
    if (logfile) {
80 80
        fprintf(logfile, "user mode %d h %08x\n",
......
231 231
        env->CP0_Context = (env->CP0_Context & 0xff800000) |
232 232
	                   ((address >> 9) &   0x007ffff0);
233 233
        env->CP0_EntryHi =
234
            (env->CP0_EntryHi & 0x000000FF) | (address & 0xFFFFF000);
234
            (env->CP0_EntryHi & 0xFF) | (address & 0xFFFFF000);
235 235
        env->exception_index = exception;
236 236
        env->error_code = error_code;
237 237
        ret = 1;

Also available in: Unified diff