diff options
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/pc.c | 22 |
1 files changed, 9 insertions, 13 deletions
@@ -901,27 +901,23 @@ void pc_memory_init(ram_addr_t ram_size, *above_4g_mem_size_p = above_4g_mem_size; *below_4g_mem_size_p = below_4g_mem_size; +#if TARGET_PHYS_ADDR_BITS == 32 + if (above_4g_mem_size > 0) { + hw_error("To much RAM for 32-bit physical address"); + } +#endif linux_boot = (kernel_filename != NULL); /* allocate RAM */ - ram_addr = qemu_ram_alloc(below_4g_mem_size); + ram_addr = qemu_ram_alloc(below_4g_mem_size + above_4g_mem_size); cpu_register_physical_memory(0, 0xa0000, ram_addr); cpu_register_physical_memory(0x100000, below_4g_mem_size - 0x100000, ram_addr + 0x100000); - - /* above 4giga memory allocation */ - if (above_4g_mem_size > 0) { -#if TARGET_PHYS_ADDR_BITS == 32 - hw_error("To much RAM for 32-bit physical address"); -#else - ram_addr = qemu_ram_alloc(above_4g_mem_size); - cpu_register_physical_memory(0x100000000ULL, - above_4g_mem_size, - ram_addr); +#if TARGET_PHYS_ADDR_BITS > 32 + cpu_register_physical_memory(0x100000000ULL, above_4g_mem_size, + ram_addr + below_4g_mem_size); #endif - } - /* BIOS load */ if (bios_name == NULL) |