moved exception tracking out of the interrupt state and into a seperate data structure

[palacios.git] / palacios / build / Makefile

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index abf8008..0fcc358 100644 (file)
--- 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_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
 
 
@@ -179,6 +178,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 
@@ -217,6 +232,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 -
@@ -246,6 +270,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 \
@@ -268,6 +293,10 @@ VMM_OBJS := \
        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
 
@@ -298,6 +327,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) \
@@ -316,6 +350,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-
@@ -395,6 +434,7 @@ CC_GENERAL_OPTS = \
        -I$(PROJECT_ROOT)/include \
        -Werror \
        -fPIC \
+       -mno-red-zone \
        -Wp,-MD,$(@D)/.$(@F).d \
        -Wp,-MT,$@ \
 
@@ -402,7 +442,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
 
@@ -438,6 +477,7 @@ CC_COMPILE = \
                -c \
                $< \
                -o $@ \
+               $(INSTRUMENT_OPT) \
        )
 
 AS_COMPILE = \
@@ -447,6 +487,7 @@ AS_COMPILE = \
                -c \
                $< \
                -o $@ \
+               $(INSTRUMENT_OPT) \
        )