Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


cleaned up Palacios Makefile
[palacios.git] / palacios / build / Makefile
index be6aaaf..e7cb6e3 100644 (file)
@@ -1,40 +1,8 @@
-# Makefile for GeekOS kernel, userspace, and tools
-# Copyright (c) 2004,2005 David H. Hovemeyer <daveho@cs.umd.edu>
-# $Revision: 1.62 $
-
-# This is free software.  You are permitted to use,
-# redistribute, and modify it as specified in the file "COPYING".
-
-# Required software to build GeekOS:
-# - GNU Make (http://www.gnu.org/software/make)
-# - gcc 2.95.2 generating code for target (i386/ELF) and host platforms
-# - nasm (http://nasm.sourceforge.net)
-# - Perl5, AWK (any version), egrep
-#
-# Cygwin (http://cygwin.com) may be used to build GeekOS.
-# Make sure that gcc, binutils, nasm, and perl are installed.
-
-# NOTES:
-# - This makefile has been written carefully to work correctly
-#   with the -j (parallel make) option.  I regularly use "make -j 2"
-#   to speed the build process on 2 processor systems.
-
-
-# Base address of kernel
-#
-# Note: at top of memory minus three pages (GDT/TSS/IDT) 
-# minus maximum size
-#
-#
-# Note that the code will initially load at 0x10000
-#
-# The setup code needs to copy it up to this address and jump there
-#
-KERNEL_BASE_ADDR := 0x00100000
-
-# Kernel entry point function
-KERNEL_ENTRY = $(SYM_PFX)Main
-
+#  Northwestern University 
+# (c) 2008, Jack Lange <jarusl@cs.northwestern.edu>
+# (c) 2008, Peter Dinda <pdinda@northwestern.edu> 
+# (c) 2008, Lei Xia <lxia@northwestern.edu>
+# (c) 2008, The V3VEE Project <http://www.v3vee.org> 
 
 PROJECT_ROOT := ..
 VPATH := $(PROJECT_ROOT)/src
@@ -45,203 +13,267 @@ VPATH := $(PROJECT_ROOT)/src
 # DEBUG=1 means VMM_DEBUG, VMM_INFO, and VMM_TRACE are enabled
 # as are SERIAL_PRINT_DEBUG
 # 
-DEBUG=1
-DEBUG_SECTIONS= 
+
+ifeq ($(LEAN_AND_MEAN),1) 
+DEBUG := 0
+DEBUG_SECTIONS :=
+else
+DEBUG := 1
+DEBUG_SECTIONS := 
+endif
+
 
 ifeq ($(DEBUG_ALL),1)
-  DEBUG_SECTIONS:= $(DEBUG_SECTIONS) -DDEBUG_SHADOW_PAGING -DDEBUG_CTRL_REGS -DDEBUG_INTERRUPTS -DDEBUG_IO -DDEBUG_KEYBOARD -DDEBUG_PIC -DDEBUG_PIT -DDEBUG_NVRAM -DDEBUG_EMULATOR -DDEBUG_GENERIC 
+  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_IDE
 endif
