[src/trunk]: src/sys/arch/x86/x86 use bootspace

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

details:   https://anonhg.NetBSD.org/src/rev/c920350698b0
branches:  trunk
changeset: 826807:c920350698b0
user:      maxv <maxv%NetBSD.org@localhost>
date:      Sat Sep 30 12:12:29 2017 +0000

description:
use bootspace

diffstat:

 sys/arch/x86/x86/db_memrw.c |  16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diffs (42 lines):

diff -r 4a1234ad3dba -r c920350698b0 sys/arch/x86/x86/db_memrw.c
--- a/sys/arch/x86/x86/db_memrw.c       Sat Sep 30 12:01:56 2017 +0000
+++ b/sys/arch/x86/x86/db_memrw.c       Sat Sep 30 12:12:29 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_memrw.c,v 1.2 2016/05/12 06:45:16 maxv Exp $        */
+/*     $NetBSD: db_memrw.c,v 1.3 2017/09/30 12:12:29 maxv Exp $        */
 
 /*-
  * Copyright (c) 1996, 2000 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.2 2016/05/12 06:45:16 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.3 2017/09/30 12:12:29 maxv Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -174,15 +174,19 @@
 void
 db_write_bytes(vaddr_t addr, size_t size, const char *data)
 {
-       extern int __rodata_start;
-       extern int __data_start;
+       extern struct bootspace bootspace;
        char *dst;
 
        dst = (char *)addr;
 
        /* If any part is in kernel text or rodata, use db_write_text() */
-       if ((addr >= KERNBASE && addr < (vaddr_t)&__rodata_start) ||
-           (addr >= (vaddr_t)&__rodata_start && addr < (vaddr_t)&__data_start)) {
+       if (addr >= bootspace.text.va &&
+           addr < (bootspace.text.va + bootspace.text.sz)) {
+               db_write_text(addr, size, data);
+               return;
+       }
+       if (addr >= bootspace.rodata.va &&
+           addr < (bootspace.rodata.va + bootspace.rodata.sz)) {
                db_write_text(addr, size, data);
                return;
        }