[KDROSDBG-NTOS]

Put the 3 helper COM functions into KDBG directly.

svn path=/branches/kd++/; revision=58970
This commit is contained in:
Hermès Bélusca-Maïto 2013-05-08 15:36:38 +00:00
parent cbdc727f61
commit 0811c4fabe
5 changed files with 29 additions and 38 deletions

View file

@ -1,13 +1,6 @@
spec2def(kdcom.dll kdrosdbg.spec ADD_IMPORTLIB)
if(ARCH STREQUAL "i386")
list(APPEND SOURCE i386/kdbg.c)
elseif(ARCH STREQUAL "amd64")
list(APPEND SOURCE i386/kdbg.c)
elseif(ARCH STREQUAL "arm")
list(APPEND SOURCE arm/kdbg.c)
endif(ARCH STREQUAL "i386")
list(APPEND SOURCE
kdrosdbg.c
kdrosdbg.rc

View file

@ -1,13 +1,8 @@
1 stdcall KdD0Transition()
2 stdcall KdD3Transition()
3 stdcall KdDebuggerInitialize0(ptr)
4 stdcall KdDebuggerInitialize1(ptr)
5 stdcall KdReceivePacket(long ptr ptr ptr ptr)
6 stdcall KdRestore(long)
7 stdcall KdSave(long)
8 stdcall KdSendPacket(long ptr ptr ptr)
; Legacy KD
@ stdcall KdPortInitializeEx(ptr long)
@ stdcall KdPortGetByteEx(ptr ptr)
@ stdcall KdPortPutByteEx(ptr long)
@ stdcall KdD0Transition()
@ stdcall KdD3Transition()
@ stdcall KdDebuggerInitialize0(ptr)
@ stdcall KdDebuggerInitialize1(ptr)
@ stdcall KdReceivePacket(long ptr ptr ptr ptr)
@ stdcall KdRestore(long)
@ stdcall KdSave(long)
@ stdcall KdSendPacket(long ptr ptr ptr)

View file

@ -363,6 +363,7 @@ endif()
if(NOT _WINKD_)
if(ARCH STREQUAL "i386")
list(APPEND SOURCE
kd/i386/kdbg.c
kd/i386/kdmemsup.c
kd/wrappers/gdbstub.c)
if(KDBG)
@ -372,6 +373,7 @@ if(NOT _WINKD_)
elseif(ARCH STREQUAL "amd64")
list(APPEND SOURCE
kd/amd64/kd.c
kd/i386/kdbg.c # Use the x86 file
kd/amd64/kdmemsup.c)
if(KDBG)
list(APPEND ASM_SOURCE kdbg/amd64/kdb_help.S)
@ -379,6 +381,8 @@ if(NOT _WINKD_)
kdbg/amd64/i386-dis.c
kdbg/amd64/kdb.c)
endif()
elseif(ARCH STREQUAL "arm")
list(APPEND SOURCE kd/arm/kdbg.c)
elseif(ARCH STREQUAL "powerpc")
list(APPEND SOURCE kd/wrappers/gdbstub_powerpc.c)
endif()

View file

@ -8,16 +8,8 @@
/* INCLUDES *******************************************************************/
#define NOEXTAPI
#include <ntifs.h>
#include <arc/arc.h>
#include <halfuncs.h>
#include <windbgkd.h>
#include <ioaccess.h> /* port intrinsics */
#include <cportlib/cportlib.h>
#include <ntoskrnl.h>
#include <arm/peripherals/pl011.h>
#include <stdio.h>
#define NDEBUG
#include <debug.h>
@ -33,6 +25,13 @@ CPPORT DefaultPort = {0, 0, 0};
/* REACTOS FUNCTIONS **********************************************************/
NTSTATUS
NTAPI
KdDebuggerInitialize1(IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL)
{
return STATUS_NOT_IMPLEMENTED;
}
BOOLEAN
NTAPI
KdPortInitializeEx(IN PCPPORT PortInformation,

View file

@ -9,15 +9,7 @@
/* INCLUDES *****************************************************************/
#define NOEXTAPI
#include <ntifs.h>
#include <arc/arc.h>
#include <halfuncs.h>
#include <windbgkd.h>
#include <ioaccess.h> /* port intrinsics */
#include <cportlib/cportlib.h>
#include <stdio.h>
#include <ntoskrnl.h>
#define NDEBUG
#include <debug.h>
@ -46,6 +38,14 @@ const ULONG BaseArray[] = {0, 0xF1012000};
/* REACTOS FUNCTIONS **********************************************************/
NTSTATUS
NTAPI
KdDebuggerInitialize1(
IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL)
{
return STATUS_NOT_IMPLEMENTED;
}
BOOLEAN
NTAPI
KdPortInitializeEx(