Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

There is no point in trying to tell userland access from kernel access by 

looking at the address on sparc64 - so, let us believe the comment and always
deal with kernel access here.
While there, fix write access to kernel text for bigger kernels.
This commit is contained in:
martin 2013-01-03 07:51:48 +00:00
parent 3e3a2f916a
commit 9cb1a35373
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/arch/sparc64/sparc64/db_interface.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: db_interface.c,v 1.130 2012/02/18 15:56:30 christos Exp $ */
/* $NetBSD: db_interface.c,v 1.131 2013/01/03 07:51:48 martin Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved.
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.130 2012/02/18 15:56:30 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.131 2013/01/03 07:51:48 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@ -358,10 +358,7 @@ db_read_bytes(db_addr_t addr, size_t size, char *data)
src = (char *)(uintptr_t)addr;
while (size-- > 0) {
if (src >= (char *)VM_MIN_KERNEL_ADDRESS)
*data++ = probeget((paddr_t)(u_long)src++, ASI_P, 1);
else
*data++ = fubyte(src++);
*data++ = probeget((paddr_t)(u_long)src++, ASI_P, 1);
}
}
@ -374,17 +371,16 @@ db_write_bytes(db_addr_t addr, size_t size, const char *data)
{
char *dst;
extern paddr_t pmap_kextract(vaddr_t va);
extern vaddr_t ektext;
dst = (char *)(uintptr_t)addr;
while (size-- > 0) {
if ((dst >= (char *)VM_MIN_KERNEL_ADDRESS+0x400000))
*dst = *data;
else if ((dst >= (char *)VM_MIN_KERNEL_ADDRESS) &&
(dst < (char *)VM_MIN_KERNEL_ADDRESS+0x400000))
if ((dst >= (char *)VM_MIN_KERNEL_ADDRESS) &&
(dst < (char *)ektext))
/* Read Only mapping -- need to do a bypass access */
stba(pmap_kextract((vaddr_t)dst), ASI_PHYS_CACHED, *data);
else
subyte(dst, *data);
*dst = *data;
dst++, data++;
}