Changeset 21731 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/exception.h

Timestamp:

Jul 21, 2009 9:16:52 AM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: update to wine 1.1.26

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/exception.h (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/exception.h

@@ -223 +223 @@
 }
 
+static inline EXCEPTION_REGISTRATION_RECORD *__wine_get_frame(void)
+{
+#if defined(__GNUC__) && defined(__i386__)
+    EXCEPTION_REGISTRATION_RECORD *ret;
+    __asm__ __volatile__(".byte 0x64\n\tmovl (0),%0" : "=r" (ret) );
+    return ret;
+#else
+    NT_TIB *teb = (NT_TIB *)NtCurrentTeb();
+    return teb->ExceptionList;
+#endif
+}
+
 /* Exception handling flags - from OS/2 2.0 exception handling */
 
@@ -248 +260 @@
 NTSYSAPI void WINAPI RtlUnwind(PVOID,PVOID,PEXCEPTION_RECORD,PVOID);
 
+static inline void DECLSPEC_NORETURN __wine_unwind_target(void)
+{
+    __WINE_FRAME *wine_frame = (__WINE_FRAME *)__wine_get_frame();
+    __wine_pop_frame( &wine_frame->frame );
+    siglongjmp( wine_frame->jmp, 1 );
+}
+
 /* wrapper for RtlUnwind since it clobbers registers on Windows */
-static inline void __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame, EXCEPTION_RECORD *record )
+static inline void DECLSPEC_NORETURN __wine_rtl_unwind( EXCEPTION_REGISTRATION_RECORD* frame,
+                                                        EXCEPTION_RECORD *record,
+                                                        void (*target)(void) )
 {
 #if defined(__GNUC__) && defined(__i386__)
-    int dummy1, dummy2, dummy3;
+    int dummy1, dummy2, dummy3, dummy4;
     __asm__ __volatile__("pushl %%ebp\n\t"
                          "pushl %%ebx\n\t"
                          "pushl $0\n\t"
+                         "pushl %3\n\t"
                          "pushl %2\n\t"
-                         "pushl $0\n\t"
                          "pushl %1\n\t"
                          "call *%0\n\t"
                          "popl %%ebx\n\t"
                          "popl %%ebp"
-                         : "=a" (dummy1), "=S" (dummy2), "=D" (dummy3)
-                         : "0" (RtlUnwind), "1" (frame), "2" (record)
-                         : "ecx", "edx", "memory" );
+                         : "=a" (dummy1), "=S" (dummy2), "=D" (dummy3), "=c" (dummy4)
+                         : "0" (RtlUnwind), "1" (frame), "2" (target), "3" (record)
+                         : "edx", "memory" );
 #else
-    RtlUnwind( frame, 0, record, 0 );
-#endif
+    RtlUnwind( frame, target, record, 0 );
+#endif
+    for (;;) target();
 }
 
@@ -279 +301 @@
     wine_frame->ExceptionRecord = wine_frame;
 
-    __wine_rtl_unwind( frame, record );
-    __wine_pop_frame( frame );
-    siglongjmp( wine_frame->jmp, 1 );
+    __wine_rtl_unwind( frame, record, __wine_unwind_target );
 }