X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=1f63eaa252e5901dca73abd17b88aeb3b49b908d;hb=ea2968665a3b24afca4a4a361926021b482b6c57;hp=0875737d02c8266bbe790fcbdb081075981876bc;hpb=0e3fe455f4c490dc4c5d9412decf2420b905b3e9;p=palacios.git diff --git a/palacios/build/Makefile b/palacios/build/Makefile index 0875737..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.51 $ +# $Revision: 1.60 $ # This is free software. You are permitted to use, # redistribute, and modify it as specified in the file "COPYING". @@ -48,6 +48,9 @@ VPATH := $(PROJECT_ROOT)/src 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 @@ -72,18 +75,14 @@ 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 - -# -# XED=1 means that libxed will be included -# -# and VMM_XED is one -# -# and make world will build an empty boot package -# -XED=1 - 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) @@ -91,18 +90,32 @@ else JRLDEBUG= -DSERIAL_PRINT_DEBUG=0 -DSERIAL_PRINT_DEBUG_LEVEL=999999 -DSERIAL_PRINT=0 -DVMM_DEBUG=0 -DVMM_INFO=0 -DVMM_TRACE=0 endif -ifeq ($(XED),1) - LEIXED = -DVMM_XED=1 + +# +# DECODER is the decoder that will be used +# currently we only support xed +# +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 - LEIXED = -DVMM_XED=0 +# This is an error endif -LEIFLAGS = $(LEIXED) - # +#TCPSTACK, uIP is used currently # -#Peter's compile flags -PADFLAGS = +TCPSTACK=UIP + + + # # This is wrong for current cygwin - no changes needed @@ -138,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 \ @@ -185,28 +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 vmm_decoder.c \ - svm_halt.c svm_pause.c vmm_config.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 serial.c DEVICE_C_OBJS := $(DEVICE_C_SRCS:%.c=devices/%.o) DEVICE_OBJS := $(DEVICE_C_OBJS) -V3LIBS := +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) + -ifeq ($(XED),1) - V3LIBS := $(V3LIBS) -L../lib/xed -lxed -endif # ---------------------------------------------------------------------- @@ -274,14 +297,14 @@ 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) $(JRLDEBUG) $(PADFLAGS) $(LEIFLAGS) -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) @@ -334,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 @@ -371,11 +397,7 @@ force_vgabios: (cd ../src/vmboot/vgabios; make clean; make) force_payload: force_rombios force_vgabios -ifeq ($(XED),1) - ../scripts/make_payload.pl payload_none.txt vm_kernel -else ../scripts/make_payload.pl payload_layout.txt vm_kernel -endif inter1: force_payload -make clean @@ -418,9 +440,10 @@ 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) vm_kernel +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) $(V3LIBS) -b binary vm_kernel + $(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 @@ -436,7 +459,7 @@ force: # 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