mirror of https://github.com/xemu-project/xemu.git
Merge branch 's390-for-upstream' of git://repo.or.cz/qemu/agraf
* 's390-for-upstream' of git://repo.or.cz/qemu/agraf: target-s390x: Update s390x_{tod,cpu}_timer() to use S390CPU target-s390x: QOM'ify CPU init target-s390x: QOM'ify CPU reset target-s390x: QOM'ify CPU
This commit is contained in:
commit
8f8d364f24
|
@ -93,6 +93,7 @@ libobj-$(TARGET_SPARC64) += vis_helper.o
|
||||||
libobj-$(CONFIG_NEED_MMU) += mmu.o
|
libobj-$(CONFIG_NEED_MMU) += mmu.o
|
||||||
libobj-$(TARGET_ARM) += neon_helper.o iwmmxt_helper.o
|
libobj-$(TARGET_ARM) += neon_helper.o iwmmxt_helper.o
|
||||||
libobj-$(TARGET_ARM) += cpu.o
|
libobj-$(TARGET_ARM) += cpu.o
|
||||||
|
libobj-$(TARGET_S390X) += cpu.o
|
||||||
ifeq ($(TARGET_BASE_ARCH), sparc)
|
ifeq ($(TARGET_BASE_ARCH), sparc)
|
||||||
libobj-y += fop_helper.o cc_helper.o win_helper.o mmu_helper.o ldst_helper.o
|
libobj-y += fop_helper.o cc_helper.o win_helper.o mmu_helper.o ldst_helper.o
|
||||||
libobj-y += cpu_init.o
|
libobj-y += cpu_init.o
|
||||||
|
|
|
@ -0,0 +1,71 @@
|
||||||
|
/*
|
||||||
|
* QEMU S/390 CPU
|
||||||
|
*
|
||||||
|
* Copyright (c) 2012 SUSE LINUX Products GmbH
|
||||||
|
*
|
||||||
|
* This library is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
|
* License as published by the Free Software Foundation; either
|
||||||
|
* version 2.1 of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This library is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
|
* License along with this library; if not, see
|
||||||
|
* <http://www.gnu.org/licenses/lgpl-2.1.html>
|
||||||
|
*/
|
||||||
|
#ifndef QEMU_S390_CPU_QOM_H
|
||||||
|
#define QEMU_S390_CPU_QOM_H
|
||||||
|
|
||||||
|
#include "qemu/cpu.h"
|
||||||
|
#include "cpu.h"
|
||||||
|
|
||||||
|
#define TYPE_S390_CPU "s390-cpu"
|
||||||
|
|
||||||
|
#define S390_CPU_CLASS(klass) \
|
||||||
|
OBJECT_CLASS_CHECK(S390CPUClass, (klass), TYPE_S390_CPU)
|
||||||
|
#define S390_CPU(obj) \
|
||||||
|
OBJECT_CHECK(S390CPU, (obj), TYPE_S390_CPU)
|
||||||
|
#define S390_CPU_GET_CLASS(obj) \
|
||||||
|
OBJECT_GET_CLASS(S390CPUClass, (obj), TYPE_S390_CPU)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* S390CPUClass:
|
||||||
|
* @parent_reset: The parent class' reset handler.
|
||||||
|
*
|
||||||
|
* An S/390 CPU model.
|
||||||
|
*/
|
||||||
|
typedef struct S390CPUClass {
|
||||||
|
/*< private >*/
|
||||||
|
CPUClass parent_class;
|
||||||
|
/*< public >*/
|
||||||
|
|
||||||
|
void (*parent_reset)(CPUState *cpu);
|
||||||
|
} S390CPUClass;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* S390CPU:
|
||||||
|
* @env: #CPUS390XState.
|
||||||
|
*
|
||||||
|
* An S/390 CPU.
|
||||||
|
*/
|
||||||
|
typedef struct S390CPU {
|
||||||
|
/*< private >*/
|
||||||
|
CPUState parent_obj;
|
||||||
|
/*< public >*/
|
||||||
|
|
||||||
|
CPUS390XState env;
|
||||||
|
} S390CPU;
|
||||||
|
|
||||||
|
static inline S390CPU *s390_env_get_cpu(CPUS390XState *env)
|
||||||
|
{
|
||||||
|
return S390_CPU(container_of(env, S390CPU, env));
|
||||||
|
}
|
||||||
|
|
||||||
|
#define ENV_GET_CPU(e) CPU(s390_env_get_cpu(e))
|
||||||
|
|
||||||
|
|
||||||
|
#endif
|
|
@ -0,0 +1,96 @@
|
||||||
|
/*
|
||||||
|
* QEMU S/390 CPU
|
||||||
|
*
|
||||||
|
* Copyright (c) 2009 Ulrich Hecht
|
||||||
|
* Copyright (c) 2011 Alexander Graf
|
||||||
|
* Copyright (c) 2012 SUSE LINUX Products GmbH
|
||||||
|
*
|
||||||
|
* This library is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
|
* License as published by the Free Software Foundation; either
|
||||||
|
* version 2.1 of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This library is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
|
* License along with this library; if not, see
|
||||||
|
* <http://www.gnu.org/licenses/lgpl-2.1.html>
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "cpu-qom.h"
|
||||||
|
#include "qemu-common.h"
|
||||||
|
#include "qemu-timer.h"
|
||||||
|
|
||||||
|
|
||||||
|
/* CPUClass::reset() */
|
||||||
|
static void s390_cpu_reset(CPUState *s)
|
||||||
|
{
|
||||||
|
S390CPU *cpu = S390_CPU(s);
|
||||||
|
S390CPUClass *scc = S390_CPU_GET_CLASS(cpu);
|
||||||
|
CPUS390XState *env = &cpu->env;
|
||||||
|
|
||||||
|
if (qemu_loglevel_mask(CPU_LOG_RESET)) {
|
||||||
|
qemu_log("CPU Reset (CPU %d)\n", env->cpu_index);
|
||||||
|
log_cpu_state(env, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
scc->parent_reset(s);
|
||||||
|
|
||||||
|
memset(env, 0, offsetof(CPUS390XState, breakpoints));
|
||||||
|
/* FIXME: reset vector? */
|
||||||
|
tlb_flush(env, 1);
|
||||||
|
s390_add_running_cpu(env);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void s390_cpu_initfn(Object *obj)
|
||||||
|
{
|
||||||
|
S390CPU *cpu = S390_CPU(obj);
|
||||||
|
CPUS390XState *env = &cpu->env;
|
||||||
|
static int cpu_num = 0;
|
||||||
|
#if !defined(CONFIG_USER_ONLY)
|
||||||
|
struct tm tm;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
cpu_exec_init(env);
|
||||||
|
#if !defined(CONFIG_USER_ONLY)
|
||||||
|
qemu_get_timedate(&tm, 0);
|
||||||
|
env->tod_offset = TOD_UNIX_EPOCH +
|
||||||
|
(time2tod(mktimegm(&tm)) * 1000000000ULL);
|
||||||
|
env->tod_basetime = 0;
|
||||||
|
env->tod_timer = qemu_new_timer_ns(vm_clock, s390x_tod_timer, cpu);
|
||||||
|
env->cpu_timer = qemu_new_timer_ns(vm_clock, s390x_cpu_timer, cpu);
|
||||||
|
#endif
|
||||||
|
env->cpu_num = cpu_num++;
|
||||||
|
env->ext_index = -1;
|
||||||
|
|
||||||
|
cpu_reset(CPU(cpu));
|
||||||
|
}
|
||||||
|
|
||||||
|
static void s390_cpu_class_init(ObjectClass *oc, void *data)
|
||||||
|
{
|
||||||
|
S390CPUClass *scc = S390_CPU_CLASS(oc);
|
||||||
|
CPUClass *cc = CPU_CLASS(scc);
|
||||||
|
|
||||||
|
scc->parent_reset = cc->reset;
|
||||||
|
cc->reset = s390_cpu_reset;
|
||||||
|
}
|
||||||
|
|
||||||
|
static const TypeInfo s390_cpu_type_info = {
|
||||||
|
.name = TYPE_S390_CPU,
|
||||||
|
.parent = TYPE_CPU,
|
||||||
|
.instance_size = sizeof(S390CPU),
|
||||||
|
.instance_init = s390_cpu_initfn,
|
||||||
|
.abstract = false,
|
||||||
|
.class_size = sizeof(S390CPUClass),
|
||||||
|
.class_init = s390_cpu_class_init,
|
||||||
|
};
|
||||||
|
|
||||||
|
static void s390_cpu_register_types(void)
|
||||||
|
{
|
||||||
|
type_register_static(&s390_cpu_type_info);
|
||||||
|
}
|
||||||
|
|
||||||
|
type_init(s390_cpu_register_types)
|
|
@ -288,6 +288,9 @@ int cpu_s390x_handle_mmu_fault (CPUS390XState *env, target_ulong address, int rw
|
||||||
|
|
||||||
|
|
||||||
#ifndef CONFIG_USER_ONLY
|
#ifndef CONFIG_USER_ONLY
|
||||||
|
void s390x_tod_timer(void *opaque);
|
||||||
|
void s390x_cpu_timer(void *opaque);
|
||||||
|
|
||||||
int s390_virtio_hypercall(CPUS390XState *env, uint64_t mem, uint64_t hypercall);
|
int s390_virtio_hypercall(CPUS390XState *env, uint64_t mem, uint64_t hypercall);
|
||||||
|
|
||||||
#ifdef CONFIG_KVM
|
#ifdef CONFIG_KVM
|
||||||
|
@ -991,4 +994,6 @@ static inline void cpu_pc_from_tb(CPUS390XState *env, TranslationBlock* tb)
|
||||||
env->psw.addr = tb->pc;
|
env->psw.addr = tb->pc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#include "cpu-qom.h"
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -51,17 +51,19 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef CONFIG_USER_ONLY
|
#ifndef CONFIG_USER_ONLY
|
||||||
static void s390x_tod_timer(void *opaque)
|
void s390x_tod_timer(void *opaque)
|
||||||
{
|
{
|
||||||
CPUS390XState *env = opaque;
|
S390CPU *cpu = opaque;
|
||||||
|
CPUS390XState *env = &cpu->env;
|
||||||
|
|
||||||
env->pending_int |= INTERRUPT_TOD;
|
env->pending_int |= INTERRUPT_TOD;
|
||||||
cpu_interrupt(env, CPU_INTERRUPT_HARD);
|
cpu_interrupt(env, CPU_INTERRUPT_HARD);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void s390x_cpu_timer(void *opaque)
|
void s390x_cpu_timer(void *opaque)
|
||||||
{
|
{
|
||||||
CPUS390XState *env = opaque;
|
S390CPU *cpu = opaque;
|
||||||
|
CPUS390XState *env = &cpu->env;
|
||||||
|
|
||||||
env->pending_int |= INTERRUPT_CPUTIMER;
|
env->pending_int |= INTERRUPT_CPUTIMER;
|
||||||
cpu_interrupt(env, CPU_INTERRUPT_HARD);
|
cpu_interrupt(env, CPU_INTERRUPT_HARD);
|
||||||
|
@ -70,32 +72,19 @@ static void s390x_cpu_timer(void *opaque)
|
||||||
|
|
||||||
CPUS390XState *cpu_s390x_init(const char *cpu_model)
|
CPUS390XState *cpu_s390x_init(const char *cpu_model)
|
||||||
{
|
{
|
||||||
|
S390CPU *cpu;
|
||||||
CPUS390XState *env;
|
CPUS390XState *env;
|
||||||
#if !defined (CONFIG_USER_ONLY)
|
|
||||||
struct tm tm;
|
|
||||||
#endif
|
|
||||||
static int inited = 0;
|
static int inited = 0;
|
||||||
static int cpu_num = 0;
|
|
||||||
|
|
||||||
env = g_malloc0(sizeof(CPUS390XState));
|
cpu = S390_CPU(object_new(TYPE_S390_CPU));
|
||||||
cpu_exec_init(env);
|
env = &cpu->env;
|
||||||
|
|
||||||
if (tcg_enabled() && !inited) {
|
if (tcg_enabled() && !inited) {
|
||||||
inited = 1;
|
inited = 1;
|
||||||
s390x_translate_init();
|
s390x_translate_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !defined(CONFIG_USER_ONLY)
|
|
||||||
qemu_get_timedate(&tm, 0);
|
|
||||||
env->tod_offset = TOD_UNIX_EPOCH +
|
|
||||||
(time2tod(mktimegm(&tm)) * 1000000000ULL);
|
|
||||||
env->tod_basetime = 0;
|
|
||||||
env->tod_timer = qemu_new_timer_ns(vm_clock, s390x_tod_timer, env);
|
|
||||||
env->cpu_timer = qemu_new_timer_ns(vm_clock, s390x_cpu_timer, env);
|
|
||||||
#endif
|
|
||||||
env->cpu_model_str = cpu_model;
|
env->cpu_model_str = cpu_model;
|
||||||
env->cpu_num = cpu_num++;
|
|
||||||
env->ext_index = -1;
|
|
||||||
cpu_state_reset(env);
|
|
||||||
qemu_init_vcpu(env);
|
qemu_init_vcpu(env);
|
||||||
return env;
|
return env;
|
||||||
}
|
}
|
||||||
|
@ -121,15 +110,7 @@ int cpu_s390x_handle_mmu_fault (CPUS390XState *env, target_ulong address, int rw
|
||||||
|
|
||||||
void cpu_state_reset(CPUS390XState *env)
|
void cpu_state_reset(CPUS390XState *env)
|
||||||
{
|
{
|
||||||
if (qemu_loglevel_mask(CPU_LOG_RESET)) {
|
cpu_reset(ENV_GET_CPU(env));
|
||||||
qemu_log("CPU Reset (CPU %d)\n", env->cpu_index);
|
|
||||||
log_cpu_state(env, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
memset(env, 0, offsetof(CPUS390XState, breakpoints));
|
|
||||||
/* FIXME: reset vector? */
|
|
||||||
tlb_flush(env, 1);
|
|
||||||
s390_add_running_cpu(env);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef CONFIG_USER_ONLY
|
#ifndef CONFIG_USER_ONLY
|
||||||
|
|
Loading…
Reference in New Issue