PERFORCE change 61581 for review

[Peter Wemm]

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

Change 61581 by peter at peter_daintree on 2004/09/16 01:18:53

	integ -I -b i386_hammer (pick up db_machdep trace fixes)

Affected files ...

.. //depot/projects/hammer/sys/amd64/include/db_machdep.h#10 integrate

Differences ...

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

@@ -41,9 +41,17 @@
 #define	BKPT_SIZE	(1)		/* size of breakpoint inst */
 #define	BKPT_SET(inst)	(BKPT_INST)
 
-#define BKPT_SKIP		kdb_frame->tf_rip += 1
+#define BKPT_SKIP				\
+do {						\
+	kdb_frame->tf_rip += 1;			\
+	kdb_thrctx->pcb_rip += 1;		\
+} while(0)
 
-#define	FIXUP_PC_AFTER_BREAK	kdb_frame->tf_rip -= 1;
+#define	FIXUP_PC_AFTER_BREAK			\
+do {						\
+	kdb_frame->tf_rip -= 1;			\
+	kdb_thrctx->pcb_rip -= 1;		\
+} while(0);
 
 #define	db_clear_single_step	kdb_cpu_clear_singlestep
 #define	db_set_single_step	kdb_cpu_set_singlestep