X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=cb557a307b21e65f4f573ae4f977d583b6092c45;hb=6412a23da90ae75906e946febb6f49df8a33d0bd;hp=4685f11ae076e7a33221055d0268a7b2c05cd7d5;hpb=5db3136d5331c355c188537c68005db8d2cb4eac;p=palacios.git

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 4685f11..cb557a3 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)
@@ -78,7 +85,7 @@ endif
 ifeq ($(DEBUG_INTERRUPTS),1)
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -DDEBUG_INTERRUPTS
 else 
-ifeq ($(DEBUG_DEBUG_INTERRUPTS),0) 
+ifeq ($(DEBUG_INTERRUPTS),0) 
 DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_INTERRUPTS
 endif
 endif
@@ -147,14 +154,44 @@ DEBUG_SECTIONS := $(DEBUG_SECTIONS) -UDEBUG_RAMDISK
 endif
 endif
 
+ifeq ($(TRACE_RAMDISK),1)
+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
 
 
@@ -171,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
@@ -217,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 \
@@ -232,28 +273,27 @@ VMM_C_SRCS :=   vm_guest.c \
                 svm_halt.c svm_pause.c svm_wbinvd.c \
 	        vmm_config.c vmm_hashtable.c \
 		vmm_string.c vmm_emulator.c vmm_queue.c\
+		vmm_host_events.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)
+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)
 
@@ -270,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 :=  $(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
 
 
@@ -302,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
@@ -329,8 +384,9 @@ 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
-CC_GENERAL_OPTS := $(GENERAL_OPTS) -Werror 
+#GENERAL_OPTS := -O -Wall $(EXTRA_C_OPTS) $(VMM_FLAGS) -fPIC #-fvisibility=hidden
+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)
@@ -358,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
 
@@ -400,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)
@@ -412,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
@@ -446,7 +505,7 @@ force:
 
 # Clean build directories of generated files
 clean :
-	for d in palacios devices; do \
+	for d in palacios devices xed; do \
 		(cd $$d && rm -f *); \
 	done