[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 5/5] hw/mips/malta: Rewrite CP0_MVPConf0 access using deposit()
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 5/5] hw/mips/malta: Rewrite CP0_MVPConf0 access using deposit() |
Date: |
Fri, 4 Dec 2020 23:26:22 +0100 |
PTC field has 8 bits, PVPE has 4. We plan to use the
"hw/registerfields.h" API with MIPS CPU definitions
(target/mips/cpu.h). Meanwhile we use magic 8 and 4.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
We want to move that to mips_cpu_reset() later,
because this is not Malta specific but cpu-specific.
However SMP 'cpus' come from MachineState ("hw/boards.h").
So meanwhile this is early review.
---
hw/mips/malta.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/hw/mips/malta.c b/hw/mips/malta.c
index 350b92b4d79..c35fbf97272 100644
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
@@ -24,6 +24,7 @@
#include "qemu/osdep.h"
#include "qemu/units.h"
+#include "qemu/bitops.h"
#include "qemu-common.h"
#include "cpu.h"
#include "hw/clock.h"
@@ -1135,8 +1136,11 @@ static void malta_mips_config(MIPSCPU *cpu)
CPUState *cs = CPU(cpu);
if (ase_mt_available(env)) {
- env->mvp->CP0_MVPConf0 |= ((smp_cpus - 1) << CP0MVPC0_PVPE) |
- ((smp_cpus * cs->nr_threads - 1) << CP0MVPC0_PTC);
+ env->mvp->CP0_MVPConf0 = deposit32(env->mvp->CP0_MVPConf0,
+ CP0MVPC0_PTC, 8,
+ smp_cpus * cs->nr_threads - 1);
+ env->mvp->CP0_MVPConf0 = deposit32(env->mvp->CP0_MVPConf0,
+ CP0MVPC0_PVPE, 4, smp_cpus - 1);
}
}
--
2.26.2
- [PATCH 0/5] mips: Sanitize Multi-Threading ASE, Philippe Mathieu-Daudé, 2020/12/04
- [PATCH 1/5] target/mips: Remove mips_def_t unused argument from mvp_init(), Philippe Mathieu-Daudé, 2020/12/04
- [PATCH 2/5] target/mips: Introduce ase_mt_available() helper, Philippe Mathieu-Daudé, 2020/12/04
- [PATCH 3/5] target/mips: Do not initialize MT registers if MT ASE absent, Philippe Mathieu-Daudé, 2020/12/04
- [PATCH 5/5] hw/mips/malta: Rewrite CP0_MVPConf0 access using deposit(),
Philippe Mathieu-Daudé <=
- [PATCH 4/5] hw/mips/malta: Do not initialize MT registers if MT ASE absent, Philippe Mathieu-Daudé, 2020/12/04
- Re: [PATCH 0/5] mips: Sanitize Multi-Threading ASE, Philippe Mathieu-Daudé, 2020/12/07