aboutsummaryrefslogtreecommitdiff
path: root/linux-user/vm86.c
diff options
context:
space:
mode:
authorMatthias Braun <matze@braunis.de>2011-08-12 19:57:41 +0200
committerRiku Voipio <riku.voipio@linaro.org>2011-10-27 14:42:16 +0300
commitcbb21eed186647716b9e8404a9e90d3fc5c6c467 (patch)
treef02e1908ef5ecb968a058adbe82cea772a4b2ea9 /linux-user/vm86.c
parent6cafd027be3a6cad710d99bde4a2b3b662869e5d (diff)
downloadqemu-arm-cbb21eed186647716b9e8404a9e90d3fc5c6c467.tar.gz
linux-user: fix abi_(u)long, target_ulong mismatch
abi_(u)long might be different from target_ulong, so don't use tswapl but introduce a new tswapal Signed-off-by: Matthias Braun <matze@braunis.de> Signed-off-by: Riku Voipio <riku.voipio@iki.fi>
Diffstat (limited to 'linux-user/vm86.c')
-rw-r--r--linux-user/vm86.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-user/vm86.c b/linux-user/vm86.c
index 0b2439dfa3..2c4ffeb551 100644
--- a/linux-user/vm86.c
+++ b/linux-user/vm86.c
@@ -432,7 +432,7 @@ int do_vm86(CPUX86State *env, long subfunction, abi_ulong vm86_addr)
env->eflags = (env->eflags & ~SAFE_MASK) |
(tswap32(target_v86->regs.eflags) & SAFE_MASK) | VM_MASK;
- ts->vm86plus.cpu_type = tswapl(target_v86->cpu_type);
+ ts->vm86plus.cpu_type = tswapal(target_v86->cpu_type);
switch (ts->vm86plus.cpu_type) {
case TARGET_CPU_286:
ts->v86mask = 0;
@@ -468,7 +468,7 @@ int do_vm86(CPUX86State *env, long subfunction, abi_ulong vm86_addr)
&target_v86->int_revectored, 32);
memcpy(&ts->vm86plus.int21_revectored,
&target_v86->int21_revectored, 32);
- ts->vm86plus.vm86plus.flags = tswapl(target_v86->vm86plus.flags);
+ ts->vm86plus.vm86plus.flags = tswapal(target_v86->vm86plus.flags);
memcpy(&ts->vm86plus.vm86plus.vm86dbg_intxxtab,
target_v86->vm86plus.vm86dbg_intxxtab, 32);
unlock_user_struct(target_v86, vm86_addr, 0);