Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 3222 → Rev 3386

/branches/network/uspace/lib/libc/arch/ia32/src/entry.s
31,10 → 31,10
.org 0
 
.globl __entry
.globl __entry_driver
 
## User-space task entry point
#
# %ebx contains the PCB pointer
#
__entry:
mov %ss, %ax
42,19 → 42,9
mov %ax, %es
mov %ax, %fs
# Do not set %gs, it contains descriptor that can see TLS
 
# Pass the PCB pointer to __main as the first argument
pushl %ebx
call __main
call __io_init
call main
 
call __exit
__entry_driver:
mov %ss, %ax
mov %ax, %ds
mov %ax, %es
mov %ax, %fs
# Do not set %gs, it contains descriptor that can see TLS
call __main
call main
call __exit
/branches/network/uspace/lib/libc/arch/ia32/src/syscall.S
53,4 → 53,3
popl %esi
popl %ebx
ret
 
/branches/network/uspace/lib/libc/arch/ia32/src/setjmp.S
26,6 → 26,8
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
 
#include <kernel/arch/context_offset.h>
 
.text
.global setjmp
.global longjmp
32,18 → 34,13
 
.type setjmp,@function
setjmp:
movl 0(%esp), %ecx # save current pc
leal 4(%esp), %edx # save stack pointer
movl (%edx), %eax # get jmp_buf pointer
movl 0(%esp),%eax # save pc value into eax
movl 4(%esp),%edx # address of the jmp_buf structure to save context to
 
# Save registers
movl %ebx, 0(%eax)
movl %esi, 4(%eax)
movl %edi, 8(%eax)
movl %ebp, 12(%eax)
movl %edx, 16(%eax)
# save registers to the jmp_buf structure
CONTEXT_SAVE_ARCH_CORE %edx %eax
 
movl %ecx, 20(%eax) # save pc
xorl %eax,%eax # set_jmp returns 0
ret
 
.type longjmp,@function
52,12 → 49,9
movl 4(%esp), %ecx # put address of jmp_buf into ecx
movl 8(%esp), %eax # put return value into eax
 
# restore all registers
movl 0(%ecx), %ebx
movl 4(%ecx), %esi
movl 8(%ecx), %edi
movl 12(%ecx), %ebp
movl 16(%ecx), %esp
movl 20(%ecx), %edx # saved return address
jmp *%edx
# restore registers from the jmp_buf structure
CONTEXT_RESTORE_ARCH_CORE %ecx %edx
 
movl %edx,0(%esp) # put saved pc on stack
ret
 
/branches/network/uspace/lib/libc/arch/ia32/src/fibril.S
26,6 → 26,8
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
 
#include <kernel/arch/context_offset.h>
 
.text
 
.global context_save
41,16 → 43,12
movl 0(%esp),%eax # the caller's return %eip
movl 4(%esp),%edx # address of the context variable to save context to
 
movl %esp,0(%edx) # %esp -> ctx->sp
movl %eax,4(%edx) # %eip -> ctx->pc
movl %ebx,8(%edx) # %ebx -> ctx->ebx
movl %esi,12(%edx) # %esi -> ctx->esi
movl %edi,16(%edx) # %edi -> ctx->edi
movl %ebp,20(%edx) # %ebp -> ctx->ebp
# save registers to the context structure
CONTEXT_SAVE_ARCH_CORE %edx %eax
 
# Save TLS
movl %gs:0, %eax
movl %eax, 24(%edx) # tls -> ctx->tls
movl %eax, OFFSET_TLS(%edx) # tls -> ctx->tls
xorl %eax,%eax # context_save returns 1
incl %eax
64,18 → 62,15
#
context_restore:
movl 4(%esp),%eax # address of the context variable to restore context from
movl 0(%eax),%esp # ctx->sp -> %esp
movl 4(%eax),%edx # ctx->pc -> %edx
movl 8(%eax),%ebx # ctx->ebx -> %ebx
movl 12(%eax),%esi # ctx->esi -> %esi
movl 16(%eax),%edi # ctx->edi -> %edi
movl 20(%eax),%ebp # ctx->ebp -> %ebp
 
# restore registers from the context structure
CONTEXT_RESTORE_ARCH_CORE %eax %edx
 
movl %edx,0(%esp) # ctx->pc -> saver's return %eip
 
# Set thread local storage
pushl %edx
movl 24(%eax), %edx # Set arg1 to TLS addr
movl OFFSET_TLS(%eax), %edx # Set arg1 to TLS addr
movl $1, %eax # Syscall SYS_TLS_SET
int $0x30
popl %edx