diff options
| author |   ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-01-24 22:00:13 +0000 |
|---|---|---|
| committer | ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-01-24 22:00:13 +0000 |
| commit | 44cbbf18b946030d7445a324aa42f624031b0639 (patch) | |
| tree | 5d285b922e9eb523ee9151efbc87606b58dd9c26 /hw/mips_r4k.c | |
| parent | Split out SDL X keymap, by Bernhard Fischer. (diff) | |
| download | qemu-kvm-44cbbf18b946030d7445a324aa42f624031b0639.tar.gz qemu-kvm-44cbbf18b946030d7445a324aa42f624031b0639.tar.bz2 qemu-kvm-44cbbf18b946030d7445a324aa42f624031b0639.zip | |
Fix malta emulation for 64bit qemu.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2355 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/mips_r4k.c')
| -rw-r--r-- | hw/mips_r4k.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c index 5fa5b76a6..8d1cac939 100644 --- a/hw/mips_r4k.c +++ b/hw/mips_r4k.c @@ -14,7 +14,7 @@ #else #define BIOS_FILENAME "mipsel_bios.bin" #endif -//#define BIOS_FILENAME "system.bin" + #ifdef MIPS_HAS_MIPS64 #define INITRD_LOAD_ADDR (int64_t)(int32_t)0x80800000 #else @@ -112,8 +112,8 @@ void load_kernel (CPUState *env, int ram_size, const char *kernel_filename, strcpy (phys_ram_base + (16 << 20) - 256, kernel_cmdline); } - *(int *)(phys_ram_base + (16 << 20) - 260) = tswap32 (0x12345678); - *(int *)(phys_ram_base + (16 << 20) - 264) = tswap32 (ram_size); + *(int32_t *)(phys_ram_base + (16 << 20) - 260) = tswap32 (0x12345678); + *(int32_t *)(phys_ram_base + (16 << 20) - 264) = tswap32 (ram_size); } static void main_cpu_reset(void *opaque) @@ -159,7 +159,7 @@ void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device, snprintf(buf, sizeof(buf), "%s/%s", bios_dir, BIOS_FILENAME); bios_size = load_image(buf, phys_ram_base + bios_offset); if ((bios_size > 0) && (bios_size <= BIOS_SIZE)) { - cpu_register_physical_memory((uint32_t)(0x1fc00000), + cpu_register_physical_memory(0x1fc00000, BIOS_SIZE, bios_offset | IO_MEM_ROM); } else { /* not fatal */ |