X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=d612435eb230e90c3f69004b1925734427aa7947;hb=d2720fdaa2bb5588049e1fec7eb66960ca928b2d;hp=87bc7dfeb9aefc94b97ab8e7d9fcd1297169a684;hpb=19963ec00c85aea5e9f3511101b7b3312708500d;p=palacios.git

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 87bc7df..d612435 100644
--- a/palacios/build/Makefile
+++ b/palacios/build/Makefile
@@ -1,6 +1,15 @@
 # Makefile for GeekOS kernel, userspace, and tools
+#
+#  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, The V3VEE Project <http://www.v3vee.org> 
+#
+# Based on GeekOS Makefile:
 # Copyright (c) 2004,2005 David H. Hovemeyer <daveho@cs.umd.edu>
-# $Revision: 1.6 $
+# $Revision: 1.71 $
+
 
 # This is free software.  You are permitted to use,
 # redistribute, and modify it as specified in the file "COPYING".
@@ -20,19 +29,6 @@
 #   to speed the build process on 2 processor systems.
 
 
-
-# THESE MUST MATCH WHAT IS DEFINED IN defs.h and defs.asm exactly
-# MUST BE INTEGRAL NUMBER OF PAGES
-TOP_OF_MEM := 0x40000000
-VM_SIZE    := 0x20000000
-VM_START   := 0x0
-
-#
-# THE KERNEL, SETUP, BOOTPACKAGE MUST BE SMALLER THAN THIS
-# MUST BE INTEGRAL NUMBER OF PAGES
-# define 
-MAX_VMM := 0x160000
-
 # Base address of kernel
 #
 # Note: at top of memory minus three pages (GDT/TSS/IDT) 
@@ -43,10 +39,8 @@ MAX_VMM := 0x160000
 #
 # The setup code needs to copy it up to this address and jump there
 #
-KERNEL_BASE_ADDR := $(shell perl -e 'print sprintf("0x%x",$(TOP_OF_MEM)-4096*3-$(MAX_VMM));')
 
-# Kernel entry point function
-KERNEL_ENTRY = $(SYM_PFX)Main
+
 
 
 PROJECT_ROOT := ..
@@ -54,24 +48,155 @@ VPATH := $(PROJECT_ROOT)/src
 
 #when -DNDEBUG is set the kassert functions are disabled
 #JRLDEBUG=-DNDEBUG
