Renamed kernel.map -> ntoskrnl.map

svn path=/trunk/; revision=3280
This commit is contained in:
David Welch 2002-07-20 21:49:35 +00:00
parent d525647699
commit 45d7740d94
6 changed files with 35 additions and 13 deletions

View file

@ -1914,7 +1914,7 @@ BOOLEAN LoadExports(void)
ENTER_FUNC();
Print(OUTPUT_WINDOW,"pICE: loading exports...\n");
hf = PICE_open(L"\\SystemRoot\\symbols\\kernel.map",OF_READ);
hf = PICE_open(L"\\SystemRoot\\symbols\\ntoskrnl.map",OF_READ);
/*
if(hf)
{

View file

@ -8,12 +8,12 @@ ARCH := i386
#
# Whether to compile in the kernel debugger
#
KDBG := 1
KDBG := 0
#
# Whether to compile for debugging
#
DBG := 1
DBG := 0
#
# Whether to compile a multiprocessor or single processor version

View file

@ -111,5 +111,5 @@ copy apps\tests\tokentest\tokentest.exe %ROS_INSTALL%\bin
copy media\fonts\helb____.ttf %ROS_INSTALL%\media\fonts
copy media\fonts\timr____.ttf %ROS_INSTALL%\media\fonts
copy media\nls\*.nls %ROS_INSTALL%\system32
copy ntoskrnl\kernel.map %ROS_INSTALL%\symbols
copy ntoskrnl\ntoskrnl.map %ROS_INSTALL%\symbols

View file

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.76 2002/07/20 20:27:21 ei Exp $
# $Id: Makefile,v 1.77 2002/07/20 21:49:35 dwelch Exp $
#
# ReactOS Operating System
#
@ -56,7 +56,7 @@ all: \
$(TARGETNAME).nostrip.exe \
$(TARGETNAME).exe \
$(TARGETNAME).sym \
kernel.map
ntoskrnl.map
#
# Architecture specific Makefile
@ -338,6 +338,7 @@ DEP_OBJECTS := $(OBJECTS_NT) $(OBJECTS_MM) $(OBJECTS_ARCH) \
$(OBJECTS_DBG) $(OBJECTS_CM) $(OBJECTS_LDR) $(OBJECTS_LPC) \
$(OBJECTS_PO) $(OBJECTS_KD) $(OBJECTS_RTL)
TAG_OBJECTS := $(join $(dir $(DEP_OBJECTS)),$(patsubst %.o, .%.TAG, $(notdir $(DEP_OBJECTS))))
#
# Include automatic dependancy tracking
@ -501,8 +502,9 @@ CLEAN_FILES = $(OBJECTS_PATH)/*.o cc/*.o cm/*.o dbg/*.o dbg/i386/*.o ex/*.o \
ex/i386/*.o io/*.o ke/*.o ldr/*.o mm/*.o nt/*.o ob/*.o ps/*.o \
rtl/*.o se/*.o ke/i386/*.o mm/i386/*.o fs/*.o po/*.o nls/*.o \
lpc/*.o kd/*.o $(TARGETNAME).o junk.tmp base.tmp temp.exp \
$(TARGETNAME).exe $(TARGETNAME).nostrip.exe $(TARGETNAME).sym kernel.map \
$(TARGETNAME).coff bugcodes.rc msg?????.bin $(DEP_FILES)
$(TARGETNAME).exe $(TARGETNAME).nostrip.exe $(TARGETNAME).sym ntoskrnl.map \
$(TARGETNAME).coff bugcodes.rc msg?????.bin $(DEP_FILES) \
$(TAG_OBJECTS)
$(TARGETNAME).nostrip.exe: $(TARGETNAME).o $(IE_DATA)
$(CC) \
@ -621,8 +623,11 @@ $(TARGETNAME).dbg: $(TARGETNAME).dbg.o $(TARGETNAME).a $(TARGETNAME).dbg.lnk
$(TARGETNAME).sym: $(TARGETNAME).nostrip.exe
$(RSYM) $(TARGETNAME).nostrip.exe $(TARGETNAME).sym
kernel.map: $(TARGETNAME).nostrip.exe
$(NM) --numeric-sort $(TARGETNAME).nostrip.exe > kernel.map
TAGS: $(TAG_OBJECTS)
etags $(addprefix -i , $(TAG_OBJECTS))
ntoskrnl.map: $(TARGETNAME).nostrip.exe
$(NM) --numeric-sort $(TARGETNAME).nostrip.exe > ntoskrnl.map
$(TARGETNAME).o: $(OBJECTS)
$(LD) \
@ -684,4 +689,16 @@ ke/main.o: ke/main.c $(PATH_TO_TOP)/include/reactos/buildno.h
%.coff: %.rc
$(RC) $(RCINC) $< -o $@
#
#
#
.%.TAG: %.S
etags -o $@ $<
.%.TAG: %.s
etags -o $@ $<
.%.TAG: %.c
etags -o $@ $^
# EOF

View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id: main.c,v 1.130 2002/07/17 21:28:37 dwelch Exp $
/* $Id: main.c,v 1.131 2002/07/20 21:49:35 dwelch Exp $
*
* PROJECT: ReactOS kernel
* FILE: ntoskrnl/ke/main.c
@ -817,7 +817,11 @@ _main (ULONG MultiBootMagic, PLOADER_PARAMETER_BLOCK _LoaderBlock)
sizeof(LOADER_MODULE) * KeLoaderBlock.ModsCount);
KeLoaderBlock.ModsCount++;
KeLoaderBlock.ModsAddr = (ULONG)&KeLoaderModules;
/*
* Convert a path specification in the grub to one understood by the
* rest of the kernel.
*/
if (((PUCHAR)_LoaderBlock->CommandLine)[0] == '(')
{
ULONG DiskNumber, PartNumber;

View file

@ -44,7 +44,8 @@ int main(int argc, char* argv[])
{
*dot = 0;
}
fprintf(out, "%s/.%s.d %s/%s.o:", prefix, buf, prefix,buf);
fprintf(out, "%s/.%s.TAG %s/.%s.d %s/%s.o:", prefix, buf, prefix, buf,
prefix,buf);
while ((ch = fgetc(stdin)) != EOF)
{