X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=0d114cd6f11a2f0e911859ae635403a6e44f205f;hb=d81740cae7d1ebf42b080cba893500cec39a8a03;hp=6b8332bbcab011d72c77ff5e8189b70efc063dac;hpb=dc450df7818a872a3e8a3725ec97bdc273756b06;p=palacios-OLD.git

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 6b8332b..0d114cd 100644
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@ -3,7 +3,7 @@
 #  Northwestern University 
 # (c) 2008, Jack Lange <jarusl@cs.northwestern.edu>
 # (c) 2008, Peter Dinda <pdinda@northwestern.edu> 
-# (c) 2008, Lei Xia <xiaxlei@gmail.com>
+# (c) 2008, Lei Xia <lxia@northwestern.edu>
 # (c) 2008, The V3VEE Project <http://www.v3vee.org> 
 #
 # Based on GeekOS Makefile:
@@ -179,6 +179,14 @@ DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_HALT
 endif
 endif
 
+ifeq ($(DEBUG_APIC),1)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_APIC
+else 
+ifeq ($(DEBUG_APIC),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_APIC
+endif
+endif
+
 ifeq ($(DEBUG_DEV_MGR),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_DEV_MGR
 else 
@@ -217,6 +225,15 @@ endif
 
 
 
+ifeq ($(INSTRUMENT_VMM),1)
+  EXTRA_C_OPTS:= -DINSTRUMENT_VMM
+  INSTRUMENT_OPT := -finstrument-functions
+  OBJ_FILES := palacios/vmm_instrument.o
+else
+  INSTRUMENT_OPT := 
+endif
+
+
 
 # ----------------------------------------------------------------------
 # Configuration -
@@ -266,6 +283,12 @@ VMM_OBJS := \
 	palacios/svm_msr.o \
 	palacios/vmm_socket.o \
 	palacios/vmm_xed.o \
+	palacios/vmm_rbtree.o \
+	palacios/vmm_profiler.o \
+	palacios/vmm_direct_paging.o \
+	palacios/vmm_ringbuffer.o \
+	palacios/vmm_hypercall.o \
+	$(OBJ_FILES)
 
 #		vmx.c vmcs_gen.c vmcs.c
 
@@ -294,6 +317,11 @@ DEVICES_OBJS := \
 	devices/ramdisk.o \
 	devices/cdrom.o \
 	devices/bochs_debug.o \
+	devices/os_debug.o \
+	devices/apic.o	\
+	devices/io_apic.o \
+   	devices/vnic.o \
+	devices/vpci.o \
 
 $(DEVICES_OBJS) :: EXTRA_CFLAGS = \
 	$(JRLDEBUG) \
@@ -398,7 +426,6 @@ CC_GENERAL_OPTS = \
 #-fvisibility=hidden
 
 
-
 # Flags passed to objcopy program (strip unnecessary sections from kernel.exe)
 OBJCOPY_FLAGS := -R .dynamic -R .note -R .comment
 
@@ -434,6 +461,7 @@ CC_COMPILE = \
 		-c \
 		$< \
 		-o $@ \
+		$(INSTRUMENT_OPT) \
 	)
 
 AS_COMPILE = \
@@ -443,6 +471,7 @@ AS_COMPILE = \
 		-c \
 		$< \
 		-o $@ \
+		$(INSTRUMENT_OPT) \
 	)