-JRLDEBUG= -DSERIAL_PRINT_DEBUG=1 -DSERIAL_PRINT_DEBUG_LEVEL=1000 -DSERIAL_PRINT=1
+
+# DEBUG=1 means VMM_DEBUG, VMM_INFO, and VMM_TRACE are enabled
+# as are SERIAL_PRINT_DEBUG
+# 
+DEBUG=1
+DEBUG_SECTIONS= 
+
+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 -DDEBUG_RAMDISK
+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_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_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
+endif
+
+ifeq ($(DEBUG_RAMDISK),1)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_RAMDISK
+else 
+ifeq ($(DEBUG_RAMDISK),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_RAMDISK
+endif
+endif
+
+
+#DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DTEST_NE2K
+
+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
+endif
+
 
 #
+# DECODER is the decoder that will be used 
+# currently we only support xed
 #
-#Peter's compile flags
-PADFLAGS = -DMAX_VMM=$(MAX_VMM)
+DECODER=XED
+
+DECODER_FLAGS=
+DECODER_SRCS=
+DECODER_LIBS=
+
+ifeq ($(DECODER),XED)
+DECODER_SRCS := vmm_xed.c
+DECODER_FLAGS :=  -L../lib/xed
+DECODER_LIBS := $(PROJECT_ROOT)/lib/xed/libxed.a
+else
+# This is an error
+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
+#
+# 
+#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
+
 
-VMM_SIZES = ../include/geekos/vmm_sizes.h
 
 
 # ----------------------------------------------------------------------
@@ -85,47 +210,57 @@ VMM_SIZES = ../include/geekos/vmm_sizes.h
 # List of targets to build by default.
 # These targets encompass everything needed to boot
 # and run GeekOS.
-ALL_TARGETS := fd.img VM_linux_kernel
+ALL_TARGETS := vmm vm_kernel
+
+
+
+
 
 
-# Kernel source files
-KERNEL_C_SRCS := idt.c int.c trap.c irq.c io.c \
-        blockdev.c ide.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 vmx.c vmcs_gen.c vmcs.c\
-	main.c
+VMM_ASM_SRCS :=  svm_lowlevel.asm vmm_lowlevel.asm\
+#			vmx_lowlevel.asm
 
-# Kernel object files built from C source files
-KERNEL_C_OBJS := $(KERNEL_C_SRCS:%.c=geekos/%.o)
+VMM_ASM_OBJS := $(VMM_ASM_SRCS:%.asm=palacios/%.o)
 
-# Kernel assembly files
-KERNEL_ASM_SRCS := lowlevel.asm vmx_lowlevel.asm
 
-KERNEL_GAS_SRCS := testvm.s
+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 vmm_queue.c\
+		 $(DECODER_SRCS)
+#		vmx.c vmcs_gen.c vmcs.c
 
-# Kernel object files build from assembler source files
-KERNEL_ASM_OBJS := $(KERNEL_ASM_SRCS:%.asm=geekos/%.o) 
+VMM_C_OBJS := $(VMM_C_SRCS:%.c=palacios/%.o)
 
-KERNEL_GAS_OBJS := $(KERNEL_GAS_SRCS:%.s=geekos/%.o)
+VMM_OBJS := $(VMM_C_OBJS) $(VMM_ASM_OBJS)
 
 
-# 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
+XED_C_SRCS := v3-xed-compat.c
+
+XED_C_OBJS := $(XED_C_SRCS:%.c=xed/%.o)
+
+XED_GAS_SRCS := v3-udiv-compat.s
+
+XED_GAS_OBJS := $(XED_GAS_SRCS:%.s=xed/%.o)
+
+XED_OBJS := $(XED_C_OBJS) $(XED_GAS_OBJS)
+
+
+
+DEVICE_C_SRCS := generic.c keyboard.c nvram.c timer.c simple_pic.c 8259a.c 8254.c serial.c ramdisk.c cdrom.c
+
+DEVICE_C_OBJS := $(DEVICE_C_SRCS:%.c=devices/%.o)
+
+DEVICE_OBJS := $(DEVICE_C_OBJS)
+
+V3LIBS := $(DECODER_LIBS)
 
-# Common library object files.
-COMMON_C_OBJS := $(COMMON_C_SRCS:%.c=common/%.o)
 
 
 
@@ -135,18 +270,18 @@ COMMON_C_OBJS := $(COMMON_C_SRCS:%.c=common/%.o)
 #   This section defines programs that are used to build GeekOS.
 # ----------------------------------------------------------------------
 
+
+V3_ARCH := __V3_32BIT__
+#V3_ARCH := __V3_64BIT__
+
 # Uncomment if cross compiling
-#TARGET_CC_PREFIX := 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
+TARGET_CC := $(TARGET_CC_PREFIX)gcc -m32
+#TARGET_CC := $(TARGET_CC_PREFIX)gcc34 -m32
 
-# 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
@@ -164,8 +299,8 @@ TARGET_NM := $(TARGET_CC_PREFIX)nm
 TARGET_OBJCOPY := $(TARGET_CC_PREFIX)objcopy
 
 # Nasm (http://nasm.sourceforge.net)
-#NASM := $(PROJECT_ROOT)/../devtools/bin/nasm
-NASM := /opt/vmm-tools/bin/nasm
+NASM := $(PROJECT_ROOT)/../devtools/bin/nasm
+#NASM := /opt/vmm-tools/bin/nasm
 
 AS = as --32
 
@@ -185,24 +320,27 @@ ZEROFILE := $(PERL) $(PROJECT_ROOT)/scripts/zerofile
 NUMSECS := $(PERL) $(PROJECT_ROOT)/scripts/numsecs
 
 
+FD_SECTORS_PER_TRACK := $(PERL) $(PROJECT_ROOT)/scripts/numsecs_per_track
+
+
 # ----------------------------------------------------------------------
 # Definitions -
 #   Options passed to the tools.
 # ----------------------------------------------------------------------
 
 # Flags used for all C source files
-GENERAL_OPTS := -O -Wall $(EXTRA_C_OPTS) $(JRLDEBUG) $(PADFLAGS)
+GENERAL_OPTS := -O -Wall $(EXTRA_C_OPTS) $(VMM_FLAGS) -fPIC #-fvisibility=hidden
 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_ARCH) $(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)
 
