openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

leon3: convert to memory API 

Reviewed-by: Richard Henderson  <rth@twiddle.net>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Avi Kivity 2011-07-25 15:07:22 +03:00
parent b3cc496255
commit 20e5758b08
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/leon3.c
View File

@ -29,6 +29,7 @@
#include "loader.h" #include "loader.h"
#include "elf.h" #include "elf.h"
#include "trace.h" #include "trace.h"
#include "exec-memory.h"
#include "grlib.h" #include "grlib.h"
@ -100,7 +101,9 @@ static void leon3_generic_hw_init(ram_addr_t ram_size,
const char *cpu_model) const char *cpu_model)
{ {
CPUState *env; CPUState *env;
ram_addr_t ram_offset, prom_offset; MemoryRegion *address_space_mem = get_system_memory();
MemoryRegion *ram = g_new(MemoryRegion, 1);
MemoryRegion *prom = g_new(MemoryRegion, 1);
int ret; int ret;
char *filename; char *filename;
qemu_irq *cpu_irqs = NULL; qemu_irq *cpu_irqs = NULL;
@ -139,14 +142,14 @@ static void leon3_generic_hw_init(ram_addr_t ram_size,
exit(1); exit(1);
} }
ram_offset = qemu_ram_alloc(NULL, "leon3.ram", ram_size); memory_region_init_ram(ram, NULL, "leon3.ram", ram_size);
cpu_register_physical_memory(0x40000000, ram_size, ram_offset | IO_MEM_RAM); memory_region_add_subregion(address_space_mem, 0x40000000, ram);
/* Allocate BIOS */ /* Allocate BIOS */
prom_size = 8 * 1024 * 1024; /* 8Mb */ prom_size = 8 * 1024 * 1024; /* 8Mb */
prom_offset = qemu_ram_alloc(NULL, "Leon3.bios", prom_size); memory_region_init_ram(prom, NULL, "Leon3.bios", prom_size);
cpu_register_physical_memory(0x00000000, prom_size, memory_region_set_readonly(prom, true);
prom_offset | IO_MEM_ROM); memory_region_add_subregion(address_space_mem, 0x00000000, prom);
/* Load boot prom */ /* Load boot prom */
if (bios_name == NULL) { if (bios_name == NULL) {