KD System Rewrite:
[reactos.git] / reactos / ntoskrnl / Makefile
index f9987f3..90853ed 100644 (file)
@@ -24,18 +24,6 @@ endif
 LINKER_SCRIPT := ntoskrnl.lnk
 STRIP_FLAGS := -Wl,-s
 
-ifeq ($(KDBG), 1)
-OBJECTS_KDBG := dbg/kdb.o dbg/kdb_cli.o dbg/kdb_expr.o dbg/kdb_keyboard.o \
-                dbg/kdb_serial.o dbg/kdb_string.o dbg/rdebug.o dbg/i386/kdb_help.o \
-                dbg/i386/i386-dis.o dbg/i386/longjmp.o dbg/i386/setjmp.o
-preall: all
-else
-OBJECTS_KDBG :=
-endif
-ifeq ($(DBG_OR_KDBG), 1)
-OBJECTS_KDBG := $(OBJECTS_KDBG) dbg/kdb_symbols.o dbg/profile.o
-endif
-
 TARGET_ASFLAGS = -I./include
 TARGET_CFLAGS = -I./include $(CFLAGS_KDBG) -Wall -Werror $(CFLAGS_OPT)
 
@@ -74,6 +62,7 @@ OBJECTS_RTL = \
        rtl/atom.o \
        rtl/capture.o \
        rtl/ctype.o \
+       rtl/debug.o \
        rtl/handle.o \
        rtl/message.o \
        rtl/misc.o \
@@ -97,11 +86,11 @@ OBJECTS_KE = \
        ke/bug.o \
        ke/catch.o \
        ke/clock.o \
-       ke/critical.o \
        ke/dpc.o \
        ke/device.o \
-       ke/error.o \
        ke/event.o \
+       ke/gate.o \
+       ke/gmutex.o \
        ke/kqueue.o \
        ke/kthread.o \
        ke/ipi.o \
@@ -113,8 +102,8 @@ OBJECTS_KE = \
        ke/sem.o \
        ke/spinlock.o \
        ke/timer.o \
-       ke/wait.o \
-       ke/alert.o
+       ke/usercall.o \
+       ke/wait.o
 
 # Memory Manager (Mm)
 OBJECTS_MM = \
@@ -144,6 +133,7 @@ OBJECTS_MM = \
        mm/pool.o \
        mm/ppool.o \
        mm/physical.o \
+       mm/process.o \
        mm/region.o \
        mm/rmap.o \
        mm/section.o \
@@ -215,12 +205,12 @@ OBJECTS_OB = \
        ob/object.o \
        ob/sdcache.o \
        ob/security.o \
-       ob/symlink.o
+       ob/symlink.o \
+       ob/wait.o
 
 # Process Manager (Ps)
 OBJECTS_PS = \
        ps/cid.o \
-       ps/create.o \
        ps/debug.o \
        ps/idle.o \
        ps/job.o \
@@ -228,31 +218,32 @@ OBJECTS_PS = \
        ps/locale.o \
        ps/process.o \
        ps/psmgr.o \
+       ps/notify.o \
+       ps/quota.o \
+       ps/query.o \
+       ps/security.o \
        ps/suspend.o \
        ps/thread.o \
-       ps/tinfo.o \
-       ps/win32.o \
-       ps/w32call.o
+       ps/win32.o
 
 # Executive Subsystem (Ex)
 OBJECTS_EX = \
-       ex/btree.o \
        ex/callback.o \
+       ex/dbgctrl.o \
+       ex/error.o \
        ex/event.o \
        ex/evtpair.o \
        ex/fmutex.o \
-       ex/hashtab.o \
+       ex/handle.o \
        ex/init.o \
        ex/interlck.o \
        ex/list.o \
        ex/lookas.o \
        ex/mutant.o \
-       ex/napi.o \
        ex/power.o \
        ex/profile.o \
        ex/resource.o \
        ex/rundown.o \
-       ex/stree.o \
        ex/sem.o \
        ex/synch.o \
        ex/sysinfo.o \
@@ -300,14 +291,6 @@ OBJECTS_CM = \
        cm/registry.o  \
        cm/regobj.o \
 
-# Debugger Support (Dbg)
-OBJECTS_DBG = \
-       dbg/dbgctrl.o \
-       dbg/errinfo.o \
-       dbg/print.o \
-       dbg/user.o \
-       $(OBJECTS_KDBG)
-
 # Loader
 OBJECTS_LDR = \
        ldr/init.o \
@@ -346,11 +329,35 @@ OBJECTS_CC = \
 
 # Kernel Debugger Support (Kd)
 OBJECTS_KD = \
