X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=1f63eaa252e5901dca73abd17b88aeb3b49b908d;hb=ea2968665a3b24afca4a4a361926021b482b6c57;hp=741c1fddd1cd5f1790ea6b966f6be25fe0e25e38;hpb=028d9b71d4a4e6d49a22ad5904b6dd2f8c596a26;p=palacios.git diff --git a/palacios/build/Makefile b/palacios/build/Makefile index 741c1fd..1f63eaa 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.35 $ +# $Revision: 1.60 $ # This is free software. You are permitted to use, # redistribute, and modify it as specified in the file "COPYING". @@ -30,7 +30,7 @@ # # The setup code needs to copy it up to this address and jump there # -KERNEL_BASE_ADDR := 0x00010000 +KERNEL_BASE_ADDR := 0x00100000 # Kernel entry point function KERNEL_ENTRY = $(SYM_PFX)Main @@ -41,22 +41,96 @@ VPATH := $(PROJECT_ROOT)/src #when -DNDEBUG is set the kassert functions are disabled #JRLDEBUG=-DNDEBUG -JRLDEBUG= -DSERIAL_PRINT_DEBUG=1 -DSERIAL_PRINT_DEBUG_LEVEL=10 -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 +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_GENERIC),1) +DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_GENERIC +endif +ifeq ($(DEBUG_EMULATOR),1) +DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_EMULATOR +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 +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 + +# +#TCPSTACK, uIP is used currently +# +TCPSTACK=UIP + + + +# +# 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 @@ -77,7 +151,7 @@ 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 \ + blockdev.c ide.c ne2k.c \ keyboard.c screen.c timer.c \ mem.c crc32.c \ gdt.c tss.c segment.c \ @@ -85,7 +159,7 @@ KERNEL_C_SRCS := idt.c int.c trap.c irq.c io.c \ synch.c kthread.c \ serial.c reboot.c \ paging.c \ - debug.c vmm_stubs.c vm.c\ + debug.c vmm_stubs.c vm.c pci.c\ main.c # Kernel object files built from C source files @@ -94,7 +168,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) @@ -124,22 +198,38 @@ 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 \ -#\ + 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) -DEVICE_C_SRCS := generic.c keyboard.c nvram.c timer.c simple_pic.c 8259a.c 8254.c + + + +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) + + +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) + + # ---------------------------------------------------------------------- @@ -198,20 +288,23 @@ 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) -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) @@ -264,6 +357,9 @@ devices/%.o : devices/%.c 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 - # Specifies files to be built @@ -285,36 +381,46 @@ all : $(ALL_TARGETS) # $(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 +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 - cat _temp vm_kernel > $@ + cp _temp fd.img vmm.img : fd.img cp fd.img vmm.img $(PAD) vmm.img 1474560 force_rombios: - (cd ../src/vmboot/rombios; make) + (cd ../src/vmboot/rombios; make clean; make) -world: force_rombios +force_vgabios: + (cd ../src/vmboot/vgabios; make clean; make) + +force_payload: force_rombios force_vgabios ../scripts/make_payload.pl payload_layout.txt vm_kernel - make clean - make vmm.img + +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 + + # 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_kernel +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` \ - -DNUM_VM_KERNEL_SECTORS=`$(NUMSECS) vm_kernel` \ + -DSECTORS_PER_TRACK=`$(FD_SECTORS_PER_TRACK) geekos/kernel.bin geekos/setup.bin` \ $(PROJECT_ROOT)/src/geekos/fd_boot.asm \ -o $@ @@ -324,7 +430,6 @@ geekos/setup.bin : geekos/kernel.bin $(PROJECT_ROOT)/src/geekos/setup.asm -I$(PROJECT_ROOT)/src/geekos/ \ -DENTRY_POINT=0x`egrep 'Main$$' geekos/kernel.syms |awk '{print $$1}'` \ -DVMM_SIZE=`$(NUMSECS) geekos/kernel.bin` \ - -DGUEST_SIZE=`$(NUMSECS) vm_kernel` \ $(PROJECT_ROOT)/src/geekos/setup.asm \ -o $@ $(PAD) $@ 512 @@ -335,25 +440,26 @@ geekos/kernel.bin : geekos/kernel.exe $(PAD) $@ 512 # The kernel executable and symbol map. -geekos/kernel.exe : $(KERNEL_OBJS) $(COMMON_C_OBJS) $(VMM_OBJS) $(DEVICE_OBJS) +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) \ - $(KERNEL_OBJS) $(COMMON_C_OBJS) $(VMM_OBJS) $(DEVICE_OBJS) + $(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 force: -vm_kernel: force - $(PAD) vm_kernel 512 - @echo "VM kernel lives at 0x100000 and is" `$(NUMSECS) vm_kernel` "sectors long" +#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; do \ + for d in geekos common libc user tools palacios devices net; do \ (cd $$d && rm -f *); \ done