X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=f057439ad201973f73fffe471dfd5004c5aca396;hb=a5c5675571882a9b8a7594ef07fe303b195ef9ae;hp=99965c69b8a11c1e5cba5574f57f29e3f24d4249;hpb=57e3d7d1e671a261befef967b4a441e5d7dc2303;p=palacios.git diff --git a/palacios/build/Makefile b/palacios/build/Makefile index 99965c6..f057439 100644 --- a/palacios/build/Makefile +++ b/palacios/build/Makefile @@ -1,6 +1,6 @@ # Makefile for GeekOS kernel, userspace, and tools # Copyright (c) 2004,2005 David H. Hovemeyer -# $Revision: 1.45 $ +# $Revision: 1.55 $ # This is free software. You are permitted to use, # redistribute, and modify it as specified in the file "COPYING". @@ -42,18 +42,67 @@ VPATH := $(PROJECT_ROOT)/src #when -DNDEBUG is set the kassert functions are disabled #JRLDEBUG=-DNDEBUG +# 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 +endif +ifeq ($(DEBUG_SHADOW_PAGING),1) +DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_SHADOW_PAGING +endif +ifeq ($(DEBUG_CTRL_REGS),1) +DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_CTRL_REGS +endif +ifeq ($(DEBUG_INTERRUPTS),1) +DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_INTERRUPTS +endif +ifeq ($(DEBUG_IO),1) +DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_IO +endif +ifeq ($(DEBUG_KEYBOARD),1) +DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_KEYBOARD +endif +ifeq ($(DEBUG_PIC),1) +DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_PIC +endif +ifeq ($(DEBUG_PIT),1) +DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_PIT +endif +ifeq ($(DEBUG_NVRAM),1) +DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_NVRAM +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 + 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 = +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 + # # This is wrong for current cygwin - no changes needed @@ -106,7 +155,7 @@ KERNEL_C_OBJS := $(KERNEL_C_SRCS:%.c=geekos/%.o) # Kernel assembly files KERNEL_ASM_SRCS := lowlevel.asm -KERNEL_GAS_SRCS := testvm.s +KERNEL_GAS_SRCS := testvm.s udivdi3.s # Kernel object files build from assembler source files KERNEL_ASM_OBJS := $(KERNEL_ASM_SRCS:%.asm=geekos/%.o) @@ -136,10 +185,12 @@ 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_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_halt.c svm_pause.c vmm_config.c vmm_hashtable.c \ + vmm_string.c vmm_emulator.c \ + $(DECODER_SRCS) #\ # vmx.c vmcs_gen.c vmcs.c @@ -147,12 +198,17 @@ VMM_C_OBJS := $(VMM_C_SRCS:%.c=palacios/%.o) VMM_OBJS := $(VMM_C_OBJS) $(VMM_ASM_OBJS) + + + DEVICE_C_SRCS := generic.c keyboard.c nvram.c timer.c simple_pic.c 8259a.c 8254.c serial.c DEVICE_C_OBJS := $(DEVICE_C_SRCS:%.c=devices/%.o) DEVICE_OBJS := $(DEVICE_C_OBJS) +V3LIBS := $(DECODER_LIBS) + # ---------------------------------------------------------------------- @@ -211,8 +267,8 @@ ZEROFILE := $(PERL) $(PROJECT_ROOT)/scripts/zerofile NUMSECS := $(PERL) $(PROJECT_ROOT)/scripts/numsecs -#Round a value up to a certain factor (hex values) -ROUND_UP_HEX := $(PERL) $(PROJECT_ROOT)/scripts/round_up_hex.pl +FD_SECTORS_PER_TRACK := $(PERL) $(PROJECT_ROOT)/scripts/numsecs_per_track + # ---------------------------------------------------------------------- # Definitions - @@ -220,14 +276,14 @@ ROUND_UP_HEX := $(PERL) $(PROJECT_ROOT)/scripts/round_up_hex.pl # ---------------------------------------------------------------------- # Flags used for all C source files -GENERAL_OPTS := -O -Wall $(EXTRA_C_OPTS) $(JRLDEBUG) $(PADFLAGS) -fPIC +GENERAL_OPTS := -O -Wall $(EXTRA_C_OPTS) $(VMM_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__ +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) @@ -340,6 +396,7 @@ geekos/fd_boot.bin : geekos/setup.bin geekos/kernel.bin $(PROJECT_ROOT)/src/geek -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 $@ @@ -361,7 +418,8 @@ geekos/kernel.bin : geekos/kernel.exe # The kernel executable and symbol map. geekos/kernel.exe : $(KERNEL_OBJS) $(COMMON_C_OBJS) $(VMM_OBJS) $(DEVICE_OBJS) vm_kernel $(TARGET_LD) -o geekos/kernel.exe -Ttext $(KERNEL_BASE_ADDR) -e $(KERNEL_ENTRY) \ - $(KERNEL_OBJS) $(COMMON_C_OBJS) $(VMM_OBJS) $(DEVICE_OBJS) -b binary vm_kernel + $(DECODER_FLAGS) \ + $(KERNEL_OBJS) $(COMMON_C_OBJS) $(VMM_OBJS) $(DEVICE_OBJS) $(V3LIBS) -b binary vm_kernel $(TARGET_NM) geekos/kernel.exe > geekos/kernel.syms