[Xen-changelog] [xen-unstable] minios: Fix ret_from_exception routine. Stack consistency is now preserved.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1170430249 0
# Node ID f9384402bc1e03dd13520011b4929141ee5bcad0
# Parent  5c6f941926982b66fc262a949020210875434fb0
minios: Fix ret_from_exception routine. Stack consistency is now preserved.
Signed-off-by: Grzegorz Milos <gm281@xxxxxxxxx>
---
 extras/mini-os/arch/x86/x86_32.S |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff -r 5c6f94192698 -r f9384402bc1e extras/mini-os/arch/x86/x86_32.S
--- a/extras/mini-os/arch/x86/x86_32.S  Fri Feb 02 14:32:48 2007 +0000
+++ b/extras/mini-os/arch/x86/x86_32.S  Fri Feb 02 15:30:49 2007 +0000
@@ -69,7 +69,7 @@ CS            = 0x2C
        popl %ds;       \
        popl %es;       \
        addl $4,%esp;   \
-       iret;           \
+       iret;           
 
 ENTRY(divide_error)
        pushl $0                # no error code
@@ -101,10 +101,9 @@ do_exception:
     jmp ret_from_exception
     
 ret_from_exception:
-        movb CS(%esp),%cl
-       test $2,%cl          # slow return to ring 2 or 3
-       jne  safesti
-        RESTORE_ALL
+    movb CS(%esp),%cl
+    addl $8,%esp
+    RESTORE_ALL
 
 # A note on the "critical region" in our callback handler.
 # We want to avoid stacking callback handlers due to events occurring

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog