X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fbuild%2FMakefile;h=41e56522f7730f27e52f4de2dbbb6d032b370e6f;hb=df58bd3c484a52b1e166dc28e7b9b6fd94e5a023;hp=2d329d2a97220a0b44cefd55105aeee73f79c4db;hpb=23882ef53edbe4dfd5029b54c5ecfe7256bfec23;p=palacios.git

diff --git a/palacios/build/Makefile b/palacios/build/Makefile
index 2d329d2..41e5652 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 <daveho@cs.umd.edu>
-# $Revision: 1.3 $
+# $Revision: 1.26 $
 
 # 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 := 0x40000000
-VM_SIZE    := 0x20000000
-VM_START   := 0x0
-
-#
-# THE KERNEL, SETUP, BOOTPACKAGE MUST BE SMALLER THAN THIS
-# MUST BE INTEGRAL NUMBER OF PAGES
-# define 
-MAX_VMM := 0x60000
-
 # Base address of kernel
 #
 # Note: at top of memory minus three pages (GDT/TSS/IDT) 
@@ -43,7 +30,7 @@ MAX_VMM := 0x60000
 #
 # 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
@@ -54,12 +41,12 @@ VPATH := $(PROJECT_ROOT)/src
 
 #when -DNDEBUG is set the kassert functions are disabled
 #JRLDEBUG=-DNDEBUG
-JRLDEBUG= -DSERIAL_PRINT_DEBUG=1 -DSERIAL_PRINT_DEBUG_LEVEL=1000 -DSERIAL_PRINT=1
+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,25 +72,27 @@ 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  rombios vgabios vmxassist
+ALL_TARGETS := fd.img vm_kernel
 
 
 # Kernel source files
 KERNEL_C_SRCS := idt.c int.c trap.c irq.c io.c \
+        blockdev.c ide.c \
 	keyboard.c screen.c timer.c \
 	mem.c crc32.c \
 	gdt.c tss.c segment.c \
 	bget.c malloc.c \
 	synch.c kthread.c \
 	serial.c  reboot.c \
-        paging.c vmx.c vmcs_gen.c vmcs.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
+KERNEL_ASM_SRCS := lowlevel.asm
 
 KERNEL_GAS_SRCS := testvm.s
 
@@ -126,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 svm_ctrl_regs.c \
+		vmcb.c vmm_mem.c vmm_paging.c vmm_io.c vmm_debug.c svm_io.c \
+		vmm_intr.c vmm_irq.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 :=  nvram.c timer.c
+
+DEVICE_C_OBJS := $(DEVICE_C_SRCS:%.c=devices/%.o)
+
+DEVICE_OBJS := $(DEVICE_C_OBJS)
 
 
 
@@ -135,11 +148,12 @@ COMMON_C_OBJS := $(COMMON_C_SRCS:%.c=common/%.o)
 # ----------------------------------------------------------------------
 
 # Uncomment if cross compiling
-#TARGET_CC_PREFIX := 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.
-#TARGET_CC := $(TARGET_CC_PREFIX)gcc
-TARGET_CC := $(TARGET_CC_PREFIX)gcc34 -m32
+TARGET_CC := $(TARGET_CC_PREFIX)gcc
+#TARGET_CC := $(TARGET_CC_PREFIX)gcc34 -m32
 
 # Host C compiler.  This is used to compile programs to execute on
 # the host platform, not the target (x86) platform.  On x86/ELF
@@ -163,7 +177,8 @@ TARGET_NM := $(TARGET_CC_PREFIX)nm
 TARGET_OBJCOPY := $(TARGET_CC_PREFIX)objcopy
 
 # Nasm (http://nasm.sourceforge.net)
-NASM := /opt/vmm-tools/bin/nasm
+NASM := $(PROJECT_ROOT)/../devtools/bin/nasm
+#NASM := /opt/vmm-tools/bin/nasm
 
 AS = as --32
 
@@ -189,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
+
+# 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)
 
@@ -231,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
@@ -240,23 +273,22 @@ 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 rombios vgabios vmxassist
+fd.img : geekos/fd_boot.bin geekos/setup.bin geekos/kernel.bin vm_kernel
 	cat geekos/fd_boot.bin geekos/setup.bin geekos/kernel.bin > _temp
 	$(PAD) _temp 512
-# Note - second copy of rombios is intentional 
-	cat _temp rombios vgabios vmxassist rombios > $@
+	cat _temp vm_kernel > $@
 
 # make ready to boot over PXE
 pxe:	fd.img
@@ -264,41 +296,24 @@ pxe:	fd.img
 	$(PAD) /tftpboot/vmm.img 1474560
 
 
