From owner-p4-projects@FreeBSD.ORG Tue Nov 9 01:50:03 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5026F16A4D0; Tue, 9 Nov 2004 01:50:02 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EEB8B16A4CE for ; Tue, 9 Nov 2004 01:50:01 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C45A143D46 for ; Tue, 9 Nov 2004 01:50:01 +0000 (GMT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id iA91o1qO073153 for ; Tue, 9 Nov 2004 01:50:01 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA91o13g073150 for perforce@freebsd.org; Tue, 9 Nov 2004 01:50:01 GMT (envelope-from peter@freebsd.org) Date: Tue, 9 Nov 2004 01:50:01 GMT Message-Id: <200411090150.iA91o13g073150@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 64659 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Nov 2004 01:50:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=64659 Change 64659 by peter@peter_daintree on 2004/11/09 01:49:57 converge towards i386. I don't understand this stuff. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/gdb_machdep.c#4 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/gdb_machdep.c#4 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include +#include #include #include #include @@ -47,40 +48,45 @@ void * gdb_cpu_getreg(int regnum, size_t *regsz) { - struct trapframe *tf = kdb_frame; *regsz = gdb_cpu_regsz(regnum); - /* XXX this stuff is mighty suspicious */ if (kdb_thread == curthread) { switch (regnum) { - case 0: return (&tf->tf_rax); - case 1: return (&tf->tf_rcx); - case 2: return (&tf->tf_rdx); + case 0: return (&kdb_frame->tf_rax); + case 1: return (&kdb_frame->tf_rcx); + case 2: return (&kdb_frame->tf_rdx); } } - /* i386 uses kdb_thrctx, a pcb for these */ switch (regnum) { - case 0: return (&tf->tf_rax); - case 1: return (&tf->tf_rbx); - case 2: return (&tf->tf_rcx); - case 3: return (&tf->tf_rdx); - case 4: return (&tf->tf_rsi); - case 5: return (&tf->tf_rdi); - case 6: return (&tf->tf_rbp); - case 7: return (&tf->tf_rsp); - case 8: return (&tf->tf_r8); - case 9: return (&tf->tf_r9); - case 10: return (&tf->tf_r10); - case 11: return (&tf->tf_r11); - case 12: return (&tf->tf_r12); - case 13: return (&tf->tf_r13); - case 14: return (&tf->tf_r14); - case 15: return (&tf->tf_r15); - case 16: return (&tf->tf_rip); - case 17: return (&tf->tf_rflags); - case 18: return (&tf->tf_cs); - case 19: return (&tf->tf_ss); +#if 0 + case 0: return (&kdb_thrctx->pcb_rax); +#endif + case 1: return (&kdb_thrctx->pcb_rbx); +#if 0 + case 2: return (&kdb_thrctx->pcb_rcx); + case 3: return (&kdb_thrctx->pcb_rdx); + case 4: return (&kdb_thrctx->pcb_rsi); + case 5: return (&kdb_thrctx->pcb_rdi); +#endif + case 6: return (&kdb_thrctx->pcb_rbp); + case 7: return (&kdb_thrctx->pcb_rsp); +#if 0 + case 8: return (&kdb_thrctx->pcb_r8); + case 9: return (&kdb_thrctx->pcb_r9); + case 10: return (&kdb_thrctx->pcb_r10); + case 11: return (&kdb_thrctx->pcb_r11); +#endif + case 12: return (&kdb_thrctx->pcb_r12); + case 13: return (&kdb_thrctx->pcb_r13); + case 14: return (&kdb_thrctx->pcb_r14); + case 15: return (&kdb_thrctx->pcb_r15); + case 16: return (&kdb_thrctx->pcb_rip); + case 17: return (&kdb_thrctx->pcb_rflags); +#if 0 + case 18: return (&kdb_thrctx->pcb_cs); + case 19: return (&kdb_thrctx->pcb_ss); +#endif } return (NULL); } @@ -88,12 +94,12 @@ void gdb_cpu_setreg(int regnum, register_t val) { - struct trapframe *tf = kdb_frame; val = __bswap64(val); switch (regnum) { case GDB_REG_PC: + kdb_thrctx->pcb_rip = val; if (kdb_thread == curthread) - tf->tf_rip = val; + kdb_frame->tf_rip = val; } }