ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s390x: Move clear reset 

Let's also move the clear reset function into the reset handler.

Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Message-Id: <20191127175046.4911-5-frankja@linux.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
Janosch Frank 2019-11-27 12:50:44 -05:00 committed by Cornelia Huck
parent 81b9222358
commit eb8adcc3e9
2 changed files with 18 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target/s390x/cpu-qom.h
View File

@ -37,6 +37,7 @@ typedef struct S390CPUDef S390CPUDef;
typedef enum cpu_reset_type { typedef enum cpu_reset_type {
S390_CPU_RESET_NORMAL, S390_CPU_RESET_NORMAL,
S390_CPU_RESET_INITIAL, S390_CPU_RESET_INITIAL,
S390_CPU_RESET_CLEAR,
} cpu_reset_type; } cpu_reset_type;
/** /**

58
target/s390x/cpu.c
View File

@ -94,6 +94,9 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type)
s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu); s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu);
switch (type) { switch (type) {
case S390_CPU_RESET_CLEAR:
memset(env, 0, offsetof(CPUS390XState, start_initial_reset_fields));
/* fall through */
case S390_CPU_RESET_INITIAL: case S390_CPU_RESET_INITIAL:
/* initial reset does not clear everything! */ /* initial reset does not clear everything! */
memset(&env->start_initial_reset_fields, 0, memset(&env->start_initial_reset_fields, 0,
@ -107,6 +110,14 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type)
env->cregs[0] = CR0_RESET; env->cregs[0] = CR0_RESET;
env->cregs[14] = CR14_RESET; env->cregs[14] = CR14_RESET;
#if defined(CONFIG_USER_ONLY)
/* user mode should always be allowed to use the full FPU */
env->cregs[0] |= CR0_AFP;
if (s390_has_feat(S390_FEAT_VECTOR)) {
env->cregs[0] |= CR0_VECTOR;
}
#endif
/* tininess for underflow is detected before rounding */ /* tininess for underflow is detected before rounding */
set_float_detect_tininess(float_tininess_before_rounding, set_float_detect_tininess(float_tininess_before_rounding,
&env->fpu_status); &env->fpu_status);
@ -125,46 +136,6 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type)
} }
} }
/* CPUClass:reset() */
static void s390_cpu_full_reset(CPUState *s)
{
S390CPU *cpu = S390_CPU(s);
S390CPUClass *scc = S390_CPU_GET_CLASS(cpu);
CPUS390XState *env = &cpu->env;
scc->parent_reset(s);
cpu->env.sigp_order = 0;
s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu);
memset(env, 0, offsetof(CPUS390XState, end_reset_fields));
/* architectured initial values for CR 0 and 14 */
env->cregs[0] = CR0_RESET;
env->cregs[14] = CR14_RESET;
#if defined(CONFIG_USER_ONLY)
/* user mode should always be allowed to use the full FPU */
env->cregs[0] |= CR0_AFP;
if (s390_has_feat(S390_FEAT_VECTOR)) {
env->cregs[0] |= CR0_VECTOR;
}
#endif
/* architectured initial value for Breaking-Event-Address register */
env->gbea = 1;
env->pfault_token = -1UL;
/* tininess for underflow is detected before rounding */
set_float_detect_tininess(float_tininess_before_rounding,
&env->fpu_status);
/* Reset state inside the kernel that we cannot access yet from QEMU. */
if (kvm_enabled()) {
kvm_s390_reset_vcpu(cpu);
}
}
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
static void s390_cpu_machine_reset_cb(void *opaque) static void s390_cpu_machine_reset_cb(void *opaque)
{ {
@ -456,6 +427,11 @@ static Property s390x_cpu_properties[] = {
DEFINE_PROP_END_OF_LIST() DEFINE_PROP_END_OF_LIST()
}; };
static void s390_cpu_reset_full(CPUState *s)
{
return s390_cpu_reset(s, S390_CPU_RESET_CLEAR);
}
static void s390_cpu_class_init(ObjectClass *oc, void *data) static void s390_cpu_class_init(ObjectClass *oc, void *data)
{ {
S390CPUClass *scc = S390_CPU_CLASS(oc); S390CPUClass *scc = S390_CPU_CLASS(oc);
@ -472,7 +448,7 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data)
scc->load_normal = s390_cpu_load_normal; scc->load_normal = s390_cpu_load_normal;
#endif #endif
scc->reset = s390_cpu_reset; scc->reset = s390_cpu_reset;
cc->reset = s390_cpu_full_reset; cc->reset = s390_cpu_reset_full;
cc->class_by_name = s390_cpu_class_by_name, cc->class_by_name = s390_cpu_class_by_name,
cc->has_work = s390_cpu_has_work; cc->has_work = s390_cpu_has_work;
#ifdef CONFIG_TCG #ifdef CONFIG_TCG