mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2024-11-29 06:43:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

sparc hw/: Don't use CPUState

Browse Source 
Scripted conversion:
  for file in hw/sun4m.c hw/sun4u.c hw/grlib.h hw/leon3.c; do
    sed -i "s/CPUState/CPUSPARCState/g" $file
  done

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Andreas Färber 2012-03-14 01:38:24 +01:00
parent 0b7ade1d3e
commit 98cec4a2e6
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/grlib.h
View File

@ -42,7 +42,7 @@ void grlib_irqmp_ack(DeviceState *dev, int intno);
static inline static inline
DeviceState *grlib_irqmp_create(target_phys_addr_t base, DeviceState *grlib_irqmp_create(target_phys_addr_t base,
CPUState *env, CPUSPARCState *env,
qemu_irq **cpu_irqs, qemu_irq **cpu_irqs,
uint32_t nr_irqs, uint32_t nr_irqs,
set_pil_in_fn set_pil_in) set_pil_in_fn set_pil_in)

8
hw/leon3.c
View File

@ -42,14 +42,14 @@
#define MAX_PILS 16 #define MAX_PILS 16
typedef struct ResetData { typedef struct ResetData {
CPUState *env; CPUSPARCState *env;
uint32_t entry; /* save kernel entry in case of reset */ uint32_t entry; /* save kernel entry in case of reset */
} ResetData; } ResetData;
static void main_cpu_reset(void *opaque) static void main_cpu_reset(void *opaque)
{ {
ResetData *s = (ResetData *)opaque; ResetData *s = (ResetData *)opaque;
CPUState *env = s->env; CPUSPARCState *env = s->env;
cpu_state_reset(env); cpu_state_reset(env);
@ -65,7 +65,7 @@ void leon3_irq_ack(void *irq_manager, int intno)
static void leon3_set_pil_in(void *opaque, uint32_t pil_in) static void leon3_set_pil_in(void *opaque, uint32_t pil_in)
{ {
CPUState *env = (CPUState *)opaque; CPUSPARCState *env = (CPUSPARCState *)opaque;
assert(env != NULL); assert(env != NULL);
@ -101,7 +101,7 @@ static void leon3_generic_hw_init(ram_addr_t ram_size,
const char *initrd_filename, const char *initrd_filename,
const char *cpu_model) const char *cpu_model)
{ {
CPUState *env; CPUSPARCState *env;
MemoryRegion *address_space_mem = get_system_memory(); MemoryRegion *address_space_mem = get_system_memory();
MemoryRegion *ram = g_new(MemoryRegion, 1); MemoryRegion *ram = g_new(MemoryRegion, 1);
MemoryRegion *prom = g_new(MemoryRegion, 1); MemoryRegion *prom = g_new(MemoryRegion, 1);

12
hw/sun4m.c
View File

@ -228,7 +228,7 @@ void sun4m_irq_info(Monitor *mon)
slavio_irq_info(mon, slavio_intctl); slavio_irq_info(mon, slavio_intctl);
} }
void cpu_check_irqs(CPUState *env) void cpu_check_irqs(CPUSPARCState *env)
{ {
if (env->pil_in && (env->interrupt_index == 0 || if (env->pil_in && (env->interrupt_index == 0 ||
(env->interrupt_index & ~15) == TT_EXTINT)) { (env->interrupt_index & ~15) == TT_EXTINT)) {
@ -253,7 +253,7 @@ void cpu_check_irqs(CPUState *env)
} }
} }
static void cpu_kick_irq(CPUState *env) static void cpu_kick_irq(CPUSPARCState *env)
{ {
env->halted = 0; env->halted = 0;
cpu_check_irqs(env); cpu_check_irqs(env);
@ -262,7 +262,7 @@ static void cpu_kick_irq(CPUState *env)
static void cpu_set_irq(void *opaque, int irq, int level) static void cpu_set_irq(void *opaque, int irq, int level)
{ {
CPUState *env = opaque; CPUSPARCState *env = opaque;
if (level) { if (level) {
trace_sun4m_cpu_set_irq_raise(irq); trace_sun4m_cpu_set_irq_raise(irq);
@ -281,7 +281,7 @@ static void dummy_cpu_set_irq(void *opaque, int irq, int level)
static void main_cpu_reset(void *opaque) static void main_cpu_reset(void *opaque)
{ {
CPUState *env = opaque; CPUSPARCState *env = opaque;
cpu_state_reset(env); cpu_state_reset(env);
env->halted = 0; env->halted = 0;
@ -289,7 +289,7 @@ static void main_cpu_reset(void *opaque)
static void secondary_cpu_reset(void *opaque) static void secondary_cpu_reset(void *opaque)
{ {
CPUState *env = opaque; CPUSPARCState *env = opaque;
cpu_state_reset(env); cpu_state_reset(env);
env->halted = 1; env->halted = 1;
@ -809,7 +809,7 @@ static TypeInfo ram_info = {
static void cpu_devinit(const char *cpu_model, unsigned int id, static void cpu_devinit(const char *cpu_model, unsigned int id,
uint64_t prom_addr, qemu_irq **cpu_irqs) uint64_t prom_addr, qemu_irq **cpu_irqs)
{ {
CPUState *env; CPUSPARCState *env;
env = cpu_init(cpu_model); env = cpu_init(cpu_model);
if (!env) { if (!env) {

24
hw/sun4u.c
View File

@ -243,7 +243,7 @@ static unsigned long sun4u_load_kernel(const char *kernel_filename,
return kernel_size; return kernel_size;
} }
void cpu_check_irqs(CPUState *env) void cpu_check_irqs(CPUSPARCState *env)
{ {
uint32_t pil = env->pil_in | uint32_t pil = env->pil_in |
(env->softint & ~(SOFTINT_TIMER | SOFTINT_STIMER)); (env->softint & ~(SOFTINT_TIMER | SOFTINT_STIMER));
@ -297,7 +297,7 @@ void cpu_check_irqs(CPUState *env)
} }
} }
static void cpu_kick_irq(CPUState *env) static void cpu_kick_irq(CPUSPARCState *env)
{ {
env->halted = 0; env->halted = 0;
cpu_check_irqs(env); cpu_check_irqs(env);
@ -306,7 +306,7 @@ static void cpu_kick_irq(CPUState *env)
static void cpu_set_irq(void *opaque, int irq, int level) static void cpu_set_irq(void *opaque, int irq, int level)
{ {
CPUState *env = opaque; CPUSPARCState *env = opaque;
if (level) { if (level) {
CPUIRQ_DPRINTF("Raise CPU IRQ %d\n", irq); CPUIRQ_DPRINTF("Raise CPU IRQ %d\n", irq);
@ -320,7 +320,7 @@ static void cpu_set_irq(void *opaque, int irq, int level)
} }
typedef struct ResetData { typedef struct ResetData {
CPUState *env; CPUSPARCState *env;
uint64_t prom_addr; uint64_t prom_addr;
} ResetData; } ResetData;
@ -344,7 +344,7 @@ void cpu_get_timer(QEMUFile *f, CPUTimer *s)
qemu_get_timer(f, s->qtimer); qemu_get_timer(f, s->qtimer);
} }
static CPUTimer* cpu_timer_create(const char* name, CPUState *env, static CPUTimer* cpu_timer_create(const char* name, CPUSPARCState *env,
QEMUBHFunc *cb, uint32_t frequency, QEMUBHFunc *cb, uint32_t frequency,
uint64_t disabled_mask) uint64_t disabled_mask)
{ {
@ -373,7 +373,7 @@ static void cpu_timer_reset(CPUTimer *timer)
static void main_cpu_reset(void *opaque) static void main_cpu_reset(void *opaque)
{ {
ResetData *s = (ResetData *)opaque; ResetData *s = (ResetData *)opaque;
CPUState *env = s->env; CPUSPARCState *env = s->env;
static unsigned int nr_resets; static unsigned int nr_resets;
cpu_state_reset(env); cpu_state_reset(env);
@ -396,7 +396,7 @@ static void main_cpu_reset(void *opaque)
static void tick_irq(void *opaque) static void tick_irq(void *opaque)
{ {
CPUState *env = opaque; CPUSPARCState *env = opaque;
CPUTimer* timer = env->tick; CPUTimer* timer = env->tick;
@ -413,7 +413,7 @@ static void tick_irq(void *opaque)
static void stick_irq(void *opaque) static void stick_irq(void *opaque)
{ {
CPUState *env = opaque; CPUSPARCState *env = opaque;
CPUTimer* timer = env->stick; CPUTimer* timer = env->stick;
@ -430,7 +430,7 @@ static void stick_irq(void *opaque)
static void hstick_irq(void *opaque) static void hstick_irq(void *opaque)
{ {
CPUState *env = opaque; CPUSPARCState *env = opaque;
CPUTimer* timer = env->hstick; CPUTimer* timer = env->hstick;
@ -714,9 +714,9 @@ static TypeInfo ram_info = {
.class_init = ram_class_init, .class_init = ram_class_init,
}; };
static CPUState *cpu_devinit(const char *cpu_model, const struct hwdef *hwdef) static CPUSPARCState *cpu_devinit(const char *cpu_model, const struct hwdef *hwdef)
{ {
CPUState *env; CPUSPARCState *env;
ResetData *reset_info; ResetData *reset_info;
uint32_t tick_frequency = 100*1000000; uint32_t tick_frequency = 100*1000000;
@ -755,7 +755,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
const char *initrd_filename, const char *cpu_model, const char *initrd_filename, const char *cpu_model,
const struct hwdef *hwdef) const struct hwdef *hwdef)
{ {
CPUState *env; CPUSPARCState *env;
M48t59State *nvram; M48t59State *nvram;
unsigned int i; unsigned int i;
long initrd_size, kernel_size; long initrd_size, kernel_size;