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.


setting up framework for 64 bit shadow paging
[palacios.git] / palacios / build / Makefile
index 551d9c3..8f2da64 100644 (file)
@@ -17,7 +17,6 @@
 # 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.
@@ -52,13 +51,22 @@ VPATH := $(PROJECT_ROOT)/src
 # DEBUG=1 means VMM_DEBUG, VMM_INFO, and VMM_TRACE are enabled
 # as are SERIAL_PRINT_DEBUG
 # 
+
+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 -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
 
+
 ifeq ($(DEBUG_SHADOW_PAGING),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_SHADOW_PAGING
 else 
@@ -78,7 +86,7 @@ endif
 ifeq ($(DEBUG_INTERRUPTS),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_INTERRUPTS
 else 
-ifeq ($(DEBUG_DEBUG_INTERRUPTS),0) 
+ifeq ($(DEBUG_INTERRUPTS),0) 
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_INTERRUPTS
 endif
 endif
@@ -147,33 +155,44 @@ 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)
-
+ifeq ($(TRACE_RAMDISK),1)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DTRACE_RAMDISK
 else
-  JRLDEBUG= -DSERIAL_PRINT_DEBUG=0 -DSERIAL_PRINT_DEBUG_LEVEL=999999 -DSERIAL_PRINT=0 -DVMM_DEBUG=0 -DVMM_INFO=0 -DVMM_TRACE=0
+ifeq ($(TRACE_RAMDSK),0)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UTRACE_RAMDISK
+endif
 endif
 
+ifeq ($(DEBUG_XED),1)
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_XED
+else 
+ifeq ($(DEBUG_XED),0) 
+DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_XED
+endif
+endif
 
-#
-# DECODER is the decoder that will be used 
-# currently we only support xed
-#
-DECODER=XED
+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_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
 
-DECODER_FLAGS=
-DECODER_SRCS=
-DECODER_LIBS=
+#DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DTEST_NE2K
 
-ifeq ($(DECODER),XED)
-DECODER_SRCS := vmm_xed.c
-DECODER_FLAGS :=  -L../lib/xed
-DECODER_LIBS := $(PROJECT_ROOT)/lib/xed/libxed.a
+ifeq ($(DEBUG),1)
+  JRLDEBUG=  -DVMM_DEBUG -DVMM_INFO -DVMM_TRACE $(DEBUG_SECTIONS)
 else
-# This is an error
+
 endif
 
 
@@ -213,53 +232,80 @@ endif
 ALL_TARGETS := vmm vm_kernel
 
 
+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_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 \
 
-
-
-
-VMM_ASM_SRCS :=  svm_lowlevel.asm vmm_lowlevel.asm\
-#                      vmx_lowlevel.asm
-
-VMM_ASM_OBJS := $(VMM_ASM_SRCS:%.asm=palacios/%.o)
-
-
-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
 
-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) \
 
-XED_C_SRCS := v3-xed-compat.c
 
-XED_C_OBJS := $(XED_C_SRCS:%.c=xed/%.o)
 
-XED_GAS_SRCS := v3-udiv-compat.s
+XED_OBJS := \
+       xed/v3-xed-compat.o \
+       xed/v3-udiv-compat.o \
 
-XED_GAS_OBJS := $(XED_GAS_SRCS:%.s=xed/%.o)
+$(XED_OBJS) :: EXTRA_CFLAGS =
 
-XED_OBJS := $(XED_C_OBJS) $(XED_GAS_OBJS)
 
+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/ramdisk.o \
+       devices/cdrom.o \
+       devices/bochs_debug.o \
 
-DEVICE_C_SRCS := generic.c keyboard.c nvram.c timer.c simple_pic.c 8259a.c 8254.c serial.c ramdisk.c cdrom.c
+$(DEVICES_OBJS) :: EXTRA_CFLAGS =
 
-DEVICE_C_OBJS := $(DEVICE_C_SRCS:%.c=devices/%.o)
-
-DEVICE_OBJS := $(DEVICE_C_OBJS)
-
-V3LIBS := $(DECODER_LIBS)
+#
+# 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
 
 
 
@@ -268,12 +314,23 @@ V3LIBS := $(DECODER_LIBS)
 #   This section defines programs that are used to build GeekOS.
 # ----------------------------------------------------------------------
 
+ifeq ($(ARCH),64)
+V3_ARCH := __V3_64BIT__
+else 
+V3_ARCH := __V3_32BIT__
+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
+ifeq ($(ARCH),64)
+TARGET_CC := $(TARGET_CC_PREFIX)gcc -m64
+else 
+TARGET_CC := $(TARGET_CC_PREFIX)gcc -m32
+endif
 #TARGET_CC := $(TARGET_CC_PREFIX)gcc34 -m32
 
 
@@ -296,7 +353,15 @@ TARGET_OBJCOPY := $(TARGET_CC_PREFIX)objcopy
 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
@@ -323,16 +388,22 @@ 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) -fPIC #-fvisibility=hidden
-CC_GENERAL_OPTS := $(GENERAL_OPTS) -Werror 
-
-# 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)
 
+CC_GENERAL_OPTS = \
+       -O \
+       -Wall \
+       -g \
+       -D__V3VEE__ \
+       -D$(V3_ARCH) \
+       $(EXTRA_C_OPTS) \
+       $(VMM_FLAGS) \
+       -I$(PROJECT_ROOT)/include \
+       -fPIC \
+       -Werror \
+       -Wp,-MD,$(@D)/.$(@F).d \
+       -Wp,-MT,$@ \
 
+#-fvisibility=hidden
 
 
 
@@ -344,27 +415,51 @@ OBJCOPY_FLAGS := -R .dynamic -R .note -R .comment
 #   Describes how to compile the source files.
 # ----------------------------------------------------------------------
 
-
-
-
-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
-
-
-xed/%.o : xed/%.c
-       $(TARGET_CC) -c $(CC_GENERAL_OPTS) $(CC_VMM_OPTS) $< -o xed/$*.o
-
-xed/%.o : xed/%.s
-       $(AS) $< -o xed/$*.o
+# 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 $@ \
+       )
+
+AS_COMPILE = \
+       $(call build,AS,$(TARGET_CC) \
+               $(CC_GENERAL_OPTS) \
+               $(EXTRA_CFLAGS) \
+               -c \
+               $< \
+               -o $@ \
+       )
+
+
+%.o: %.c
+       $(CC_COMPILE)
+%.o: %.S
+       $(AS_COMPILE)
+%.o: %.s
+       $(AS_COMPILE)
 
 
 # ----------------------------------------------------------------------
@@ -395,6 +490,7 @@ rombios_link:
 vgabios_link:
        ln -s -f ../src/vmboot/vgabios/VGABIOS-lgpl-latest.bin vgabios
 
+
 force_rombios: rombios_link
        (cd ../src/vmboot/rombios; make clean; make)
 
@@ -420,15 +516,13 @@ palacios/vmm.bin : palacios/vmm.lib
 
 
 # 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)
-
+palacios/vmm.lib: libv3vee.a
+libv3vee.a: \
+       $(VMM_OBJS) \
+       $(DEVICES_OBJS) \
+       $(XED_OBJS) \
 
+       $(call build,AR,$(TARGET_AR) rcs $@ $^)
 
 force:
 
@@ -438,26 +532,10 @@ force:
 
 # Clean build directories of generated files
 clean :
-       for d in palacios devices; 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) \
-               $(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