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
-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 \
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)
# 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
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
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
# 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