Commit df6cacf6 authored by Maciej Suminski's avatar Maciej Suminski
Browse files

Windows build fix.

parent fdf9898e

common/system/fcontext.s

+9 −8
Original line number Diff line number Diff line
@@ -5,12 +5,13 @@ 




#if __i386__

 #include "jump_i386_sysv_elf_gas.S"

 #include "make_i386_sysv_elf_gas.S"



    #ifdef __WIN32__

        #include "jump_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



#elif __x86_64__

common/system/jump_i386_pe_gas.S

+47 −48
Original line number Diff line number Diff line
@@ -4,12 +4,11 @@ 
           http://www.boost.org/LICENSE_1_0.txt)

*/



.global _jump_fcontext

.text

.globl jump_fcontext

.align 2

.type jump_fcontext,@function



jump_fcontext:

_jump_fcontext:

    mov    0x4(%esp),%ecx

    mov    %edi,(%ecx)

    mov    %esi,0x4(%ecx)
@@ -35,7 +34,7 @@ jump_fcontext: 
    mov    0xc(%edx),%ebp

    mov    0x10(%esp),%eax

    test   %eax,%eax

  je     jump_fcontext+0x5f

    je     _jump_fcontext+0x5f

    stmxcsr 0x2c(%ecx)

    fnstcw 0x30(%ecx)

    ldmxcsr 0x2c(%edx)

common/system/make_i386_pe_gas.S

+8 −12
Original line number Diff line number Diff line
@@ -4,12 +4,11 @@ 
           http://www.boost.org/LICENSE_1_0.txt)

*/



.global _make_fcontext

.text

.globl make_fcontext

.align 2

.type make_fcontext,@function



make_fcontext:

_make_fcontext:

	mov    0x4(%esp),%eax

	lea    -0x34(%eax),%eax

	and    $0xfffffff0,%eax
@@ -31,10 +30,10 @@ make_fcontext: 
	mov    %fs:0x18,%ecx

	mov    (%ecx),%edx

	inc    %edx

	je     make_fcontext+0x4c // <_make_fcontext+0x4c>

	je     _make_fcontext+0x4c // <_make_fcontext+0x4c>

	dec    %edx

	xchg   %edx,%ecx

	jmp    make_fcontext+0x42 // <_make_fcontext+0x42>

	jmp    _make_fcontext+0x42 // <_make_fcontext+0x42>

	mov    0x4(%ecx),%ecx

	mov    0x10(%eax),%edx

	mov    %ecx,0x18(%edx)
@@ -49,6 +48,3 @@ finish: 
    mov    %eax,(%esp)

    call   finish+0xa

    hlt
 


.size make_fcontext,.-make_fcontext