attempt to get setjmp and longjmp assembly working in MSVC

JuliaLang · Mar 25, 2014 · e97ef83 · e97ef83
1 parent dc6d167
commit e97ef83
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/src/support/_longjmp.win32.S b/src/support/_longjmp.win32.S
@@ -53,10 +53,12 @@
 
 #ifndef _MSC_VER
 .intel_syntax
+ENTRY(jl_longjmp)
 #else
 .model small,C
+.code
+jl_longjmp proc
 #endif
-ENTRY(jl_longjmp)
     mov    edx,DWORD PTR [esp+4]
     mov    eax,DWORD PTR [esp+8]
     mov    ebp,DWORD PTR [edx+0]
@@ -70,4 +72,7 @@ ENTRY(jl_longjmp)
     inc    eax
 a:  mov    DWORD PTR [esp],ecx
     ret
+#ifdef _MSC_VER
+jl_longjmp endp
+#endif
 END(jl_longjmp)
diff --git a/src/support/_longjmp.win64.S b/src/support/_longjmp.win64.S
@@ -2,8 +2,11 @@
 
 #ifndef _MSC_VER
 .intel_syntax noprefix
-#endif
 ENTRY(jl_longjmp)
+#else
+.code
+jl_longjmp proc
+#endif
     mov    rbx,QWORD PTR [rcx+8]
     mov    rsp,QWORD PTR [rcx+16]
     mov    rbp,QWORD PTR [rcx+24]
@@ -30,4 +33,7 @@ ENTRY(jl_longjmp)
     inc    eax
 a:  mov    QWORD PTR [rsp],r8
     ret
+#ifdef _MSC_VER
+jl_longjmp endp
+#endif
 END(jl_longjmp)
diff --git a/src/support/_setjmp.win32.S b/src/support/_setjmp.win32.S
@@ -53,10 +53,12 @@
 
 #ifndef _MSC_VER
 .intel_syntax
+ENTRY(jl_setjmp)
 #else
 .model small,C
+.code
+jl_setjmp proc
 #endif
-ENTRY(jl_setjmp)
     mov    eax,DWORD PTR [esp+4]
     mov    edx,DWORD PTR [esp+0]
     mov    DWORD PTR [eax+0],ebp  /* rta */
@@ -67,4 +69,7 @@ ENTRY(jl_setjmp)
     mov    DWORD PTR [eax+20],edx
     xor    eax,eax
     ret
+#ifdef _MSC_VER
+jl_setjmp endp
+#endif
 END(jl_setjmp)
diff --git a/src/support/_setjmp.win64.S b/src/support/_setjmp.win64.S
@@ -2,8 +2,11 @@
 
 #ifndef _MSC_VER
 .intel_syntax noprefix
-#endif
 ENTRY(jl_setjmp)
+#else
+.code
+jl_setjmp proc
+#endif
     mov    rdx,QWORD PTR [rsp]
     mov    QWORD PTR [rcx],0
     mov    QWORD PTR [rcx+8],rbx
@@ -29,4 +32,7 @@ ENTRY(jl_setjmp)
     movaps XMMWORD PTR [rcx+240],xmm15
     xor    rax,rax
     ret
+#ifdef _MSC_VER
+jl_setjmp endp
+#endif
 END(jl_setjmp)