Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-28 17:01:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTOS:KDBG] Fix the support for /(NO)LOADSYMBOLS as we didn't respect them properly.

Browse source 
LoadSymbols was reset to its default value whenever KdbSymInit() was
called, thus we would e.g. load symbols even if /NOLOADSYMBOLS or
/LOADSYMBOLS=NO were specified at the command line.
This commit is contained in:
Hermès Bélusca-Maïto 2023-03-14 00:51:03 +01:00
parent e241c87eea
commit de892d5bc7
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
ntoskrnl/kdbg/kdb_symbols.c
View file

@ -26,7 +26,7 @@ typedef struct _IMAGE_SYMBOL_INFO_CACHE
} }
IMAGE_SYMBOL_INFO_CACHE, *PIMAGE_SYMBOL_INFO_CACHE; IMAGE_SYMBOL_INFO_CACHE, *PIMAGE_SYMBOL_INFO_CACHE;
static BOOLEAN LoadSymbols; static BOOLEAN LoadSymbols = FALSE;
static LIST_ENTRY SymbolsToLoad; static LIST_ENTRY SymbolsToLoad;
static KSPIN_LOCK SymbolsToLoadLock; static KSPIN_LOCK SymbolsToLoadLock;
static KEVENT SymbolsToLoadEvent; static KEVENT SymbolsToLoadEvent;
@ -345,23 +345,22 @@ KdbSymInit(
{ {
DPRINT("KdbSymInit() BootPhase=%d\n", BootPhase); DPRINT("KdbSymInit() BootPhase=%d\n", BootPhase);
LoadSymbols = FALSE;
#if DBG
/* Load symbols only if we have 96Mb of RAM or more */
if (MmNumberOfPhysicalPages >= 0x6000)
LoadSymbols = TRUE;
#endif
if (BootPhase == 0) if (BootPhase == 0)
{ {
PCHAR p1, p2; PCHAR p1, p2;
SHORT Found = FALSE; SHORT Found = FALSE;
CHAR YesNo; CHAR YesNo;
/* Perform actual initialization of symbol module */ /*
//NtoskrnlModuleObject->PatchInformation = NULL; * Default symbols loading strategy:
//LdrHalModuleObject->PatchInformation = NULL; * In DBG builds, load symbols only if we have 96MB of RAM or more.
* In REL builds, do not load them by default.
*/
#if DBG
LoadSymbols = (MmNumberOfPhysicalPages >= 0x6000);
#else
LoadSymbols = FALSE;
#endif
/* Check the command line for /LOADSYMBOLS, /NOLOADSYMBOLS, /* Check the command line for /LOADSYMBOLS, /NOLOADSYMBOLS,
* /LOADSYMBOLS={YES|NO}, /NOLOADSYMBOLS={YES|NO} */ * /LOADSYMBOLS={YES|NO}, /NOLOADSYMBOLS={YES|NO} */
@ -405,13 +404,21 @@ KdbSymInit(
p1 = p2; p1 = p2;
} }
} }
else if ((BootPhase == 1) && LoadSymbols) else if (BootPhase == 1)
{ {
HANDLE Thread; HANDLE Thread;
NTSTATUS Status; NTSTATUS Status;
KIRQL OldIrql; KIRQL OldIrql;
PLIST_ENTRY ListEntry; PLIST_ENTRY ListEntry;
/* Do not load symbols if we have less than 96MB of RAM */
if (MmNumberOfPhysicalPages < 0x6000)
LoadSymbols = FALSE;
/* Continue this phase only if we need to load symbols */
if (!LoadSymbols)
return;
/* Launch our worker thread */ /* Launch our worker thread */
InitializeListHead(&SymbolsToLoad); InitializeListHead(&SymbolsToLoad);
KeInitializeSpinLock(&SymbolsToLoadLock); KeInitializeSpinLock(&SymbolsToLoadLock);