From 06cd8d0b847cc613445cd250299444ff3e2b2866 Mon Sep 17 00:00:00 2001 From: David Lovemore Date: Mon, 18 Jun 2012 16:19:02 +0100 Subject: Added comments for w3i6mv, and removed speculative xci6gc code, which is done properly on a different branch. Copied from Perforce Change: 178497 ServerID: perforce.ravenbrook.com --- mps/code/mpstd.h | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) (limited to 'mps/code/mpstd.h') diff --git a/mps/code/mpstd.h b/mps/code/mpstd.h index 0d902ae9f83..b71da925752 100644 --- a/mps/code/mpstd.h +++ b/mps/code/mpstd.h @@ -155,10 +155,13 @@ #define MPS_PF_ALIGN 8 -/* Duplicated from W3I3MV, then... @@@@ - * "Predefined Macros" from "Visual Studio 2010" on MSDN +/* "Predefined Macros" from "Visual Studio 2010" on MSDN * . * Note that Win32 includes 64-bit Windows! + * We use the same alignment as MS malloc: 16, which is used for XMM + * operations. + * See MSDN -> x64 Software Conventions -> Overview of x64 Calling Conventions + * */ #elif defined(_MSC_VER) && defined(_WIN32) && defined(_WIN64) && defined(_M_X64) @@ -175,7 +178,7 @@ #define MPS_T_ULONGEST unsigned __int64 #define MPS_WORD_WIDTH 64 #define MPS_WORD_SHIFT 6 -#define MPS_PF_ALIGN 16 /* @@@@ ref? */ +#define MPS_PF_ALIGN 16 /* MW C/C++/ASM Lang Ref (CW9), pp. 184-186. Metrowerks does not document @@ -300,23 +303,6 @@ #define MPS_WORD_SHIFT 5 #define MPS_PF_ALIGN 4 /* I'm just guessing. */ -/* @@@@ fill in */ - -#elif defined(__APPLE__) && defined(__x86_64__) && defined(__MACH__) \ - && defined(__GNUC__) -#if defined(CONFIG_PF_STRING) && ! defined(CONFIG_PF_XCI6GC) -#error "specified CONFIG_PF_... inconsistent with detected xci6gc" -#endif -#define MPS_PF_XCI6GC -#define MPS_PF_STRING "xci6gc" -#define MPS_OS_XC -#define MPS_ARCH_I6 -#define MPS_BUILD_GC -#define MPS_T_WORD unsigned long -#define MPS_WORD_WIDTH 64 -#define MPS_WORD_SHIFT 6 -#define MPS_PF_ALIGN 8 /* I'm just guessing. */ - /* GCC 2.5.8, gcc -E -dM, (__SVR4 indicates Solaris) */ #elif defined(__sun__) && defined(__sparc__) && defined(__GNUC__) \ -- cgit v1.2.1