diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2003-05-12 18:23:04 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2003-05-12 18:23:04 +0000 |
| commit | 0f6241620bdc20665f61bd33eadc63909a32eb93 (patch) | |
| tree | 980aa7887722eab0ded7c8952a09d90e9f7870de /sys | |
| parent | 72490791a84b54191d9661027221725c33904c0b (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/amd64/amd64/machdep.c | 4 | ||||
| -rw-r--r-- | sys/amd64/include/ucontext.h | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index d3890de0b2d5..353717011fd9 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -245,7 +245,7 @@ sendsig(catcher, sig, mask, code) sf.sf_uc.uc_stack.ss_flags = (p->p_flag & P_ALTSTACK) ? ((oonstack) ? SS_ONSTACK : 0) : SS_DISABLE; sf.sf_uc.uc_mcontext.mc_onstack = (oonstack) ? 1 : 0; - bcopy(regs, &sf.sf_uc.uc_mcontext.mc_r15, sizeof(*regs)); + bcopy(regs, &sf.sf_uc.uc_mcontext.mc_rdi, sizeof(*regs)); sf.sf_uc.uc_mcontext.mc_len = sizeof(sf.sf_uc.uc_mcontext); /* magic */ get_fpcontext(td, &sf.sf_uc.uc_mcontext); fpstate_drop(td); @@ -371,7 +371,7 @@ sigreturn(td, uap) ret = set_fpcontext(td, &ucp->uc_mcontext); if (ret != 0) return (ret); - bcopy(&ucp->uc_mcontext.mc_r15, regs, sizeof(*regs)); + bcopy(&ucp->uc_mcontext.mc_rdi, regs, sizeof(*regs)); PROC_LOCK(p); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) diff --git a/sys/amd64/include/ucontext.h b/sys/amd64/include/ucontext.h index 1938707021cf..7aa9d6de5d3a 100644 --- a/sys/amd64/include/ucontext.h +++ b/sys/amd64/include/ucontext.h @@ -38,21 +38,21 @@ typedef struct __mcontext { * and ucontext_t at the same time. */ register_t mc_onstack; /* XXX - sigcontext compat. */ - register_t mc_r15; /* machine state (struct trapframe) */ - register_t mc_r14; - register_t mc_r13; - register_t mc_r12; - register_t mc_r11; - register_t mc_r10; - register_t mc_r9; - register_t mc_r8; - register_t mc_rdi; + register_t mc_rdi; /* machine state (struct trapframe) */ register_t mc_rsi; - register_t mc_rbp; - register_t mc_rbx; register_t mc_rdx; register_t mc_rcx; + register_t mc_r8; + register_t mc_r9; register_t mc_rax; + register_t mc_rbx; + register_t mc_rbp; + register_t mc_r10; + register_t mc_r11; + register_t mc_r12; + register_t mc_r13; + register_t mc_r14; + register_t mc_r15; register_t mc_trapno; register_t mc_err; register_t mc_rip; |