target/mips: Clean up handling of CP0 register 4

Clean up handling of CP0 register 4.

Reviewed-by: Aleksandar Rikalo <arikalo@wavecomp.com>
Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>
Message-Id: <1567009614-12438-6-git-send-email-aleksandar.markovic@rt-rk.com>
This commit is contained in:
Aleksandar Markovic 2019-08-29 11:46:55 +02:00
parent acd3731632
commit 020fe37909
2 changed files with 22 additions and 16 deletions

View file

@ -305,7 +305,9 @@ typedef struct mips_def_t mips_def_t;
#define CP0_REG03__TCOPT 7 #define CP0_REG03__TCOPT 7
/* CP0 Register 04 */ /* CP0 Register 04 */
#define CP0_REG04__CONTEXT 0 #define CP0_REG04__CONTEXT 0
#define CP0_REG04__CONTEXTCONFIG 1
#define CP0_REG04__USERLOCAL 2 #define CP0_REG04__USERLOCAL 2
#define CP0_REG04__XCONTEXTCONFIG 3
#define CP0_REG04__DBGCONTEXTID 4 #define CP0_REG04__DBGCONTEXTID 4
#define CP0_REG00__MMID 5 #define CP0_REG00__MMID 5
/* CP0 Register 05 */ /* CP0 Register 05 */

View file

@ -6975,16 +6975,17 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, int reg, int sel)
break; break;
case CP0_REGISTER_04: case CP0_REGISTER_04:
switch (sel) { switch (sel) {
case 0: case CP0_REG04__CONTEXT:
tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_Context)); tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_Context));
tcg_gen_ext32s_tl(arg, arg); tcg_gen_ext32s_tl(arg, arg);
register_name = "Context"; register_name = "Context";
break; break;
case 1: case CP0_REG04__CONTEXTCONFIG:
/* gen_helper_mfc0_contextconfig(arg); - SmartMIPS ASE */ /* SmartMIPS ASE */
/* gen_helper_mfc0_contextconfig(arg); */
register_name = "ContextConfig"; register_name = "ContextConfig";
goto cp0_unimplemented; goto cp0_unimplemented;
case 2: case CP0_REG04__USERLOCAL:
CP0_CHECK(ctx->ulri); CP0_CHECK(ctx->ulri);
tcg_gen_ld_tl(arg, cpu_env, tcg_gen_ld_tl(arg, cpu_env,
offsetof(CPUMIPSState, active_tc.CP0_UserLocal)); offsetof(CPUMIPSState, active_tc.CP0_UserLocal));
@ -7710,15 +7711,16 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
break; break;
case CP0_REGISTER_04: case CP0_REGISTER_04:
switch (sel) { switch (sel) {
case 0: case CP0_REG04__CONTEXT:
gen_helper_mtc0_context(cpu_env, arg); gen_helper_mtc0_context(cpu_env, arg);
register_name = "Context"; register_name = "Context";
break; break;
case 1: case CP0_REG04__CONTEXTCONFIG:
// gen_helper_mtc0_contextconfig(cpu_env, arg); /* SmartMIPS ASE */ /* SmartMIPS ASE */
/* gen_helper_mtc0_contextconfig(arg); */
register_name = "ContextConfig"; register_name = "ContextConfig";
goto cp0_unimplemented; goto cp0_unimplemented;
case 2: case CP0_REG04__USERLOCAL:
CP0_CHECK(ctx->ulri); CP0_CHECK(ctx->ulri);
tcg_gen_st_tl(arg, cpu_env, tcg_gen_st_tl(arg, cpu_env,
offsetof(CPUMIPSState, active_tc.CP0_UserLocal)); offsetof(CPUMIPSState, active_tc.CP0_UserLocal));
@ -8455,15 +8457,16 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, int reg, int sel)
break; break;
case CP0_REGISTER_04: case CP0_REGISTER_04:
switch (sel) { switch (sel) {
case 0: case CP0_REG04__CONTEXT:
tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_Context)); tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_Context));
register_name = "Context"; register_name = "Context";
break; break;
case 1: case CP0_REG04__CONTEXTCONFIG:
// gen_helper_dmfc0_contextconfig(arg); /* SmartMIPS ASE */ /* SmartMIPS ASE */
/* gen_helper_dmfc0_contextconfig(arg); */
register_name = "ContextConfig"; register_name = "ContextConfig";
goto cp0_unimplemented; goto cp0_unimplemented;
case 2: case CP0_REG04__USERLOCAL:
CP0_CHECK(ctx->ulri); CP0_CHECK(ctx->ulri);
tcg_gen_ld_tl(arg, cpu_env, tcg_gen_ld_tl(arg, cpu_env,
offsetof(CPUMIPSState, active_tc.CP0_UserLocal)); offsetof(CPUMIPSState, active_tc.CP0_UserLocal));
@ -9168,15 +9171,16 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, int reg, int sel)
break; break;
case CP0_REGISTER_04: case CP0_REGISTER_04:
switch (sel) { switch (sel) {
case 0: case CP0_REG04__CONTEXT:
gen_helper_mtc0_context(cpu_env, arg); gen_helper_mtc0_context(cpu_env, arg);
register_name = "Context"; register_name = "Context";
break; break;
case 1: case CP0_REG04__CONTEXTCONFIG:
// gen_helper_mtc0_contextconfig(cpu_env, arg); /* SmartMIPS ASE */ /* SmartMIPS ASE */
/* gen_helper_dmtc0_contextconfig(arg); */
register_name = "ContextConfig"; register_name = "ContextConfig";
goto cp0_unimplemented; goto cp0_unimplemented;
case 2: case CP0_REG04__USERLOCAL:
CP0_CHECK(ctx->ulri); CP0_CHECK(ctx->ulri);
tcg_gen_st_tl(arg, cpu_env, tcg_gen_st_tl(arg, cpu_env,
offsetof(CPUMIPSState, active_tc.CP0_UserLocal)); offsetof(CPUMIPSState, active_tc.CP0_UserLocal));