Imported Upstream version 4.1.0-dfsgupstream/4.1.0-dfsg

1 files changed, 20 insertions, 7 deletions

diff --git a/Makefile.kmk b/Makefile.kmk
index b4a39e58a..015ac3f6c 100644
--- a/Makefile.kmk
+++ b/Makefile.kmk
@@ -1,10 +1,10 @@
-# $Id: Makefile.kmk $
+# $Id: Makefile.kmk 37955 2011-07-14 12:23:02Z vboxsync $
 ## @file
 # Top level makefile.
 #
 
 #
-# Copyright (C) 2006-2010 Oracle Corporation
+# Copyright (C) 2006-2011 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
 # available from http://www.virtualbox.org. This file is free software;
@@ -595,7 +595,6 @@ VBOX_CORE_DOXYFILE_INPUT_FIRST =\
 	$(PATH_ROOT)/include/VBox/vd.h \
 	$(PATH_ROOT)/include/VBox/types.h \
 	$(PATH_ROOT)/include/VBox/err.h \
-	$(PATH_ROOT)/include/VBox/x86.h \
 	$(PATH_ROOT)/include/VBox/vmm/cpumdis.h \
 	$(PATH_ROOT)/include/VBox/dbggui.h \
 	$(PATH_ROOT)/include/VBox/dis.h \
@@ -1372,8 +1371,8 @@ incs:
 	$(SED) -f include/VBox/err.sed     --output include/VBox/err.mac           include/VBox/err.h
 	$(APPEND) include/VBox/err.mac '%include "iprt/err.mac"'
 	$(SED) -f include/VBox/err.sed     --output include/iprt/err.mac           include/iprt/err.h
+	$(SED) -f include/VBox/various.sed --output include/iprt/x86.mac           include/iprt/x86.h
 	$(SED) -f include/VBox/various.sed --output include/VBox/apic.mac          include/VBox/apic.h
-	$(SED) -f include/VBox/various.sed --output include/VBox/x86.mac           include/VBox/x86.h
 	$(SED) -f include/VBox/various.sed --output include/VBox/param.mac         include/VBox/param.h
 	$(SED) -f include/VBox/various.sed --output include/VBox/VMMDevTesting.mac include/VBox/VMMDevTesting.h
 
@@ -1383,12 +1382,14 @@ incs:
 #
 vslick.h: include/VBox/cdefs.h include/iprt/cdefs.h $(MAKEFILE)
 	$(RM) -f -- $@ $@.tmp $@.tmp2 $@.tmp3
-	$(APPEND) $@.tmp '// autogenerated'
 	@$(APPEND) $@.tmp '#define IN_SLICKEDIT '
 	@$(APPEND) $@.tmp '#define RT_C_DECLS_BEGIN '
 	@$(APPEND) $@.tmp '#define RT_C_DECLS_END '
 	@$(APPEND) $@.tmp '#define RT_NO_THROW '
 	@$(APPEND) $@.tmp '#define RT_THROW(type) throw(type)'
+	@$(APPEND) $@.tmp '#define RT_GCC_EXTENSION'
+	@$(APPEND) $@.tmp '#define RT_COMPILER_GROKS_64BIT_BITFIELDS'
+	@$(APPEND) $@.tmp '#define RT_COMPILER_WITH_80BIT_LONG_DOUBLE'
 
 	@$(APPEND) $@.tmp '#define ATL_NO_VTABLE '
 	@$(APPEND) $@.tmp '#define BEGIN_COM_MAP(a) '
@@ -1499,6 +1500,18 @@ endif
 	@$(APPEND) $@.tmp '#define PGM_BTH_NAME_EPT_AMD64(name)    PGM_CTX3(pgm,Bth,name)'
 	@$(APPEND) $@.tmp '#define PGM_BTH_DECL(type, name)        type PGM_BTH_NAME(name)'
 
