From: Peter Dinda Date: Thu, 29 Nov 2007 23:04:14 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: working-vmxassist-dinda~1 X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=a74d47844b74d7f20540037ec949a23461559e53 *** empty log message *** --- diff --git a/palacios/build/Makefile b/palacios/build/Makefile index 941b8bd..bc0b800 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.1 $ +# $Revision: 1.2 $ # This is free software. You are permitted to use, # redistribute, and modify it as specified in the file "COPYING". @@ -138,7 +138,8 @@ COMMON_C_OBJS := $(COMMON_C_SRCS:%.c=common/%.o) #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)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 @@ -147,7 +148,7 @@ TARGET_CC := $(TARGET_CC_PREFIX)gcc HOST_CC := gcc # Target linker. GNU ld is probably to only one that will work. -TARGET_LD := $(TARGET_CC_PREFIX)ld +TARGET_LD := $(TARGET_CC_PREFIX)ld -melf_i386 # Target archiver TARGET_AR := $(TARGET_CC_PREFIX)ar @@ -162,9 +163,9 @@ TARGET_NM := $(TARGET_CC_PREFIX)nm TARGET_OBJCOPY := $(TARGET_CC_PREFIX)objcopy # Nasm (http://nasm.sourceforge.net) -NASM := /usr/local/nasm-vmx/bin/nasm +NASM := /opt/vmm-tools/bin/nasm -AS = as +AS = as --32 # Tool to build PFAT filesystem images. BUILDFAT := tools/builtFat.exe diff --git a/palacios/build/depend.mak b/palacios/build/depend.mak index b7fa572..08ba54f 100644 --- a/palacios/build/depend.mak +++ b/palacios/build/depend.mak @@ -1,174 +1,210 @@ geekos/idt.o: ../src/geekos/idt.c ../include/geekos/kassert.h \ ../include/geekos/screen.h ../include/geekos/ktypes.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stdbool.h \ ../include/geekos/defs.h ../include/geekos/idt.h \ - ../include/geekos/int.h + ../include/geekos/int.h ../include/geekos/serial.h \ + ../include/geekos/irq.h ../include/geekos/string.h \ + ../include/geekos/../libc/string.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stddef.h \ + ../include/geekos/io.h geekos/int.o: ../src/geekos/int.c ../include/geekos/idt.h \ ../include/geekos/int.h ../include/geekos/kassert.h \ ../include/geekos/screen.h ../include/geekos/ktypes.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stdbool.h \ ../include/geekos/defs.h ../include/geekos/serial.h \ ../include/geekos/irq.h ../include/geekos/string.h \ ../include/geekos/../libc/string.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stddef.h \ - ../include/geekos/io.h + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stddef.h \ + ../include/geekos/io.h ../include/geekos/vmcs.h \ + ../include/geekos/vmcs_gen.h ../include/geekos/cpu.h geekos/trap.o: ../src/geekos/trap.c ../include/geekos/idt.h \ ../include/geekos/int.h ../include/geekos/kassert.h \ ../include/geekos/screen.h ../include/geekos/ktypes.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stdbool.h \ ../include/geekos/defs.h ../include/geekos/kthread.h \ - ../include/geekos/list.h ../include/geekos/trap.h + ../include/geekos/list.h ../include/geekos/trap.h \ + ../include/geekos/serial.h ../include/geekos/irq.h \ + ../include/geekos/string.h ../include/geekos/../libc/string.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stddef.h \ + ../include/geekos/io.h geekos/irq.o: ../src/geekos/irq.c ../include/geekos/kassert.h \ ../include/geekos/screen.h ../include/geekos/ktypes.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stdbool.h \ ../include/geekos/idt.h ../include/geekos/int.h \ ../include/geekos/defs.h ../include/geekos/io.h ../include/geekos/irq.h geekos/io.o: ../src/geekos/io.c ../include/geekos/io.h \ ../include/geekos/ktypes.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stdbool.h + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stdbool.h geekos/keyboard.o: ../src/geekos/keyboard.c ../include/geekos/kthread.h \ ../include/geekos/ktypes.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stdbool.h \ ../include/geekos/list.h ../include/geekos/kassert.h \ ../include/geekos/screen.h ../include/geekos/irq.h \ ../include/geekos/int.h ../include/geekos/defs.h ../include/geekos/io.h \ ../include/geekos/keyboard.h geekos/screen.o: ../src/geekos/screen.c \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stdarg.h \ ../include/geekos/kassert.h ../include/geekos/screen.h \ ../include/geekos/ktypes.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stdbool.h \ ../include/geekos/io.h ../include/geekos/int.h ../include/geekos/defs.h \ ../include/geekos/fmtout.h ../include/geekos/../libc/fmtout.h geekos/timer.o: ../src/geekos/timer.c \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/limits.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/syslimits.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/limits.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/syslimits.h \ /usr/include/limits.h /usr/include/features.h /usr/include/sys/cdefs.h \ - /usr/include/gnu/stubs.h /usr/include/bits/posix1_lim.h \ + /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ + /usr/include/gnu/stubs-64.h /usr/include/bits/posix1_lim.h \ /usr/include/bits/local_lim.h /usr/include/linux/limits.h \ /usr/include/bits/posix2_lim.h ../include/geekos/io.h \ ../include/geekos/ktypes.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stdbool.h \ ../include/geekos/int.h ../include/geekos/kassert.h \ ../include/geekos/screen.h ../include/geekos/defs.h \ ../include/geekos/irq.h ../include/geekos/kthread.h \ - ../include/geekos/list.h ../include/geekos/timer.h + ../include/geekos/list.h ../include/geekos/timer.h \ + ../include/geekos/serial.h ../include/geekos/string.h \ + ../include/geekos/../libc/string.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stddef.h geekos/mem.o: ../src/geekos/mem.c ../include/geekos/defs.h \ ../include/geekos/ktypes.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stdbool.h \ ../include/geekos/kassert.h ../include/geekos/screen.h \ ../include/geekos/bootinfo.h ../include/geekos/gdt.h \ ../include/geekos/int.h ../include/geekos/malloc.h \ ../include/geekos/string.h ../include/geekos/../libc/string.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stddef.h \ ../include/geekos/mem.h ../include/geekos/list.h \ - ../include/geekos/paging.h + ../include/geekos/paging.h ../include/geekos/vmm_sizes.h \ + ../include/geekos/serial.h ../include/geekos/irq.h \ + ../include/geekos/io.h geekos/crc32.o: ../src/geekos/crc32.c ../include/geekos/crc32.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stddef.h \ ../include/geekos/ktypes.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stdbool.h \ - ../include/geekos/kassert.h ../include/geekos/screen.h + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stdbool.h \ + ../include/geekos/kassert.h ../include/geekos/screen.h \ + ../include/geekos/serial.h ../include/geekos/irq.h \ + ../include/geekos/int.h ../include/geekos/defs.h \ + ../include/geekos/string.h ../include/geekos/../libc/string.h \ + ../include/geekos/io.h geekos/gdt.o: ../src/geekos/gdt.c ../include/geekos/kassert.h \ ../include/geekos/screen.h ../include/geekos/ktypes.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stdbool.h \ ../include/geekos/segment.h ../include/geekos/int.h \ ../include/geekos/defs.h ../include/geekos/tss.h \ - ../include/geekos/gdt.h + ../include/geekos/gdt.h ../include/libc/string.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stddef.h geekos/tss.o: ../src/geekos/tss.c ../include/geekos/kassert.h \ ../include/geekos/screen.h ../include/geekos/ktypes.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stdbool.h \ ../include/geekos/defs.h ../include/geekos/gdt.h \ ../include/geekos/segment.h ../include/geekos/string.h \ ../include/geekos/../libc/string.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stddef.h \ - ../include/geekos/tss.h + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stddef.h \ + ../include/geekos/tss.h ../include/geekos/serial.h \ + ../include/geekos/irq.h ../include/geekos/int.h ../include/geekos/io.h geekos/segment.o: ../src/geekos/segment.c ../include/geekos/kassert.h \ ../include/geekos/screen.h ../include/geekos/ktypes.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stdbool.h \ ../include/geekos/string.h ../include/geekos/../libc/string.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stddef.h \ ../include/geekos/tss.h ../include/geekos/segment.h geekos/bget.o: ../src/geekos/bget.c ../include/geekos/string.h \ ../include/geekos/../libc/string.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stddef.h \ ../include/geekos/kassert.h ../include/geekos/screen.h \ ../include/geekos/ktypes.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stdbool.h \ ../include/geekos/bget.h geekos/malloc.o: ../src/geekos/malloc.c ../include/geekos/screen.h \ ../include/geekos/ktypes.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stdbool.h \ ../include/geekos/int.h ../include/geekos/kassert.h \ ../include/geekos/defs.h ../include/geekos/bget.h \ ../include/geekos/malloc.h geekos/synch.o: ../src/geekos/synch.c ../include/geekos/kthread.h \ ../include/geekos/ktypes.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stdbool.h \ ../include/geekos/list.h ../include/geekos/kassert.h \ ../include/geekos/screen.h ../include/geekos/int.h \ ../include/geekos/defs.h ../include/geekos/synch.h geekos/kthread.o: ../src/geekos/kthread.c ../include/geekos/kassert.h \ ../include/geekos/screen.h ../include/geekos/ktypes.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stdbool.h \ ../include/geekos/defs.h ../include/geekos/int.h \ ../include/geekos/mem.h ../include/geekos/list.h \ ../include/geekos/paging.h ../include/geekos/bootinfo.h \ ../include/geekos/symbol.h ../include/geekos/string.h \ ../include/geekos/../libc/string.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stddef.h \ - ../include/geekos/kthread.h ../include/geekos/malloc.h + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stddef.h \ + ../include/geekos/kthread.h ../include/geekos/malloc.h \ + ../include/geekos/serial.h ../include/geekos/irq.h \ + ../include/geekos/io.h geekos/serial.o: ../src/geekos/serial.c ../include/geekos/serial.h \ ../include/geekos/irq.h ../include/geekos/int.h \ ../include/geekos/kassert.h ../include/geekos/screen.h \ ../include/geekos/ktypes.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stdbool.h \ ../include/geekos/defs.h ../include/geekos/string.h \ ../include/geekos/../libc/string.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stddef.h \ ../include/geekos/io.h ../include/geekos/reboot.h \ ../include/geekos/gdt.h ../include/geekos/idt.h geekos/reboot.o: ../src/geekos/reboot.c ../include/geekos/reboot.h \ ../include/libc/string.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stddef.h + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stddef.h geekos/paging.o: ../src/geekos/paging.c ../include/geekos/string.h \ ../include/geekos/../libc/string.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stddef.h \ ../include/geekos/int.h ../include/geekos/kassert.h \ ../include/geekos/screen.h ../include/geekos/ktypes.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stdbool.h \ ../include/geekos/defs.h ../include/geekos/idt.h \ ../include/geekos/kthread.h ../include/geekos/list.h \ ../include/geekos/mem.h ../include/geekos/paging.h \ ../include/geekos/bootinfo.h ../include/geekos/malloc.h \ ../include/geekos/gdt.h ../include/geekos/segment.h \ ../include/geekos/crc32.h ../include/geekos/serial.h \ - ../include/geekos/irq.h ../include/geekos/io.h + ../include/geekos/irq.h ../include/geekos/io.h ../include/geekos/vmcs.h \ + ../include/geekos/vmcs_gen.h geekos/vmx.o: ../src/geekos/vmx.c ../include/geekos/vmx.h \ ../include/geekos/ktypes.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stdbool.h \ ../include/geekos/vmcs.h ../include/geekos/serial.h \ ../include/geekos/irq.h ../include/geekos/int.h \ ../include/geekos/kassert.h ../include/geekos/screen.h \ ../include/geekos/defs.h ../include/geekos/string.h \ ../include/geekos/../libc/string.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stddef.h \ ../include/geekos/io.h ../include/geekos/vmcs_gen.h \ ../include/geekos/mem.h ../include/geekos/list.h \ - ../include/geekos/paging.h ../include/geekos/bootinfo.h + ../include/geekos/paging.h ../include/geekos/bootinfo.h \ + ../include/geekos/segment.h ../include/geekos/gdt.h \ + ../include/geekos/idt.h ../include/geekos/cpu.h \ + ../include/geekos/io_devs.h geekos/vmcs_gen.o: ../src/geekos/vmcs_gen.c ../include/geekos/vmcs_gen.h \ ../include/geekos/vmcs.h ../include/geekos/ktypes.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stdbool.h \ ../include/geekos/serial.h ../include/geekos/irq.h \ ../include/geekos/int.h ../include/geekos/kassert.h \ ../include/geekos/screen.h ../include/geekos/defs.h \ ../include/geekos/string.h ../include/geekos/../libc/string.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stddef.h \ ../include/geekos/io.h +geekos/vmcs.o: ../src/geekos/vmcs.c ../include/geekos/vmcs.h \ + ../include/geekos/ktypes.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stdbool.h \ + ../include/geekos/serial.h ../include/geekos/irq.h \ + ../include/geekos/int.h ../include/geekos/kassert.h \ + ../include/geekos/screen.h ../include/geekos/defs.h \ + ../include/geekos/string.h ../include/geekos/../libc/string.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stddef.h \ + ../include/geekos/io.h ../include/geekos/vmcs_gen.h geekos/main.o: ../src/geekos/main.c ../include/geekos/bootinfo.h \ ../include/geekos/string.h ../include/geekos/../libc/string.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stddef.h \ ../include/geekos/screen.h ../include/geekos/ktypes.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stdbool.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stdbool.h \ ../include/geekos/mem.h ../include/geekos/defs.h \ ../include/geekos/list.h ../include/geekos/kassert.h \ ../include/geekos/paging.h ../include/geekos/crc32.h \ @@ -178,21 +214,23 @@ geekos/main.o: ../src/geekos/main.c ../include/geekos/bootinfo.h \ ../include/geekos/io.h ../include/geekos/serial.h \ ../include/geekos/irq.h ../include/geekos/reboot.h \ ../include/geekos/vmx.h ../include/geekos/vmcs.h \ - ../include/geekos/vmcs_gen.h + ../include/geekos/vmcs_gen.h ../include/geekos/gdt.h \ + ../include/geekos/vmm_sizes.h common/fmtout.o: ../src/common/fmtout.c \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stdarg.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stddef.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stddef.h \ ../include/geekos/string.h ../include/geekos/../libc/string.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/limits.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/syslimits.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/limits.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/syslimits.h \ /usr/include/limits.h /usr/include/features.h /usr/include/sys/cdefs.h \ - /usr/include/gnu/stubs.h /usr/include/bits/posix1_lim.h \ + /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \ + /usr/include/gnu/stubs-64.h /usr/include/bits/posix1_lim.h \ /usr/include/bits/local_lim.h /usr/include/linux/limits.h \ /usr/include/bits/posix2_lim.h ../include/geekos/fmtout.h \ ../include/geekos/../libc/fmtout.h common/string.o: ../src/common/string.c ../include/libc/fmtout.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stdarg.h \ + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stdarg.h \ ../include/libc/string.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stddef.h + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stddef.h common/memmove.o: ../src/common/memmove.c ../include/libc/string.h \ - /usr/lib/gcc/i386-redhat-linux/3.4.6/include/stddef.h + /usr/lib/gcc/x86_64-redhat-linux/3.4.6/include/stddef.h diff --git a/palacios/src/vmboot/vmxassist/Makefile b/palacios/src/vmboot/vmxassist/Makefile index 116692d..6959a28 100644 --- a/palacios/src/vmboot/vmxassist/Makefile +++ b/palacios/src/vmboot/vmxassist/Makefile @@ -19,7 +19,7 @@ # # External CFLAGS can do more harm than good. -CFLAGS := +CFLAGS := -m32 # The emulator code lives in ROM space