[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/24] armv7m: convert to memory API
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH 08/24] armv7m: convert to memory API |
Date: |
Wed, 24 Aug 2011 13:11:07 +0300 |
Signed-off-by: Avi Kivity <address@hidden>
---
hw/arm-misc.h | 5 ++++-
hw/armv7m.c | 24 ++++++++++++++----------
hw/stellaris.c | 3 ++-
3 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/hw/arm-misc.h b/hw/arm-misc.h
index f8a7472..af403a1 100644
--- a/hw/arm-misc.h
+++ b/hw/arm-misc.h
@@ -11,13 +11,16 @@
#ifndef ARM_MISC_H
#define ARM_MISC_H 1
+#include "memory.h"
+
/* The CPU is also modeled as an interrupt controller. */
#define ARM_PIC_CPU_IRQ 0
#define ARM_PIC_CPU_FIQ 1
qemu_irq *arm_pic_init_cpu(CPUState *env);
/* armv7m.c */
-qemu_irq *armv7m_init(int flash_size, int sram_size,
+qemu_irq *armv7m_init(MemoryRegion *address_space_mem,
+ int flash_size, int sram_size,
const char *kernel_filename, const char *cpu_model);
/* arm_boot.c */
diff --git a/hw/armv7m.c b/hw/armv7m.c
index a932f16..db535fd 100644
--- a/hw/armv7m.c
+++ b/hw/armv7m.c
@@ -7,6 +7,8 @@
* This code is licensed under the GPL.
*/
+#include <glib.h>
+
#include "sysbus.h"
#include "arm-misc.h"
#include "loader.h"
@@ -156,7 +158,8 @@ static void armv7m_reset(void *opaque)
flash_size and sram_size are in kb.
Returns the NVIC array. */
-qemu_irq *armv7m_init(int flash_size, int sram_size,
+qemu_irq *armv7m_init(MemoryRegion *address_space_mem,
+ int flash_size, int sram_size,
const char *kernel_filename, const char *cpu_model)
{
CPUState *env;
@@ -169,6 +172,9 @@ qemu_irq *armv7m_init(int flash_size, int sram_size,
uint64_t lowaddr;
int i;
int big_endian;
+ MemoryRegion *sram = g_new(MemoryRegion, 1);
+ MemoryRegion *flash = g_new(MemoryRegion, 1);
+ MemoryRegion *hack = g_new(MemoryRegion, 1);
flash_size *= 1024;
sram_size *= 1024;
@@ -194,12 +200,11 @@ qemu_irq *armv7m_init(int flash_size, int sram_size,
#endif
/* Flash programming is done via the SCU, so pretend it is ROM. */
- cpu_register_physical_memory(0, flash_size,
- qemu_ram_alloc(NULL, "armv7m.flash",
- flash_size) | IO_MEM_ROM);
- cpu_register_physical_memory(0x20000000, sram_size,
- qemu_ram_alloc(NULL, "armv7m.sram",
- sram_size) | IO_MEM_RAM);
+ memory_region_init_ram(flash, NULL, "armv7m.flash", flash_size);
+ memory_region_set_readonly(flash, true);
+ memory_region_add_subregion(address_space_mem, 0, flash);
+ memory_region_init_ram(sram, NULL, "armv7m.sram", sram_size);
+ memory_region_add_subregion(address_space_mem, 0x20000000, sram);
armv7m_bitband_init();
nvic = qdev_create(NULL, "armv7m_nvic");
@@ -232,9 +237,8 @@ qemu_irq *armv7m_init(int flash_size, int sram_size,
/* Hack to map an additional page of ram at the top of the address
space. This stops qemu complaining about executing code outside RAM
when returning from an exception. */
- cpu_register_physical_memory(0xfffff000, 0x1000,
- qemu_ram_alloc(NULL, "armv7m.hack",
- 0x1000) | IO_MEM_RAM);
+ memory_region_init_ram(hack, NULL, "armv7m.hack", 0x1000);
+ memory_region_add_subregion(address_space_mem, 0xfffff000, hack);
qemu_register_reset(armv7m_reset, env);
return pic;
diff --git a/hw/stellaris.c b/hw/stellaris.c
index f47b06e..d354008 100644
--- a/hw/stellaris.c
+++ b/hw/stellaris.c
@@ -1276,7 +1276,8 @@ static void stellaris_init(MemoryRegion
*address_space_mem,
flash_size = ((board->dc0 & 0xffff) + 1) << 1;
sram_size = (board->dc0 >> 18) + 1;
- pic = armv7m_init(flash_size, sram_size, kernel_filename, cpu_model);
+ pic = armv7m_init(address_space_mem,
+ flash_size, sram_size, kernel_filename, cpu_model);
if (board->dc1 & (1 << 16)) {
dev = sysbus_create_varargs("stellaris-adc", 0x40038000,
--
1.7.5.3
- [Qemu-devel] [PATCH 00/24] Memory API conversions, batch 5, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH 01/24] arm_sysctl: convert to memory API, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH 05/24] ReadWriteHandler: remove, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH 14/24] piix_pci: wrap memory update in a transaction, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH 09/24] axis_dev88: convert to memory API (RAM only), Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH 23/24] milkymist-softusb: convert to memory API, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH 02/24] stellaris_enet: convert to memory API, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH 19/24] lm32_boards: convert to memory API, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH 08/24] armv7m: convert to memory API,
Avi Kivity <=
- [Qemu-devel] [PATCH 17/24] dummy_m68k: convert to memory API, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH 10/24] sysbus: add sysbus_add_memory_overlap(), Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH 11/24] integratorcp: convert to memory API (RAM/flash only), Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH 20/24] mainstone: convert to memory API, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH 18/24] g364fb: convert to memory API, Avi Kivity, 2011/08/24
- [Qemu-devel] [PATCH 21/24] mcf5208: convert to memory API, Avi Kivity, 2011/08/24