motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-07 17:53:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Scrap SIGN_EXTEND32.

Browse source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2251 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
ths 2006-12-21 13:48:28 +00:00
parent c570fd169c
commit 5dc4b74480
6 changed files with 79 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

12
hw/mips_r4k.c
View file

@ -11,10 +11,14 @@
#define BIOS_FILENAME "mips_bios.bin"
//#define BIOS_FILENAME "system.bin"
#define KERNEL_LOAD_ADDR SIGN_EXTEND32(0x80010000)
#define INITRD_LOAD_ADDR SIGN_EXTEND32(0x80800000)
#define KERNEL_LOAD_ADDR (int32_t)0x80010000
#ifdef MIPS_HAS_MIPS64
#define INITRD_LOAD_ADDR (int64_t)0x80800000
#else
#define INITRD_LOAD_ADDR (int32_t)0x80800000
#endif
#define VIRT_TO_PHYS_ADDEND (-SIGN_EXTEND32(0x80000000LL))
#define VIRT_TO_PHYS_ADDEND (-((int64_t)(int32_t)0x80000000))
static const int ide_iobase[2] = { 0x1f0, 0x170 };
static const int ide_iobase2[2] = { 0x3f6, 0x376 };
@ -76,7 +80,7 @@ void load_kernel (CPUState *env, int ram_size, const char *kernel_filename,
kernel_size = load_elf(kernel_filename, VIRT_TO_PHYS_ADDEND, &entry);
if (kernel_size >= 0) {
if ((entry & ~0x7fffffffULL) == 0x80000000)
entry = SIGN_EXTEND32(entry);
entry = (int32_t)entry;
env->PC = entry;
} else {
kernel_size = load_image(kernel_filename,