mirror of
https://github.com/reactos/reactos.git
synced 2024-06-28 17:01:28 +00:00
[NTOS:KD] Merge KdpReport() with kd64 version
This commit is contained in:
parent
a8662c73a5
commit
329b9fa2fb
|
@ -281,6 +281,10 @@ NTAPI
|
||||||
KdpReportExceptionStateChange(
|
KdpReportExceptionStateChange(
|
||||||
IN PEXCEPTION_RECORD ExceptionRecord,
|
IN PEXCEPTION_RECORD ExceptionRecord,
|
||||||
IN OUT PCONTEXT Context,
|
IN OUT PCONTEXT Context,
|
||||||
|
#ifndef _WINKD_
|
||||||
|
IN PKTRAP_FRAME TrapFrame,
|
||||||
|
IN KPROCESSOR_MODE PreviousMode,
|
||||||
|
#endif
|
||||||
IN BOOLEAN SecondChanceException
|
IN BOOLEAN SecondChanceException
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -52,15 +52,13 @@ KdpReportLoadSymbolsStateChange(IN PSTRING PathName,
|
||||||
|
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
NTAPI
|
NTAPI
|
||||||
KdpReport(IN PKTRAP_FRAME TrapFrame,
|
KdpReportExceptionStateChange(IN PEXCEPTION_RECORD ExceptionRecord,
|
||||||
IN PKEXCEPTION_FRAME ExceptionFrame,
|
IN OUT PCONTEXT ContextRecord,
|
||||||
IN PEXCEPTION_RECORD ExceptionRecord,
|
IN PKTRAP_FRAME TrapFrame,
|
||||||
IN PCONTEXT ContextRecord,
|
IN KPROCESSOR_MODE PreviousMode,
|
||||||
IN KPROCESSOR_MODE PreviousMode,
|
IN BOOLEAN SecondChanceException)
|
||||||
IN BOOLEAN SecondChanceException)
|
|
||||||
{
|
{
|
||||||
KD_CONTINUE_TYPE Return = kdHandleException;
|
KD_CONTINUE_TYPE Return = kdHandleException;
|
||||||
|
|
||||||
#ifdef KDBG
|
#ifdef KDBG
|
||||||
/* Check if this is an assertion failure */
|
/* Check if this is an assertion failure */
|
||||||
if (ExceptionRecord->ExceptionCode == STATUS_ASSERTION_FAILURE)
|
if (ExceptionRecord->ExceptionCode == STATUS_ASSERTION_FAILURE)
|
||||||
|
@ -288,6 +286,9 @@ KdDebuggerInitialize1(
|
||||||
/* Call the Wrapper Init Routine */
|
/* Call the Wrapper Init Routine */
|
||||||
if (WrapperInitRoutine)
|
if (WrapperInitRoutine)
|
||||||
WrapperTable.KdpInitRoutine(&WrapperTable, 1);
|
WrapperTable.KdpInitRoutine(&WrapperTable, 1);
|
||||||
|
|
||||||
|
NtGlobalFlag |= FLG_STOP_ON_EXCEPTION;
|
||||||
|
|
||||||
return STATUS_SUCCESS;
|
return STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1728,13 +1728,13 @@ KdpReportCommandStringStateChange(IN PSTRING NameString,
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef _WINKD_
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
NTAPI
|
NTAPI
|
||||||
KdpReportExceptionStateChange(IN PEXCEPTION_RECORD ExceptionRecord,
|
KdpReportExceptionStateChange(IN PEXCEPTION_RECORD ExceptionRecord,
|
||||||
IN OUT PCONTEXT Context,
|
IN OUT PCONTEXT Context,
|
||||||
IN BOOLEAN SecondChanceException)
|
IN BOOLEAN SecondChanceException)
|
||||||
{
|
{
|
||||||
#ifdef _WINKD_
|
|
||||||
STRING Header, Data;
|
STRING Header, Data;
|
||||||
DBGKD_ANY_WAIT_STATE_CHANGE WaitStateChange;
|
DBGKD_ANY_WAIT_STATE_CHANGE WaitStateChange;
|
||||||
KCONTINUE_STATUS Status;
|
KCONTINUE_STATUS Status;
|
||||||
|
@ -1782,11 +1782,8 @@ KdpReportExceptionStateChange(IN PEXCEPTION_RECORD ExceptionRecord,
|
||||||
|
|
||||||
/* Return */
|
/* Return */
|
||||||
return Status;
|
return Status;
|
||||||
#else
|
|
||||||
UNIMPLEMENTED;
|
|
||||||
return FALSE;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
NTAPI
|
NTAPI
|
||||||
|
@ -1850,6 +1847,10 @@ KdpSwitchProcessor(IN PEXCEPTION_RECORD ExceptionRecord,
|
||||||
/* Report a state change */
|
/* Report a state change */
|
||||||
Status = KdpReportExceptionStateChange(ExceptionRecord,
|
Status = KdpReportExceptionStateChange(ExceptionRecord,
|
||||||
ContextRecord,
|
ContextRecord,
|
||||||
|
#ifndef _WINKD_
|
||||||
|
NULL,
|
||||||
|
KernelMode,
|
||||||
|
#endif
|
||||||
SecondChanceException);
|
SecondChanceException);
|
||||||
|
|
||||||
/* Restore the port data and return */
|
/* Restore the port data and return */
|
||||||
|
|
|
@ -47,16 +47,6 @@
|
||||||
|
|
||||||
/* FUNCTIONS *****************************************************************/
|
/* FUNCTIONS *****************************************************************/
|
||||||
|
|
||||||
#ifndef _WINKD_
|
|
||||||
BOOLEAN
|
|
||||||
NTAPI
|
|
||||||
KdpReport(IN PKTRAP_FRAME TrapFrame,
|
|
||||||
IN PKEXCEPTION_FRAME ExceptionFrame,
|
|
||||||
IN PEXCEPTION_RECORD ExceptionRecord,
|
|
||||||
IN PCONTEXT ContextRecord,
|
|
||||||
IN KPROCESSOR_MODE PreviousMode,
|
|
||||||
IN BOOLEAN SecondChanceException);
|
|
||||||
#else
|
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
NTAPI
|
NTAPI
|
||||||
KdpReport(IN PKTRAP_FRAME TrapFrame,
|
KdpReport(IN PKTRAP_FRAME TrapFrame,
|
||||||
|
@ -126,6 +116,10 @@ KdpReport(IN PKTRAP_FRAME TrapFrame,
|
||||||
Handled = KdpReportExceptionStateChange(ExceptionRecord,
|
Handled = KdpReportExceptionStateChange(ExceptionRecord,
|
||||||
&Prcb->ProcessorState.
|
&Prcb->ProcessorState.
|
||||||
ContextFrame,
|
ContextFrame,
|
||||||
|
#ifndef _WINKD_
|
||||||
|
TrapFrame,
|
||||||
|
PreviousMode,
|
||||||
|
#endif
|
||||||
SecondChanceException);
|
SecondChanceException);
|
||||||
|
|
||||||
/* Now restore the processor state, manually again. */
|
/* Now restore the processor state, manually again. */
|
||||||
|
@ -139,7 +133,6 @@ KdpReport(IN PKTRAP_FRAME TrapFrame,
|
||||||
KdpControlCPressed = FALSE;
|
KdpControlCPressed = FALSE;
|
||||||
return Handled;
|
return Handled;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
BOOLEAN
|
BOOLEAN
|
||||||
NTAPI
|
NTAPI
|
||||||
|
|
Loading…
Reference in a new issue