change mps_clock_t to word.

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

3 files changed, 14 insertions, 4 deletions

diff --git a/mps/code/mpmtypes.h b/mps/code/mpmtypes.h
index 984790baf56..f7cf9a023ea 100644
--- a/mps/code/mpmtypes.h
+++ b/mps/code/mpmtypes.h
@@ -41,7 +41,7 @@ typedef unsigned Shift;                 /* <design/type/#shift> */
 typedef unsigned Serial;                /* <design/type/#serial> */
 typedef Addr Ref;                       /* <design/type/#ref> */
 typedef void *Pointer;                  /* <design/type/#pointer> */
-typedef unsigned long Clock;            /* processor time */
+typedef Word Clock;                     /* processor time */
 typedef MPS_T_ULONGEST ULongest;        /* <design/type/#ulongest> */
 
 typedef Word RefSet;                    /* design.mps.refset */
diff --git a/mps/code/mps.h b/mps/code/mps.h
index 6d0edbb75d2..c3433aca1ce 100644
--- a/mps/code/mps.h
+++ b/mps/code/mps.h
@@ -76,7 +76,7 @@ typedef size_t mps_align_t;     /* alignment (size_t) */
 typedef unsigned mps_rm_t;      /* root mode (unsigned) */
 typedef unsigned mps_rank_t;    /* ranks (unsigned) */
 typedef unsigned mps_message_type_t;    /* message type (unsigned) */
-typedef unsigned long mps_clock_t;  /* processor time */
+typedef mps_word_t mps_clock_t;  /* processor time */
 
 /* Result Codes */
 /* .result-codes: Keep in sync with <code/mpmtypes.h#result-codes> */
diff --git a/mps/code/mpsliban.c b/mps/code/mpsliban.c
index 654615a9919..98a5f6ce91c 100644
--- a/mps/code/mpsliban.c
+++ b/mps/code/mpsliban.c
@@ -37,6 +37,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
+#include <assert.h>
 
 
 int mps_lib_get_EOF(void)
@@ -95,13 +96,22 @@ int (mps_lib_memcmp)(const void *s1, const void *s2, size_t n)
 /* See http://devworld.apple.com/dev/techsupport/insidemac/OSUtilities/OSUtilities-94.html#MARKER-9-32 */
 mps_clock_t mps_clock(void)
 {
-  return (unsigned long)clock();
+  /* The clock values need to fit in mps_clock_t.  If your platform
+     has a very wide clock type, trim or truncate it. */
+  assert(sizeof(mps_clock_t) >= sizeof(clock_t));
+
+  return (mps_clock_t)clock();
 }
 
 
 mps_clock_t mps_clocks_per_sec(void)
 {
-  return (unsigned long)CLOCKS_PER_SEC;
+  /* The MPS needs at least a millisecond clock to get enough
+       resolution for telemetry tools.  If your platform has a
+       floating point clock, multiply it up here in the plinth. */
+  assert(CLOCKS_PER_SEC >= 1000);
+
+  return (mps_clock_t)CLOCKS_PER_SEC;
 }