i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use debug_memcpy() instead of user_memcpy() in the kernel debugger.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36231 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2010-04-13 17:40:50 +00:00
parent c3676b54bf
commit f6f047841e
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/debugger/disasm/x86/Jamfile
+1
View File
@@ -3,6 +3,7 @@ SubDir HAIKU_TOP src add-ons kernel debugger disasm $(TARGET_ARCH) ;
SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ; SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
UseHeaders [ LibraryHeaders udis86 ] ; UseHeaders [ LibraryHeaders udis86 ] ;
UseHeaders [ LibraryHeaders [ FDirName udis86 libudis86 ] ] ; UseHeaders [ LibraryHeaders [ FDirName udis86 libudis86 ] ] ;
UsePrivateKernelHeaders ;
DEFINES += __UD_STANDALONE__ ; DEFINES += __UD_STANDALONE__ ;
DEFINES += assert=disasm_arch_assert ; DEFINES += assert=disasm_arch_assert ;
src/add-ons/kernel/debugger/disasm/x86/disasm_arch.cpp
+4 -1
View File
@@ -6,6 +6,8 @@
#include <OS.h> #include <OS.h>
#include <KernelExport.h> #include <KernelExport.h>
#include <debug.h>
#include "disasm_arch.h" #include "disasm_arch.h"
#include "udis86.h" #include "udis86.h"
@@ -20,7 +22,8 @@ static int
read_next_byte(struct ud*) read_next_byte(struct ud*)
{ {
uint8_t buffer; uint8_t buffer;
if (user_memcpy(&buffer, (void*)sCurrentReadAddress, 1) != B_OK) { if (debug_memcpy(B_CURRENT_TEAM, &buffer, (void*)sCurrentReadAddress, 1)
!= B_OK) {
kprintf("<read fault>\n"); kprintf("<read fault>\n");
return UD_EOI; return UD_EOI;
} }