-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"
-
-
-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).
-geekos/fd_boot.bin : geekos/setup.bin geekos/kernel.bin $(PROJECT_ROOT)/src/geekos/fd_boot.asm rombios vgabios vmxassist
+geekos/fd_boot.bin : geekos/setup.bin geekos/kernel.bin $(PROJECT_ROOT)/src/geekos/fd_boot.asm vm_kernel
 	$(NASM) -f bin \
 		-I$(PROJECT_ROOT)/src/geekos/ \
 		-DNUM_SETUP_SECTORS=`$(NUMSECS) geekos/setup.bin` \
 		-DNUM_KERN_SECTORS=`$(NUMSECS) geekos/kernel.bin` \
-		-DNUM_BIOS_SECTORS=`$(NUMSECS) rombios` \
-		-DNUM_VGA_BIOS_SECTORS=`$(NUMSECS) vgabios` \
-		-DNUM_VMXASSIST_SECTORS=`$(NUMSECS) vmxassist` \
+		-DNUM_VM_KERNEL_SECTORS=`$(NUMSECS) vm_kernel` \
 		$(PROJECT_ROOT)/src/geekos/fd_boot.asm \
 		-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
@@ -309,71 +324,25 @@ 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_SETUP_LENGTH (" `$(NUMSECS) geekos/setup.bin` "*512)" >> $(VMM_SIZES) 
-	echo "#define KERNEL_CORE_LENGTH (" `$(NUMSECS)  geekos/kernel.bin` "*512)" >> $(VMM_SIZES) 
-	echo "#define KERNEL_START (KERNEL_LOAD_ADDRESS)" >> $(VMM_SIZES)
-	echo "#define KERNEL_END (KERNEL_LOAD_ADDRESS+KERNEL_CORE_LENGTH-1)" >> $(VMM_SIZES)
-	echo "#define BIOS_LENGTH (" `$(NUMSECS) rombios` "*512)" >> $(VMM_SIZES) 
-	echo "#define VGA_BIOS_LENGTH (" `$(NUMSECS) vgabios` "*512)" >> $(VMM_SIZES) 
-	echo "#define VMXASSIST_LENGTH (" `$(NUMSECS) vmxassist` "*512)" >> $(VMM_SIZES) 
-	echo "#define BIOS_START (KERNEL_LOAD_ADDRESS+KERNEL_CORE_LENGTH)" >> $(VMM_SIZES) 
-	echo "#define VGA_BIOS_START (BIOS_START+BIOS_LENGTH)" >> $(VMM_SIZES)
-	echo "#define VMXASSIST_START (VGA_BIOS_START+VGA_BIOS_LENGTH)" >> $(VMM_SIZES)
-	echo "//Note this is a second copy of the rom bios for debug" >> $(VMM_SIZES)
-	echo "#define BIOS2_START (VMXASSIST_START+VMXASSIST_LENGTH)" >> $(VMM_SIZES)
-	echo "#define VM_BOOT_PACKAGE_START (BIOS_START) " >> $(VMM_SIZES)
-	echo "#define VM_BOOT_PACKAGE_END  (BIOS2_START+BIOS_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:
 
 
-rombios: force
-	(cd ../src/vmboot/rombios; make)
-	cp ../src/vmboot/rombios/BIOS-bochs-latest rombios
-	$(PAD) rombios 512
-	@echo "Rom bios lives at f000:0000 and is" `$(NUMSECS) rombios` "sectors long"
+vm_kernel: force
+	$(PAD) vm_kernel 512
+	@echo "VM kernel lives at 0x100000 and is" `$(NUMSECS) vm_kernel` "sectors long"
 
 
-vgabios: force
-	(cd ../src/vmboot/vgabios;  make)
-	cp ../src/vmboot/vgabios/vgabios.bin vgabios
-	$(PAD) vgabios 512
-	@echo "Vga bios lives at c000:0000 and is" `$(NUMSECS) vgabios` "sectors long"
 
-vmxassist: force
-	(cd ../src/vmboot/vmxassist; make)
-	cp ../src/vmboot/vmxassist/vmxassist.bin vmxassist
-	$(PAD) vmxassist 512
-	@echo "vmxassist lives at d000:0000 and is" `$(NUMSECS) vmxassist` "sectors long"
 
 # Clean build directories of generated files
 clean :
-	rm -f rombios vgabios vmxassist
-	(cd ../src/vmboot/rombios; make clean)
-	(cd ../src/vmboot/vgabios;  make clean)
-	(cd ../src/vmboot/vmxassist; make 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
 
@@ -389,6 +358,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 :