Commit c6ee607c94753d8cfe3561cf2898c246536c31ea
1 parent
ae5fc450
mips_r4k warning fixes.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3581 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
1 additions
and
6 deletions
hw/mips_r4k.c
| @@ -15,11 +15,7 @@ | @@ -15,11 +15,7 @@ | ||
| 15 | #define BIOS_FILENAME "mipsel_bios.bin" | 15 | #define BIOS_FILENAME "mipsel_bios.bin" |
| 16 | #endif | 16 | #endif |
| 17 | 17 | ||
| 18 | -#ifdef TARGET_MIPS64 | ||
| 19 | -#define PHYS_TO_VIRT(x) ((x) | ~0x7fffffffULL) | ||
| 20 | -#else | ||
| 21 | -#define PHYS_TO_VIRT(x) ((x) | ~0x7fffffffU) | ||
| 22 | -#endif | 18 | +#define PHYS_TO_VIRT(x) ((x) | ~(target_ulong)0x7fffffff) |
| 23 | 19 | ||
| 24 | #define VIRT_TO_PHYS_ADDEND (-((int64_t)(int32_t)0x80000000)) | 20 | #define VIRT_TO_PHYS_ADDEND (-((int64_t)(int32_t)0x80000000)) |
| 25 | 21 | ||
| @@ -152,7 +148,6 @@ void mips_r4k_init (int ram_size, int vga_ram_size, const char *boot_device, | @@ -152,7 +148,6 @@ void mips_r4k_init (int ram_size, int vga_ram_size, const char *boot_device, | ||
| 152 | CPUState *env; | 148 | CPUState *env; |
| 153 | RTCState *rtc_state; | 149 | RTCState *rtc_state; |
| 154 | int i; | 150 | int i; |
| 155 | - mips_def_t *def; | ||
| 156 | qemu_irq *i8259; | 151 | qemu_irq *i8259; |
| 157 | 152 | ||
| 158 | /* init CPUs */ | 153 | /* init CPUs */ |