aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorpbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>2007-11-11 12:02:33 +0000
committerpbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>2007-11-11 12:02:33 +0000
commitc6ee607c94753d8cfe3561cf2898c246536c31ea (patch)
tree4ea4261740ea63ac5730f5448e16927a47c4e434 /hw
parentae5fc4507e39d35904cea8ee2b311959c8747c71 (diff)
mips_r4k warning fixes.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3581 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
-rw-r--r--hw/mips_r4k.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index 5a8bf6c244..acdb384cd0 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -15,11 +15,7 @@
#define BIOS_FILENAME "mipsel_bios.bin"
#endif
-#ifdef TARGET_MIPS64
-#define PHYS_TO_VIRT(x) ((x) | ~0x7fffffffULL)
-#else
-#define PHYS_TO_VIRT(x) ((x) | ~0x7fffffffU)
-#endif
+#define PHYS_TO_VIRT(x) ((x) | ~(target_ulong)0x7fffffff)
#define VIRT_TO_PHYS_ADDEND (-((int64_t)(int32_t)0x80000000))
@@ -152,7 +148,6 @@ void mips_r4k_init (int ram_size, int vga_ram_size, const char *boot_device,
CPUState *env;
RTCState *rtc_state;
int i;
- mips_def_t *def;
qemu_irq *i8259;
/* init CPUs */