X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=8fbe2a230ef1c30c39bf527f004d4e77ba0cd59e;hb=3496b5b5469fe691a6847eb76d973019bb769318;hp=604c266facb74d3bc0471a0eaf5fbfb3107caf68;hpb=3e2c1876fc0d3049514ce1c82c6da217f28380a8;p=palacios.git

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 604c266..8fbe2a2 100644
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@ -53,11 +53,11 @@ VPATH := $(PROJECT_ROOT)/src
 # 
 
 ifeq ($(LEAN_AND_MEAN),1) 
-DEBUG=0
-DEBUG_SECTIONS=
+DEBUG := 0
+DEBUG_SECTIONS :=
 else
-DEBUG=1
-DEBUG_SECTIONS= 
+DEBUG := 1
+DEBUG_SECTIONS := 
 endif
 
 
@@ -217,6 +217,9 @@ endif
 
 
 
+ifeq ($(INSTRUMENT_VMM),1)
+  EXTRA_C_OPTS:= -DINSTRUMENT_VMM
+endif
 
 # ----------------------------------------------------------------------
 # Configuration -
@@ -265,6 +268,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 \
+	palacios/vmm_instrument.o \
 
 #		vmx.c vmcs_gen.c vmcs.c
 
@@ -278,8 +287,8 @@ XED_OBJS := \
 	xed/v3-xed-compat.o \
 	xed/v3-udiv-compat.o \
 
-$(XED_OBJS) :: EXTRA_CFLAGS =
-
+$(XED_OBJS) :: EXTRA_CFLAGS = \
+	$(JRLDEBUG) \
 
 DEVICES_OBJS := \
 	devices/generic.o \
@@ -293,20 +302,11 @@ DEVICES_OBJS := \
 	devices/ramdisk.o \
 	devices/cdrom.o \
 	devices/bochs_debug.o \
+	devices/os_debug.o \
+	devices/apic.o	\
 
-$(DEVICES_OBJS) :: EXTRA_CFLAGS =
-
-#
-# 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
+$(DEVICES_OBJS) :: EXTRA_CFLAGS = \
+	$(JRLDEBUG) \
 
 
 
@@ -399,14 +399,19 @@ CC_GENERAL_OPTS = \
 	$(EXTRA_C_OPTS) \
 	$(VMM_FLAGS) \
 	-I$(PROJECT_ROOT)/include \
-	-fPIC \
 	-Werror \
+	-fPIC \
 	-Wp,-MD,$(@D)/.$(@F).d \
 	-Wp,-MT,$@ \
 
+#-fPIC \
 #-fvisibility=hidden
 
-
+ifeq ($(INSTRUMENT_VMM),1)
+	INSTRUMENT_OPT = -finstrument-functions
+else
+	INSTRUMENT_OPT = 
+endif
 
 # Flags passed to objcopy program (strip unnecessary sections from kernel.exe)
 OBJCOPY_FLAGS := -R .dynamic -R .note -R .comment
@@ -443,6 +448,7 @@ CC_COMPILE = \
 		-c \
 		$< \
 		-o $@ \
+		$(INSTRUMENT_OPT) \
 	)
 
 AS_COMPILE = \
@@ -452,6 +458,7 @@ AS_COMPILE = \
 		-c \
 		$< \
 		-o $@ \
+		$(INSTRUMENT_OPT) \
 	)