From owner-p4-projects@FreeBSD.ORG  Fri Feb 22 05:31:34 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A208C16A407; Fri, 22 Feb 2008 05:31:34 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6680816A405
	for <perforce@freebsd.org>; Fri, 22 Feb 2008 05:31:34 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5955E13C447
	for <perforce@freebsd.org>; Fri, 22 Feb 2008 05:31:34 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1M5VYt8048934
	for <perforce@freebsd.org>; Fri, 22 Feb 2008 05:31:34 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1M5VYfa048931
	for perforce@freebsd.org; Fri, 22 Feb 2008 05:31:34 GMT
	(envelope-from marcel@freebsd.org)
Date: Fri, 22 Feb 2008 05:31:34 GMT
Message-Id: <200802220531.m1M5VYfa048931@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>
Cc: 
Subject: PERFORCE change 135941 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Fri, 22 Feb 2008 05:31:35 -0000

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

Change 135941 by marcel@marcel_xcllnt on 2008/02/22 05:31:11

	Unify <machine/kdb.h>
	
	Simply stop using an inline function and instead put
	the prototype in the header. The implementation has
	been moved to machdep.c.

Affected files ...

.. //depot/projects/e500/sys/powerpc/aim/machdep.c#9 edit
.. //depot/projects/e500/sys/powerpc/booke/machdep.c#11 edit
.. //depot/projects/e500/sys/powerpc/include/kdb.h#4 edit

Differences ...

==== //depot/projects/e500/sys/powerpc/aim/machdep.c#9 (text+ko) ====

@@ -107,6 +107,7 @@
 #include <machine/cpu.h>
 #include <machine/elf.h>
 #include <machine/fpu.h>
+#include <machine/kdb.h>
 #include <machine/md_var.h>
 #include <machine/metadata.h>
 #include <machine/mmuvar.h>
@@ -897,6 +898,20 @@
 	return (0);
 }
 
+void
+kdb_cpu_clear_singlestep(void)
+{
+
+	kdb_frame->srr1 &= ~PSL_SE;
+}
+
+void
+kdb_cpu_set_singlestep(void)
+{
+
+	kdb_frame->srr1 |= PSL_SE;
+}
+
 /*
  * Initialise a struct pcpu.
  */

==== //depot/projects/e500/sys/powerpc/booke/machdep.c#11 (text+ko) ====

@@ -119,6 +119,7 @@
 #include <vm/vm_pager.h>
 
 #include <machine/cpu.h>
+#include <machine/kdb.h>
 #include <machine/reg.h>
 #include <machine/vmparam.h>
 #include <machine/spr.h>
@@ -785,6 +786,26 @@
 }
 
 void
+kdb_cpu_clear_singlestep(void)
+{
+	register_t r;
+
+	r = mfspr(SPR_DBCR0);
+	mtspr(SPR_DBCR0, r & ~DBCR0_IC);
+	kdb_frame->srr1 &= ~PSL_DE;
+}
+
+void
+kdb_cpu_set_singlestep(void)
+{
+	register_t r;
+
+	r = mfspr(SPR_DBCR0);
+	mtspr(SPR_DBCR0, r | DBCR0_IC | DBCR0_IDM);
+	kdb_frame->srr1 |= PSL_DE;
+}
+
+void
 sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask)
 {
 	struct trapframe *tf;

==== //depot/projects/e500/sys/powerpc/include/kdb.h#4 (text+ko) ====

@@ -35,43 +35,13 @@
 #include <machine/psl.h>
 #include <machine/spr.h>
 
-static __inline void
-kdb_cpu_clear_singlestep(void)
-{
-#ifdef E500
-	u_int  value;
-
-	value = mfspr(SPR_DBCR0);
+void kdb_cpu_clear_singlestep(void);
+void kdb_cpu_set_singlestep(void);
 
-	value  &= ~DBCR0_IC;
-	mtspr(SPR_DBCR0, value);
-	kdb_frame->srr1 &= ~PSL_DE;
-#else
-	kdb_frame->srr1 &= ~PSL_SE;
-#endif
-}
-
 static __inline void
-kdb_cpu_set_singlestep(void)
+kdb_cpu_sync_icache(unsigned char *addr, size_t size)
 {
-#ifdef E500
-	u_int value;
-	u_int msr_value;
-
-	value = mfspr(SPR_DBCR0);
-	value = value | DBCR0_IC | DBCR0_IDM;
-	mtspr(SPR_DBCR0, value);
-
-	msr_value = mfmsr();
-	kdb_frame->srr1 |= PSL_DE;
-#else
-	kdb_frame->srr1 |= PSL_SE;
-#endif
-}
 
-static __inline void
-kdb_cpu_sync_icache(unsigned char *addr, size_t size)
-{
 	__syncicache(addr, size);
 }