aboutsummaryrefslogtreecommitdiff
path: root/linux-user
diff options
context:
space:
mode:
authorbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2008-07-29 14:09:57 +0000
committerbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2008-07-29 14:09:57 +0000
commiteae473c187de4088c975b8dd08f9284fb7993a1a (patch)
treec9a23d0db5ff92cd38b764825bec712924d7526a /linux-user
parentd0c22f49ba84016e4d06012af2176a851825814f (diff)
downloadqemu-eae473c187de4088c975b8dd08f9284fb7993a1a.zip
qemu-eae473c187de4088c975b8dd08f9284fb7993a1a.tar.gz
qemu-eae473c187de4088c975b8dd08f9284fb7993a1a.tar.bz2
Unswap qemu-arm data and prefetch abort addresses (Laurent Desnogues).
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4967 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'linux-user')
-rw-r--r--linux-user/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux-user/main.c b/linux-user/main.c
index 060ef82..023aac3 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -709,10 +709,10 @@ void cpu_loop(CPUARMState *env)
/* just indicate that signals should be handled asap */
break;
case EXCP_PREFETCH_ABORT:
- addr = env->cp15.c6_data;
+ addr = env->cp15.c6_insn;
goto do_segv;
case EXCP_DATA_ABORT:
- addr = env->cp15.c6_insn;
+ addr = env->cp15.c6_data;
goto do_segv;
do_segv:
{