Lowercase STATIC and CONST. Fixes build with DBG but without KDBG.

svn path=/trunk/; revision=41403
This commit is contained in:
Dmitry Gorbachev 2009-06-13 15:28:33 +00:00
parent df5470127f
commit ca19857e83
5 changed files with 110 additions and 118 deletions

View file

@ -27,34 +27,34 @@
/* GLOBALS *******************************************************************/ /* GLOBALS *******************************************************************/
STATIC LONG KdbEntryCount = 0; static LONG KdbEntryCount = 0;
STATIC CHAR KdbStack[KDB_STACK_SIZE]; static CHAR KdbStack[KDB_STACK_SIZE];
STATIC ULONG KdbBreakPointCount = 0; /* Number of used breakpoints in the array */ static ULONG KdbBreakPointCount = 0; /* Number of used breakpoints in the array */
STATIC KDB_BREAKPOINT KdbBreakPoints[KDB_MAXIMUM_BREAKPOINT_COUNT] = {{0}}; /* Breakpoint array */ static KDB_BREAKPOINT KdbBreakPoints[KDB_MAXIMUM_BREAKPOINT_COUNT] = {{0}}; /* Breakpoint array */
STATIC ULONG KdbSwBreakPointCount = 0; /* Number of enabled software breakpoints */ static ULONG KdbSwBreakPointCount = 0; /* Number of enabled software breakpoints */
STATIC ULONG KdbHwBreakPointCount = 0; /* Number of enabled hardware breakpoints */ static ULONG KdbHwBreakPointCount = 0; /* Number of enabled hardware breakpoints */
STATIC PKDB_BREAKPOINT KdbSwBreakPoints[KDB_MAXIMUM_SW_BREAKPOINT_COUNT]; /* Enabled software breakpoints, orderless */ static PKDB_BREAKPOINT KdbSwBreakPoints[KDB_MAXIMUM_SW_BREAKPOINT_COUNT]; /* Enabled software breakpoints, orderless */
STATIC PKDB_BREAKPOINT KdbHwBreakPoints[KDB_MAXIMUM_HW_BREAKPOINT_COUNT]; /* Enabled hardware breakpoints, orderless */ static PKDB_BREAKPOINT KdbHwBreakPoints[KDB_MAXIMUM_HW_BREAKPOINT_COUNT]; /* Enabled hardware breakpoints, orderless */
STATIC PKDB_BREAKPOINT KdbBreakPointToReenable = NULL; /* Set to a breakpoint struct when single stepping after static PKDB_BREAKPOINT KdbBreakPointToReenable = NULL; /* Set to a breakpoint struct when single stepping after
a software breakpoint was hit, to reenable it */ a software breakpoint was hit, to reenable it */
LONG KdbLastBreakPointNr = -1; /* Index of the breakpoint which cause KDB to be entered */ LONG KdbLastBreakPointNr = -1; /* Index of the breakpoint which cause KDB to be entered */
ULONG KdbNumSingleSteps = 0; /* How many single steps to do */ ULONG KdbNumSingleSteps = 0; /* How many single steps to do */
BOOLEAN KdbSingleStepOver = FALSE; /* Whether to step over calls/reps. */ BOOLEAN KdbSingleStepOver = FALSE; /* Whether to step over calls/reps. */
ULONG KdbDebugState = 0; /* KDBG Settings (NOECHO, KDSERIAL) */ ULONG KdbDebugState = 0; /* KDBG Settings (NOECHO, KDSERIAL) */
STATIC BOOLEAN KdbEnteredOnSingleStep = FALSE; /* Set to true when KDB was entered because of single step */ static BOOLEAN KdbEnteredOnSingleStep = FALSE; /* Set to true when KDB was entered because of single step */
PEPROCESS KdbCurrentProcess = NULL; /* The current process context in which KDB runs */ PEPROCESS KdbCurrentProcess = NULL; /* The current process context in which KDB runs */
PEPROCESS KdbOriginalProcess = NULL; /* The process in whichs context KDB was intered */ PEPROCESS KdbOriginalProcess = NULL; /* The process in whichs context KDB was intered */
PETHREAD KdbCurrentThread = NULL; /* The current thread context in which KDB runs */ PETHREAD KdbCurrentThread = NULL; /* The current thread context in which KDB runs */
PETHREAD KdbOriginalThread = NULL; /* The thread in whichs context KDB was entered */ PETHREAD KdbOriginalThread = NULL; /* The thread in whichs context KDB was entered */
PKDB_KTRAP_FRAME KdbCurrentTrapFrame = NULL; /* Pointer to the current trapframe */ PKDB_KTRAP_FRAME KdbCurrentTrapFrame = NULL; /* Pointer to the current trapframe */
STATIC KDB_KTRAP_FRAME KdbTrapFrame = { { 0 } }; /* The trapframe which was passed to KdbEnterDebuggerException */ static KDB_KTRAP_FRAME KdbTrapFrame = { { 0 } }; /* The trapframe which was passed to KdbEnterDebuggerException */
STATIC KDB_KTRAP_FRAME KdbThreadTrapFrame = { { 0 } }; /* The trapframe of the current thread (KdbCurrentThread) */ static KDB_KTRAP_FRAME KdbThreadTrapFrame = { { 0 } }; /* The trapframe of the current thread (KdbCurrentThread) */
STATIC KAPC_STATE KdbApcState; static KAPC_STATE KdbApcState;
extern BOOLEAN KdbpBugCheckRequested; extern BOOLEAN KdbpBugCheckRequested;
/* Array of conditions when to enter KDB */ /* Array of conditions when to enter KDB */
STATIC KDB_ENTER_CONDITION KdbEnterConditions[][2] = static KDB_ENTER_CONDITION KdbEnterConditions[][2] =
{ {
/* First chance Last chance */ /* First chance Last chance */
{ KdbDoNotEnter, KdbEnterFromKmode }, /* Zero devide */ { KdbDoNotEnter, KdbEnterFromKmode }, /* Zero devide */
@ -81,7 +81,7 @@ STATIC KDB_ENTER_CONDITION KdbEnterConditions[][2] =
}; };
/* Exception descriptions */ /* Exception descriptions */
STATIC CONST CHAR *ExceptionNrToString[] = static const CHAR *ExceptionNrToString[] =
{ {
"Divide Error", "Divide Error",
"Debug Trap", "Debug Trap",
@ -133,7 +133,7 @@ HalReleaseDisplayOwnership(
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
STATIC VOID static VOID
KdbpTrapFrameToKdbTrapFrame(PKTRAP_FRAME TrapFrame, PKDB_KTRAP_FRAME KdbTrapFrame) KdbpTrapFrameToKdbTrapFrame(PKTRAP_FRAME TrapFrame, PKDB_KTRAP_FRAME KdbTrapFrame)
{ {
ULONG TrapCr0, TrapCr2, TrapCr3, TrapCr4; ULONG TrapCr0, TrapCr2, TrapCr3, TrapCr4;
@ -180,7 +180,7 @@ KdbpTrapFrameToKdbTrapFrame(PKTRAP_FRAME TrapFrame, PKDB_KTRAP_FRAME KdbTrapFram
/* FIXME: copy v86 registers if TrapFrame is a V86 trapframe */ /* FIXME: copy v86 registers if TrapFrame is a V86 trapframe */
} }
STATIC VOID static VOID
KdbpKdbTrapFrameToTrapFrame(PKDB_KTRAP_FRAME KdbTrapFrame, PKTRAP_FRAME TrapFrame) KdbpKdbTrapFrameToTrapFrame(PKDB_KTRAP_FRAME KdbTrapFrame, PKTRAP_FRAME TrapFrame)
{ {
/* Copy the TrapFrame only up to Eflags and zero the rest*/ /* Copy the TrapFrame only up to Eflags and zero the rest*/
@ -194,7 +194,7 @@ KdbpKdbTrapFrameToTrapFrame(PKDB_KTRAP_FRAME KdbTrapFrame, PKTRAP_FRAME TrapFram
/* FIXME: copy v86 registers if TrapFrame is a V86 trapframe */ /* FIXME: copy v86 registers if TrapFrame is a V86 trapframe */
} }
STATIC VOID static VOID
KdbpKdbTrapFrameFromKernelStack(PVOID KernelStack, KdbpKdbTrapFrameFromKernelStack(PVOID KernelStack,
PKDB_KTRAP_FRAME KdbTrapFrame) PKDB_KTRAP_FRAME KdbTrapFrame)
{ {
@ -227,7 +227,7 @@ KdbpKdbTrapFrameFromKernelStack(PVOID KernelStack,
* *
* \returns NTSTATUS * \returns NTSTATUS
*/ */
STATIC NTSTATUS static NTSTATUS
KdbpOverwriteInstruction( KdbpOverwriteInstruction(
IN PEPROCESS Process, IN PEPROCESS Process,
IN ULONG_PTR Address, IN ULONG_PTR Address,
@ -698,7 +698,7 @@ KdbpDeleteBreakPoint(
* *
* \returns Breakpoint number, -1 on error. * \returns Breakpoint number, -1 on error.
*/ */
STATIC LONG static LONG
KdbpIsBreakPointOurs( KdbpIsBreakPointOurs(
IN NTSTATUS ExceptionCode, IN NTSTATUS ExceptionCode,
IN PKTRAP_FRAME TrapFrame) IN PKTRAP_FRAME TrapFrame)
@ -1174,7 +1174,7 @@ KdbpAttachToProcess(
/*!\brief Calls the main loop ... /*!\brief Calls the main loop ...
*/ */
STATIC VOID static VOID
KdbpCallMainLoop() KdbpCallMainLoop()
{ {
KdbpCliMainLoop(KdbEnteredOnSingleStep); KdbpCliMainLoop(KdbEnteredOnSingleStep);
@ -1184,7 +1184,7 @@ KdbpCallMainLoop()
* *
* Disables interrupts, releases display ownership, ... * Disables interrupts, releases display ownership, ...
*/ */
STATIC VOID static VOID
KdbpInternalEnter() KdbpInternalEnter()
{ {
PETHREAD Thread; PETHREAD Thread;
@ -1218,7 +1218,7 @@ KdbpInternalEnter()
KbdEnableMouse(); KbdEnableMouse();
} }
STATIC ULONG static ULONG
KdbpGetExceptionNumberFromStatus(IN NTSTATUS ExceptionCode) KdbpGetExceptionNumberFromStatus(IN NTSTATUS ExceptionCode)
{ {
ULONG Ret; ULONG Ret;
@ -1507,7 +1507,7 @@ KdbEnterDebuggerException(
} }
else else
{ {
CONST CHAR *ExceptionString = (ExpNr < RTL_NUMBER_OF(ExceptionNrToString)) ? const CHAR *ExceptionString = (ExpNr < RTL_NUMBER_OF(ExceptionNrToString)) ?
(ExceptionNrToString[ExpNr]) : (ExceptionNrToString[ExpNr]) :
("Unknown/User defined exception"); ("Unknown/User defined exception");

View file

@ -7,14 +7,6 @@
# define RTL_NUMBER_OF(x) (sizeof(x) / sizeof((x)[0])) # define RTL_NUMBER_OF(x) (sizeof(x) / sizeof((x)[0]))
#endif #endif
#ifndef STATIC
#define STATIC static
#endif
#ifndef CONST
#define CONST const
#endif
/* TYPES *********************************************************************/ /* TYPES *********************************************************************/
/* from kdb.c */ /* from kdb.c */

View file

@ -58,50 +58,50 @@
/* PROTOTYPES ****************************************************************/ /* PROTOTYPES ****************************************************************/
STATIC BOOLEAN KdbpCmdEvalExpression(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdEvalExpression(ULONG Argc, PCHAR Argv[]);
STATIC BOOLEAN KdbpCmdDisassembleX(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdDisassembleX(ULONG Argc, PCHAR Argv[]);
STATIC BOOLEAN KdbpCmdRegs(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdRegs(ULONG Argc, PCHAR Argv[]);
STATIC BOOLEAN KdbpCmdBackTrace(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdBackTrace(ULONG Argc, PCHAR Argv[]);
STATIC BOOLEAN KdbpCmdContinue(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdContinue(ULONG Argc, PCHAR Argv[]);
STATIC BOOLEAN KdbpCmdStep(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdStep(ULONG Argc, PCHAR Argv[]);
STATIC BOOLEAN KdbpCmdBreakPointList(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdBreakPointList(ULONG Argc, PCHAR Argv[]);
STATIC BOOLEAN KdbpCmdEnableDisableClearBreakPoint(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdEnableDisableClearBreakPoint(ULONG Argc, PCHAR Argv[]);
STATIC BOOLEAN KdbpCmdBreakPoint(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdBreakPoint(ULONG Argc, PCHAR Argv[]);
STATIC BOOLEAN KdbpCmdThread(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdThread(ULONG Argc, PCHAR Argv[]);
STATIC BOOLEAN KdbpCmdProc(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdProc(ULONG Argc, PCHAR Argv[]);
STATIC BOOLEAN KdbpCmdMod(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdMod(ULONG Argc, PCHAR Argv[]);
STATIC BOOLEAN KdbpCmdGdtLdtIdt(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdGdtLdtIdt(ULONG Argc, PCHAR Argv[]);
STATIC BOOLEAN KdbpCmdPcr(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdPcr(ULONG Argc, PCHAR Argv[]);
STATIC BOOLEAN KdbpCmdTss(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdTss(ULONG Argc, PCHAR Argv[]);
STATIC BOOLEAN KdbpCmdBugCheck(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdBugCheck(ULONG Argc, PCHAR Argv[]);
STATIC BOOLEAN KdbpCmdFilter(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdFilter(ULONG Argc, PCHAR Argv[]);
STATIC BOOLEAN KdbpCmdSet(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdSet(ULONG Argc, PCHAR Argv[]);
STATIC BOOLEAN KdbpCmdHelp(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdHelp(ULONG Argc, PCHAR Argv[]);
/* GLOBALS *******************************************************************/ /* GLOBALS *******************************************************************/
STATIC BOOLEAN KdbUseIntelSyntax = FALSE; /* Set to TRUE for intel syntax */ static BOOLEAN KdbUseIntelSyntax = FALSE; /* Set to TRUE for intel syntax */
STATIC BOOLEAN KdbBreakOnModuleLoad = FALSE; /* Set to TRUE to break into KDB when a module is loaded */ static BOOLEAN KdbBreakOnModuleLoad = FALSE; /* Set to TRUE to break into KDB when a module is loaded */
STATIC CHAR KdbCommandHistoryBuffer[2048]; /* Command history string ringbuffer */ static CHAR KdbCommandHistoryBuffer[2048]; /* Command history string ringbuffer */
STATIC PCHAR KdbCommandHistory[sizeof(KdbCommandHistoryBuffer) / 8] = { NULL }; /* Command history ringbuffer */ static PCHAR KdbCommandHistory[sizeof(KdbCommandHistoryBuffer) / 8] = { NULL }; /* Command history ringbuffer */
STATIC LONG KdbCommandHistoryBufferIndex = 0; static LONG KdbCommandHistoryBufferIndex = 0;
STATIC LONG KdbCommandHistoryIndex = 0; static LONG KdbCommandHistoryIndex = 0;
STATIC ULONG KdbNumberOfRowsPrinted = 0; static ULONG KdbNumberOfRowsPrinted = 0;
STATIC ULONG KdbNumberOfColsPrinted = 0; static ULONG KdbNumberOfColsPrinted = 0;
STATIC BOOLEAN KdbOutputAborted = FALSE; static BOOLEAN KdbOutputAborted = FALSE;
STATIC LONG KdbNumberOfRowsTerminal = -1; static LONG KdbNumberOfRowsTerminal = -1;
STATIC LONG KdbNumberOfColsTerminal = -1; static LONG KdbNumberOfColsTerminal = -1;
PCHAR KdbInitFileBuffer = NULL; /* Buffer where KDBinit file is loaded into during initialization */ PCHAR KdbInitFileBuffer = NULL; /* Buffer where KDBinit file is loaded into during initialization */
BOOLEAN KdbpBugCheckRequested = FALSE; BOOLEAN KdbpBugCheckRequested = FALSE;
STATIC CONST struct static const struct
{ {
PCHAR Name; PCHAR Name;
PCHAR Syntax; PCHAR Syntax;
@ -163,7 +163,7 @@ STATIC CONST struct
* \retval TRUE Success. * \retval TRUE Success.
* \retval FALSE Failure. * \retval FALSE Failure.
*/ */
STATIC BOOLEAN static BOOLEAN
KdbpGetComponentId( KdbpGetComponentId(
IN PCCH ComponentName, IN PCCH ComponentName,
OUT PULONG ComponentId) OUT PULONG ComponentId)
@ -293,13 +293,13 @@ KdbpGetComponentId(
* \retval TRUE Success. * \retval TRUE Success.
* \retval FALSE Failure. * \retval FALSE Failure.
*/ */
STATIC BOOLEAN static BOOLEAN
KdbpEvaluateExpression( KdbpEvaluateExpression(
IN PCHAR Expression, IN PCHAR Expression,
IN LONG ErrOffset, IN LONG ErrOffset,
OUT PULONGLONG Result) OUT PULONGLONG Result)
{ {
STATIC CHAR ErrMsgBuffer[130] = "^ "; static CHAR ErrMsgBuffer[130] = "^ ";
LONG ExpressionErrOffset = -1; LONG ExpressionErrOffset = -1;
PCHAR ErrMsg = ErrMsgBuffer; PCHAR ErrMsg = ErrMsgBuffer;
BOOLEAN Ok; BOOLEAN Ok;
@ -320,7 +320,7 @@ KdbpEvaluateExpression(
/*!\brief Evaluates an expression and displays the result. /*!\brief Evaluates an expression and displays the result.
*/ */
STATIC BOOLEAN static BOOLEAN
KdbpCmdEvalExpression(ULONG Argc, PCHAR Argv[]) KdbpCmdEvalExpression(ULONG Argc, PCHAR Argv[])
{ {
ULONG i, len; ULONG i, len;
@ -375,7 +375,7 @@ KdbpCmdEvalExpression(ULONG Argc, PCHAR Argv[])
/*!\brief Display list of active debug channels /*!\brief Display list of active debug channels
*/ */
STATIC BOOLEAN static BOOLEAN
KdbpCmdFilter(ULONG Argc, PCHAR Argv[]) KdbpCmdFilter(ULONG Argc, PCHAR Argv[])
{ {
ULONG i, j, ComponentId, Level; ULONG i, j, ComponentId, Level;
@ -455,7 +455,7 @@ KdbpCmdFilter(ULONG Argc, PCHAR Argv[])
/*!\brief Disassembles 10 instructions at eip or given address or /*!\brief Disassembles 10 instructions at eip or given address or
* displays 16 dwords from memory at given address. * displays 16 dwords from memory at given address.
*/ */
STATIC BOOLEAN static BOOLEAN
KdbpCmdDisassembleX(ULONG Argc, PCHAR Argv[]) KdbpCmdDisassembleX(ULONG Argc, PCHAR Argv[])
{ {
ULONG Count; ULONG Count;
@ -565,12 +565,12 @@ KdbpCmdDisassembleX(ULONG Argc, PCHAR Argv[])
/*!\brief Displays CPU registers. /*!\brief Displays CPU registers.
*/ */
STATIC BOOLEAN static BOOLEAN
KdbpCmdRegs(ULONG Argc, PCHAR Argv[]) KdbpCmdRegs(ULONG Argc, PCHAR Argv[])
{ {
PKTRAP_FRAME Tf = &KdbCurrentTrapFrame->Tf; PKTRAP_FRAME Tf = &KdbCurrentTrapFrame->Tf;
INT i; INT i;
STATIC CONST PCHAR EflagsBits[32] = { " CF", NULL, " PF", " BIT3", " AF", " BIT5", static const PCHAR EflagsBits[32] = { " CF", NULL, " PF", " BIT3", " AF", " BIT5",
" ZF", " SF", " TF", " IF", " DF", " OF", " ZF", " SF", " TF", " IF", " DF", " OF",
NULL, NULL, " NT", " BIT15", " RF", " VF", NULL, NULL, " NT", " BIT15", " RF", " VF",
" AC", " VIF", " VIP", " ID", " BIT22", " AC", " VIF", " VIP", " ID", " BIT22",
@ -617,11 +617,11 @@ KdbpCmdRegs(ULONG Argc, PCHAR Argv[])
ULONG Cr0, Cr2, Cr3, Cr4; ULONG Cr0, Cr2, Cr3, Cr4;
KDESCRIPTOR Gdtr = {0}, Ldtr = {0}, Idtr = {0}; KDESCRIPTOR Gdtr = {0}, Ldtr = {0}, Idtr = {0};
ULONG Tr = 0; ULONG Tr = 0;
STATIC CONST PCHAR Cr0Bits[32] = { " PE", " MP", " EM", " TS", " ET", " NE", NULL, NULL, static const PCHAR Cr0Bits[32] = { " PE", " MP", " EM", " TS", " ET", " NE", NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
" WP", NULL, " AM", NULL, NULL, NULL, NULL, NULL, " WP", NULL, " AM", NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, " NW", " CD", " PG" }; NULL, NULL, NULL, NULL, NULL, " NW", " CD", " PG" };
STATIC CONST PCHAR Cr4Bits[32] = { " VME", " PVI", " TSD", " DE", " PSE", " PAE", " MCE", " PGE", static const PCHAR Cr4Bits[32] = { " VME", " PVI", " TSD", " DE", " PSE", " PAE", " MCE", " PGE",
" PCE", " OSFXSR", " OSXMMEXCPT", NULL, NULL, NULL, NULL, NULL, " PCE", " OSFXSR", " OSXMMEXCPT", NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }; NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL };
@ -698,7 +698,7 @@ KdbpCmdRegs(ULONG Argc, PCHAR Argv[])
/*!\brief Displays a backtrace. /*!\brief Displays a backtrace.
*/ */
STATIC BOOLEAN static BOOLEAN
KdbpCmdBackTrace(ULONG Argc, PCHAR Argv[]) KdbpCmdBackTrace(ULONG Argc, PCHAR Argv[])
{ {
ULONG Count; ULONG Count;
@ -797,7 +797,7 @@ KdbpCmdBackTrace(ULONG Argc, PCHAR Argv[])
/*!\brief Continues execution of the system/leaves KDB. /*!\brief Continues execution of the system/leaves KDB.
*/ */
STATIC BOOLEAN static BOOLEAN
KdbpCmdContinue(ULONG Argc, PCHAR Argv[]) KdbpCmdContinue(ULONG Argc, PCHAR Argv[])
{ {
/* Exit the main loop */ /* Exit the main loop */
@ -806,7 +806,7 @@ KdbpCmdContinue(ULONG Argc, PCHAR Argv[])
/*!\brief Continues execution of the system/leaves KDB. /*!\brief Continues execution of the system/leaves KDB.
*/ */
STATIC BOOLEAN static BOOLEAN
KdbpCmdStep(ULONG Argc, PCHAR Argv[]) KdbpCmdStep(ULONG Argc, PCHAR Argv[])
{ {
ULONG Count = 1; ULONG Count = 1;
@ -834,7 +834,7 @@ KdbpCmdStep(ULONG Argc, PCHAR Argv[])
/*!\brief Lists breakpoints. /*!\brief Lists breakpoints.
*/ */
STATIC BOOLEAN static BOOLEAN
KdbpCmdBreakPointList(ULONG Argc, PCHAR Argv[]) KdbpCmdBreakPointList(ULONG Argc, PCHAR Argv[])
{ {
LONG l; LONG l;
@ -927,7 +927,7 @@ KdbpCmdBreakPointList(ULONG Argc, PCHAR Argv[])
/*!\brief Enables, disables or clears a breakpoint. /*!\brief Enables, disables or clears a breakpoint.
*/ */
STATIC BOOLEAN static BOOLEAN
KdbpCmdEnableDisableClearBreakPoint(ULONG Argc, PCHAR Argv[]) KdbpCmdEnableDisableClearBreakPoint(ULONG Argc, PCHAR Argv[])
{ {
PCHAR pend; PCHAR pend;
@ -966,7 +966,7 @@ KdbpCmdEnableDisableClearBreakPoint(ULONG Argc, PCHAR Argv[])
/*!\brief Sets a software or hardware (memory) breakpoint at the given address. /*!\brief Sets a software or hardware (memory) breakpoint at the given address.
*/ */
STATIC BOOLEAN static BOOLEAN
KdbpCmdBreakPoint(ULONG Argc, PCHAR Argv[]) KdbpCmdBreakPoint(ULONG Argc, PCHAR Argv[])
{ {
ULONGLONG Result = 0; ULONGLONG Result = 0;
@ -1084,7 +1084,7 @@ KdbpCmdBreakPoint(ULONG Argc, PCHAR Argv[])
/*!\brief Lists threads or switches to another thread context. /*!\brief Lists threads or switches to another thread context.
*/ */
STATIC BOOLEAN static BOOLEAN
KdbpCmdThread(ULONG Argc, PCHAR Argv[]) KdbpCmdThread(ULONG Argc, PCHAR Argv[])
{ {
PLIST_ENTRY Entry; PLIST_ENTRY Entry;
@ -1096,7 +1096,7 @@ KdbpCmdThread(ULONG Argc, PCHAR Argv[])
ULONG Eip; ULONG Eip;
ULONG ul = 0; ULONG ul = 0;
PCHAR State, pend, str1, str2; PCHAR State, pend, str1, str2;
STATIC CONST PCHAR ThreadStateToString[DeferredReady+1] = static const PCHAR ThreadStateToString[DeferredReady+1] =
{ "Initialized", "Ready", "Running", { "Initialized", "Ready", "Running",
"Standby", "Terminated", "Waiting", "Standby", "Terminated", "Waiting",
"Transition", "DeferredReady" }; "Transition", "DeferredReady" };
@ -1268,7 +1268,7 @@ KdbpCmdThread(ULONG Argc, PCHAR Argv[])
/*!\brief Lists processes or switches to another process context. /*!\brief Lists processes or switches to another process context.
*/ */
STATIC BOOLEAN static BOOLEAN
KdbpCmdProc(ULONG Argc, PCHAR Argv[]) KdbpCmdProc(ULONG Argc, PCHAR Argv[])
{ {
PLIST_ENTRY Entry; PLIST_ENTRY Entry;
@ -1380,7 +1380,7 @@ KdbpCmdProc(ULONG Argc, PCHAR Argv[])
/*!\brief Lists loaded modules or the one containing the specified address. /*!\brief Lists loaded modules or the one containing the specified address.
*/ */
STATIC BOOLEAN static BOOLEAN
KdbpCmdMod(ULONG Argc, PCHAR Argv[]) KdbpCmdMod(ULONG Argc, PCHAR Argv[])
{ {
ULONGLONG Result = 0; ULONGLONG Result = 0;
@ -1441,7 +1441,7 @@ KdbpCmdMod(ULONG Argc, PCHAR Argv[])
/*!\brief Displays GDT, LDT or IDTd. /*!\brief Displays GDT, LDT or IDTd.
*/ */
STATIC BOOLEAN static BOOLEAN
KdbpCmdGdtLdtIdt(ULONG Argc, PCHAR Argv[]) KdbpCmdGdtLdtIdt(ULONG Argc, PCHAR Argv[])
{ {
KDESCRIPTOR Reg = {0}; KDESCRIPTOR Reg = {0};
@ -1642,7 +1642,7 @@ KdbpCmdGdtLdtIdt(ULONG Argc, PCHAR Argv[])
/*!\brief Displays the KPCR /*!\brief Displays the KPCR
*/ */
STATIC BOOLEAN static BOOLEAN
KdbpCmdPcr(ULONG Argc, PCHAR Argv[]) KdbpCmdPcr(ULONG Argc, PCHAR Argv[])
{ {
PKIPCR Pcr = (PKIPCR)KeGetPcr(); PKIPCR Pcr = (PKIPCR)KeGetPcr();
@ -1687,7 +1687,7 @@ KdbpCmdPcr(ULONG Argc, PCHAR Argv[])
/*!\brief Displays the TSS /*!\brief Displays the TSS
*/ */
STATIC BOOLEAN static BOOLEAN
KdbpCmdTss(ULONG Argc, PCHAR Argv[]) KdbpCmdTss(ULONG Argc, PCHAR Argv[])
{ {
KTSS *Tss = KeGetPcr()->TSS; KTSS *Tss = KeGetPcr()->TSS;
@ -1707,7 +1707,7 @@ KdbpCmdTss(ULONG Argc, PCHAR Argv[])
/*!\brief Bugchecks the system. /*!\brief Bugchecks the system.
*/ */
STATIC BOOLEAN static BOOLEAN
KdbpCmdBugCheck(ULONG Argc, PCHAR Argv[]) KdbpCmdBugCheck(ULONG Argc, PCHAR Argv[])
{ {
/* Set the flag and quit looping */ /* Set the flag and quit looping */
@ -1717,7 +1717,7 @@ KdbpCmdBugCheck(ULONG Argc, PCHAR Argv[])
/*!\brief Sets or displays a config variables value. /*!\brief Sets or displays a config variables value.
*/ */
STATIC BOOLEAN static BOOLEAN
KdbpCmdSet(ULONG Argc, PCHAR Argv[]) KdbpCmdSet(ULONG Argc, PCHAR Argv[])
{ {
LONG l; LONG l;
@ -1725,7 +1725,7 @@ KdbpCmdSet(ULONG Argc, PCHAR Argv[])
PCHAR pend = 0; PCHAR pend = 0;
KDB_ENTER_CONDITION ConditionFirst = KdbDoNotEnter; KDB_ENTER_CONDITION ConditionFirst = KdbDoNotEnter;
KDB_ENTER_CONDITION ConditionLast = KdbDoNotEnter; KDB_ENTER_CONDITION ConditionLast = KdbDoNotEnter;
STATIC CONST PCHAR ExceptionNames[21] = static const PCHAR ExceptionNames[21] =
{ "ZERODEVIDE", "DEBUGTRAP", "NMI", "INT3", "OVERFLOW", "BOUND", "INVALIDOP", { "ZERODEVIDE", "DEBUGTRAP", "NMI", "INT3", "OVERFLOW", "BOUND", "INVALIDOP",
"NOMATHCOP", "DOUBLEFAULT", "RESERVED(9)", "INVALIDTSS", "SEGMENTNOTPRESENT", "NOMATHCOP", "DOUBLEFAULT", "RESERVED(9)", "INVALIDTSS", "SEGMENTNOTPRESENT",
"STACKFAULT", "GPF", "PAGEFAULT", "RESERVED(15)", "MATHFAULT", "ALIGNMENTCHECK", "STACKFAULT", "GPF", "PAGEFAULT", "RESERVED(15)", "MATHFAULT", "ALIGNMENTCHECK",
@ -1875,7 +1875,7 @@ KdbpCmdSet(ULONG Argc, PCHAR Argv[])
/*!\brief Displays help screen. /*!\brief Displays help screen.
*/ */
STATIC BOOLEAN static BOOLEAN
KdbpCmdHelp(ULONG Argc, PCHAR Argv[]) KdbpCmdHelp(ULONG Argc, PCHAR Argv[])
{ {
ULONG i; ULONG i;
@ -1912,10 +1912,10 @@ KdbpPrint(
IN PCHAR Format, IN PCHAR Format,
IN ... OPTIONAL) IN ... OPTIONAL)
{ {
STATIC CHAR Buffer[4096]; static CHAR Buffer[4096];
STATIC BOOLEAN TerminalInitialized = FALSE; static BOOLEAN TerminalInitialized = FALSE;
STATIC BOOLEAN TerminalConnected = FALSE; static BOOLEAN TerminalConnected = FALSE;
STATIC BOOLEAN TerminalReportsSize = TRUE; static BOOLEAN TerminalReportsSize = TRUE;
CHAR c = '\0'; CHAR c = '\0';
PCHAR p, p2; PCHAR p, p2;
ULONG Length; ULONG Length;
@ -2122,7 +2122,7 @@ KdbpPrint(
* *
* \param Command Pointer to the command to append to the history. * \param Command Pointer to the command to append to the history.
*/ */
STATIC VOID static VOID
KdbpCommandHistoryAppend( KdbpCommandHistoryAppend(
IN PCHAR Command) IN PCHAR Command)
{ {
@ -2194,7 +2194,7 @@ KdbpCommandHistoryAppend(
* *
* \note Accepts only \n newlines, \r is ignored. * \note Accepts only \n newlines, \r is ignored.
*/ */
STATIC VOID static VOID
KdbpReadCommand( KdbpReadCommand(
OUT PCHAR Buffer, OUT PCHAR Buffer,
IN ULONG Size) IN ULONG Size)
@ -2203,8 +2203,8 @@ KdbpReadCommand(
PCHAR Orig = Buffer; PCHAR Orig = Buffer;
ULONG ScanCode = 0; ULONG ScanCode = 0;
BOOLEAN EchoOn; BOOLEAN EchoOn;
STATIC CHAR LastCommand[1024] = ""; static CHAR LastCommand[1024] = "";
STATIC CHAR NextKey = '\0'; static CHAR NextKey = '\0';
INT CmdHistIndex = -1; INT CmdHistIndex = -1;
INT i; INT i;
@ -2373,15 +2373,15 @@ KdbpReadCommand(
* \retval TRUE Don't continue execution. * \retval TRUE Don't continue execution.
* \retval FALSE Continue execution (leave KDB) * \retval FALSE Continue execution (leave KDB)
*/ */
STATIC BOOLEAN static BOOLEAN
KdbpDoCommand( KdbpDoCommand(
IN PCHAR Command) IN PCHAR Command)
{ {
ULONG i; ULONG i;
PCHAR p; PCHAR p;
ULONG Argc; ULONG Argc;
STATIC PCH Argv[256]; static PCH Argv[256];
STATIC CHAR OrigCommand[1024]; static CHAR OrigCommand[1024];
strncpy(OrigCommand, Command, sizeof(OrigCommand) - 1); strncpy(OrigCommand, Command, sizeof(OrigCommand) - 1);
OrigCommand[sizeof(OrigCommand) - 1] = '\0'; OrigCommand[sizeof(OrigCommand) - 1] = '\0';
@ -2429,7 +2429,7 @@ VOID
KdbpCliMainLoop( KdbpCliMainLoop(
IN BOOLEAN EnteredOnSingleStep) IN BOOLEAN EnteredOnSingleStep)
{ {
STATIC CHAR Command[1024]; static CHAR Command[1024];
BOOLEAN Continue; BOOLEAN Continue;
if (EnteredOnSingleStep) if (EnteredOnSingleStep)

View file

@ -87,9 +87,9 @@ typedef struct _RPN_STACK
#define RPN_VALUE_STACK_SIZE 256 #define RPN_VALUE_STACK_SIZE 256
/* GLOBALS *******************************************************************/ /* GLOBALS *******************************************************************/
STATIC struct { ULONG Size; ULONG Sp; RPN_OP Ops[RPN_OP_STACK_SIZE]; } RpnStack = { RPN_OP_STACK_SIZE, 0 }; static struct { ULONG Size; ULONG Sp; RPN_OP Ops[RPN_OP_STACK_SIZE]; } RpnStack = { RPN_OP_STACK_SIZE, 0 };
STATIC CONST struct { PCHAR Name; UCHAR Offset; UCHAR Size; } RegisterToTrapFrame[] = static const struct { PCHAR Name; UCHAR Offset; UCHAR Size; } RegisterToTrapFrame[] =
{ {
{"eip", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Eip), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Eip)}, {"eip", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.Eip), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.Eip)},
{"eflags", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.EFlags), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.EFlags)}, {"eflags", FIELD_OFFSET(KDB_KTRAP_FRAME, Tf.EFlags), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Tf.EFlags)},
@ -118,7 +118,7 @@ STATIC CONST struct { PCHAR Name; UCHAR Offset; UCHAR Size; } RegisterToTrapFram
{"cr3", FIELD_OFFSET(KDB_KTRAP_FRAME, Cr3), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Cr3)}, {"cr3", FIELD_OFFSET(KDB_KTRAP_FRAME, Cr3), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Cr3)},
{"cr4", FIELD_OFFSET(KDB_KTRAP_FRAME, Cr4), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Cr4)} {"cr4", FIELD_OFFSET(KDB_KTRAP_FRAME, Cr4), RTL_FIELD_SIZE(KDB_KTRAP_FRAME, Cr4)}
}; };
STATIC CONST INT RegisterToTrapFrameCount = static const INT RegisterToTrapFrameCount =
sizeof (RegisterToTrapFrame) / sizeof (RegisterToTrapFrame[0]); sizeof (RegisterToTrapFrame) / sizeof (RegisterToTrapFrame[0]);
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
@ -268,7 +268,7 @@ RpnpDumpStack(
* *
* \param Stack Pointer to a RPN_STACK structure. * \param Stack Pointer to a RPN_STACK structure.
*/ */
STATIC VOID static VOID
RpnpClearStack( RpnpClearStack(
OUT PRPN_STACK Stack) OUT PRPN_STACK Stack)
{ {
@ -281,7 +281,7 @@ RpnpClearStack(
* \param Stack Pointer to a RPN_STACK structure. * \param Stack Pointer to a RPN_STACK structure.
* \param Op RPN_OP to be copied onto the stack. * \param Op RPN_OP to be copied onto the stack.
*/ */
STATIC BOOLEAN static BOOLEAN
RpnpPushStack( RpnpPushStack(
IN OUT PRPN_STACK Stack, IN OUT PRPN_STACK Stack,
IN PRPN_OP Op) IN PRPN_OP Op)
@ -305,7 +305,7 @@ RpnpPushStack(
* \retval TRUE Success. * \retval TRUE Success.
* \retval FALSE Failure (stack empty) * \retval FALSE Failure (stack empty)
*/ */
STATIC BOOLEAN static BOOLEAN
RpnpPopStack( RpnpPopStack(
IN OUT PRPN_STACK Stack, IN OUT PRPN_STACK Stack,
OUT PRPN_OP Op OPTIONAL) OUT PRPN_OP Op OPTIONAL)
@ -329,7 +329,7 @@ RpnpPopStack(
* \retval TRUE Success. * \retval TRUE Success.
* \retval FALSE Failure (stack empty) * \retval FALSE Failure (stack empty)
*/ */
STATIC BOOLEAN static BOOLEAN
RpnpTopStack( RpnpTopStack(
IN PRPN_STACK Stack, IN PRPN_STACK Stack,
OUT PRPN_OP Op) OUT PRPN_OP Op)
@ -362,7 +362,7 @@ RpnpTopStack(
* \retval TRUE Success. * \retval TRUE Success.
* \retval FALSE Failure. * \retval FALSE Failure.
*/ */
STATIC BOOLEAN static BOOLEAN
RpnpParseExpression( RpnpParseExpression(
IN PRPN_STACK Stack, IN PRPN_STACK Stack,
IN PCHAR Expression, IN PCHAR Expression,
@ -785,7 +785,7 @@ get_operand:
* \retval TRUE Success. * \retval TRUE Success.
* \retval FALSE Failure. * \retval FALSE Failure.
*/ */
STATIC BOOLEAN static BOOLEAN
RpnpEvaluateStack( RpnpEvaluateStack(
IN PRPN_STACK Stack, IN PRPN_STACK Stack,
IN PKDB_KTRAP_FRAME TrapFrame, IN PKDB_KTRAP_FRAME TrapFrame,

View file

@ -44,7 +44,7 @@ BOOLEAN KdbpSymbolsInitialized = FALSE;
* *
* \sa KdbpSymFindModule * \sa KdbpSymFindModule
*/ */
STATIC BOOLEAN static BOOLEAN
KdbpSymFindUserModule(IN PVOID Address OPTIONAL, KdbpSymFindUserModule(IN PVOID Address OPTIONAL,
IN LPCWSTR Name OPTIONAL, IN LPCWSTR Name OPTIONAL,
IN INT Index OPTIONAL, IN INT Index OPTIONAL,
@ -102,7 +102,7 @@ KdbpSymFindUserModule(IN PVOID Address OPTIONAL,
* *
* \sa KdbpSymFindUserModule * \sa KdbpSymFindUserModule
*/ */
STATIC BOOLEAN static BOOLEAN
KdbpSymFindModule(IN PVOID Address OPTIONAL, KdbpSymFindModule(IN PVOID Address OPTIONAL,
IN LPCWSTR Name OPTIONAL, IN LPCWSTR Name OPTIONAL,
IN INT Index OPTIONAL, IN INT Index OPTIONAL,
@ -296,7 +296,7 @@ KdbSymGetAddressInformation(IN PROSSYM_INFO RosSymInfo,
* *
* \sa KdbpSymAddCachedFile * \sa KdbpSymAddCachedFile
*/ */
STATIC PROSSYM_INFO static PROSSYM_INFO
KdbpSymFindCachedFile(IN PUNICODE_STRING FileName) KdbpSymFindCachedFile(IN PUNICODE_STRING FileName)
{ {
PIMAGE_SYMBOL_INFO_CACHE Current; PIMAGE_SYMBOL_INFO_CACHE Current;
@ -337,7 +337,7 @@ KdbpSymFindCachedFile(IN PUNICODE_STRING FileName)
* *
* \sa KdbpSymRemoveCachedFile * \sa KdbpSymRemoveCachedFile
*/ */
STATIC VOID static VOID
KdbpSymAddCachedFile(IN PUNICODE_STRING FileName, KdbpSymAddCachedFile(IN PUNICODE_STRING FileName,
IN PROSSYM_INFO RosSymInfo) IN PROSSYM_INFO RosSymInfo)
{ {
@ -371,7 +371,7 @@ KdbpSymAddCachedFile(IN PUNICODE_STRING FileName,
* *
* \sa KdbpSymAddCachedFile * \sa KdbpSymAddCachedFile
*/ */
STATIC VOID static VOID
KdbpSymRemoveCachedFile(IN PROSSYM_INFO RosSymInfo) KdbpSymRemoveCachedFile(IN PROSSYM_INFO RosSymInfo)
{ {
PIMAGE_SYMBOL_INFO_CACHE Current; PIMAGE_SYMBOL_INFO_CACHE Current;
@ -413,7 +413,7 @@ KdbpSymRemoveCachedFile(IN PROSSYM_INFO RosSymInfo)
* *
* \sa KdbpSymUnloadModuleSymbols * \sa KdbpSymUnloadModuleSymbols
*/ */
STATIC VOID static VOID
KdbpSymLoadModuleSymbols(IN PUNICODE_STRING FileName, KdbpSymLoadModuleSymbols(IN PUNICODE_STRING FileName,
OUT PROSSYM_INFO *RosSymInfo) OUT PROSSYM_INFO *RosSymInfo)
{ {
@ -484,7 +484,7 @@ KdbpSymLoadModuleSymbols(IN PUNICODE_STRING FileName,
* *
* \sa KdbpSymLoadModuleSymbols * \sa KdbpSymLoadModuleSymbols
*/ */
STATIC VOID static VOID
KdbpSymUnloadModuleSymbols(IN PROSSYM_INFO RosSymInfo) KdbpSymUnloadModuleSymbols(IN PROSSYM_INFO RosSymInfo)
{ {
DPRINT("Unloading symbols\n"); DPRINT("Unloading symbols\n");