| Message ID | 1547830785-7079-13-git-send-email-aleksandar.markovic@rt-rk.com |
|---|---|
| State | New |
| Headers | show |
| Series | [PULL,v2,01/12] target/mips: Move comment containing summary of CP0 registers | expand |
Hi Fredrik and Aleksandar, On Fri, Jan 18, 2019 at 6:10 PM Aleksandar Markovic <aleksandar.markovic@rt-rk.com> wrote: > > From: Fredrik Noring <noring@nocrew.org> > > The 32 R5900 128-bit registers are split into two 64-bit halves: > the lower halves are the GPRs and the upper halves are accessible > by the R5900-specific multimedia instructions. > > Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com> > Signed-off-by: Fredrik Noring <noring@nocrew.org> > Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com> > --- > target/mips/cpu.h | 3 +++ > target/mips/translate.c | 16 ++++++++++++++++ > 2 files changed, 19 insertions(+) > > diff --git a/target/mips/cpu.h b/target/mips/cpu.h > index 21daf50..c4da7df 100644 > --- a/target/mips/cpu.h > +++ b/target/mips/cpu.h > @@ -429,6 +429,9 @@ struct TCState { > > float_status msa_fp_status; > > + /* Upper 64-bit MMRs (multimedia registers); the lower 64-bit are GPRs */ > + uint64_t mmr[32]; FYI using MMI then migrating fails because these registers are not migrated. > + > #define NUMBER_OF_MXU_REGISTERS 16 > target_ulong mxu_gpr[NUMBER_OF_MXU_REGISTERS - 1]; > target_ulong mxu_cr; ...
On Sat, Nov 14, 2020 at 07:23:10PM +0100, Philippe Mathieu-Daudé wrote: > Hi Fredrik and Aleksandar, > > On Fri, Jan 18, 2019 at 6:10 PM Aleksandar Markovic > <aleksandar.markovic@rt-rk.com> wrote: > > > > From: Fredrik Noring <noring@nocrew.org> > > > > The 32 R5900 128-bit registers are split into two 64-bit halves: > > the lower halves are the GPRs and the upper halves are accessible > > by the R5900-specific multimedia instructions. > > > > Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com> > > Signed-off-by: Fredrik Noring <noring@nocrew.org> > > Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com> > > --- > > target/mips/cpu.h | 3 +++ > > target/mips/translate.c | 16 ++++++++++++++++ > > 2 files changed, 19 insertions(+) > > > > diff --git a/target/mips/cpu.h b/target/mips/cpu.h > > index 21daf50..c4da7df 100644 > > --- a/target/mips/cpu.h > > +++ b/target/mips/cpu.h > > @@ -429,6 +429,9 @@ struct TCState { > > > > float_status msa_fp_status; > > > > + /* Upper 64-bit MMRs (multimedia registers); the lower 64-bit are GPRs */ > > + uint64_t mmr[32]; > > FYI using MMI then migrating fails because these registers are not migrated. We can postpone the R5900 MMIs, in my opinion, because they are not (yet) supported by modern 5.x R5900 Linux kernels anyway. The details of R5900 psABIs having them need to be sorted out too. Fredrik
diff --git a/target/mips/cpu.h b/target/mips/cpu.h index 21daf50..c4da7df 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -429,6 +429,9 @@ struct TCState { float_status msa_fp_status; + /* Upper 64-bit MMRs (multimedia registers); the lower 64-bit are GPRs */ + uint64_t mmr[32]; + #define NUMBER_OF_MXU_REGISTERS 16 target_ulong mxu_gpr[NUMBER_OF_MXU_REGISTERS - 1]; target_ulong mxu_cr; diff --git a/target/mips/translate.c b/target/mips/translate.c index 3ac0b1f..ab307c4 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -2455,6 +2455,11 @@ static TCGv_i32 fpu_fcr0, fpu_fcr31; static TCGv_i64 fpu_f64[32]; static TCGv_i64 msa_wr_d[64]; +#if defined(TARGET_MIPS64) +/* Upper halves of R5900's 128-bit registers: MMRs (multimedia registers) */ +static TCGv_i64 cpu_mmr[32]; +#endif + #if !defined(TARGET_MIPS64) /* MXU registers */ static TCGv mxu_gpr[NUMBER_OF_MXU_REGISTERS - 1]; @@ -29845,6 +29850,17 @@ void mips_tcg_init(void) fpu_fcr31 = tcg_global_mem_new_i32(cpu_env, offsetof(CPUMIPSState, active_fpu.fcr31), "fcr31"); + +#if defined(TARGET_MIPS64) + cpu_mmr[0] = NULL; + for (i = 1; i < 32; i++) { + cpu_mmr[i] = tcg_global_mem_new_i64(cpu_env, + offsetof(CPUMIPSState, + active_tc.mmr[i]), + regnames[i]); + } +#endif + #if !defined(TARGET_MIPS64) for (i = 0; i < NUMBER_OF_MXU_REGISTERS - 1; i++) { mxu_gpr[i] = tcg_global_mem_new(cpu_env,