1 files changed, 56 insertions, 1 deletions

diff --git a/lib/libthread_db/arch/amd64/libpthread_md.c b/lib/libthread_db/arch/amd64/libpthread_md.c
index 7553ed117eae..8fca1fdf1acc 100644
--- a/lib/libthread_db/arch/amd64/libpthread_md.c
+++ b/lib/libthread_db/arch/amd64/libpthread_md.c
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2004 David Xu <davidxu@freebsd.org>
  * Copyright (c) 2004 Marcel Moolenaar
  * All rights reserved.
  *
@@ -33,30 +34,84 @@ __FBSDID("$FreeBSD$");
 void
 pt_reg_to_ucontext(const struct reg *r, ucontext_t *uc)
 {
+	mcontext_t *mc = &uc->uc_mcontext;
+
+	mc->mc_rdi = r->r_rdi;
+	mc->mc_rsi = r->r_rsi;
+	mc->mc_rdx = r->r_rdx;
+	mc->mc_rcx = r->r_rcx;
+	mc->mc_r8 = r->r_r8;
+	mc->mc_r9 = r->r_r9;
+	mc->mc_rax = r->r_rax;
+	mc->mc_rbx = r->r_rbx;
+	mc->mc_rbp = r->r_rbp;
+	mc->mc_r10 = r->r_r10;
+	mc->mc_r11 = r->r_r11;
+	mc->mc_r12 = r->r_r12;
+	mc->mc_r13 = r->r_r13;
+	mc->mc_r14 = r->r_r14;
+	mc->mc_r15 = r->r_r15;
+	mc->mc_rip = r->r_rip;
+	mc->mc_cs = r->r_cs;
+	mc->mc_rflags = r->r_rflags;
+	mc->mc_rsp = r->r_rsp;
+	mc->mc_ss = r->r_ss;
 }
 
 void
 pt_ucontext_to_reg(const ucontext_t *uc, struct reg *r)
 {
+	const mcontext_t *mc = &uc->uc_mcontext;
+
+	r->r_rdi = mc->mc_rdi;
+	r->r_rsi = mc->mc_rsi;
+	r->r_rdx = mc->mc_rdx;
+	r->r_rcx = mc->mc_rcx;
+	r->r_r8 = mc->mc_r8;
+	r->r_r9 = mc->mc_r9;
+	r->r_rax = mc->mc_rax;
+	r->r_rbx = mc->mc_rbx;
+	r->r_rbp = mc->mc_rbp;
+	r->r_r10 = mc->mc_r10;
+	r->r_r11 = mc->mc_r11;
+	r->r_r12 = mc->mc_r12;
+	r->r_r13 = mc->mc_r13;
+	r->r_r14 = mc->mc_r14;
+	r->r_r15 = mc->mc_r15;
+	r->r_rip = mc->mc_rip;
+	r->r_cs = mc->mc_cs;
+	r->r_rflags = mc->mc_rflags;
+	r->r_rsp = mc->mc_rsp;
+	r->r_ss = mc->mc_ss;
 }
 
 void
 pt_fpreg_to_ucontext(const struct fpreg* r, ucontext_t *uc)
 {
+	memcpy(&uc->uc_mcontext.mc_fpstate, r, sizeof(r));
 }
 
 void
 pt_ucontext_to_fpreg(const ucontext_t *uc, struct fpreg *r)
 {
+	memcpy(r, &uc->uc_mcontext.mc_fpstate, sizeof(r));
 }
 
 void
 pt_md_init(void)
 {
+	/* Nothing to do */
 }
 
 int
 pt_reg_sstep(struct reg *reg, int step)
 {
-	return (0);
+	register_t old;
+
+	old = reg->r_rflags;
+	if (step)
+		reg->r_rflags |= 0x0100;
+	else
+		reg->r_rflags &= ~0x0100;
+	return (old != reg->r_rflags); /* changed ? */
 }