https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6fafe54f89649a654c2b6b9737ae3387f645ea36
commit 6fafe54f89649a654c2b6b9737ae3387f645ea36 Author: Hermès Bélusca-Maïto <[email protected]> AuthorDate: Sun Mar 26 01:28:59 2023 +0100 Commit: Hermès Bélusca-Maïto <[email protected]> CommitDate: Mon Mar 27 23:31:28 2023 +0200 [NTOS:KD:KDBG] Move some files to a better place. --- ntoskrnl/include/internal/kd.h | 19 ------------------- ntoskrnl/kd/arm/{kdbg.c => kdserial.c} | 0 ntoskrnl/kd/i386/{kdbg.c => kdserial.c} | 0 ntoskrnl/{kdbg/kdb_keyboard.c => kd/kdps2kbd.c} | 0 ntoskrnl/{kdbg/kdb_serial.c => kd/kdserial.c} | 0 ntoskrnl/{kd => kdbg}/i386/kdmemsup.c | 3 --- ntoskrnl/kdbg/kdb.h | 16 ++++++++++++++++ ntoskrnl/ntos.cmake | 15 ++++++--------- 8 files changed, 22 insertions(+), 31 deletions(-) diff --git a/ntoskrnl/include/internal/kd.h b/ntoskrnl/include/internal/kd.h index 424ae89fe1f..64b83e7a168 100644 --- a/ntoskrnl/include/internal/kd.h +++ b/ntoskrnl/include/internal/kd.h @@ -93,25 +93,6 @@ KdpDebugLogInit( #endif -/* KD ROUTINES ***************************************************************/ - -BOOLEAN -NTAPI -KdpSafeReadMemory( - IN ULONG_PTR Addr, - IN LONG Len, - OUT PVOID Value -); - -BOOLEAN -NTAPI -KdpSafeWriteMemory( - IN ULONG_PTR Addr, - IN LONG Len, - IN ULONGLONG Value -); - - /* KD GLOBALS ***************************************************************/ /* Serial debug connection */ diff --git a/ntoskrnl/kd/arm/kdbg.c b/ntoskrnl/kd/arm/kdserial.c similarity index 100% rename from ntoskrnl/kd/arm/kdbg.c rename to ntoskrnl/kd/arm/kdserial.c diff --git a/ntoskrnl/kd/i386/kdbg.c b/ntoskrnl/kd/i386/kdserial.c similarity index 100% rename from ntoskrnl/kd/i386/kdbg.c rename to ntoskrnl/kd/i386/kdserial.c diff --git a/ntoskrnl/kdbg/kdb_keyboard.c b/ntoskrnl/kd/kdps2kbd.c similarity index 100% rename from ntoskrnl/kdbg/kdb_keyboard.c rename to ntoskrnl/kd/kdps2kbd.c diff --git a/ntoskrnl/kdbg/kdb_serial.c b/ntoskrnl/kd/kdserial.c similarity index 100% rename from ntoskrnl/kdbg/kdb_serial.c rename to ntoskrnl/kd/kdserial.c diff --git a/ntoskrnl/kd/i386/kdmemsup.c b/ntoskrnl/kdbg/i386/kdmemsup.c similarity index 98% rename from ntoskrnl/kd/i386/kdmemsup.c rename to ntoskrnl/kdbg/i386/kdmemsup.c index 20a5824deb2..86edb18663b 100644 --- a/ntoskrnl/kd/i386/kdmemsup.c +++ b/ntoskrnl/kdbg/i386/kdmemsup.c @@ -9,15 +9,12 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Kernel - * FILE: ntoskrnl/kd/i386/kdmemsup.c * PURPOSE: Kernel Debugger Safe Memory Support * * PROGRAMMERS: arty */ #include <ntoskrnl.h> -#define NDEBUG -#include <debug.h> #define HIGH_PHYS_MASK 0x80000000 #define PAGE_TABLE_MASK 0x3ff diff --git a/ntoskrnl/kdbg/kdb.h b/ntoskrnl/kdbg/kdb.h index 2ec084fbb13..6a5027ec2e8 100644 --- a/ntoskrnl/kdbg/kdb.h +++ b/ntoskrnl/kdbg/kdb.h @@ -259,6 +259,22 @@ KdbEnterDebuggerException(IN PEXCEPTION_RECORD64 ExceptionRecord, /* other functions */ +BOOLEAN +NTAPI +KdpSafeReadMemory( + IN ULONG_PTR Addr, + IN LONG Len, + OUT PVOID Value +); + +BOOLEAN +NTAPI +KdpSafeWriteMemory( + IN ULONG_PTR Addr, + IN LONG Len, + IN ULONGLONG Value +); + NTSTATUS KdbpSafeReadMemory(OUT PVOID Dest, IN PVOID Src, diff --git a/ntoskrnl/ntos.cmake b/ntoskrnl/ntos.cmake index 1bef231351f..6816452fab4 100644 --- a/ntoskrnl/ntos.cmake +++ b/ntoskrnl/ntos.cmake @@ -366,7 +366,6 @@ elseif(ARCH STREQUAL "arm") ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/trap.s) list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/config/arm/cmhardwr.c - ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/arm/kdbg.c ${REACTOS_SOURCE_DIR}/ntoskrnl/kd64/arm/kdarm.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/cpu.c ${REACTOS_SOURCE_DIR}/ntoskrnl/ke/arm/exp.c @@ -387,21 +386,19 @@ if(NOT _WINKD_) endif() if(ARCH STREQUAL "i386") - list(APPEND SOURCE - ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/i386/kdbg.c) + list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/i386/kdserial.c) if(KDBG) list(APPEND ASM_SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/i386/kdb_help.S) list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/i386/i386-dis.c) endif() elseif(ARCH STREQUAL "amd64") - list(APPEND SOURCE - ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/i386/kdbg.c) + list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/i386/kdserial.c) if(KDBG) list(APPEND ASM_SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/amd64/kdb_help.S) list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/i386/i386-dis.c) endif() elseif(ARCH STREQUAL "arm") - list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/arm/kdbg.c) + list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/arm/kdserial.c) endif() if(KDBG) @@ -409,14 +406,14 @@ if(NOT _WINKD_) ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb.c ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb_cli.c ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb_expr.c - ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb_keyboard.c - ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb_serial.c ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb_symbols.c) endif() list(APPEND SOURCE ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/kdio.c - ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/kdmain.c) + ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/kdmain.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/kdps2kbd.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/kd/kdserial.c) else() add_definitions(-D_WINKD_)
