SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target-mips: use CP0_CHECK for gen_m{f|t}hc0

Browse Source 
Reuse CP0_CHECK macro for gen_m{f|t}hc0.

Signed-off-by: Yongbok Kim <yongbok.kim@imgtec.com>
Reviewed-by: Leon Alrae <leon.alrae@imgtec.com>
Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
This commit is contained in:
Yongbok Kim 2016-03-24 15:49:59 +00:00 committed by Leon Alrae
parent 408294352a
commit c98d3d79ee
1 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
target-mips/translate.c
View File

@ -4775,13 +4775,18 @@ static inline void gen_mtc0_store32 (TCGv arg, target_ulong off)
tcg_temp_free_i32(t0); tcg_temp_free_i32(t0);
} }
#define CP0_CHECK(c) \
do { \
if (!(c)) { \
goto cp0_unimplemented; \
} \
} while (0)
static void gen_mfhc0(DisasContext *ctx, TCGv arg, int reg, int sel) static void gen_mfhc0(DisasContext *ctx, TCGv arg, int reg, int sel)
{ {
const char *rn = "invalid"; const char *rn = "invalid";
if (!(ctx->hflags & MIPS_HFLAG_ELPA)) { CP0_CHECK(ctx->hflags & MIPS_HFLAG_ELPA);
goto mfhc0_read_zero;
}
switch (reg) { switch (reg) {
case 2: case 2:
@ -4791,7 +4796,7 @@ static void gen_mfhc0(DisasContext *ctx, TCGv arg, int reg, int sel)
rn = "EntryLo0"; rn = "EntryLo0";
break; break;
default: default:
goto mfhc0_read_zero; goto cp0_unimplemented;
} }
break; break;
case 3: case 3:
@ -4801,7 +4806,7 @@ static void gen_mfhc0(DisasContext *ctx, TCGv arg, int reg, int sel)
rn = "EntryLo1"; rn = "EntryLo1";
break; break;
default: default:
goto mfhc0_read_zero; goto cp0_unimplemented;
} }
break; break;
case 17: case 17:
@ -4812,7 +4817,7 @@ static void gen_mfhc0(DisasContext *ctx, TCGv arg, int reg, int sel)
rn = "LLAddr"; rn = "LLAddr";
break; break;
default: default:
goto mfhc0_read_zero; goto cp0_unimplemented;
} }
break; break;
case 28: case 28:
@ -4825,18 +4830,18 @@ static void gen_mfhc0(DisasContext *ctx, TCGv arg, int reg, int sel)
rn = "TagLo"; rn = "TagLo";
break; break;
default: default:
goto mfhc0_read_zero; goto cp0_unimplemented;
} }
break; break;
default: default:
goto mfhc0_read_zero; goto cp0_unimplemented;
} }
(void)rn; /* avoid a compiler warning */ (void)rn; /* avoid a compiler warning */
LOG_DISAS("mfhc0 %s (reg %d sel %d)\n", rn, reg, sel); LOG_DISAS("mfhc0 %s (reg %d sel %d)\n", rn, reg, sel);
return; return;
mfhc0_read_zero: cp0_unimplemented:
LOG_DISAS("mfhc0 %s (reg %d sel %d)\n", rn, reg, sel); LOG_DISAS("mfhc0 %s (reg %d sel %d)\n", rn, reg, sel);
tcg_gen_movi_tl(arg, 0); tcg_gen_movi_tl(arg, 0);
} }
@ -4846,9 +4851,7 @@ static void gen_mthc0(DisasContext *ctx, TCGv arg, int reg, int sel)
const char *rn = "invalid"; const char *rn = "invalid";
uint64_t mask = ctx->PAMask >> 36; uint64_t mask = ctx->PAMask >> 36;
if (!(ctx->hflags & MIPS_HFLAG_ELPA)) { CP0_CHECK(ctx->hflags & MIPS_HFLAG_ELPA);
goto mthc0_nop;
}
switch (reg) { switch (reg) {
case 2: case 2:
@ -4859,7 +4862,7 @@ static void gen_mthc0(DisasContext *ctx, TCGv arg, int reg, int sel)
rn = "EntryLo0"; rn = "EntryLo0";
break; break;
default: default:
goto mthc0_nop; goto cp0_unimplemented;
} }
break; break;
case 3: case 3:
@ -4870,7 +4873,7 @@ static void gen_mthc0(DisasContext *ctx, TCGv arg, int reg, int sel)
rn = "EntryLo1"; rn = "EntryLo1";
break; break;
default: default:
goto mthc0_nop; goto cp0_unimplemented;
} }
break; break;
case 17: case 17:
@ -4883,7 +4886,7 @@ static void gen_mthc0(DisasContext *ctx, TCGv arg, int reg, int sel)
rn = "LLAddr"; rn = "LLAddr";
break; break;
default: default:
goto mthc0_nop; goto cp0_unimplemented;
} }
break; break;
case 28: case 28:
@ -4897,15 +4900,15 @@ static void gen_mthc0(DisasContext *ctx, TCGv arg, int reg, int sel)
rn = "TagLo"; rn = "TagLo";
break; break;
default: default:
goto mthc0_nop; goto cp0_unimplemented;
} }
break; break;
default: default:
goto mthc0_nop; goto cp0_unimplemented;
} }
(void)rn; /* avoid a compiler warning */ (void)rn; /* avoid a compiler warning */
mthc0_nop: cp0_unimplemented:
LOG_DISAS("mthc0 %s (reg %d sel %d)\n", rn, reg, sel); LOG_DISAS("mthc0 %s (reg %d sel %d)\n", rn, reg, sel);
} }
@ -4918,13 +4921,6 @@ static inline void gen_mfc0_unimplemented(DisasContext *ctx, TCGv arg)
} }
} }
#define CP0_CHECK(c) \
do { \
if (!(c)) { \
goto cp0_unimplemented; \
} \
} while (0)
static void gen_mfc0(DisasContext *ctx, TCGv arg, int reg, int sel) static void gen_mfc0(DisasContext *ctx, TCGv arg, int reg, int sel)
{ {
const char *rn = "invalid"; const char *rn = "invalid";