# Makefile for GeekOS kernel, userspace, and tools
# Copyright (c) 2004,2005 David H. Hovemeyer <daveho@cs.umd.edu>
-# $Revision: 1.10 $
+# $Revision: 1.21 $
# This is free software. You are permitted to use,
# redistribute, and modify it as specified in the file "COPYING".
# 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 := 0x30000000
-VM_SIZE := 0x20000000
-VM_START := 0x0
-
-#
-# THE KERNEL, SETUP, BOOTPACKAGE MUST BE SMALLER THAN THIS
-# MUST BE INTEGRAL NUMBER OF PAGES
-# define
-MAX_VMM := 0x160000
-
# Base address of kernel
#
# Note: at top of memory minus three pages (GDT/TSS/IDT)
#
# 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
#
#
#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)
EXTRA_CC_USER_OPTS := -Dmain=geekos_main
endif
-VMM_SIZES = ../include/geekos/vmm_sizes.h
+
# ----------------------------------------------------------------------
bget.c malloc.c \
synch.c kthread.c \
serial.c reboot.c \
- paging.c vmx.c vmcs_gen.c vmcs.c\
- svm.c vmm.c\
+ paging.c vm_guest.c \
+ svm.c svm_handler.c vmm.c vmm_util.c vmm_stubs.c svm_ctrl_regs.c \
+ vmcb.c vmm_mem.c vmm_paging.c vmm_io.c vmm_debug.c svm_io.c \
+ vmm_shadow_paging.c vm_guest_mem.c \
+ debug.c vmx.c vmcs_gen.c vmcs.c\
main.c
# Kernel object files built from C source files
# ----------------------------------------------------------------------
# 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
$(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 vm_kernel
-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
$(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_START (KERNEL_LOAD_ADDRESS)" >> $(VMM_SIZES)
- echo "#define KERNEL_CORE_LENGTH (" `$(NUMSECS) geekos/kernel.bin` "*512)" >> $(VMM_SIZES)
- echo "#define KERNEL_END (KERNEL_LOAD_ADDRESS+KERNEL_CORE_LENGTH-1)" >> $(VMM_SIZES)
-
- echo "#define VM_KERNEL_LENGTH (" `$(NUMSECS) vm_kernel` "*512)" >> $(VMM_SIZES)
- echo "#define VM_KERNEL_START (KERNEL_LOAD_ADDRESS + KERNEL_CORE_LENGTH)" >> $(VMM_SIZES)
- echo "#define VM_BOOT_PACKAGE_START (VM_KERNEL_START) " >> $(VMM_SIZES)
- echo "#define VM_BOOT_PACKAGE_END (VM_KERNEL_START+VM_KERNEL_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:
@echo "VM kernel lives at 0x100000 and is" `$(NUMSECS) vm_kernel` "sectors long"
+
+vmm_mem_test: geekos/vmm_mem.c
+ $(HOST_CC) -m32 -o mem_test -DVMM_MEM_TEST -I../include ../src/geekos/vmm_mem.c
+
+
# Clean build directories of generated files
clean :
for d in geekos common libc user tools; do \