-# 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
@@ -212,26 +350,27 @@ OBJCOPY_FLAGS := -R .dynamic -R .note -R .comment
 #   Describes how to compile the source files.
 # ----------------------------------------------------------------------
 
-# Compilation of kernel C source files
 
-geekos/%.o : geekos/%.c
-	$(TARGET_CC) -c $(CC_GENERAL_OPTS) $(CC_KERNEL_OPTS) $< -o geekos/$*.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
 
-# 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
+xed/%.o : xed/%.c
+	$(TARGET_CC) -c $(CC_GENERAL_OPTS) $(CC_VMM_OPTS) $< -o xed/$*.o
 
-geekos/%.o : geekos/%.S
-	$(TARGET_CC) -c $(CC_GENERAL_OPTS) $(CC_KERNEL_OPTS) $< -o geekos/$*.o
+xed/%.o : xed/%.s
+	$(AS) $< -o xed/$*.o
 
-# Compilation of common library C source files
-common/%.o : common/%.c
-	$(TARGET_CC) -c $(CC_GENERAL_OPTS) $(CC_USER_OPTS) $< -o common/$*.o
 
 # ----------------------------------------------------------------------
 # Targets -
@@ -242,114 +381,72 @@ common/%.o : common/%.c
 all : $(ALL_TARGETS)
 
 
