motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-29 13:01:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

64 bit compilation fixes

Browse source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3622 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2007-11-11 22:22:34 +00:00
parent 6f12a2a6ea
commit 1455bf488f
1 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

37
linux-user/vm86.c
View file

@ -39,22 +39,27 @@ static inline int is_revectored(int nr, struct target_revectored_struct *bitmap)
return (((uint8_t *)bitmap)[nr >> 3] >> (nr & 7)) & 1; return (((uint8_t *)bitmap)[nr >> 3] >> (nr & 7)) & 1;
} }
static inline void vm_putw(uint8_t *segptr, unsigned int reg16, unsigned int val) static inline void vm_putw(uint32_t segptr, unsigned int reg16, unsigned int val)
{ {
stw(segptr + (reg16 & 0xffff), val); stw(segptr + (reg16 & 0xffff), val);
} }
static inline void vm_putl(uint8_t *segptr, unsigned int reg16, unsigned int val) static inline void vm_putl(uint32_t segptr, unsigned int reg16, unsigned int val)
{ {
stl(segptr + (reg16 & 0xffff), val); stl(segptr + (reg16 & 0xffff), val);
} }
static inline unsigned int vm_getw(uint8_t *segptr, unsigned int reg16) static inline unsigned int vm_getb(uint32_t segptr, unsigned int reg16)
{
return ldub(segptr + (reg16 & 0xffff));
}
static inline unsigned int vm_getw(uint32_t segptr, unsigned int reg16)
{ {
return lduw(segptr + (reg16 & 0xffff)); return lduw(segptr + (reg16 & 0xffff));
} }
static inline unsigned int vm_getl(uint8_t *segptr, unsigned int reg16) static inline unsigned int vm_getl(uint32_t segptr, unsigned int reg16)
{ {
return ldl(segptr + (reg16 & 0xffff)); return ldl(segptr + (reg16 & 0xffff));
} }
@ -196,8 +201,7 @@ static inline unsigned int get_vflags(CPUX86State *env)
static void do_int(CPUX86State *env, int intno) static void do_int(CPUX86State *env, int intno)
{ {
TaskState *ts = env->opaque; TaskState *ts = env->opaque;
uint32_t *int_ptr, segoffs; uint32_t int_addr, segoffs, ssp;
uint8_t *ssp;
unsigned int sp; unsigned int sp;
if (env->segs[R_CS].selector == TARGET_BIOSSEG) if (env->segs[R_CS].selector == TARGET_BIOSSEG)
@ -207,8 +211,8 @@ static void do_int(CPUX86State *env, int intno)
if (intno == 0x21 && is_revectored((env->regs[R_EAX] >> 8) & 0xff, if (intno == 0x21 && is_revectored((env->regs[R_EAX] >> 8) & 0xff,
&ts->vm86plus.int21_revectored)) &ts->vm86plus.int21_revectored))
goto cannot_handle; goto cannot_handle;
int_ptr = (uint32_t *)(intno << 2); int_addr = (intno << 2);
segoffs = tswap32(*int_ptr); segoffs = ldl(int_addr);
if ((segoffs >> 16) == TARGET_BIOSSEG) if ((segoffs >> 16) == TARGET_BIOSSEG)
goto cannot_handle; goto cannot_handle;
#if defined(DEBUG_VM86) #if defined(DEBUG_VM86)
@ -216,7 +220,7 @@ static void do_int(CPUX86State *env, int intno)
intno, segoffs >> 16, segoffs & 0xffff); intno, segoffs >> 16, segoffs & 0xffff);
#endif #endif
/* save old state */ /* save old state */
ssp = (uint8_t *)(env->segs[R_SS].selector << 4); ssp = env->segs[R_SS].selector << 4;
sp = env->regs[R_ESP] & 0xffff; sp = env->regs[R_ESP] & 0xffff;
vm_putw(ssp, sp - 2, get_vflags(env)); vm_putw(ssp, sp - 2, get_vflags(env));
vm_putw(ssp, sp - 4, env->segs[R_CS].selector); vm_putw(ssp, sp - 4, env->segs[R_CS].selector);
@ -259,26 +263,25 @@ void handle_vm86_trap(CPUX86State *env, int trapno)
void handle_vm86_fault(CPUX86State *env) void handle_vm86_fault(CPUX86State *env)
{ {
TaskState *ts = env->opaque; TaskState *ts = env->opaque;
uint8_t *csp, *pc, *ssp; uint32_t csp, ssp;
unsigned int ip, sp, newflags, newip, newcs, opcode, intno; unsigned int ip, sp, newflags, newip, newcs, opcode, intno;
int data32, pref_done; int data32, pref_done;
csp = (uint8_t *)(env->segs[R_CS].selector << 4); csp = env->segs[R_CS].selector << 4;
ip = env->eip & 0xffff; ip = env->eip & 0xffff;
pc = csp + ip;
ssp = (uint8_t *)(env->segs[R_SS].selector << 4); ssp = env->segs[R_SS].selector << 4;
sp = env->regs[R_ESP] & 0xffff; sp = env->regs[R_ESP] & 0xffff;
#if defined(DEBUG_VM86) #if defined(DEBUG_VM86)
fprintf(logfile, "VM86 exception %04x:%08x %02x %02x\n", fprintf(logfile, "VM86 exception %04x:%08x\n",
env->segs[R_CS].selector, env->eip, pc[0], pc[1]); env->segs[R_CS].selector, env->eip);
#endif #endif
data32 = 0; data32 = 0;
pref_done = 0; pref_done = 0;
do { do {
opcode = csp[ip]; opcode = vm_getb(csp, ip);
ADD16(ip, 1); ADD16(ip, 1);
switch (opcode) { switch (opcode) {
case 0x66: /* 32-bit data */ data32=1; break; case 0x66: /* 32-bit data */ data32=1; break;
@ -328,7 +331,7 @@ void handle_vm86_fault(CPUX86State *env)
VM86_FAULT_RETURN; VM86_FAULT_RETURN;
case 0xcd: /* int */ case 0xcd: /* int */
intno = csp[ip]; intno = vm_getb(csp, ip);
ADD16(ip, 1); ADD16(ip, 1);
env->eip = ip; env->eip = ip;
if (ts->vm86plus.vm86plus.flags & TARGET_vm86dbg_active) { if (ts->vm86plus.vm86plus.flags & TARGET_vm86dbg_active) {