Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix thread context switching to take the stack ABI into account.

Browse Source 
From Wolfgang Solfrank.
This commit is contained in:
fvdl 2004-10-21 16:49:47 +00:00
parent d16bfcc7a2
commit 5febc5eef5
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/libpthread/arch/x86_64/_context_u.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: _context_u.S,v 1.3 2003/11/08 21:45:59 fvdl Exp $ */
/* $NetBSD: _context_u.S,v 1.4 2004/10/21 16:49:47 fvdl Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@ -53,6 +53,11 @@
fxsave UC_FPREGS(%rdi) ; \
movl $(_UC_USER | _UC_CPU | _UC_FPU),UC_FLAGS(%rdi)
#define lretqm(x) \
.byte 0x48 ; \
.byte 0xca ; \
.word x
#define SETC \
movl UC_FLAGS(%rdi), %eax ; \
btl $_UC_USER_BIT, %eax ; \
@ -91,28 +96,28 @@
movq (UC_REGS + _REG_RDX * 8)(%rdi), %rdx ; \
movq (UC_REGS + _REG_RSI * 8)(%rdi), %rsi ; \
movw (UC_REGS + _REG_CS * 8)(%rdi), %ax ; \
movq %rax, -8(%r11) ; \
movq %rax, -128-8(%r11) ; \
movw (UC_REGS + _REG_DS * 8)(%rdi), %ax ; \
movq %rax, -32(%r11) ; \
movq %rax, -128-32(%r11) ; \
movq (UC_REGS + _REG_RIP * 8)(%rdi), %rax ; \
movq %rax, -16(%r11) ; \
movq %rax, -128-16(%r11) ; \
movq (UC_REGS + _REG_RAX * 8)(%rdi), %rax ; \
movq %rax, -24(%r11) ; \
movq %rax, -128-24(%r11) ; \
movq (UC_REGS + _REG_R11 * 8)(%rdi), %rax ; \
movq %rax, -40(%r11) ; \
movq %rax, -128-40(%r11) ; \
movq (UC_REGS + _REG_RFL * 8)(%rdi), %rax ; \
movq %rax, -48(%r11) ; \
movq %rax, -128-48(%r11) ; \
; \
movw (UC_REGS + _REG_SS * 8)(%rdi), %ss ; \
movq (UC_REGS + _REG_RDI)(%rdi), %rdi ; \
leaq -48(%r11), %rsp ; \
leaq -128-48(%r11), %rsp ; \
; \
popfq ; \
popq %r11 ; \
popq %rax ; \
movl %eax,%ds ; \
popq %rax ; \
lretq
lretqm(128)
ENTRY(_getcontext_u)
GETC

4
sys/arch/amd64/include/mcontext.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: mcontext.h,v 1.4 2003/10/13 18:38:34 fvdl Exp $ */
/* $NetBSD: mcontext.h,v 1.5 2004/10/21 16:49:47 fvdl Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -95,7 +95,7 @@ typedef struct {
#define _UC_UCONTEXT_ALIGN (~0xf)
#define _UC_MACHINE_SP(uc) ((uc)->uc_mcontext.__gregs[_REG_URSP])
#define _UC_MACHINE_SP(uc) ((uc)->uc_mcontext.__gregs[_REG_URSP] - 128)
#define _UC_MACHINE_PC(uc) ((uc)->uc_mcontext.__gregs[_REG_RIP])
#define _UC_MACHINE_INTRV(uc) ((uc)->uc_mcontext.__gregs[_REG_RAX])