+	@$(APPEND) $@.tmp '#define FNIEMOP_STUB(a_Name)        	   static VBOXSTRICTRC a_Name(PIEMCPU pIemCpu) { return VERR_NOT_IMPLEMENTED; }'
+	@$(APPEND) $@.tmp '#define FNIEMOP_DEF(a_Name)        	   static VBOXSTRICTRC a_Name(PIEMCPU pIemCpu)'
+	@$(APPEND) $@.tmp '#define FNIEMOP_DEF_1(a_Name, a_Type0, a_Name0) static VBOXSTRICTRC a_Name(PIEMCPU pIemCpu, a_Type0 a_Name0)'
+	@$(APPEND) $@.tmp '#define FNIEMOP_DEF_2(a_Name, a_Type0, a_Name0, a_Type1, a_Name1) static VBOXSTRICTRC a_Name(PIEMCPU pIemCpu, a_Type0 a_Name0, a_Type1 a_Name1)'
+	@$(APPEND) $@.tmp '#define IEM_CIMPL_DEF_0(a_Name)         static VBOXSTRICTRC a_Name(PIEMCPU pIemCpu)'
+	@$(APPEND) $@.tmp '#define IEM_CIMPL_DEF_1(a_Name, a_Type0, a_Name0) static VBOXSTRICTRC a_Name(PIEMCPU pIemCpu, , a_Type0 a_Name0)'
+	@$(APPEND) $@.tmp '#define IEM_CIMPL_DEF_2(a_Name, a_Type0, a_Name0, a_Type1, a_Name1) static VBOXSTRICTRC a_Name(PIEMCPU pIemCpu, , a_Type0 a_Name0, a_Type1 a_Name1)'
+	@$(APPEND) $@.tmp '#define IEM_CIMPL_DEF_3(a_Name, a_Type0, a_Name0, a_Type1, a_Name1, a_Type2, a_Name2)  static VBOXSTRICTRC a_Name(PIEMCPU pIemCpu, , a_Type0 a_Name0, a_Type1 a_Name1, , a_Type2 a_Name2)'
+	@$(APPEND) $@.tmp '#define IEM_MC_LOCAL(a_Type, a_Name)                       a_Type a_Name'
+	@$(APPEND) $@.tmp '#define IEM_MC_ARG(a_Type, a_Name, a_iArg)                 a_Type a_Name'
+	@$(APPEND) $@.tmp '#define IEM_MC_ARG_CONST(a_Type, a_Name, a_Value, a_iArg)  a_Type const a_Name = a_Value'
+
 	$(SED)  -e '/__cdecl/d' \
 		-e '/^ *# *define.*DECL/!d' \
 		-e '/DECLS/d' \
@@ -1521,14 +1534,14 @@ endif
 		-e '/define RT[DATGRC03]*DECL(type) *DECLHIDDEN(type)/d' \
 		\
 		--append $@.tmp \
-		$(filter-out include/VBox/err.h, $(wildcard include/VBox/*.h)) \
+		$(filter-out include/VBox/err.h, $(wildcard include/VBox/*.h include/VBox/vmm/*.h)) \
 		include/iprt/cdefs.h
 	$(CAT_EXT) $@.tmp \
 		| $(SED_EXT) -e 's/_/\x1F/g' -e 's/(/\x1E/g' -e 's/[[:space:]][[:space:]]*/\x1C/g' \
 		| sort $(if-expr "$(KBUILD_TARGET)" == "win",,-f) \
 		| $(SED_EXT) -e 's/\x1F/_/g' -e 's/\x1E/(/g' -e 's/\x1C/ /g' \
 		| $(SED_EXT) -e 's/$$/\n/' --output $@.tmp2
-	$(MV) -f $@.tmp2 $@
+	$(SED) -e '/#define/s/$$/ \/\/ vbox/' --output $@ $@.tmp2
 	$(RM) -f $@.tmp $@.tmp2 $@.tmp3
 ifeq ($(KBUILD_HOST),win)
 	@$(ECHO) 'TODO: Merge vslick.h with your "$(HOMEDRIVE)$(HOMEPATH)\Documents\My SlickEdit Config\x.y.z\usercpp.h" file.'