Commit df6cacf6 authored by Maciej Suminski's avatar Maciej Suminski

Windows build fix.

parent fdf9898e
...@@ -5,12 +5,13 @@ ...@@ -5,12 +5,13 @@
#if __i386__ #if __i386__
#include "jump_i386_sysv_elf_gas.S"
#include "make_i386_sysv_elf_gas.S"
#ifdef __WIN32__ #ifdef __WIN32__
#include "jump_i386_pe_gas.S" #include "jump_i386_pe_gas.S"
#include "make_i386_pe_gas.S" #include "make_i386_pe_gas.S"
#else
#include "jump_i386_sysv_elf_gas.S"
#include "make_i386_sysv_elf_gas.S"
#endif #endif
#elif __x86_64__ #elif __x86_64__
......
...@@ -4,12 +4,11 @@ ...@@ -4,12 +4,11 @@
http://www.boost.org/LICENSE_1_0.txt) http://www.boost.org/LICENSE_1_0.txt)
*/ */
.global _jump_fcontext
.text .text
.globl jump_fcontext
.align 2 .align 2
.type jump_fcontext,@function
jump_fcontext: _jump_fcontext:
mov 0x4(%esp),%ecx mov 0x4(%esp),%ecx
mov %edi,(%ecx) mov %edi,(%ecx)
mov %esi,0x4(%ecx) mov %esi,0x4(%ecx)
...@@ -35,7 +34,7 @@ jump_fcontext: ...@@ -35,7 +34,7 @@ jump_fcontext:
mov 0xc(%edx),%ebp mov 0xc(%edx),%ebp
mov 0x10(%esp),%eax mov 0x10(%esp),%eax
test %eax,%eax test %eax,%eax
je jump_fcontext+0x5f je _jump_fcontext+0x5f
stmxcsr 0x2c(%ecx) stmxcsr 0x2c(%ecx)
fnstcw 0x30(%ecx) fnstcw 0x30(%ecx)
ldmxcsr 0x2c(%edx) ldmxcsr 0x2c(%edx)
......
...@@ -4,12 +4,11 @@ ...@@ -4,12 +4,11 @@
http://www.boost.org/LICENSE_1_0.txt) http://www.boost.org/LICENSE_1_0.txt)
*/ */
.global _make_fcontext
.text .text
.globl make_fcontext
.align 2 .align 2
.type make_fcontext,@function
make_fcontext: _make_fcontext:
mov 0x4(%esp),%eax mov 0x4(%esp),%eax
lea -0x34(%eax),%eax lea -0x34(%eax),%eax
and $0xfffffff0,%eax and $0xfffffff0,%eax
...@@ -31,10 +30,10 @@ make_fcontext: ...@@ -31,10 +30,10 @@ make_fcontext:
mov %fs:0x18,%ecx mov %fs:0x18,%ecx
mov (%ecx),%edx mov (%ecx),%edx
inc %edx inc %edx
je make_fcontext+0x4c // <_make_fcontext+0x4c> je _make_fcontext+0x4c // <_make_fcontext+0x4c>
dec %edx dec %edx
xchg %edx,%ecx xchg %edx,%ecx
jmp make_fcontext+0x42 // <_make_fcontext+0x42> jmp _make_fcontext+0x42 // <_make_fcontext+0x42>
mov 0x4(%ecx),%ecx mov 0x4(%ecx),%ecx
mov 0x10(%eax),%edx mov 0x10(%eax),%edx
mov %ecx,0x18(%edx) mov %ecx,0x18(%edx)
...@@ -49,6 +48,3 @@ finish: ...@@ -49,6 +48,3 @@ finish:
mov %eax,(%esp) mov %eax,(%esp)
call finish+0xa call finish+0xa
hlt hlt
.size make_fcontext,.-make_fcontext
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment