[MLton-commit] r4203

[Matthew Fluet]

Reordered TYPE_INDEX constants
----------------------------------------------------------------------

U   mlton/branches/on-20050822-x86_64-branch/mlton/backend/rep-type.fun
U   mlton/branches/on-20050822-x86_64-branch/runtime/gc/TODO
U   mlton/branches/on-20050822-x86_64-branch/runtime/gc/object.h

----------------------------------------------------------------------

Modified: mlton/branches/on-20050822-x86_64-branch/mlton/backend/rep-type.fun
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/mlton/backend/rep-type.fun	2005-11-12 00:24:53 UTC (rev 4202)
+++ mlton/branches/on-20050822-x86_64-branch/mlton/backend/rep-type.fun	2005-11-12 01:22:59 UTC (rev 4203)
@@ -379,10 +379,11 @@
       (* Order in the following vector matters.  The basic pointer tycons must
        * correspond to the constants in gc.h.
        * STACK_TYPE_INDEX,
-       * STRING_TYPE_INDEX,
        * THREAD_TYPE_INDEX,
        * WEAK_GONE_TYPE_INDEX,
-       * WORD_VECTOR_TYPE_INDEX.
+       * WORD8_VECTOR_TYPE_INDEX,
+       * WORD16_VECTOR_TYPE_INDEX,
+       * WORD32_VECTOR_TYPE_INDEX.
        *)
       val basic =
          let
@@ -397,9 +398,9 @@
          in
             Vector.fromList
             [(PointerTycon.stack, stack),
-             wordVec 8,
              (PointerTycon.thread, thread),
              (PointerTycon.weakGone, WeakGone),
+             wordVec 8,
              wordVec 32,
              wordVec 16]
          end

Modified: mlton/branches/on-20050822-x86_64-branch/runtime/gc/TODO
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/gc/TODO	2005-11-12 00:24:53 UTC (rev 4202)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/gc/TODO	2005-11-12 01:22:59 UTC (rev 4203)
@@ -1,6 +1,3 @@
-
-* reorder ZZZ_TYPE_INDEX
-* eliminate STRING_TYPE_INDEX, STRING_TYPE_HEADER in favor of WORD8.
 * fix semantics of numNonPointers for normal objects to mean bytes of
         non-pointer data, rather than number of 32-bit words of
         non-pointer data.  Rename to sizeNonPointers.

Modified: mlton/branches/on-20050822-x86_64-branch/runtime/gc/object.h
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/gc/object.h	2005-11-12 00:24:53 UTC (rev 4202)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/gc/object.h	2005-11-12 01:22:59 UTC (rev 4203)
@@ -102,10 +102,9 @@
 enum {
   /* The type indices here must agree with those in backend/rep-type.fun. */
   STACK_TYPE_INDEX =         0,
-  STRING_TYPE_INDEX =        1,
-  THREAD_TYPE_INDEX =        2,
-  WEAK_GONE_TYPE_INDEX =     3,
-  WORD8_VECTOR_TYPE_INDEX =  STRING_TYPE_INDEX,
+  THREAD_TYPE_INDEX =        1,
+  WEAK_GONE_TYPE_INDEX =     2,
+  WORD8_VECTOR_TYPE_INDEX =  3,
   WORD32_VECTOR_TYPE_INDEX = 4,
   WORD16_VECTOR_TYPE_INDEX = 5,
 };