From owner-p4-projects@FreeBSD.ORG  Mon Jul  5 00:16:40 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EA55316A4D0; Mon,  5 Jul 2004 00:16:39 +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 C610716A4CE
	for <perforce@freebsd.org>; Mon,  5 Jul 2004 00:16:39 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BF86743D2D
	for <perforce@freebsd.org>; Mon,  5 Jul 2004 00:16:39 +0000 (GMT)
	(envelope-from marcel@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 i650GdVU065044
	for <perforce@freebsd.org>; Mon, 5 Jul 2004 00:16:39 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i650GdCj065040
	for perforce@freebsd.org; Mon, 5 Jul 2004 00:16:39 GMT
	(envelope-from marcel@freebsd.org)
Date: Mon, 5 Jul 2004 00:16:39 GMT
Message-Id: <200407050016.i650GdCj065040@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 56472 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jul 2004 00:16:40 -0000

http://perforce.freebsd.org/chv.cgi?CH=56472

Change 56472 by marcel@marcel_sledge on 2004/07/05 00:15:56

	Update to the new world order.

Affected files ...

.. //depot/projects/gdb/sys/amd64/include/db_machdep.h#2 edit

Differences ...

==== //depot/projects/gdb/sys/amd64/include/db_machdep.h#2 (text+ko) ====

@@ -30,30 +30,23 @@
 #define	_MACHINE_DB_MACHDEP_H_
 
 #include <machine/frame.h>
-#include <machine/psl.h>
 #include <machine/trap.h>
 
-#define amd64_saved_state trapframe
-
 typedef	vm_offset_t	db_addr_t;	/* address - unsigned */
 typedef	long		db_expr_t;	/* expression - signed */
 
-typedef struct amd64_saved_state db_regs_t;
-extern db_regs_t	ddb_regs;	/* register state */
-#define	DDB_REGS	(&ddb_regs)
-
-#define	PC_REGS(regs)	((db_addr_t)(regs)->tf_rip)
+#define	PC_REGS()	((db_addr_t)kdb_thrctx->pcb_rip)
 
 #define	BKPT_INST	0xcc		/* breakpoint instruction */
 #define	BKPT_SIZE	(1)		/* size of breakpoint inst */
 #define	BKPT_SET(inst)	(BKPT_INST)
 
-#define BKPT_SKIP		ddb_regs.tf_rip += 1
+#define BKPT_SKIP		kdb_frame->tf_rip += 1
 
-#define	FIXUP_PC_AFTER_BREAK	ddb_regs.tf_rip -= 1;
+#define	FIXUP_PC_AFTER_BREAK	kdb_frame->tf_rip -= 1;
 
-#define	db_clear_single_step(regs)	((regs)->tf_rflags &= ~PSL_T)
-#define	db_set_single_step(regs)	((regs)->tf_rflags |=  PSL_T)
+#define	db_clear_single_step	kdb_cpu_clear_singlestep
+#define	db_set_single_step	kdb_cpu_set_singlestep
 
 #define	IS_BREAKPOINT_TRAP(type, code)	((type) == T_BPTFLT)
 /*