X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=41515153d440cb5820679dc3bb490f34ccbbce6b;hb=472dec28ebae078e8bf90ff48d1693c1ef8a7b85;hp=7bf6dc7b5f53773bfaa3c178956c5704be97d26b;hpb=2e05f3b8f738466246add183c55bcb17abf33ec9;p=palacios.git diff --git a/palacios/build/Makefile b/palacios/build/Makefile index 7bf6dc7..4151515 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.13 $ +# $Revision: 1.37 $ # This is free software. You are permitted to use, # redistribute, and modify it as specified in the file "COPYING". @@ -20,19 +20,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 := 0x30000000 -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,7 +30,7 @@ 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_BASE_ADDR := 0x00010000 # Kernel entry point function KERNEL_ENTRY = $(SYM_PFX)Main @@ -59,7 +46,7 @@ JRLDEBUG= -DSERIAL_PRINT_DEBUG=1 -DSERIAL_PRINT_DEBUG_LEVEL=10 -DSERIAL_PRINT=1 # # #Peter's compile flags -PADFLAGS = -DMAX_VMM=$(MAX_VMM) +PADFLAGS = # Figure out if we're compiling with cygwin, http://cygwin.com SYSTEM_NAME := $(shell uname -s) @@ -71,7 +58,7 @@ NON_ELF_SYSTEM := yes EXTRA_CC_USER_OPTS := -Dmain=geekos_main endif -VMM_SIZES = ../include/geekos/vmm_sizes.h + # ---------------------------------------------------------------------- @@ -85,7 +72,7 @@ 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_kernel +ALL_TARGETS := vmm.img vm_kernel # Kernel source files @@ -97,17 +84,15 @@ KERNEL_C_SRCS := idt.c int.c trap.c irq.c io.c \ bget.c malloc.c \ synch.c kthread.c \ serial.c reboot.c \ - paging.c vmx.c vmcs_gen.c vmcs.c \ - svm.c vmm.c vmm_util.c vmm_stubs.c \ - vmcb.c vmm_mem.c vm_guest.c \ - debug.c\ + paging.c \ + debug.c vmm_stubs.c vm.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 vmx_lowlevel.asm svm_lowlevel.asm +KERNEL_ASM_SRCS := lowlevel.asm KERNEL_GAS_SRCS := testvm.s @@ -130,6 +115,30 @@ COMMON_C_SRCS := fmtout.c string.c memmove.c # Common library object files. COMMON_C_OBJS := $(COMMON_C_SRCS:%.c=common/%.o) +VMM_ASM_SRCS := svm_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 \ +#\ +# vmx.c vmcs_gen.c vmcs.c + +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 + +DEVICE_C_OBJS := $(DEVICE_C_SRCS:%.c=devices/%.o) + +DEVICE_OBJS := $(DEVICE_C_OBJS) @@ -195,12 +204,18 @@ NUMSECS := $(PERL) $(PROJECT_ROOT)/scripts/numsecs # ---------------------------------------------------------------------- # Flags used for all C source files -GENERAL_OPTS := -O -Wall $(EXTRA_C_OPTS) $(JRLDEBUG) $(PADFLAGS) +GENERAL_OPTS := -O -Wall $(EXTRA_C_OPTS) $(JRLDEBUG) $(PADFLAGS) -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__ + +# 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) @@ -237,6 +252,18 @@ geekos/%.o : geekos/%.S 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 + # ---------------------------------------------------------------------- # Targets - # Specifies files to be built @@ -246,16 +273,16 @@ 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/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 +#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_kernel @@ -263,26 +290,26 @@ fd.img : geekos/fd_boot.bin geekos/setup.bin geekos/kernel.bin vm_kernel $(PAD) _temp 512 cat _temp vm_kernel > $@ -# make ready to boot over PXE -pxe: fd.img - cp fd.img /tftpboot/vmm.img - $(PAD) /tftpboot/vmm.img 1474560 +vmm.img : fd.img + cp fd.img vmm.img + $(PAD) vmm.img 1474560 +force_rombios: + (cd ../src/vmboot/rombios; make clean; make) +# cp ../src/vmboot/rombios/BIOS-bochs-latest rombios -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" +force_vgabios: + (cd ../src/vmboot/vgabios; make clean; make) +world: force_rombios force_vgabios + ../scripts/make_payload.pl payload_layout.txt vm_kernel + - make clean + make vmm.img + +# make ready to boot over PXE +pxe: vmm.img + cp vmm.img /tftpboot/vmm.img -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). @@ -296,12 +323,12 @@ geekos/fd_boot.bin : geekos/setup.bin geekos/kernel.bin $(PROJECT_ROOT)/src/geek -o $@ # Setup program (second stage boot loader). -geekos/setup.bin : geekos/kernel.exe $(PROJECT_ROOT)/src/geekos/setup.asm +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_FINAL_ADDR=$(KERNEL_BASE_ADDR) \ - -DVMM_SIZE=$(MAX_VMM) \ + -DVMM_SIZE=`$(NUMSECS) geekos/kernel.bin` \ + -DGUEST_SIZE=`$(NUMSECS) vm_kernel` \ $(PROJECT_ROOT)/src/geekos/setup.asm \ -o $@ $(PAD) $@ 512 @@ -312,37 +339,12 @@ geekos/kernel.bin : geekos/kernel.exe $(PAD) $@ 512 # The kernel executable and symbol map. -geekos/kernel.exe : $(KERNEL_OBJS) $(COMMON_C_OBJS) +geekos/kernel.exe : $(KERNEL_OBJS) $(COMMON_C_OBJS) $(VMM_OBJS) $(DEVICE_OBJS) $(TARGET_LD) -o geekos/kernel.exe -Ttext $(KERNEL_BASE_ADDR) -e $(KERNEL_ENTRY) \ - $(KERNEL_OBJS) $(COMMON_C_OBJS) + $(KERNEL_OBJS) $(COMMON_C_OBJS) $(VMM_OBJS) $(DEVICE_OBJS) $(TARGET_NM) geekos/kernel.exe > geekos/kernel.syms -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) - - 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) - - echo "#define VM_KERNEL_LENGTH (" `$(NUMSECS) vm_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) - -make_show_sizes: generate_sizes ../src/geekos/show_sizes.c - $(HOST_CC) -I../include/geekos ../src/geekos/show_sizes.c -o show_sizes - -show_sizes: make_show_sizes - ./show_sizes - - -get_kernel_size: make_show_sizes - ./show_sizes | grep - force: @@ -351,9 +353,11 @@ vm_kernel: force @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; do \ + for d in geekos common libc user tools palacios devices; do \ (cd $$d && rm -f *); \ done @@ -369,6 +373,14 @@ depend : $(GENERATED_LIBC_SRCS) $(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 :