[MLton-commit] r5417

[Matthew Fluet]

Undo accidental commit
----------------------------------------------------------------------

U   mlton/branches/on-20050822-x86_64-branch/runtime/gc/gc_state.c
U   mlton/branches/on-20050822-x86_64-branch/runtime/gc/init-world.c

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

Modified: mlton/branches/on-20050822-x86_64-branch/runtime/gc/gc_state.c
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/gc/gc_state.c	2007-03-11 16:51:23 UTC (rev 5416)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/gc/gc_state.c	2007-03-11 16:52:53 UTC (rev 5417)
@@ -67,8 +67,7 @@
       and (nurseryBytesRequested
            <= (size_t)(s->limitPlusSlop
                        - alignFrontier (s, (s->limitPlusSlop 
-                                            - nurserySize / 2
-                                            - s->alignment / 2))))
+                                            - nurserySize / 2 + 2))))
       /* The nursery is large enough to be worth it. */
       and (((float)(h->size - s->lastMajorStatistics.bytesLive) 
             / (float)nurserySize) 

Modified: mlton/branches/on-20050822-x86_64-branch/runtime/gc/init-world.c
===================================================================
--- mlton/branches/on-20050822-x86_64-branch/runtime/gc/init-world.c	2007-03-11 16:51:23 UTC (rev 5416)
+++ mlton/branches/on-20050822-x86_64-branch/runtime/gc/init-world.c	2007-03-11 16:52:53 UTC (rev 5417)
@@ -152,7 +152,7 @@
   initIntInfs (s);
   initVectors (s);
   assert ((size_t)(s->frontier - start) <= s->lastMajorStatistics.bytesLive);
-  s->heap.oldGenSize = align(s->frontier - s->heap.start, s->alignment);
+  s->heap.oldGenSize = s->frontier - s->heap.start;
   setGCStateCurrentHeap (s, 0, 0);
   thread = newThread (s, sizeofStackInitial (s));
   switchToThread (s, pointerToObjptr((pointer)thread - offsetofThread (s), s->heap.start));