-       kd/dlog.o \
-       kd/gdbstub.o \
-       kd/kdebug.o \
-       kd/mda.o \
-       kd/service.o
+       kd/kdinit.o \
+       kd/kdmain.o \
+       kd/kdio.o \
+       kd/service.o \
+       kd/wrappers/gdbstub.o \
+       kd/wrappers/bochs.o
+
+# User-Mode Debugging (Dbgk)
+OBJECTS_DBGK = \
+       dbgk/dbgkutil.o \
+       dbgk/debug.o
+
+ifeq ($(KDBG), 1)
+OBJECTS_KDBG := \
+       kdbg/kdb.o \
+       kdbg/kdb_cli.o \
+       kdbg/kdb_expr.o \
+       kdbg/kdb_keyboard.o \
+       kdbg/kdb_serial.o \
+       kdbg/kdb_string.o
+preall: all
+else
+OBJECTS_KDBG :=
+endif
+ifeq ($(DBG_OR_KDBG), 1)
+OBJECTS_KDBG := \
+       $(OBJECTS_KDBG) \
+       kdbg/kdb_symbols.o
+endif
 
 # Boot video (Inbv)
 OBJECTS_INBV = \
@@ -359,7 +366,7 @@ OBJECTS_INBV = \
 DEP_OBJECTS := $(OBJECTS_MM) $(OBJECTS_ARCH) \
        $(OBJECTS_IO) $(OBJECTS_KE) $(OBJECTS_OB) \
        $(OBJECTS_PS) $(OBJECTS_EX) $(OBJECTS_CC) $(OBJECTS_FS) $(OBJECTS_SE) \
-       $(OBJECTS_DBG) $(OBJECTS_CM) $(OBJECTS_LDR) $(OBJECTS_LPC) \
+       $(OBJECTS_KDBG) $(OBJECTS_DBGK) $(OBJECTS_CM) $(OBJECTS_LDR) $(OBJECTS_LPC) \
        $(OBJECTS_PO) $(OBJECTS_KD) $(OBJECTS_RTL) $(OBJECTS_INBV)
 
 TAG_OBJECTS := $(join $(dir $(DEP_OBJECTS)),$(patsubst %.o, .%.TAG, $(notdir $(DEP_OBJECTS))))
@@ -376,134 +383,27 @@ $(OBJECTS_PATH):
 
 $(OBJECTS_RESOURCE): $(TARGET_NAME).rc bugcodes.rc $(PATH_TO_TOP)/include/reactos/resource.h
 
