[src/trunk]: src/sys/arch Use the current destination address to compute PTE, ...

[jym <jym%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/06cf2b3d702b
branches:  trunk
changeset: 779164:06cf2b3d702b
user:      jym <jym%NetBSD.org@localhost>
date:      Mon May 07 12:12:03 2012 +0000

description:
Use the current destination address to compute PTE, not the address of
origin.

Harmless, except when db_write_text() passes a page boundary.

>From Bug Hunting.

XXX has to be pulled up to -5 and -6.

diffstat:

 sys/arch/amd64/amd64/db_memrw.c |  6 +++---
 sys/arch/i386/i386/db_memrw.c   |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 835674fd12ca -r 06cf2b3d702b sys/arch/amd64/amd64/db_memrw.c
--- a/sys/arch/amd64/amd64/db_memrw.c   Mon May 07 11:20:24 2012 +0000
+++ b/sys/arch/amd64/amd64/db_memrw.c   Mon May 07 12:12:03 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_memrw.c,v 1.9 2011/11/23 01:15:02 jym Exp $ */
+/*     $NetBSD: db_memrw.c,v 1.10 2012/05/07 12:12:04 jym Exp $        */
 
 /*-
  * Copyright (c) 1996, 2000 The NetBSD Foundation, Inc.
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.9 2011/11/23 01:15:02 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.10 2012/05/07 12:12:04 jym Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -111,7 +111,7 @@
                /*
                 * Get the PTE for the page.
                 */
-               ppte = kvtopte(addr);
+               ppte = kvtopte((vaddr_t)dst);
                pte = *ppte;
 
                if ((pte & PG_V) == 0) {
diff -r 835674fd12ca -r 06cf2b3d702b sys/arch/i386/i386/db_memrw.c
--- a/sys/arch/i386/i386/db_memrw.c     Mon May 07 11:20:24 2012 +0000
+++ b/sys/arch/i386/i386/db_memrw.c     Mon May 07 12:12:03 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_memrw.c,v 1.28 2012/05/07 02:32:09 jym Exp $        */
+/*     $NetBSD: db_memrw.c,v 1.29 2012/05/07 12:12:03 jym Exp $        */
 
 /*-
  * Copyright (c) 1996, 2000 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.28 2012/05/07 02:32:09 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.29 2012/05/07 12:12:03 jym Exp $");
 
 #include "opt_xen.h"
 
@@ -111,7 +111,7 @@
                /*
                 * Get the PTE for the page.
                 */
-               ppte = kvtopte(addr);
+               ppte = kvtopte((vaddr_t)dst);
                pte = *ppte;
 
                if ((pte & PG_V) == 0) {