mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-15 15:32:51 +00:00
target/arm: Generalize cpu_arm_{get,set}_vq
Rename from cpu_arm_{get,set}_sve_vq, and take the ARMVQMap as the opaque parameter. Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20220620175235.60881-14-richard.henderson@linaro.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
7f9e25a6e4
commit
0f40784eac
|
@ -579,15 +579,15 @@ static void cpu_max_set_sve_max_vq(Object *obj, Visitor *v, const char *name,
|
|||
}
|
||||
|
||||
/*
|
||||
* Note that cpu_arm_get/set_sve_vq cannot use the simpler
|
||||
* object_property_add_bool interface because they make use
|
||||
* of the contents of "name" to determine which bit on which
|
||||
* to operate.
|
||||
* Note that cpu_arm_{get,set}_vq cannot use the simpler
|
||||
* object_property_add_bool interface because they make use of the
|
||||
* contents of "name" to determine which bit on which to operate.
|
||||
*/
|
||||
static void cpu_arm_get_sve_vq(Object *obj, Visitor *v, const char *name,
|
||||
void *opaque, Error **errp)
|
||||
static void cpu_arm_get_vq(Object *obj, Visitor *v, const char *name,
|
||||
void *opaque, Error **errp)
|
||||
{
|
||||
ARMCPU *cpu = ARM_CPU(obj);
|
||||
ARMVQMap *vq_map = opaque;
|
||||
uint32_t vq = atoi(&name[3]) / 128;
|
||||
bool value;
|
||||
|
||||
|
@ -595,15 +595,15 @@ static void cpu_arm_get_sve_vq(Object *obj, Visitor *v, const char *name,
|
|||
if (!cpu_isar_feature(aa64_sve, cpu)) {
|
||||
value = false;
|
||||
} else {
|
||||
value = extract32(cpu->sve_vq.map, vq - 1, 1);
|
||||
value = extract32(vq_map->map, vq - 1, 1);
|
||||
}
|
||||
visit_type_bool(v, name, &value, errp);
|
||||
}
|
||||
|
||||
static void cpu_arm_set_sve_vq(Object *obj, Visitor *v, const char *name,
|
||||
void *opaque, Error **errp)
|
||||
static void cpu_arm_set_vq(Object *obj, Visitor *v, const char *name,
|
||||
void *opaque, Error **errp)
|
||||
{
|
||||
ARMCPU *cpu = ARM_CPU(obj);
|
||||
ARMVQMap *vq_map = opaque;
|
||||
uint32_t vq = atoi(&name[3]) / 128;
|
||||
bool value;
|
||||
|
||||
|
@ -611,8 +611,8 @@ static void cpu_arm_set_sve_vq(Object *obj, Visitor *v, const char *name,
|
|||
return;
|
||||
}
|
||||
|
||||
cpu->sve_vq.map = deposit32(cpu->sve_vq.map, vq - 1, 1, value);
|
||||
cpu->sve_vq.init |= 1 << (vq - 1);
|
||||
vq_map->map = deposit32(vq_map->map, vq - 1, 1, value);
|
||||
vq_map->init |= 1 << (vq - 1);
|
||||
}
|
||||
|
||||
static bool cpu_arm_get_sve(Object *obj, Error **errp)
|
||||
|
@ -691,6 +691,7 @@ static void cpu_arm_get_sve_default_vec_len(Object *obj, Visitor *v,
|
|||
|
||||
void aarch64_add_sve_properties(Object *obj)
|
||||
{
|
||||
ARMCPU *cpu = ARM_CPU(obj);
|
||||
uint32_t vq;
|
||||
|
||||
object_property_add_bool(obj, "sve", cpu_arm_get_sve, cpu_arm_set_sve);
|
||||
|
@ -698,8 +699,8 @@ void aarch64_add_sve_properties(Object *obj)
|
|||
for (vq = 1; vq <= ARM_MAX_VQ; ++vq) {
|
||||
char name[8];
|
||||
sprintf(name, "sve%d", vq * 128);
|
||||
object_property_add(obj, name, "bool", cpu_arm_get_sve_vq,
|
||||
cpu_arm_set_sve_vq, NULL, NULL);
|
||||
object_property_add(obj, name, "bool", cpu_arm_get_vq,
|
||||
cpu_arm_set_vq, NULL, &cpu->sve_vq);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_USER_ONLY
|
||||
|
|
Loading…
Reference in a new issue