+
+
 ifeq ($(DEBUG_SHADOW_PAGING),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_SHADOW_PAGING
+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)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_CTRL_REGS
+else 
+ifeq ($(DEBUG_CTRL_REGS),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_CTRL_REGS
+endif
 endif
+
 ifeq ($(DEBUG_INTERRUPTS),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_INTERRUPTS
+else 
+ifeq ($(DEBUG_INTERRUPTS),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_INTERRUPTS
+endif
 endif
+
 ifeq ($(DEBUG_IO),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_IO
+else 
+ifeq ($(DEBUG_IO),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_IO
+endif
 endif
+
 ifeq ($(DEBUG_KEYBOARD),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_KEYBOARD
+else 
+ifeq ($(DEBUG_KEYBOARD),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_KEYBOARD
+endif
 endif
+
 ifeq ($(DEBUG_PIC),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_PIC
+else 
+ifeq ($(DEBUG_PIC),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_PIC
+endif
 endif
+
 ifeq ($(DEBUG_PIT),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_PIT
+else 
+ifeq ($(DEBUG_PIT),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_PIT
+endif
 endif
+
 ifeq ($(DEBUG_NVRAM),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_NVRAM
+else 
+ifeq ($(DEBUG_NVRAM),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_NVRAM
+endif
 endif
+
 ifeq ($(DEBUG_GENERIC),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_GENERIC
+else 
+ifeq ($(DEBUG_GENERIC),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_GENERIC
+endif
 endif
+
 ifeq ($(DEBUG_EMULATOR),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_EMULATOR
+else 
+ifeq ($(DEBUG_EMULATOR),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_EMULATOR
 endif
-ifeq ($(DEBUG_RAMDISK),1)
-DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_RAMDISK
 endif
 
-
-ifeq ($(DEBUG),1)
-  JRLDEBUG= -DSERIAL_PRINT_DEBUG=1 -DSERIAL_PRINT_DEBUG_LEVEL=10 -DSERIAL_PRINT=1 -DVMM_DEBUG=1 -DVMM_INFO=1 -DVMM_TRACE=1 $(DEBUG_SECTIONS)
-
-else
-  JRLDEBUG= -DSERIAL_PRINT_DEBUG=0 -DSERIAL_PRINT_DEBUG_LEVEL=999999 -DSERIAL_PRINT=0 -DVMM_DEBUG=0 -DVMM_INFO=0 -DVMM_TRACE=0
+ifeq ($(DEBUG_IDE),1)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_IDE
+else 
+ifeq ($(DEBUG_IDE),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_IDE
 endif
-
-
-#
-# DECODER is the decoder that will be used 
-# currently we only support xed
-#
-DECODER=XED
-
-DECODER_FLAGS=
-DECODER_SRCS=
-DECODER_LIBS=
-
-ifeq ($(DECODER),XED)
-DECODER_SRCS := vmm_xed.c
-DECODER_FLAGS :=  -L../lib/xed
-DECODER_LIBS := -lxed
-else
-# This is an error
 endif
 
-#
-#TCPSTACK, uIP is used currently
-#
-TCPSTACK=UIP
-
-#
-#RAMDISK
-#
-RAMDISK_SRCS=
-BOOT_FLAGS=
-
-ifeq ($(RAMDISK_BOOT),1)
-BOOT_FLAGS := $(BOOT_FLAGS) -DRAMDISK_BOOT
-RAMDISK_SRCS := ramdisk.c cdrom.c
+ifeq ($(DEBUG_XED),1)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_XED
+else 
+ifeq ($(DEBUG_XED),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_XED
+endif
 endif
 
+ifeq ($(DEBUG_HALT),1)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_HALT
+else 
+ifeq ($(DEBUG_HALT),0) 
+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
 
-#
-# This is wrong for current cygwin - no changes needed
-#
-# Figure out if we're compiling with cygwin, http://cygwin.com
-#
-# 
-#SYSTEM_NAME := $(shell uname -s)
-#ifeq ($(findstring CYGWIN,$(SYSTEM_NAME)),CYGWIN)
-#SYM_PFX            := _
-#EXTRA_C_OPTS       := -DNEED_UNDERSCORE -DGNU_WIN32
-#EXTRA_NASM_OPTS    := -DNEED_UNDERSCORE
-#NON_ELF_SYSTEM     := yes
-#EXTRA_CC_USER_OPTS := -Dmain=geekos_main
-#endif
-
-
-
-
-# ----------------------------------------------------------------------
-# Configuration -
-#   Various options specifying how GeekOS should be built,
-#   what source files to build, which user programs to build,
-#   etc.  This is generally the only section of the makefile
-#   that will need to be modified.
-# ----------------------------------------------------------------------
-
-# List of targets to build by default.
-# These targets encompass everything needed to boot
-# and run GeekOS.
-ALL_TARGETS := vmm.img vm_kernel
-
-
-# Kernel source files
-KERNEL_C_SRCS := idt.c int.c trap.c irq.c io.c \
-        blockdev.c ide.c ne2k.c \
-       keyboard.c screen.c timer.c \
-       mem.c crc32.c \
-       gdt.c tss.c segment.c \
-       bget.c malloc.c \
-       synch.c kthread.c \
-       serial.c  reboot.c \
-        paging.c \
-       debug.c vmm_stubs.c  vm.c  pci.c\
-       main.c
-
-# Kernel object files built from C source files
-KERNEL_C_OBJS := $(KERNEL_C_SRCS:%.c=geekos/%.o)
-
-# Kernel assembly files
-KERNEL_ASM_SRCS := lowlevel.asm
-
-KERNEL_GAS_SRCS := testvm.s udivdi3.s
-
-# Kernel object files build from assembler source files
-KERNEL_ASM_OBJS := $(KERNEL_ASM_SRCS:%.asm=geekos/%.o) 
-
-KERNEL_GAS_OBJS := $(KERNEL_GAS_SRCS:%.s=geekos/%.o)
+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 
+ifeq ($(DEBUG_DEV_MGR),0)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_DEV_MGR
+endif
+endif
 
-# All kernel object files
-KERNEL_OBJS := $(KERNEL_C_OBJS) \
-  $(KERNEL_ASM_OBJS) $(KERNEL_GAS_OBJS)
 
-# Common library source files.
-# This library is linked into both the kernel and user programs.
-# It provides string functions and generic printf()-style
-# formatted output.
-COMMON_C_SRCS := fmtout.c string.c memmove.c
+ifeq ($(DEBUG),1)
+  JRLDEBUG=  -DVMM_DEBUG -DVMM_INFO -DVMM_TRACE $(DEBUG_SECTIONS)
+else
 
-# Common library object files.
-COMMON_C_OBJS := $(COMMON_C_SRCS:%.c=common/%.o)
+endif
 
-VMM_ASM_SRCS :=  svm_lowlevel.asm \
-#                      vmx_lowlevel.asm
 
-VMM_ASM_OBJS := $(VMM_ASM_SRCS:%.asm=palacios/%.o)
+ifeq ($(INSTRUMENT_VMM),1)
+  EXTRA_C_OPTS:= -DINSTRUMENT_VMM
+  INSTRUMENT_OPT := -finstrument-functions
+  OBJ_FILES := palacios/vmm_instrument.o
+else
+  INSTRUMENT_OPT := 
+endif
 
+CFLAGS = -fno-stack-protector
+
+
+# Compile targets
+
+ALL_TARGETS := vmm force_payload
+
+# Compilation Objects
+
+
+VMM_OBJS := \
+       palacios/vm_guest.o \
+       palacios/svm.o \
+       palacios/svm_handler.o \
+       palacios/vmm.o \
+       palacios/vmm_util.o \
+       palacios/vmm_ctrl_regs.o \
+       palacios/vmcb.o \
+       palacios/vmm_mem.o \
+       palacios/vmm_paging.o \
+       palacios/vmm_io.o \
+       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 \
+       palacios/vm_dev.o \
+       palacios/vmm_dev_mgr.o \
+       palacios/vmm_decoder.o \
+       palacios/svm_halt.o \
+       palacios/svm_pause.o \
+       palacios/svm_wbinvd.o \
+       palacios/vmm_config.o \
+       palacios/vmm_hashtable.o \
+       palacios/vmm_string.o \
+       palacios/vmm_emulator.o \
+       palacios/vmm_queue.o \
+       palacios/vmm_host_events.o \
+       palacios/svm_lowlevel.o \
+       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_hypercall.o \
+       $(OBJ_FILES)
 
-VMM_C_SRCS :=   vm_guest.c \
-               svm.c svm_handler.c vmm.c vmm_util.c vmm_ctrl_regs.c \
-               vmcb.c vmm_mem.c vmm_paging.c vmm_io.c vmm_debug.c svm_io.c \
-               vmm_intr.c vmm_time.c \
-               vmm_shadow_paging.c vm_guest_mem.c  \
-                vm_dev.c vmm_dev_mgr.c vmm_decoder.c \
-                svm_halt.c svm_pause.c svm_wbinvd.c \
-               vmm_config.c vmm_hashtable.c \
-               vmm_string.c vmm_emulator.c \
-                $(DECODER_SRCS)
 #              vmx.c vmcs_gen.c vmcs.c
 
-VMM_C_OBJS := $(VMM_C_SRCS:%.c=palacios/%.o)
-
-VMM_OBJS := $(VMM_C_OBJS) $(VMM_ASM_OBJS)
-
-
+# Extra C flags for the VMM objects
+$(VMM_OBJS) :: EXTRA_CFLAGS = \
+       $(JRLDEBUG) $(CFLAGS)\
 
 
-DEVICE_C_SRCS := generic.c keyboard.c nvram.c timer.c simple_pic.c 8259a.c 8254.c serial.c $(RAMDISK_SRCS)
 
-DEVICE_C_OBJS := $(DEVICE_C_SRCS:%.c=devices/%.o)
+XED_OBJS := \
+       xed/v3-xed-compat.o \
+       xed/v3-udiv-compat.o \
 
-DEVICE_OBJS := $(DEVICE_C_OBJS)
+$(XED_OBJS) :: EXTRA_CFLAGS = \
+       $(JRLDEBUG) $(CFLAGS)\
 
-V3LIBS := $(DECODER_LIBS)
+DEVICES_OBJS := \
+       devices/generic.o \
+       devices/keyboard.o \
+       devices/nvram.o \
+       devices/timer.o \
+       devices/simple_pic.o \
+       devices/8259a.o \
+       devices/8254.o \
+       devices/serial.o \
+       devices/bochs_debug.o \
+       devices/os_debug.o \
+       devices/apic.o  \
+       devices/io_apic.o \
+       devices/pci.o \
+       devices/para_net.o \
+       devices/ide.o \
+       devices/ram_cd.o \
+       devices/ram_hd.o \
+       devices/i440fx.o \
+       devices/piix3.o \
 
+#      devices/ne2k.o  \
+#      devices/vnic.o \
 
-TCPSTACK_C_SRCS := psock.c timer.c uip_arp.c uip.c uip-fw.c uiplib.c uip-neighbor.c uip-split.c resolv.c
-
-TCPSTACK_C_OBJS := $(TCPSTACK_C_SRCS:%.c=net/%.o)
-
-TCPSTACK_OBJS := $(TCPSTACK_C_OBJS)
-
+$(DEVICES_OBJS) :: EXTRA_CFLAGS = \
+       $(JRLDEBUG) $(CFLAGS)\
 
 
 
@@ -250,19 +282,28 @@ TCPSTACK_OBJS := $(TCPSTACK_C_OBJS)
 #   This section defines programs that are used to build GeekOS.
 # ----------------------------------------------------------------------
 
+ifeq ($(ARCH),64)
+V3_ARCH := __V3_64BIT__
+else 
+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 :=  $(PROJECT_ROOT)/../devtools/i386/bin/i386-elf-
 #TARGET_CC_PREFIX :=  i386-elf-
 
-# Target C compiler.  gcc 2.95.2 or later should work.
-TARGET_CC := $(TARGET_CC_PREFIX)gcc
-#TARGET_CC := $(TARGET_CC_PREFIX)gcc34 -m32
+ifeq ($(ARCH),64)
+TARGET_CC := $(TARGET_CC_PREFIX)gcc -m64
+else 
+TARGET_CC := $(TARGET_CC_PREFIX)gcc -m32
+endif
 
-# Host C compiler.  This is used to compile programs to execute on
-# the host platform, not the target (x86) platform.  On x86/ELF
-# systems, such as Linux and FreeBSD, it can generally be the same
-# as the target C compiler.
-HOST_CC := gcc
 
 # Target linker.  GNU ld is probably to only one that will work.
 TARGET_LD := $(TARGET_CC_PREFIX)ld -melf_i386
@@ -279,11 +320,15 @@ TARGET_NM := $(TARGET_CC_PREFIX)nm
 # Target objcopy
 TARGET_OBJCOPY := $(TARGET_CC_PREFIX)objcopy
 
-# Nasm (http://nasm.sourceforge.net)
-NASM := $(PROJECT_ROOT)/../devtools/bin/nasm
-#NASM := /opt/vmm-tools/bin/nasm
+CPP := cpp
 
+
+ifeq ($(ARCH),64)
+AS = as --64
+else 
 AS = as --32
+endif
+
 
 # Tool to build PFAT filesystem images.
 BUILDFAT := tools/builtFat.exe
@@ -310,24 +355,25 @@ FD_SECTORS_PER_TRACK := $(PERL) $(PROJECT_ROOT)/scripts/numsecs_per_track
 # ----------------------------------------------------------------------
 
 # Flags used for all C source files
-GENERAL_OPTS := -O -Wall $(EXTRA_C_OPTS) $(VMM_FLAGS) $(BOOT_FLAGS) -fPIC
-CC_GENERAL_OPTS := $(GENERAL_OPTS) -Werror 
-
-# Flags used for kernel C source files
-CC_KERNEL_OPTS := -g -DGEEKOS -I$(PROJECT_ROOT)/include
-
-# Flags used for VMM C source files
-CC_VMM_OPTS := -g -I$(PROJECT_ROOT)/include -D__V3VEE__ -D__V3_32BIT__ $(DECODER_FLAGS) $(JRLDEBUG)
-
-# Flags used for VMM C ASM files
-NASM_VMM_OPTS := -I$(PROJECT_ROOT)/src/palacios/ -f elf $(EXTRA_NASM_OPTS)
 
-# Flags user for kernel assembly files
-NASM_KERNEL_OPTS := -I$(PROJECT_ROOT)/src/geekos/ -f elf $(EXTRA_NASM_OPTS)
+CC_GENERAL_OPTS = \
+       -O \
+       -Wall \
+       -g \
+       -D__V3VEE__ \
+       -D$(V3_ARCH) \
+       $(EXTRA_C_OPTS) \
+       $(VMM_FLAGS) \
+       -I$(PROJECT_ROOT)/include \
+       -Werror \
+       -fPIC \
+       -mno-red-zone \
+       -Wp,-MD,$(@D)/.$(@F).d \
+       -Wp,-MT,$@ \
+
+#-fPIC \
+#-fvisibility=hidden
 
-# Flags used for common library and libc source files
-CC_USER_OPTS := -I$(PROJECT_ROOT)/include -I$(PROJECT_ROOT)/include/libc \
-       $(EXTRA_CC_USER_OPTS)
 
 # Flags passed to objcopy program (strip unnecessary sections from kernel.exe)
 OBJCOPY_FLAGS := -R .dynamic -R .note -R .comment
@@ -338,40 +384,53 @@ OBJCOPY_FLAGS := -R .dynamic -R .note -R .comment
 # ----------------------------------------------------------------------
 
 # Compilation of kernel C source files
+# Usage:
+#      $(call build,TAG,commandline)
+#
+# If V=1 on the command line or the environment, then the actual
+# command executed will be echoed to the terminal.  Otherwise
+# only the tag and the output file will be printed to make
+# any warnings stand out from the compile messages.
+#
+build = \
+       @if [ -z "$V" ]; then \
+               echo '    [$1]  $@'; \
+               $2; \
+       else \
+               echo '$2'; \
+               $2; \
+       fi
+
+
+
+CC_COMPILE = \
+       $(call build,CC,$(TARGET_CC) \
+               $(CC_GENERAL_OPTS) \
+               $(EXTRA_CFLAGS) \
+               -c \
+               $< \
+               -o $@ \
+               $(INSTRUMENT_OPT) \
+       )
+
+AS_COMPILE = \
+       $(call build,AS,$(TARGET_CC) \
+               $(CC_GENERAL_OPTS) \
+               $(EXTRA_CFLAGS) \
+               -c \
+               $< \
+               -o $@ \
+               $(INSTRUMENT_OPT) \
+       )
+
+
+%.o: %.c
+       $(CC_COMPILE)
+%.o: %.S
+       $(AS_COMPILE)
+%.o: %.s
+       $(AS_COMPILE)
 
-geekos/%.o : geekos/%.c
-       $(TARGET_CC) -c $(CC_GENERAL_OPTS) $(CC_KERNEL_OPTS) $< -o geekos/$*.o
-
-
-# Compilation of kernel assembly source files
-geekos/%.o : geekos/%.asm
-       $(NASM) $(NASM_KERNEL_OPTS) $< -o geekos/$*.o
-
-# Compilation of test VM
-geekos/%.o : geekos/%.s
-       $(AS) $< -o geekos/$*.o
-
-geekos/%.o : geekos/%.S
-       $(TARGET_CC) -c $(CC_GENERAL_OPTS) $(CC_KERNEL_OPTS) $< -o geekos/$*.o
-
-# Compilation of common library C source files
-common/%.o : common/%.c
-       $(TARGET_CC) -c $(CC_GENERAL_OPTS) $(CC_USER_OPTS) $< -o common/$*.o
-
-palacios/%.o : palacios/%.c
-       $(TARGET_CC) -c $(CC_GENERAL_OPTS) $(CC_VMM_OPTS) $< -o palacios/$*.o
-
-palacios/%.o : palacios/%.asm
-       $(NASM) $(NASM_VMM_OPTS) $< -o palacios/$*.o
-
-devices/%.o : devices/%.c
-       $(TARGET_CC) -c $(CC_GENERAL_OPTS) $(CC_VMM_OPTS) $< -o devices/$*.o
-
-devices/%.o : devices/%.asm
-       $(NASM) $(NASM_VMM_OPTS) $< -o devices/$*.o
-
-net/%.o : net/%.c
-       $(TARGET_CC) -c $(CC_GENERAL_OPTS) $(CC_VMM_OPTS)  $(CC_USER_OPTS) $< -o net/$*.o
 
 # ----------------------------------------------------------------------
 # Targets -
@@ -381,124 +440,50 @@ net/%.o : net/%.c
 # Default target - see definition of ALL_TARGETS in Configuration section
 all : $(ALL_TARGETS)
 
+rombios_link:
+       ln -s -f ../src/vmboot/rombios/BIOS-bochs-latest rombios
 
-#geekos/vmx_lowlevel.o: $(PROJECT_ROOT)/src/geekos/vmx_lowlevel.asm
-#      $(NASM) -O99 \
-#      -f elf \
-#              -I$(PROJECT_ROOT)/src/geekos/ \
-#              $(PROJECT_ROOT)/src/geekos/vmx_lowlevel.asm \
-#      -o $@
-
-
-#geekos/test: geekos/test.o geekos/vmcs.o geekos/vmx_lowlevel.o 
-#      $(CC) geekos/test.o geekos/vmcs.o geekos/vmx_lowlevel.o  -o geekos/test
-
-# Standard floppy image - just boots the kernel
-fd.img : geekos/fd_boot.bin geekos/setup.bin geekos/kernel.bin
-       cat geekos/fd_boot.bin geekos/setup.bin geekos/kernel.bin > _temp
-       $(PAD) _temp 512
-       cp _temp fd.img
-
-vmm.img : fd.img
-       cp fd.img vmm.img
-       $(PAD) vmm.img 1474560
+vgabios_link:
+       ln -s -f ../src/vmboot/vgabios/VGABIOS-lgpl-latest.bin vgabios
 
-force_rombios: 
-       (cd ../src/vmboot/rombios; make clean; make)
 
-force_vgabios:
-       (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
        -make clean
 
-world: inter1 vmm.img
-
-# make ready to boot over PXE
-pxe:   vmm.img
-       cp vmm.img /tftpboot/vmm.img
-
-run: vmm.img
-       /usr/local/qemu/bin/qemu-system-x86_64 -m 1024 -serial file:serial.out -cdrom puppy.iso -fda vmm.img 
-
+world: inter1 vmm
 
+vmm: palacios/vmm.lib 
 
 
-# Floppy boot sector (first stage boot loader).
-geekos/fd_boot.bin : geekos/setup.bin geekos/kernel.bin $(PROJECT_ROOT)/src/geekos/fd_boot.asm
-       $(NASM) -f bin \
-               -I$(PROJECT_ROOT)/src/geekos/ \
-               -DNUM_SETUP_SECTORS=`$(NUMSECS) geekos/setup.bin` \
-               -DNUM_KERN_SECTORS=`$(NUMSECS) geekos/kernel.bin` \
-               -DSECTORS_PER_TRACK=`$(FD_SECTORS_PER_TRACK) geekos/kernel.bin geekos/setup.bin` \
-               $(PROJECT_ROOT)/src/geekos/fd_boot.asm \
-               -o $@
-
-# Setup program (second stage boot loader).
-geekos/setup.bin : geekos/kernel.bin $(PROJECT_ROOT)/src/geekos/setup.asm
-       $(NASM) -f bin \
-               -I$(PROJECT_ROOT)/src/geekos/ \
-               -DENTRY_POINT=0x`egrep 'Main$$' geekos/kernel.syms |awk '{print $$1}'` \
-               -DVMM_SIZE=`$(NUMSECS) geekos/kernel.bin` \
-               $(PROJECT_ROOT)/src/geekos/setup.asm \
-               -o $@
-       $(PAD) $@ 2048
-
 # Loadable (flat) kernel image.
-geekos/kernel.bin : geekos/kernel.exe
-       $(TARGET_OBJCOPY) $(OBJCOPY_FLAGS) -S -O binary geekos/kernel.exe geekos/kernel.bin
-       $(PAD) $@ 512
+palacios/vmm.bin : palacios/vmm.lib
+       $(TARGET_OBJCOPY) $(OBJCOPY_FLAGS) -S -O binary palacios/vmm.lib palacios/vmm.bin
+
 
 # The kernel executable and symbol map.
-geekos/kernel.exe : $(KERNEL_OBJS) $(COMMON_C_OBJS) $(VMM_OBJS) $(DEVICE_OBJS) $(TCPSTACK_OBJS) vm_kernel
-       $(TARGET_LD) -o geekos/kernel.exe -Ttext $(KERNEL_BASE_ADDR) -e $(KERNEL_ENTRY) \
-               $(DECODER_FLAGS) \
-               $(KERNEL_OBJS) $(COMMON_C_OBJS) $(VMM_OBJS) $(DEVICE_OBJS) $(V3LIBS) $(TCPSTACK_OBJS) -b binary vm_kernel
-       $(TARGET_NM) geekos/kernel.exe > geekos/kernel.syms
+palacios/vmm.lib: libv3vee.a
+libv3vee.a: \
+       $(VMM_OBJS) \
+       $(DEVICES_OBJS) \
+       $(XED_OBJS) \
 
+       $(call build,AR,$(TARGET_AR) rcs $@ $^)
 
 force:
 
 
-#vm_kernel: force
-#      $(PAD) vm_kernel 512
-#      @echo "VM kernel lives at 0x100000 and is" `$(NUMSECS) vm_kernel` "sectors long"
-
 
 
 
 # Clean build directories of generated files
 clean :
-       for d in geekos common libc user tools palacios devices net; do \
-               (cd $$d && rm -f *); \
+       for d in palacios devices xed; do \
+               (cd $$d && rm -f * .*.d); \
        done
 
 
-# Build header file dependencies, so source files are recompiled when
-# header files they depend on are modified.
-depend : $(GENERATED_LIBC_SRCS)
-       $(TARGET_CC) -M $(CC_GENERAL_OPTS) $(CC_KERNEL_OPTS) \
-               $(KERNEL_C_SRCS:%.c=$(PROJECT_ROOT)/src/geekos/%.c) \
-               | $(PERL) -n -e 's,^(\S),geekos/$$1,;print' \
-               > depend.mak
-       $(TARGET_CC) -M $(CC_GENERAL_OPTS) $(CC_USER_OPTS) \
-               $(COMMON_C_SRCS:%.c=$(PROJECT_ROOT)/src/common/%.c) \
-               | $(PERL) -n -e 's,^(\S),common/$$1,;print' \
-               >> depend.mak
-       $(TARGET_CC) -M $(CC_GENERAL_OPTS) $(CC_KERNEL_OPTS) \
-               $(VMM_C_SRCS:%.c=$(PROJECT_ROOT)/src/palacios/%.c) \
-               | $(PERL) -n -e 's,^(\S),palacios/$$1,;print' \
-               >> depend.mak
-       $(TARGET_CC) -M $(CC_GENERAL_OPTS) $(CC_KERNEL_OPTS) \
-               $(DEVICE_C_SRCS:%.c=$(PROJECT_ROOT)/src/devices/%.c) \
-               | $(PERL) -n -e 's,^(\S),devices/$$1,;print' \
-               >> depend.mak
-
-# By default, there are no header file dependencies.
-depend.mak :
-       touch $@
-
-include depend.mak
+# Include all of the generated dependency files if they exist
+-include */.*.o.d