Decouple memory access functions from db_interface.c so they can be

shared with upcoming KGDB. As per NetBSD.
Ok'd by niklas.

3 files changed, 113 insertions, 67 deletions

diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 2c4835f5f12..1a785269ed9 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.i386,v 1.66 2000/05/15 06:26:59 niklas Exp $
+#	$OpenBSD: files.i386,v 1.67 2000/07/05 14:26:34 hugh Exp $
 #	$NetBSD: files.i386,v 1.73 1996/05/07 00:58:36 thorpej Exp $
 #
 # new style config file for i386 architecture
@@ -15,6 +15,7 @@ file	arch/i386/i386/autoconf.c
 file	arch/i386/i386/conf.c
 file	arch/i386/i386/db_disasm.c	ddb
 file	arch/i386/i386/db_interface.c	ddb
+file	arch/i386/i386/db_memrw.c	ddb
 file	arch/i386/i386/db_trace.c	ddb
 file	arch/i386/i386/db_magic.s	ddb
 file	arch/i386/i386/disksubr.c	disk
diff --git a/sys/arch/i386/i386/db_interface.c b/sys/arch/i386/i386/db_interface.c
index 978d0a064dc..227d8e56454 100644
--- a/sys/arch/i386/i386/db_interface.c
+++ b/sys/arch/i386/i386/db_interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_interface.c,v 1.7 1999/12/30 16:36:38 deraadt Exp $	*/
+/*	$OpenBSD: db_interface.c,v 1.8 2000/07/05 14:26:34 hugh Exp $	*/
 /*	$NetBSD: db_interface.c,v 1.22 1996/05/03 19:42:00 christos Exp $	*/
 
 /* 
@@ -140,71 +140,6 @@ kdb_trap(type, code, regs)
 	return (1);
 }
 
-/*
- * Read bytes from kernel address space for debugger.
- */
-void
-db_read_bytes(addr, size, data)
-	vm_offset_t	addr;
-	register size_t	size;
-	register char	*data;
-{
-	register char	*src;
-
-	src = (char *)addr;
-	while (size-- > 0)
-		*data++ = *src++;
-}
-
-pt_entry_t *pmap_pte __P((pmap_t, vm_offset_t));
-
-/*
- * Write bytes to kernel address space for debugger.
- */
-void
-db_write_bytes(addr, size, data)
-	vm_offset_t	addr;
-	register size_t	size;
-	register char	*data;
-{
-	register char	*dst;
-
-	register pt_entry_t *ptep0 = 0;
-	pt_entry_t	oldmap0 = { 0 };
-	vm_offset_t	addr1;
-	register pt_entry_t *ptep1 = 0;
-	pt_entry_t	oldmap1 = { 0 };
-	extern char	etext;
-
-	if (addr >= VM_MIN_KERNEL_ADDRESS &&
-	    addr < (vm_offset_t)&etext) {
-		ptep0 = pmap_pte(pmap_kernel(), addr);
-		oldmap0 = *ptep0;
-		*(int *)ptep0 |= /* INTEL_PTE_WRITE */ PG_RW;
-
-		addr1 = i386_trunc_page(addr + size - 1);
-		if (i386_trunc_page(addr) != addr1) {
-			/* data crosses a page boundary */
-			ptep1 = pmap_pte(pmap_kernel(), addr1);
-			oldmap1 = *ptep1;
-			*(int *)ptep1 |= /* INTEL_PTE_WRITE */ PG_RW;
-		}
-		pmap_update();
-	}
-
-	dst = (char *)addr;
-
-	while (size-- > 0)
-		*dst++ = *data++;
-
-	if (ptep0) {
-		*ptep0 = oldmap0;
-		if (ptep1)
-			*ptep1 = oldmap1;
-		pmap_update();
-	}
-}
-
 void
 Debugger()
 {
diff --git a/sys/arch/i386/i386/db_memrw.c b/sys/arch/i386/i386/db_memrw.c
new file mode 100644
index 00000000000..cfa980a2ef2
--- /dev/null
+++ b/sys/arch/i386/i386/db_memrw.c
@@ -0,0 +1,110 @@
+/*	$OpenBSD: db_memrw.c,v 1.1 2000/07/05 14:26:34 hugh Exp $	*/
+/*	$NetBSD: db_memrw.c,v 1.6 1999/04/12 20:38:19 pk Exp $	*/
+
+/* 
+ * Mach Operating System
+ * Copyright (c) 1991,1990 Carnegie Mellon University
+ * All Rights Reserved.
+ * 
+ * Permission to use, copy, modify and distribute this software and its
+ * documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
+ * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ * 
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ * 
+ * any improvements or extensions that they make and grant Carnegie Mellon
+ * the rights to redistribute these changes.
+ *
+ *	db_interface.c,v 2.4 1991/02/05 17:11:13 mrt (CMU)
+ */
+
+/*
+ * Routines to read and write memory on behalf of the debugger, used
+ * by DDB and KGDB.
+ */
+
+#include <sys/param.h>
+#include <sys/proc.h>
+#include <sys/systm.h>
+
+#include <vm/vm.h>
+
+#include <machine/db_machdep.h>
+
+#include <ddb/db_access.h>
+
+/*
+ * Read bytes from kernel address space for debugger.
+ */
+void
+db_read_bytes(addr, size, data)
+	vm_offset_t	addr;
+	register size_t	size;
+	register char	*data;
+{
+	register char	*src;
+
+	src = (char *)addr;
+	while (size-- > 0)
+		*data++ = *src++;
+}
+
+pt_entry_t *pmap_pte __P((pmap_t, vm_offset_t));
+
+/*
+ * Write bytes to kernel address space for debugger.
+ */
+void
+db_write_bytes(addr, size, data)
+	vm_offset_t	addr;
+	register size_t	size;
+	register char	*data;
+{
+	register char	*dst;
+
+	register pt_entry_t *ptep0 = 0;
+	pt_entry_t	oldmap0 = { 0 };
+	vm_offset_t	addr1;
+	register pt_entry_t *ptep1 = 0;
+	pt_entry_t	oldmap1 = { 0 };
+	extern char	etext;
+
+	if (addr >= VM_MIN_KERNEL_ADDRESS &&
+	    addr < (vm_offset_t)&etext) {
+		ptep0 = pmap_pte(pmap_kernel(), addr);
+		oldmap0 = *ptep0;
+		*(int *)ptep0 |= /* INTEL_PTE_WRITE */ PG_RW;
+
+		addr1 = i386_trunc_page(addr + size - 1);
+		if (i386_trunc_page(addr) != addr1) {
+			/* data crosses a page boundary */
+			ptep1 = pmap_pte(pmap_kernel(), addr1);
+			oldmap1 = *ptep1;
+			*(int *)ptep1 |= /* INTEL_PTE_WRITE */ PG_RW;
+		}
+		pmap_update();
+	}
+
+	dst = (char *)addr;
+
+	while (size-- > 0)
+		*dst++ = *data++;
+
+	if (ptep0) {
+		*ptep0 = oldmap0;
+		if (ptep1)
+			*ptep1 = oldmap1;
+		pmap_update();
+	}
+}