X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=8e9d972d273758529c407b7fd9ed7931891494c7;hb=7569a7e7b33dc1c26b68d66e4bcd3aebf3beaf7f;hp=8ebcd215cb9282856e5a4c9c3461f54f99d2f06b;hpb=8cd226e9445d54e8914ca71abdc233f8fb15d513;p=palacios-OLD.git

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 8ebcd21..8e9d972 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:
@@ -217,6 +217,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 -
@@ -265,6 +274,12 @@ VMM_OBJS := \
 	palacios/vmm_msr.o \
 	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 \
+	$(OBJ_FILES)
 
 #		vmx.c vmcs_gen.c vmcs.c
 
@@ -293,20 +308,12 @@ DEVICES_OBJS := \
 	devices/ramdisk.o \
 	devices/cdrom.o \
 	devices/bochs_debug.o \
+	devices/os_debug.o \
+	devices/apic.o	\
+	devices/io_apic.o \
 
 $(DEVICES_OBJS) :: EXTRA_CFLAGS = \
 	$(JRLDEBUG) \
-#
-# DECODER is the decoder that will be used 
-# currently we only support xed
-#
-DECODER=XED
-
-ifeq ($(DECODER),XED)
-VMM_OBJS += palacios/vmm_xed.o 
-else
-# This is an error
-endif
 
 
 
@@ -408,7 +415,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
 
@@ -444,6 +450,7 @@ CC_COMPILE = \
 		-c \
 		$< \
 		-o $@ \
+		$(INSTRUMENT_OPT) \
 	)
 
 AS_COMPILE = \
@@ -453,6 +460,7 @@ AS_COMPILE = \
 		-c \
 		$< \
 		-o $@ \
+		$(INSTRUMENT_OPT) \
 	)