[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-next 70/74] mips_r4k: Use cpu_mips_init() to obt
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH for-next 70/74] mips_r4k: Use cpu_mips_init() to obtain MIPSCPU |
Date: |
Sun, 6 May 2012 17:35:10 +0200 |
Needed for main_cpu_reset().
Signed-off-by: Andreas Färber <address@hidden>
---
hw/mips_r4k.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index e2da49c..f89957c 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -162,6 +162,7 @@ void mips_r4k_init (ram_addr_t ram_size,
MemoryRegion *bios;
MemoryRegion *iomem = g_new(MemoryRegion, 1);
int bios_size;
+ MIPSCPU *cpu;
CPUMIPSState *env;
ResetData *reset_info;
int i;
@@ -179,11 +180,13 @@ void mips_r4k_init (ram_addr_t ram_size,
cpu_model = "24Kf";
#endif
}
- env = cpu_init(cpu_model);
- if (!env) {
+ cpu = cpu_mips_init(cpu_model);
+ if (cpu == NULL) {
fprintf(stderr, "Unable to find CPU definition\n");
exit(1);
}
+ env = &cpu->env;
+
reset_info = g_malloc0(sizeof(ResetData));
reset_info->env = env;
reset_info->vector = env->active_tc.PC;
--
1.7.7
- [Qemu-devel] [PATCH for-next 71/74] mips_r4k: Store MIPSCPU in ResetData, (continued)
- [Qemu-devel] [PATCH for-next 71/74] mips_r4k: Store MIPSCPU in ResetData, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 58/74] petalogix_s3adsp1800_mmu: Use cpu_mb_init() to obtain MicroBlazeCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 69/74] mips_mipssim: Store MIPSCPU in ResetData, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 64/74] mips_jazz: Use cpu_mips_init() to obtain MIPSCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 72/74] bsd-user: Use cpu_reset() in after cpu_init(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 73/74] linux-user: Use cpu_reset() after cpu_init() / cpu_copy(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 63/74] mips_fulong2e: Pass MIPSCPU to main_cpu_reset(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 74/74] Kill off cpu_state_reset(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 70/74] mips_r4k: Use cpu_mips_init() to obtain MIPSCPU,
Andreas Färber <=