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

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 8fbe2a2..9479e2b 100644
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@ -62,8 +62,7 @@ endif
 
 
 ifeq ($(DEBUG_ALL),1)
-  DEBUG_SECTIONS:= $(DEBUG_SECTIONS) -DDEBUG_SHADOW_PAGING -DDEBUG_CTRL_REGS -DDEBUG_INTERRUPTS -DDEBUG_KEYBOARD -DDEBUG_PIC -DDEBUG_PIT -DDEBUG_NVRAM -DDEBUG_EMULATOR  -DDEBUG_XED -DDEBUG_HALT -DDEBUG_DEV_MGR
-# -DDEBUG_IO -DDEBUG_GENERIC -DDEBUG_RAMDISK
+  DEBUG_SECTIONS:= $(DEBUG_SECTIONS) -DDEBUG_SHADOW_PAGING -DDEBUG_NESTED_PAGING -DDEBUG_CTRL_REGS -DDEBUG_INTERRUPTS -DDEBUG_KEYBOARD -DDEBUG_PIC -DDEBUG_PIT -DDEBUG_NVRAM -DDEBUG_EMULATOR  -DDEBUG_XED -DDEBUG_HALT -DDEBUG_DEV_MGR -DDEBUG_IO -DDEBUG_GENERIC -DDEBUG_RAMDISK
 endif
 
 
@@ -73,6 +72,14 @@ else
 ifeq ($(DEBUG_SHADOW_PAGING),0) 
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_SHADOW_PAGING
 endif
+
+endif
+ifeq ($(DEBUG_NESTED_PAGING),1)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_NESTED_PAGING
+else 
+ifeq ($(DEBUG_NESTED_PAGING),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_NESTED_PAGING
+endif
 endif
 
 ifeq ($(DEBUG_CTRL_REGS),1)
@@ -179,6 +186,22 @@ 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_PCI),1)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_PCI
+else 
+ifeq ($(DEBUG_PCI),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_PCI
+endif
+endif
+
 ifeq ($(DEBUG_DEV_MGR),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_DEV_MGR
 else 
@@ -219,8 +242,14 @@ 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 -
 #   Various options specifying how GeekOS should be built,
@@ -249,6 +278,7 @@ VMM_OBJS := \
 	palacios/vmm_debug.o \
 	palacios/svm_io.o \
 	palacios/vmm_intr.o \
+	palacios/vmm_excp.o \
 	palacios/vmm_time.o \
 	palacios/vmm_shadow_paging.o \
 	palacios/vm_guest_mem.o \
@@ -273,7 +303,8 @@ VMM_OBJS := \
 	palacios/vmm_profiler.o \
 	palacios/vmm_direct_paging.o \
 	palacios/vmm_ringbuffer.o \
-	palacios/vmm_instrument.o \
+	palacios/vmm_hypercall.o \
+	$(OBJ_FILES)
 
 #		vmx.c vmcs_gen.c vmcs.c
 
@@ -304,6 +335,11 @@ DEVICES_OBJS := \
 	devices/bochs_debug.o \
 	devices/os_debug.o \
 	devices/apic.o	\
+	devices/io_apic.o \
+	devices/pci.o \
+	devices/para_net.o \
+
+#   	devices/vnic.o \
 
 $(DEVICES_OBJS) :: EXTRA_CFLAGS = \
 	$(JRLDEBUG) \
@@ -322,6 +358,11 @@ V3_ARCH := __V3_32BIT__
 endif
 
 
+ifeq ($(CRAY_XT),1)
+EXTRA_C_OPTS := $(EXTRA_C_OPTS) -DCRAY_XT
+endif
+
+
 # Uncomment if cross compiling
 #TARGET_CC_PREFIX :=  $(PROJECT_ROOT)/../devtools/i386/bin/i386-elf-
 #TARGET_CC_PREFIX :=  i386-elf-
@@ -401,17 +442,13 @@ CC_GENERAL_OPTS = \
 	-I$(PROJECT_ROOT)/include \
 	-Werror \
 	-fPIC \
+	-mno-red-zone \
 	-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
@@ -499,13 +536,7 @@ vgabios_link:
 	ln -s -f ../src/vmboot/vgabios/VGABIOS-lgpl-latest.bin vgabios
 
 
-force_rombios: rombios_link
-	(cd ../src/vmboot/rombios; make clean; make)
-
-force_vgabios: vgabios_link
-	(cd ../src/vmboot/vgabios; make clean; make)
-
-force_payload: force_rombios force_vgabios
+force_payload: rombios_link vgabios_link
 	../scripts/make_payload.pl payload_layout.txt vm_kernel
 
 inter1: force_payload