david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pc: remove test on TARGET_PHYS_ADDR_BITS == 32

Browse Source 
Both i386 and x86_64 targets are now using target_phys_bits=64. Remove
useless code.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
Aurelien Jarno 2011-02-09 19:35:51 +01:00
parent 71deff2749
commit 1c69371006
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/pc.c
View File

@ -980,11 +980,6 @@ void pc_memory_init(ram_addr_t ram_size,
*above_4g_mem_size_p = above_4g_mem_size; *above_4g_mem_size_p = above_4g_mem_size;
*below_4g_mem_size_p = below_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); linux_boot = (kernel_filename != NULL);
/* allocate RAM */ /* allocate RAM */
@ -994,12 +989,10 @@ void pc_memory_init(ram_addr_t ram_size,
cpu_register_physical_memory(0x100000, cpu_register_physical_memory(0x100000,
below_4g_mem_size - 0x100000, below_4g_mem_size - 0x100000,
ram_addr + 0x100000); ram_addr + 0x100000);
#if TARGET_PHYS_ADDR_BITS > 32
if (above_4g_mem_size > 0) { if (above_4g_mem_size > 0) {
cpu_register_physical_memory(0x100000000ULL, above_4g_mem_size, cpu_register_physical_memory(0x100000000ULL, above_4g_mem_size,
ram_addr + below_4g_mem_size); ram_addr + below_4g_mem_size);
} }
#endif
/* BIOS load */ /* BIOS load */
if (bios_name == NULL) if (bios_name == NULL)