This is a patch i've been keeping for a while. Yes, it's not "as nt does it",

[reactos.git] / reactos / ntoskrnl / kd / wrappers / gdbstub.c

diff --git a/reactos/ntoskrnl/kd/wrappers/gdbstub.c b/reactos/ntoskrnl/kd/wrappers/gdbstub.c
index 1e23ef9..aedf32d 100644 (file)
--- a/reactos/ntoskrnl/kd/wrappers/gdbstub.c
+++ b/reactos/ntoskrnl/kd/wrappers/gdbstub.c
@@ -322,19 +322,9 @@ static volatile void *GspAccessLocation = NULL;
 static CHAR
 GspReadMemSafe(PCHAR Address)
 {
-  CHAR ch;
-
-  if (NULL == Address)
-    {
-      GspMemoryError = TRUE;
-      return '\0';
-    }
-
-  GspAccessLocation = Address;
-  ch = *Address;
-  GspAccessLocation = NULL;
-
-  return ch;
+    CHAR ch;
+    KdpSafeReadMemory((ULONG_PTR)Address, 1, &ch);
+    return ch;
 }
 
 /* Convert the memory pointed to by Address into hex, placing result in Buffer */
@@ -455,19 +445,11 @@ GspHex2Mem(PCHAR Buffer,
   return Buffer + 2 * Count;
 }
 
-static CHAR
-GspWriteMemSafeGetContent(PVOID Context, ULONG Offset)
-{
-  ASSERT(0 == Offset);
-
-  return *((PCHAR) Context);
-}
-
 static void
 GspWriteMemSafe(PCHAR Address,
   CHAR Ch)
 {
-  GspWriteMem(Address, 1, TRUE, GspWriteMemSafeGetContent, &Ch);
+    KdpSafeWriteMemory((ULONG_PTR)Address, 1, Ch);
 }