Merging branch/2012-03-27/longest back to master, removing the assumption that "unsigned long" is the longest integer type, or that it is large enough to hold a pointer.

Copied from Perforce
 Change: 178072
 ServerID: perforce.ravenbrook.com

1 files changed, 20 insertions, 0 deletions

diff --git a/mps/code/mpstd.h b/mps/code/mpstd.h
index c7360ed942c..fd637864286 100644
--- a/mps/code/mpstd.h
+++ b/mps/code/mpstd.h
@@ -74,6 +74,7 @@
 #define MPS_ARCH_M2
 #define MPS_BUILD_CC
 #define MPS_T_WORD      unsigned long
+#define MPS_T_ULONGEST  unsigned long
 #define MPS_WORD_WIDTH  32
 #define MPS_WORD_SHIFT  5
 #define MPS_PF_ALIGN    8
@@ -91,6 +92,7 @@
 #define MPS_ARCH_M4
 #define MPS_BUILD_CC
 #define MPS_T_WORD      unsigned long
+#define MPS_T_ULONGEST  unsigned long
 #define MPS_WORD_WIDTH  32
 #define MPS_WORD_SHIFT  5
 #define MPS_PF_ALIGN    8
@@ -107,6 +109,7 @@
 #define MPS_ARCH_AL
 #define MPS_BUILD_MV
 #define MPS_T_WORD      unsigned long
+#define MPS_T_ULONGEST  unsigned long
 #define MPS_WORD_WIDTH  32
 #define MPS_WORD_SHIFT  5
 #define MPS_PF_ALIGN    4
@@ -123,6 +126,7 @@
 #define MPS_ARCH_PP
 #define MPS_BUILD_MV
 #define MPS_T_WORD      unsigned long
+#define MPS_T_ULONGEST  unsigned long
 #define MPS_WORD_WIDTH  32
 #define MPS_WORD_SHIFT  5
 #define MPS_PF_ALIGN    4
@@ -145,6 +149,7 @@
 #define MPS_ARCH_I3
 #define MPS_BUILD_MV
 #define MPS_T_WORD      unsigned long
+#define MPS_T_ULONGEST  unsigned long
 #define MPS_WORD_WIDTH  32
 #define MPS_WORD_SHIFT  5
 #define MPS_PF_ALIGN    8
@@ -163,6 +168,7 @@
 #define MPS_ARCH_60
 #define MPS_BUILD_MW
 #define MPS_T_WORD      unsigned long
+#define MPS_T_ULONGEST  unsigned long
 #define MPS_WORD_WIDTH  32
 #define MPS_WORD_SHIFT  5
 #define MPS_PF_ALIGN    1
@@ -181,6 +187,7 @@
 #define MPS_ARCH_PP
 #define MPS_BUILD_MW
 #define MPS_T_WORD      unsigned long
+#define MPS_T_ULONGEST  unsigned long
 #define MPS_WORD_WIDTH  32
 #define MPS_WORD_SHIFT  5
 #define MPS_PF_ALIGN    8 /* .macos.ppc.align */
@@ -201,6 +208,7 @@
 #define MPS_ARCH_60
 #define MPS_BUILD_AC
 #define MPS_T_WORD      unsigned long
+#define MPS_T_ULONGEST  unsigned long
 #define MPS_WORD_WIDTH  32
 #define MPS_WORD_SHIFT  5
 #define MPS_PF_ALIGN    1
@@ -221,6 +229,7 @@
 #define MPS_ARCH_PP
 #define MPS_BUILD_AC
 #define MPS_T_WORD      unsigned long
+#define MPS_T_ULONGEST  unsigned long
 #define MPS_WORD_WIDTH  32
 #define MPS_WORD_SHIFT  5
 #define MPS_PF_ALIGN    8 /* .macos.ppc.align */
@@ -241,6 +250,7 @@
 #define MPS_ARCH_PP
 #define MPS_BUILD_GC
 #define MPS_T_WORD      unsigned long
