Remove some debugging code.

svn path=/trunk/; revision=3469
This commit is contained in:
Casper Hornstrup 2002-09-07 17:08:31 +00:00
parent 59448c64c0
commit fb914ea8cb
2 changed files with 2 additions and 54 deletions

View file

@ -1,4 +1,4 @@
/* $Id: iomgr.c,v 1.25 2002/09/07 15:12:53 chorns Exp $ /* $Id: iomgr.c,v 1.26 2002/09/07 17:08:31 chorns Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -16,13 +16,6 @@
#define NDEBUG #define NDEBUG
#include <internal/debug.h> #include <internal/debug.h>
#define xbp(Value) \
{ \
ULONG Port = 0x3f8; \
__asm__("outb %0, %w1\n\t" : : "a" (Value), "d" (Port)); \
}
/* GLOBALS *******************************************************************/ /* GLOBALS *******************************************************************/
#define TAG_DEVICE_TYPE TAG('D', 'E', 'V', 'T') #define TAG_DEVICE_TYPE TAG('D', 'E', 'V', 'T')
@ -273,8 +266,6 @@ VOID IoInit (VOID)
* Initialize PnP manager * Initialize PnP manager
*/ */
PnpInit(); PnpInit();
xbp('a');
} }

View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: main.c,v 1.135 2002/09/07 15:12:56 chorns Exp $ /* $Id: main.c,v 1.136 2002/09/07 17:08:31 chorns Exp $
* *
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
* FILE: ntoskrnl/ke/main.c * FILE: ntoskrnl/ke/main.c
@ -34,12 +34,6 @@
#define NDEBUG #define NDEBUG
#include <internal/debug.h> #include <internal/debug.h>
#define xbp(Value) \
{ \
ULONG Port = 0x3f8; \
__asm__("outb %0, %w1\n\t" : : "a" (Value), "d" (Port)); \
}
/* GLOBALS *******************************************************************/ /* GLOBALS *******************************************************************/
ULONG NtBuildNumber = KERNEL_VERSION_BUILD; ULONG NtBuildNumber = KERNEL_VERSION_BUILD;
@ -292,35 +286,20 @@ ExpVerifyOffsets()
assert(FIELD_OFFSET(KTSS, Esp0) == KTSS_ESP0); assert(FIELD_OFFSET(KTSS, Esp0) == KTSS_ESP0);
assert(FIELD_OFFSET(KV86M_REGISTERS, Ebp) == KV86M_REGISTERS_EBP); assert(FIELD_OFFSET(KV86M_REGISTERS, Ebp) == KV86M_REGISTERS_EBP);
assert(FIELD_OFFSET(KV86M_REGISTERS, Edi) == KV86M_REGISTERS_EDI); assert(FIELD_OFFSET(KV86M_REGISTERS, Edi) == KV86M_REGISTERS_EDI);
xbp('S');
assert(FIELD_OFFSET(KV86M_REGISTERS, Esi) == KV86M_REGISTERS_ESI); assert(FIELD_OFFSET(KV86M_REGISTERS, Esi) == KV86M_REGISTERS_ESI);
xbp('T');
assert(FIELD_OFFSET(KV86M_REGISTERS, Edx) == KV86M_REGISTERS_EDX); assert(FIELD_OFFSET(KV86M_REGISTERS, Edx) == KV86M_REGISTERS_EDX);
xbp('U');
assert(FIELD_OFFSET(KV86M_REGISTERS, Ecx) == KV86M_REGISTERS_ECX); assert(FIELD_OFFSET(KV86M_REGISTERS, Ecx) == KV86M_REGISTERS_ECX);
xbp('V');
assert(FIELD_OFFSET(KV86M_REGISTERS, Ebx) == KV86M_REGISTERS_EBX); assert(FIELD_OFFSET(KV86M_REGISTERS, Ebx) == KV86M_REGISTERS_EBX);
xbp('W');
assert(FIELD_OFFSET(KV86M_REGISTERS, Eax) == KV86M_REGISTERS_EAX); assert(FIELD_OFFSET(KV86M_REGISTERS, Eax) == KV86M_REGISTERS_EAX);
xbp('X');
assert(FIELD_OFFSET(KV86M_REGISTERS, Ds) == KV86M_REGISTERS_DS); assert(FIELD_OFFSET(KV86M_REGISTERS, Ds) == KV86M_REGISTERS_DS);
xbp('Y');
assert(FIELD_OFFSET(KV86M_REGISTERS, Es) == KV86M_REGISTERS_ES); assert(FIELD_OFFSET(KV86M_REGISTERS, Es) == KV86M_REGISTERS_ES);
xbp('Z');
assert(FIELD_OFFSET(KV86M_REGISTERS, Fs) == KV86M_REGISTERS_FS); assert(FIELD_OFFSET(KV86M_REGISTERS, Fs) == KV86M_REGISTERS_FS);
xbp('A');
assert(FIELD_OFFSET(KV86M_REGISTERS, Gs) == KV86M_REGISTERS_GS); assert(FIELD_OFFSET(KV86M_REGISTERS, Gs) == KV86M_REGISTERS_GS);
xbp('B');
assert(FIELD_OFFSET(KV86M_REGISTERS, Eip) == KV86M_REGISTERS_EIP); assert(FIELD_OFFSET(KV86M_REGISTERS, Eip) == KV86M_REGISTERS_EIP);
xbp('C');
assert(FIELD_OFFSET(KV86M_REGISTERS, Cs) == KV86M_REGISTERS_CS); assert(FIELD_OFFSET(KV86M_REGISTERS, Cs) == KV86M_REGISTERS_CS);
xbp('D');
assert(FIELD_OFFSET(KV86M_REGISTERS, Eflags) == KV86M_REGISTERS_EFLAGS); assert(FIELD_OFFSET(KV86M_REGISTERS, Eflags) == KV86M_REGISTERS_EFLAGS);
xbp('E');
assert(FIELD_OFFSET(KV86M_REGISTERS, Esp) == KV86M_REGISTERS_ESP); assert(FIELD_OFFSET(KV86M_REGISTERS, Esp) == KV86M_REGISTERS_ESP);
xbp('F');
assert(FIELD_OFFSET(KV86M_REGISTERS, Ss) == KV86M_REGISTERS_SS); assert(FIELD_OFFSET(KV86M_REGISTERS, Ss) == KV86M_REGISTERS_SS);
xbp('G');
} }
VOID VOID
@ -337,24 +316,19 @@ ExpInitializeExecutive(VOID)
ExpVerifyOffsets(); ExpVerifyOffsets();
LdrInit1(); LdrInit1();
xbp('0');
KeLowerIrql(DISPATCH_LEVEL); KeLowerIrql(DISPATCH_LEVEL);
xbp('1');
NtEarlyInitVdm(); NtEarlyInitVdm();
xbp('2');
MmInit1(FirstKrnlPhysAddr, MmInit1(FirstKrnlPhysAddr,
LastKrnlPhysAddr, LastKrnlPhysAddr,
LastKernelAddress, LastKernelAddress,
(PADDRESS_RANGE)&KeMemoryMap, (PADDRESS_RANGE)&KeMemoryMap,
KeMemoryMapRangeCount); KeMemoryMapRangeCount);
xbp('3');
/* create default nls tables */ /* create default nls tables */
RtlpInitNlsTables(); RtlpInitNlsTables();
xbp('4');
/* /*
* Initialize the kernel debugger * Initialize the kernel debugger
@ -395,35 +369,27 @@ ExpInitializeExecutive(VOID)
"under certain\n"); "under certain\n");
HalDisplayString("conditions. There is absolutely no warranty for " HalDisplayString("conditions. There is absolutely no warranty for "
"ReactOS.\n\n"); "ReactOS.\n\n");
xbp('A');
/* Initialize all processors */ /* Initialize all processors */
KeNumberProcessors = 0; KeNumberProcessors = 0;
while (!HalAllProcessorsStarted()) while (!HalAllProcessorsStarted())
{ {
PVOID ProcessorStack; PVOID ProcessorStack;
xbp('B');
if (KeNumberProcessors != 0) if (KeNumberProcessors != 0)
{ {
KePrepareForApplicationProcessorInit(KeNumberProcessors); KePrepareForApplicationProcessorInit(KeNumberProcessors);
PsPrepareForApplicationProcessorInit(KeNumberProcessors); PsPrepareForApplicationProcessorInit(KeNumberProcessors);
} }
xbp('C');
/* Allocate a stack for use when booting the processor */ /* Allocate a stack for use when booting the processor */
/* FIXME: The nonpaged memory for the stack is not released after use */ /* FIXME: The nonpaged memory for the stack is not released after use */
ProcessorStack = ProcessorStack =
ExAllocatePool(NonPagedPool, MM_STACK_SIZE) + MM_STACK_SIZE; ExAllocatePool(NonPagedPool, MM_STACK_SIZE) + MM_STACK_SIZE;
xbp('D');
Ki386InitialStackArray[((int)KeNumberProcessors)] = Ki386InitialStackArray[((int)KeNumberProcessors)] =
(PVOID)(ProcessorStack - MM_STACK_SIZE); (PVOID)(ProcessorStack - MM_STACK_SIZE);
xbp('E');
HalInitializeProcessor(KeNumberProcessors, ProcessorStack); HalInitializeProcessor(KeNumberProcessors, ProcessorStack);
xbp('F');
KeNumberProcessors++; KeNumberProcessors++;
xbp('G');
} }
xbp('H');
if (KeNumberProcessors > 1) if (KeNumberProcessors > 1)
{ {
@ -446,23 +412,14 @@ ExpInitializeExecutive(VOID)
HalInitSystem(1, (PLOADER_PARAMETER_BLOCK)&KeLoaderBlock); HalInitSystem(1, (PLOADER_PARAMETER_BLOCK)&KeLoaderBlock);
ExInit(); ExInit();
xbp('Q');
IoInit(); IoInit();
xbp('R');
PoInit(); PoInit();
xbp('A');
LdrInitModuleManagement(); LdrInitModuleManagement();
xbp('B');
CmInitializeRegistry(); CmInitializeRegistry();
xbp('C');
NtInit(); NtInit();
xbp('D');
MmInit3(); MmInit3();
xbp('E');
CcInit(); CcInit();
xbp('F');
KdInit2(); KdInit2();
xbp('G');
/* Report all resources used by hal */ /* Report all resources used by hal */
HalReportResourceUsage(); HalReportResourceUsage();