On Fri, Oct 12, 2018 at 6:49 PM Aleksandar Markovic
<aleksandar.marko...@rt-rk.com> wrote:
>
> From: Yongbok Kim <yongbok....@mips.com>
>
> Add PWSize register (CP0 Register 5, Select 7).
>
> The PWSize register configures hardware page table walking for TLB
> refills.
>
> This register is required for the hardware page walker feature. It
> exists only if Config3 PW bit is set to 1. It contains following
> fields:
>
> GDW (29..24) Global Directory index width
> UDW (23..18) Upper Directory index width
> MDW (17..12) Middle Directory index width
> PTW (11..6 ) Page Table index width
> PTEW ( 5..0 ) Left shift applied to the Page Table index
>
> Reviewed-by: Aleksandar Markovic <amarko...@wavecomp.com>
> Signed-off-by: Yongbok Kim <yongbok....@mips.com>
> Signed-off-by: Aleksandar Markovic <amarko...@wavecomp.com>
> ---
> target/mips/cpu.h | 7 +++++++
> target/mips/helper.h | 1 +
> target/mips/machine.c | 5 +++--
> target/mips/op_helper.c | 9 +++++++++
> target/mips/translate.c | 20 ++++++++++++++++++++
> 5 files changed, 40 insertions(+), 2 deletions(-)
>
> diff --git a/target/mips/cpu.h b/target/mips/cpu.h
> index 01cd65c..a6abd1f 100644
> --- a/target/mips/cpu.h
> +++ b/target/mips/cpu.h
> @@ -296,6 +296,13 @@ struct CPUMIPSState {
> #define CP0PF_MDI 12 /* 17..12 */
> #define CP0PF_PTI 6 /* 11..6 */
> #define CP0PF_PTEI 0 /* 5..0 */
> + target_ulong CP0_PWSize;
> +#define CP0PS_PS 30
> +#define CP0PS_GDW 24 /* 29..24 */
> +#define CP0PS_UDW 18 /* 23..18 */
> +#define CP0PS_MDW 12 /* 17..12 */
> +#define CP0PS_PTW 6 /* 11..6 */
> +#define CP0PS_PTEW 0 /* 5..0 */
> int32_t CP0_Wired;
> int32_t CP0_SRSConf0_rw_bitmask;
> int32_t CP0_SRSConf0;
> diff --git a/target/mips/helper.h b/target/mips/helper.h
> index 6366f9b..169890a 100644
> --- a/target/mips/helper.h
> +++ b/target/mips/helper.h
> @@ -121,6 +121,7 @@ DEF_HELPER_2(mtc0_segctl0, void, env, tl)
> DEF_HELPER_2(mtc0_segctl1, void, env, tl)
> DEF_HELPER_2(mtc0_segctl2, void, env, tl)
> DEF_HELPER_2(mtc0_pwfield, void, env, tl)
> +DEF_HELPER_2(mtc0_pwsize, void, env, tl)
> DEF_HELPER_2(mtc0_wired, void, env, tl)
> DEF_HELPER_2(mtc0_srsconf0, void, env, tl)
> DEF_HELPER_2(mtc0_srsconf1, void, env, tl)
> diff --git a/target/mips/machine.c b/target/mips/machine.c
> index 7aa496c..3da891f 100644
> --- a/target/mips/machine.c
> +++ b/target/mips/machine.c
> @@ -212,8 +212,8 @@ const VMStateDescription vmstate_tlb = {
>
> const VMStateDescription vmstate_mips_cpu = {
> .name = "cpu",
> - .version_id = 13,
> - .minimum_version_id = 13,
> + .version_id = 14,
> + .minimum_version_id = 14,
> .post_load = cpu_post_load,
> .fields = (VMStateField[]) {
> /* Active TC */
> @@ -258,6 +258,7 @@ const VMStateDescription vmstate_mips_cpu = {
> VMSTATE_UINTTL(env.CP0_SegCtl2, MIPSCPU),
> VMSTATE_UINTTL(env.CP0_PWBase, MIPSCPU),
> VMSTATE_UINTTL(env.CP0_PWField, MIPSCPU),
> + VMSTATE_UINTTL(env.CP0_PWSize, MIPSCPU),
> VMSTATE_INT32(env.CP0_Wired, MIPSCPU),
> VMSTATE_INT32(env.CP0_SRSConf0, MIPSCPU),
> VMSTATE_INT32(env.CP0_SRSConf1, MIPSCPU),
> diff --git a/target/mips/op_helper.c b/target/mips/op_helper.c
> index bc506de..0986baf 100644
> --- a/target/mips/op_helper.c
> +++ b/target/mips/op_helper.c
> @@ -1479,6 +1479,15 @@ void helper_mtc0_pwfield(CPUMIPSState *env,
> target_ulong arg1)
> #endif
> }
>
> +void helper_mtc0_pwsize(CPUMIPSState *env, target_ulong arg1)
> +{
> +#ifdef TARGET_MIPS64
> + env->CP0_PWSize = arg1 & 0x3F7FFFFFFFULL;
> +#else
> + env->CP0_PWSize = arg1 & 0x3FFFFFFF;
> +#endif
> +}
> +
> void helper_mtc0_wired(CPUMIPSState *env, target_ulong arg1)
> {
> if (env->insn_flags & ISA_MIPS32R6) {
> diff --git a/target/mips/translate.c b/target/mips/translate.c
> index 882a765..ef38be9 100644
> --- a/target/mips/translate.c
> +++ b/target/mips/translate.c
> @@ -5558,6 +5558,11 @@ static void gen_mfc0(DisasContext *ctx, TCGv arg, int
> reg, int sel)
> gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_PWField));
> rn = "PWField";
> break;
> + case 7:
> + check_pw(ctx);
> + gen_mfc0_load32(arg, offsetof(CPUMIPSState, CP0_PWSize));
> + rn = "PWSize";
> + break;
> default:
> goto cp0_unimplemented;
> }
> @@ -6269,6 +6274,11 @@ static void gen_mtc0(DisasContext *ctx, TCGv arg, int
> reg, int sel)
> gen_helper_mtc0_pwfield(cpu_env, arg);
> rn = "PWField";
> break;
> + case 7:
> + check_pw(ctx);
> + gen_helper_mtc0_pwsize(cpu_env, arg);
> + rn = "PWSize";
> + break;
> default:
> goto cp0_unimplemented;
> }
> @@ -6989,6 +6999,11 @@ static void gen_dmfc0(DisasContext *ctx, TCGv arg, int
> reg, int sel)
> tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_PWField));
> rn = "PWField";
> break;
> + case 7:
> + check_pw(ctx);
> + tcg_gen_ld_tl(arg, cpu_env, offsetof(CPUMIPSState, CP0_PWSize));
gen_mfc0_load64()?
> + rn = "PWSize";
> + break;
> default:
> goto cp0_unimplemented;
> }
> @@ -7682,6 +7697,11 @@ static void gen_dmtc0(DisasContext *ctx, TCGv arg, int
> reg, int sel)
> gen_helper_mtc0_pwfield(cpu_env, arg);
> rn = "PWField";
> break;
> + case 7:
> + check_pw(ctx);
> + gen_helper_mtc0_pwsize(cpu_env, arg);
> + rn = "PWSize";
> + break;
> default:
> goto cp0_unimplemented;
> }
> --
> 2.7.4
>
>