+#define MPS_T_ULONGEST  unsigned long
 #define MPS_WORD_WIDTH  32
 #define MPS_WORD_SHIFT  5
 #define MPS_PF_ALIGN    8 /* .macos.ppc.align */
@@ -261,6 +271,7 @@
 #define MPS_ARCH_I3
 #define MPS_BUILD_GC
 #define MPS_T_WORD      unsigned long
+#define MPS_T_ULONGEST  unsigned long
 #define MPS_WORD_WIDTH  32
 #define MPS_WORD_SHIFT  5
 #define MPS_PF_ALIGN    4       /* I'm just guessing. */
@@ -278,6 +289,7 @@
 #define MPS_ARCH_S8
 #define MPS_BUILD_GC
 #define MPS_T_WORD      unsigned long
+#define MPS_T_ULONGEST  unsigned long
 #define MPS_WORD_WIDTH  32
 #define MPS_WORD_SHIFT  5
 #define MPS_PF_ALIGN    8
@@ -295,6 +307,7 @@
 #define MPS_ARCH_S8
 #define MPS_BUILD_LC
 #define MPS_T_WORD      unsigned long
+#define MPS_T_ULONGEST  unsigned long
 #define MPS_WORD_WIDTH  32
 #define MPS_WORD_SHIFT  5
 #define MPS_PF_ALIGN    8
@@ -312,6 +325,7 @@
 #define MPS_ARCH_S8
 #define MPS_BUILD_GC
 #define MPS_T_WORD      unsigned long
+#define MPS_T_ULONGEST  unsigned long
 #define MPS_WORD_WIDTH  32
 #define MPS_WORD_SHIFT  5
 #define MPS_PF_ALIGN    8
@@ -332,6 +346,7 @@
 #define MPS_ARCH_S9
 #define MPS_BUILD_SC
 #define MPS_T_WORD      unsigned long
+#define MPS_T_ULONGEST  unsigned long
 #define MPS_WORD_WIDTH  32
 #define MPS_WORD_SHIFT  5
 #define MPS_PF_ALIGN    8
@@ -348,6 +363,7 @@
 #define MPS_ARCH_AL
 #define MPS_BUILD_GC
 #define MPS_T_WORD      unsigned long
+#define MPS_T_ULONGEST  unsigned long
 #define MPS_WORD_WIDTH  64
 #define MPS_WORD_SHIFT  6
 #define MPS_PF_ALIGN    8
@@ -364,6 +380,7 @@
 #define MPS_ARCH_AL
 #define MPS_BUILD_CC
 #define MPS_T_WORD      unsigned long
+#define MPS_T_ULONGEST  unsigned long
 #define MPS_WORD_WIDTH  64
 #define MPS_WORD_SHIFT  6
 #define MPS_PF_ALIGN    8
@@ -383,6 +400,7 @@
 #define MPS_ARCH_I4
 #define MPS_BUILD_GC
 #define MPS_T_WORD      unsigned long
+#define MPS_T_ULONGEST  unsigned long
 #define MPS_WORD_WIDTH  32
 #define MPS_WORD_SHIFT  5
 #define MPS_PF_ALIGN    4
@@ -399,6 +417,7 @@
 #define MPS_ARCH_PP
 #define MPS_BUILD_GC
 #define MPS_T_WORD      unsigned long
+#define MPS_T_ULONGEST  unsigned long
 #define MPS_WORD_WIDTH  32
 #define MPS_WORD_SHIFT  5
 #define MPS_PF_ALIGN    8 /* @@@@ not tested */
@@ -416,6 +435,7 @@
 #define MPS_ARCH_I4
 #define MPS_BUILD_GC
 #define MPS_T_WORD      unsigned long
+#define MPS_T_ULONGEST  unsigned long
 #define MPS_WORD_WIDTH  32
 #define MPS_WORD_SHIFT  5
 #define MPS_PF_ALIGN    4