Fixing horrible type unsafe candy-machine interface to tracestartgendesc_diag, which broke on w3i6mv.

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

1 files changed, 15 insertions, 10 deletions

diff --git a/mps/code/trace.c b/mps/code/trace.c
index e553d160318..a11fbd059c7 100644
--- a/mps/code/trace.c
+++ b/mps/code/trace.c
@@ -1517,30 +1517,35 @@ static Res rootGrey(Root root, void *p)
 }
 
 
-static void TraceStartGenDesc_diag(GenDesc desc, int i)
+static void TraceStartGenDesc_diag(GenDesc desc, Bool top, Index i)
 {
   Ring n, nn;
+  
+#if !defined(DIAG_WITH_STREAM_AND_WRITEF)
+  UNUSED(i);
+#endif
 
-  if(i < 0) {
+  if(top) {
     DIAG_WRITEF(( DIAG_STREAM,
       "         GenDesc [top]",
       NULL ));
   } else {
     DIAG_WRITEF(( DIAG_STREAM,
-      "         GenDesc [$U]", i,
+      "         GenDesc [$U]", (WriteFU)i,
       NULL ));
   }
   DIAG_WRITEF(( DIAG_STREAM,
     " $P capacity: $U KiB, mortality $D\n",
-    (void *)desc, desc->capacity, desc->mortality,
-    "         ZoneSet:$B\n", desc->zones,
+    (WriteFP)desc, (WriteFU)desc->capacity, (WriteFD)desc->mortality,
+    "         ZoneSet:$B\n", (WriteFU)desc->zones,
     NULL ));
   RING_FOR(n, &desc->locusRing, nn) {
     DIAG_DECL( PoolGen gen = RING_ELT(PoolGen, genRing, n); )
     DIAG_WRITEF(( DIAG_STREAM,
-      "           PoolGen $U ($S)", gen->nr, gen->pool->class->name,
-      " totalSize $U", gen->totalSize,
-      " newSize $U\n", gen->newSizeAtCreate,
+      "           PoolGen $U ($S)",
+      (WriteFU)gen->nr, gen->pool->class->name,
+      " totalSize $U", (WriteFU)gen->totalSize,
+      " newSize $U\n", (WriteFU)gen->newSizeAtCreate,
       NULL ));
   }
 }
@@ -1631,7 +1636,7 @@ void TraceStart(Trace trace, double mortality, double finishingTime)
 
       for(i = 0; i < chain->genCount; ++i) {
         GenDesc desc = &chain->gens[i];
-        TraceStartGenDesc_diag(desc, i);
+        TraceStartGenDesc_diag(desc, FALSE, i);
       }
     }
 
@@ -1639,7 +1644,7 @@ void TraceStart(Trace trace, double mortality, double finishingTime)
     DIAG_WRITEF(( DIAG_STREAM,
       "       topGen\n",
       NULL ));
-    TraceStartGenDesc_diag(&arena->topGen, -1);
+    TraceStartGenDesc_diag(&arena->topGen, TRUE, 0);
   }
   
   DIAG_END( "TraceStart" );