yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-02-02 12:31:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/mips: Clean up handling of CP0 register 28

Browse source 
Clean up handling of CP0 register 28.

Backports commit a30e2f218034f6215757734c8107fd47f5385dfa from qemu
This commit is contained in:
Aleksandar Markovic 2019-11-18 23:40:46 -05:00 committed by Lioncash
parent 9ed9ff06ab
commit 7dc128c3ad
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
2 changed files with 54 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
qemu/target/mips/cpu.h
View file

@ -232,12 +232,12 @@ typedef struct mips_def_t mips_def_t;
*
* 0 DataLo DataHi ErrorEPC DESAVE
* 1 TagLo TagHi
* 2 DataLo DataHi KScratch<n>
* 3 TagLo TagHi KScratch<n>
* 4 DataLo DataHi KScratch<n>
* 5 TagLo TagHi KScratch<n>
* 6 DataLo DataHi KScratch<n>
* 7 TagLo TagHi KScratch<n>
* 2 DataLo1 DataHi KScratch<n>
* 3 TagLo1 TagHi KScratch<n>
* 4 DataLo2 DataHi KScratch<n>
* 5 TagLo2 TagHi KScratch<n>
* 6 DataLo3 DataHi KScratch<n>
* 7 TagLo3 TagHi KScratch<n>
*
*/
#define CP0_REGISTER_00 0
@ -426,10 +426,14 @@ typedef struct mips_def_t mips_def_t;
/* CP0 Register 27 */
#define CP0_REG27__CACHERR 0
/* CP0 Register 28 */
#define CP0_REG28__ITAGLO 0
#define CP0_REG28__IDATALO 1
#define CP0_REG28__DTAGLO 2
#define CP0_REG28__DDATALO 3
#define CP0_REG28__TAGLO 0
#define CP0_REG28__DATALO 1
#define CP0_REG28__TAGLO1 2
#define CP0_REG28__DATALO1 3
#define CP0_REG28__TAGLO2 4
#define CP0_REG28__DATALO2 5
#define CP0_REG28__TAGLO3 6
#define CP0_REG28__DATALO3 7
/* CP0 Register 29 */
#define CP0_REG29__IDATAHI 1
#define CP0_REG29__DDATAHI 3

80
qemu/target/mips/translate.c
View file

@ -6765,10 +6765,10 @@ static void gen_mfhc0(DisasContext *ctx, TCGv arg, int reg, int sel)
break;
case CP0_REGISTER_28:
switch (sel) {
case 0:
case 2:
case 4:
case 6:
case CP0_REG28__TAGLO:
case CP0_REG28__TAGLO1:
case CP0_REG28__TAGLO2:
case CP0_REG28__TAGLO3:
gen_mfhc0_load64(ctx, arg, offsetof(CPUMIPSState, CP0_TagLo), 0);
register_name = "TagLo";
break;
@ -6853,10 +6853,10 @@ static void gen_mthc0(DisasContext *ctx, TCGv arg, int reg, int sel)
break;
case CP0_REGISTER_28:
switch (sel) {
case 0:
case 2:
case 4:
case 6:
case CP0_REG28__TAGLO:
case CP0_REG28__TAGLO1:
case CP0_REG28__TAGLO2:
case CP0_REG28__TAGLO3:
tcg_gen_andi_tl(s, arg, arg, mask);
gen_mthc0_store64(ctx, arg, offsetof(CPUMIPSState, CP0_TagLo));
register_name = "TagLo";
@ -7555,10 +7555,10 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, int reg, int sel)
break;
case CP0_REGISTER_28:
switch (sel) {
case 0:
case 2:
case 4:
case 6:
case CP0_REG28__TAGLO:
case CP0_REG28__TAGLO1:
case CP0_REG28__TAGLO2:
case CP0_REG28__TAGLO3:
{
TCGv_i64 tmp = tcg_temp_new_i64(tcg_ctx);
tcg_gen_ld_i64(tcg_ctx, tmp, tcg_ctx->cpu_env, offsetof(CPUMIPSState, CP0_TagLo));
@ -7567,10 +7567,10 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, int reg, int sel)
}
register_name = "TagLo";
break;
case 1:
case 3:
case 5:
case 7:
case CP0_REG28__DATALO:
case CP0_REG28__DATALO1:
case CP0_REG28__DATALO2:
case CP0_REG28__DATALO3:
gen_mfc0_load32(ctx, arg, offsetof(CPUMIPSState, CP0_DataLo));
register_name = "DataLo";
break;
@ -8311,17 +8311,17 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
break;
case CP0_REGISTER_28:
switch (sel) {
case 0:
case 2:
case 4:
case 6:
case CP0_REG28__TAGLO:
case CP0_REG28__TAGLO1:
case CP0_REG28__TAGLO2:
case CP0_REG28__TAGLO3:
gen_helper_mtc0_taglo(tcg_ctx, tcg_ctx->cpu_env, arg);
register_name = "TagLo";
break;
case 1:
case 3:
case 5:
case 7:
case CP0_REG28__DATALO:
case CP0_REG28__DATALO1:
case CP0_REG28__DATALO2:
case CP0_REG28__DATALO3:
gen_helper_mtc0_datalo(tcg_ctx, tcg_ctx->cpu_env, arg);
register_name = "DataLo";
break;
@ -9035,17 +9035,17 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, int reg, int sel)
break;
case CP0_REGISTER_28:
switch (sel) {
case 0:
case 2:
case 4:
case 6:
case CP0_REG28__TAGLO:
case CP0_REG28__TAGLO1:
case CP0_REG28__TAGLO2:
case CP0_REG28__TAGLO3:
gen_mfc0_load32(ctx, arg, offsetof(CPUMIPSState, CP0_TagLo));
register_name = "TagLo";
break;
case 1:
case 3:
case 5:
case 7:
case CP0_REG28__DATALO:
case CP0_REG28__DATALO1:
case CP0_REG28__DATALO2:
case CP0_REG28__DATALO3:
gen_mfc0_load32(ctx, arg, offsetof(CPUMIPSState, CP0_DataLo));
register_name = "DataLo";
break;
@ -9768,17 +9768,17 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
break;
case CP0_REGISTER_28:
switch (sel) {
case 0:
case 2:
case 4:
case 6:
case CP0_REG28__TAGLO:
case CP0_REG28__TAGLO1:
case CP0_REG28__TAGLO2:
case CP0_REG28__TAGLO3:
gen_helper_mtc0_taglo(tcg_ctx, tcg_ctx->cpu_env, arg);
register_name = "TagLo";
break;
case 1:
case 3:
case 5:
case 7:
case CP0_REG28__DATALO:
case CP0_REG28__DATALO1:
case CP0_REG28__DATALO2:
case CP0_REG28__DATALO3:
gen_helper_mtc0_datalo(tcg_ctx, tcg_ctx->cpu_env, arg);
register_name = "DataLo";
break;