Since we can load .sym files when defined(DBG) now, enable

/PROFILE option for defined(DBG) too.

svn path=/trunk/; revision=12765
This commit is contained in:
Gé van Geldorp 2005-01-03 22:53:21 +00:00
parent 22244655d6
commit a3e3b56cca
5 changed files with 10 additions and 14 deletions

View file

@ -34,7 +34,7 @@ endif
ifeq ($(KDBG), 1) ifeq ($(KDBG), 1)
OBJECTS_KDBG := dbg/kdb.o dbg/kdb_serial.o dbg/kdb_keyboard.o dbg/rdebug.o \ OBJECTS_KDBG := dbg/kdb.o dbg/kdb_serial.o dbg/kdb_keyboard.o dbg/rdebug.o \
dbg/i386/kdb_help.o dbg/profile.o \ dbg/i386/kdb_help.o \
../dk/w32/lib/libkjs.a dbg/i386/i386-dis.o ../dk/w32/lib/libkjs.a dbg/i386/i386-dis.o
CFLAGS_KDBG := -I../lib/kjs/include CFLAGS_KDBG := -I../lib/kjs/include
preall: all preall: all
@ -45,7 +45,7 @@ else
OBJECTS_KDBG := OBJECTS_KDBG :=
endif endif
ifeq ($(DBG_OR_KDBG), 1) ifeq ($(DBG_OR_KDBG), 1)
OBJECTS_KDBG := $(OBJECTS_KDBG) dbg/kdb_stabs.o dbg/kdb_symbols.o OBJECTS_KDBG := $(OBJECTS_KDBG) dbg/kdb_stabs.o dbg/kdb_symbols.o dbg/profile.o
endif endif
TARGET_ASFLAGS = -I./include TARGET_ASFLAGS = -I./include

View file

@ -16,8 +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: profile.c,v 1.10 2004/10/22 20:16:47 ekohl Exp $ /*
*
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
* FILE: ntoskrnl/dbg/profile.c * FILE: ntoskrnl/dbg/profile.c
* PURPOSE: Kernel profiling * PURPOSE: Kernel profiling

View file

@ -1,5 +1,4 @@
/* $Id: kdebug.c,v 1.58 2004/12/14 10:18:57 gvg Exp $ /*
*
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
* FILE: ntoskrnl/kd/kdebug.c * FILE: ntoskrnl/kd/kdebug.c
@ -243,7 +242,7 @@ KdInitSystem(ULONG BootPhase,
} }
} }
} }
#ifdef KDBG #if defined(KDBG) || defined(DBG)
else if (!_strnicmp(p2, "PROFILE", 7) && BootPhase > 0) else if (!_strnicmp(p2, "PROFILE", 7) && BootPhase > 0)
{ {
KdbInitProfiling(); KdbInitProfiling();

View file

@ -16,8 +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$ /*
*
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
* FILE: ntoskrnl/ke/i386/irq.c * FILE: ntoskrnl/ke/i386/irq.c
* PURPOSE: IRQ handling * PURPOSE: IRQ handling
@ -37,7 +36,7 @@
/* INCLUDES ****************************************************************/ /* INCLUDES ****************************************************************/
#include <ntoskrnl.h> #include <ntoskrnl.h>
#ifdef KDBG #if defined(KDBG) || defined(DBG)
#include <../dbg/kdb.h> #include <../dbg/kdb.h>
#endif /* KDBG */ #endif /* KDBG */
@ -358,7 +357,7 @@ KiInterruptDispatch (ULONG vector, PKIRQ_TRAPFRAME Trapframe)
{ {
KeIRQTrapFrameToTrapFrame(Trapframe, &KernelTrapFrame); KeIRQTrapFrameToTrapFrame(Trapframe, &KernelTrapFrame);
KeUpdateSystemTime(&KernelTrapFrame, old_level); KeUpdateSystemTime(&KernelTrapFrame, old_level);
#ifdef KDBG #if defined(KDBG) || defined(DBG)
KdbProfileInterrupt(Trapframe->Eip); KdbProfileInterrupt(Trapframe->Eip);
#endif /* KDBG */ #endif /* KDBG */
} }

View file

@ -16,8 +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$ /*
*
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
* FILE: ntoskrnl/ke/main.c * FILE: ntoskrnl/ke/main.c
* PURPOSE: Initalizes the kernel * PURPOSE: Initalizes the kernel
@ -705,7 +704,7 @@ ExpInitializeExecutive(VOID)
KEBUGCHECK(INACCESSIBLE_BOOT_DEVICE); KEBUGCHECK(INACCESSIBLE_BOOT_DEVICE);
} }
#ifdef KDBG #if defined(KDBG) || defined(DBG)
KdbInitProfiling2(); KdbInitProfiling2();
#endif /* KDBG */ #endif /* KDBG */