-#
-# Build subsystem intermediate objects
-#
-$(OBJECTS_PATH)/arch.o: $(OBJECTS_ARCH)
-       $(LD) -r -o $(OBJECTS_PATH)/arch.o $(OBJECTS_ARCH)
-
-$(OBJECTS_PATH)/io.o: $(OBJECTS_IO)
-       $(LD) \
-               -r \
-               -o $(OBJECTS_PATH)/io.o \
-               $(OBJECTS_IO)
-
-$(OBJECTS_PATH)/ke.o: $(OBJECTS_KE)
-       $(LD) \
-               -r \
-               -o $(OBJECTS_PATH)/ke.o \
-               $(OBJECTS_KE)
-
-$(OBJECTS_PATH)/rtl.o: $(OBJECTS_RTL)
-       $(LD) \
-               -r \
-               -o $(OBJECTS_PATH)/rtl.o \
-               $(OBJECTS_RTL)
-
-$(OBJECTS_PATH)/mm.o: $(OBJECTS_MM)
-       $(LD) \
-               -r \
-               -o $(OBJECTS_PATH)/mm.o \
-               $(OBJECTS_MM)
-
-$(OBJECTS_PATH)/ob.o: $(OBJECTS_OB)
-       $(LD) \
-               -r \
-               -o $(OBJECTS_PATH)/ob.o \
-               $(OBJECTS_OB)
-
-$(OBJECTS_PATH)/ps.o: $(OBJECTS_PS)
-       $(LD) \
-               -r \
-               -o $(OBJECTS_PATH)/ps.o \
-               $(OBJECTS_PS)
-
-$(OBJECTS_PATH)/ex.o: $(OBJECTS_EX)
-       $(LD) \
-               -r \
-               -o $(OBJECTS_PATH)/ex.o \
-               $(OBJECTS_EX)
-
-$(OBJECTS_PATH)/fs.o: $(OBJECTS_FS)
-       $(LD) \
-               -r \
-               -o $(OBJECTS_PATH)/fs.o \
-               $(OBJECTS_FS)
-
-$(OBJECTS_PATH)/se.o: $(OBJECTS_SE)
-       $(LD) \
-               -r \
-               -o $(OBJECTS_PATH)/se.o \
-               $(OBJECTS_SE)
-
-$(OBJECTS_PATH)/cm.o: $(OBJECTS_CM)
-       $(LD) \
-               -r \
-               -o $(OBJECTS_PATH)/cm.o \
-               $(OBJECTS_CM)
-
-$(OBJECTS_PATH)/dbg.o: $(OBJECTS_DBG)
-       $(LD) \
-               -r \
-               -o $(OBJECTS_PATH)/dbg.o \
-               $(OBJECTS_DBG)
-
-$(OBJECTS_PATH)/ldr.o: $(OBJECTS_LDR)
-       $(LD) \
-               -r \
-               -o $(OBJECTS_PATH)/ldr.o \
-               $(OBJECTS_LDR)
-
-$(OBJECTS_PATH)/lpc.o: $(OBJECTS_LPC)
-       $(LD) \
-               -r \
-               -o $(OBJECTS_PATH)/lpc.o \
-               $(OBJECTS_LPC)
-
-$(OBJECTS_PATH)/po.o: $(OBJECTS_PO)
-       $(LD) \
-               -r \
-               -o $(OBJECTS_PATH)/po.o \
-               $(OBJECTS_PO)
-
-$(OBJECTS_PATH)/cc.o: $(OBJECTS_CC)
-       $(LD) \
-               -r \
-               -o $(OBJECTS_PATH)/cc.o \
-               $(OBJECTS_CC)
-
-$(OBJECTS_PATH)/kd.o: $(OBJECTS_KD)
-       $(LD) \
-               -r \
-               -o $(OBJECTS_PATH)/kd.o \
-               $(OBJECTS_KD)
-
-$(OBJECTS_PATH)/inbv.o: $(OBJECTS_INBV)
-       $(LD) \
-               -r \
-               -o $(OBJECTS_PATH)/inbv.o \
-               $(OBJECTS_INBV)
-
 # Note: arch.o MUST be the first file!!!
 OBJECTS := \
-       $(OBJECTS_PATH)/arch.o \
-       $(OBJECTS_PATH)/ke.o \
-       $(OBJECTS_PATH)/cc.o \
-       $(OBJECTS_PATH)/cm.o \
-       $(OBJECTS_PATH)/dbg.o \
-       $(OBJECTS_PATH)/ex.o \
-       $(OBJECTS_PATH)/lpc.o \
-       $(OBJECTS_PATH)/fs.o \
-       $(OBJECTS_PATH)/io.o \
-       $(OBJECTS_PATH)/kd.o \
-       $(OBJECTS_PATH)/ldr.o \
-       $(OBJECTS_PATH)/mm.o \
-       $(OBJECTS_PATH)/ob.o \
-       $(OBJECTS_PATH)/po.o \
-       $(OBJECTS_PATH)/ps.o \
-       $(OBJECTS_PATH)/rtl.o \
-       $(OBJECTS_PATH)/se.o \
-       $(OBJECTS_PATH)/inbv.o \
+       $(OBJECTS_ARCH) \
+       $(OBJECTS_KE) \
+       $(OBJECTS_CC) \
+       $(OBJECTS_CM) \
+       $(OBJECTS_EX) \
+       $(OBJECTS_LPC) \
+       $(OBJECTS_FS) \
+       $(OBJECTS_IO) \
+       $(OBJECTS_KD) \
+       $(OBJECTS_DBGK) \
+       $(OBJECTS_LDR) \
+       $(OBJECTS_MM) \
+       $(OBJECTS_OB) \
+       $(OBJECTS_PO) \
+       $(OBJECTS_PS) \
+       $(OBJECTS_RTL) \
+       $(OBJECTS_SE) \
+       $(OBJECTS_KDBG) \
+       $(OBJECTS_INBV) \
        $(OBJECTS_RESOURCE)
 
 EXTRA_OBJECTS = $(PATH_TO_TOP)/include/reactos/bugcodes.h
@@ -546,7 +446,6 @@ TARGET_CLEAN = \
   $(PATH_TO_TOP)/include/reactos/bugcodes.h \
   $(DEP_OBJECTS) $(DEP_FILES) MSG00409.bin bugcodes.rc
 
-ex/napi.o: ex/zw.S $(PATH_TO_TOP)/include/ntdll/napi.h
 
 ke/main.o: ke/main.c $(PATH_TO_TOP)/include/reactos/buildno.h