X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=75986854a778570945683365896f7aa333689d92;hb=b59b6f0b0d56b9ef9360d63be89d2510f26423f2;hp=9f05bf9267b93f3e44268c28887340fc0b2661c2;hpb=82cceefa66b1f05d8f9d5bfcb2fb7214755e1904;p=palacios-OLD.git diff --git a/palacios/build/Makefile b/palacios/build/Makefile index 9f05bf9..7598685 100644 --- a/palacios/build/Makefile +++ b/palacios/build/Makefile @@ -52,11 +52,18 @@ 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_IO -DDEBUG_KEYBOARD -DDEBUG_PIC -DDEBUG_PIT -DDEBUG_NVRAM -DDEBUG_EMULATOR -DDEBUG_GENERIC -DDEBUG_RAMDISK -DDEBUG_XED -DDEBUG_HALT -DDEBUG_DEV_MGR endif ifeq ($(DEBUG_SHADOW_PAGING),1) @@ -148,22 +155,43 @@ endif endif ifeq ($(TRACE_RAMDISK),1) -DEBUG_SECTIONS := $(DEBUG_SECTIONS -DTRACE_RAMDISK +DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DTRACE_RAMDISK else 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 + +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 #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) - + JRLDEBUG= -DVMM_DEBUG -DVMM_INFO -DVMM_TRACE $(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 @@ -180,7 +208,11 @@ DECODER_LIBS= ifeq ($(DECODER),XED) DECODER_SRCS := vmm_xed.c DECODER_FLAGS := -L../lib/xed +ifeq ($(ARCH),64) +DECODER_LIBS := $(PROJECT_ROOT)/lib/xed/libxed32e.a +else DECODER_LIBS := $(PROJECT_ROOT)/lib/xed/libxed.a +endif else # This is an error endif @@ -226,11 +258,11 @@ ALL_TARGETS := vmm vm_kernel -VMM_ASM_SRCS := svm_lowlevel.asm vmm_lowlevel.asm\ -# vmx_lowlevel.asm - +VMM_ASM_SRCS := VMM_ASM_OBJS := $(VMM_ASM_SRCS:%.asm=palacios/%.o) +VMM_GAS_SRCS := svm_lowlevel.s +VMM_GAS_OBJS := $(VMM_GAS_SRCS:%.s=palacios/%.o) VMM_C_SRCS := vm_guest.c \ svm.c svm_handler.c vmm.c vmm_util.c vmm_ctrl_regs.c \ @@ -247,23 +279,21 @@ VMM_C_SRCS := vm_guest.c \ VMM_C_OBJS := $(VMM_C_SRCS:%.c=palacios/%.o) -VMM_OBJS := $(VMM_C_OBJS) $(VMM_ASM_OBJS) +VMM_OBJS := $(VMM_C_OBJS) $(VMM_ASM_OBJS) $(VMM_GAS_OBJS) XED_C_SRCS := v3-xed-compat.c - XED_C_OBJS := $(XED_C_SRCS:%.c=xed/%.o) XED_GAS_SRCS := v3-udiv-compat.s - XED_GAS_OBJS := $(XED_GAS_SRCS:%.s=xed/%.o) XED_OBJS := $(XED_C_OBJS) $(XED_GAS_OBJS) -DEVICE_C_SRCS := generic.c keyboard.c nvram.c timer.c simple_pic.c 8259a.c 8254.c serial.c ramdisk.c cdrom.c +DEVICE_C_SRCS := generic.c keyboard.c nvram.c timer.c simple_pic.c 8259a.c 8254.c serial.c ramdisk.c cdrom.c bochs_debug.c DEVICE_C_OBJS := $(DEVICE_C_SRCS:%.c=devices/%.o) @@ -280,16 +310,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__ -#V3_ARCH := __V3_64BIT__ +endif + # Uncomment if cross compiling #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. +ifeq ($(ARCH),64) +TARGET_CC := $(TARGET_CC_PREFIX)gcc +else TARGET_CC := $(TARGET_CC_PREFIX)gcc -m32 +endif #TARGET_CC := $(TARGET_CC_PREFIX)gcc34 -m32 @@ -312,7 +349,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 +else AS = as --32 +endif + # Tool to build PFAT filesystem images. BUILDFAT := tools/builtFat.exe @@ -340,8 +385,8 @@ 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 -GENERAL_OPTS := -O -Wall $(EXTRA_C_OPTS) $(VMM_FLAGS) -fPIC #-fvisibility=hidden -CC_GENERAL_OPTS := $(GENERAL_OPTS) -Werror +GENERAL_OPTS := -O -Wall $(EXTRA_C_OPTS) $(VMM_FLAGS) -fPIC -Werror#-fvisibility=hidden +CC_GENERAL_OPTS := $(GENERAL_OPTS) # Flags used for VMM C source files CC_VMM_OPTS := -g -I$(PROJECT_ROOT)/include -D__V3VEE__ -D$(V3_ARCH) $(DECODER_FLAGS) $(JRLDEBUG) @@ -369,6 +414,11 @@ palacios/%.o : palacios/%.c palacios/%.o : palacios/%.asm $(NASM) $(NASM_VMM_OPTS) $< -o palacios/$*.o +palacios/%.o : palacios/%.S + $(CPP) $(CC_VMM_OPTS) $< | $(AS) -o palacios/$*.o + + + devices/%.o : devices/%.c $(TARGET_CC) -c $(CC_GENERAL_OPTS) $(CC_VMM_OPTS) $< -o devices/$*.o @@ -411,8 +461,6 @@ rombios_link: vgabios_link: ln -s -f ../src/vmboot/vgabios/VGABIOS-lgpl-latest.bin vgabios -force_lwip: - (cd ../src/lwip/build; make clean; make) force_rombios: rombios_link (cd ../src/vmboot/rombios; make clean; make) @@ -423,7 +471,7 @@ force_vgabios: vgabios_link force_payload: force_rombios force_vgabios ../scripts/make_payload.pl payload_layout.txt vm_kernel -inter1: force_payload force_lwip +inter1: force_payload -make clean world: inter1 vmm