-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 VM_linux_kernel
-	cat geekos/fd_boot.bin geekos/setup.bin geekos/kernel.bin > _temp
-	$(PAD) _temp 512
-	cat _temp VM_linux_kernel > $@
-
-# make ready to boot over PXE
-pxe:	fd.img
-	cp fd.img /tftpboot/vmm.img
-	$(PAD) /tftpboot/vmm.img 1474560
-
-
-pxe-discovery-pdinda:	fd.img
-	cp fd.img geekos.img
-	$(PAD) geekos.img 1474560
-	/usr/local/vmm-util/pxe_cp geekos.img
-	/usr/local/vmm-util/tty_perm pdinda
-	echo "Copied file to PXE boot area and set serial permissions for pdinda"
-
-
-pxe-discovery-bjp600:	fd.img
-	cp fd.img geekos.img
-	$(PAD) geekos.img 1474560
-	/usr/local/vmm-util/pxe_cp geekos.img
-	/usr/local/vmm-util/tty_perm bjp600
-	echo "Copied file to PXE boot area and set serial permissions for pdinda"
-
-
-# Floppy boot sector (first stage boot loader).
-geekos/fd_boot.bin : geekos/setup.bin geekos/kernel.bin $(PROJECT_ROOT)/src/geekos/fd_boot.asm VM_linux_kernel
-	$(NASM) -f bin \
-		-I$(PROJECT_ROOT)/src/geekos/ \
-		-DNUM_SETUP_SECTORS=`$(NUMSECS) geekos/setup.bin` \
-		-DNUM_KERN_SECTORS=`$(NUMSECS) geekos/kernel.bin` \
-		-DNUM_VM_KERNEL_SECTORS=`$(NUMSECS) VM_linux_kernel` \
-		$(PROJECT_ROOT)/src/geekos/fd_boot.asm \
-		-o $@
-
-# Setup program (second stage boot loader).
-geekos/setup.bin : geekos/kernel.exe $(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_FINAL_ADDR=$(KERNEL_BASE_ADDR) \
-	        -DVMM_SIZE=$(MAX_VMM) \
-		$(PROJECT_ROOT)/src/geekos/setup.asm \
-		-o $@
-	$(PAD) $@ 512
+#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 $@
 
-# 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
 
-# The kernel executable and symbol map.
-geekos/kernel.exe : $(KERNEL_OBJS) $(COMMON_C_OBJS)
-	$(TARGET_LD) -o geekos/kernel.exe -Ttext $(KERNEL_BASE_ADDR) -e $(KERNEL_ENTRY) \
-		$(KERNEL_OBJS) $(COMMON_C_OBJS)
-	$(TARGET_NM) geekos/kernel.exe > geekos/kernel.syms
+#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
+
+
+
+rombios_link:
+	ln -s -f ../src/vmboot/rombios/BIOS-bochs-latest rombios
+
+vgabios_link:
+	ln -s -f ../src/vmboot/vgabios/VGABIOS-lgpl-latest.bin vgabios
 
+force_lwip:
+	(cd ../src/lwip/build; make clean; make)
 
-generate_sizes: force
-	echo "#ifndef __vmm_sizes" > $(VMM_SIZES)
-	echo "#define __vmm_sizes" >> $(VMM_SIZES)
-	echo "#define KERNEL_LOAD_ADDRESS " $(KERNEL_BASE_ADDR)  >> $(VMM_SIZES) 
+force_rombios: rombios_link
+	(cd ../src/vmboot/rombios; make clean; make)
 
-	echo "#define KERNEL_START (KERNEL_LOAD_ADDRESS)" >> $(VMM_SIZES)
-	echo "#define KERNEL_CORE_LENGTH (" `$(NUMSECS) geekos/kernel.bin` "*512)" >> $(VMM_SIZES) 
-	echo "#define KERNEL_END (KERNEL_LOAD_ADDRESS+KERNEL_CORE_LENGTH-1)" >> $(VMM_SIZES)
+force_vgabios: vgabios_link
+	(cd ../src/vmboot/vgabios; make clean; make)
 
-	echo "#define VM_KERNEL_LENGTH (" `$(NUMSECS) VM_linux_kernel` "*512)" >> $(VMM_SIZES)
-	echo "#define VM_KERNEL_START (KERNEL_LOAD_ADDRESS + KERNEL_CORE_LENGTH)" >> $(VMM_SIZES)
-	echo "#define VM_BOOT_PACKAGE_START (VM_KERNEL_START) " >> $(VMM_SIZES)
-	echo "#define VM_BOOT_PACKAGE_END  (VM_KERNEL_START+VM_KERNEL_LENGTH-1) " >> $(VMM_SIZES)
-	echo "#endif" >> $(VMM_SIZES)
+force_payload: force_rombios force_vgabios
+	../scripts/make_payload.pl payload_layout.txt vm_kernel
 
-make_show_sizes: generate_sizes ../src/geekos/show_sizes.c
-	$(HOST_CC) -I../include/geekos ../src/geekos/show_sizes.c -o show_sizes
+inter1: force_payload force_lwip
+	-make clean
 
-show_sizes: make_show_sizes
-	./show_sizes
+world: inter1 vmm
+
+vmm: palacios/vmm.lib 
+
+
+
+
+# Loadable (flat) kernel image.
+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.
+palacios/vmm.lib: $(VMM_OBJS) $(DEVICE_OBJS) $(XED_OBJS) vm_kernel
+#	$(TARGET_LD) -o palacios/vmm.lib  \
+#		$(DECODER_FLAGS) \
+#		 $(VMM_OBJS) $(DEVICE_OBJS) $(XED_OBJS) $(V3LIBS) -b binary vm_kernel
+#	$(TARGET_NM) palacios/vmm.lib > palacios/vmm.syms
+	$(TARGET_AR) rcs libv3vee.a  \
+		 $(VMM_OBJS) $(DEVICE_OBJS) $(XED_OBJS)
 
 
-get_kernel_size: make_show_sizes
-	./show_sizes | grep 
 
 force:
 
 
-VM_linux_kernel: force
-	$(PAD) VM_linux_kernel 512
-	@echo "VM kernel lives at 0x100000 and is" `$(NUMSECS) VM_linux_kernel` "sectors long"
+
 
 
 # Clean build directories of generated files
 clean :
-	for d in geekos common libc user tools; do \
+	for d in palacios devices; do \
 		(cd $$d && rm -f *); \
 	done
 
@@ -357,13 +454,14 @@ clean :
 # 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) \
+		$(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) \
-		$(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' \
+		$(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.