Adding packed boolean event parameter type, partly to suppress warnings.

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

5 files changed, 117 insertions, 98 deletions

diff --git a/mps/code/eventcnv.c b/mps/code/eventcnv.c
index 10241135ceb..c5a436d1df9 100644
--- a/mps/code/eventcnv.c
+++ b/mps/code/eventcnv.c
@@ -328,45 +328,61 @@ static void clearBucket(void)
  * some event types that are handled specially.
  */
 
-static void printArg(EventProc proc,
-                     void *arg, char argType, char *styleConv)
+static void printParamA(EventProc proc, char *styleConv, Addr addr)
 {
-  switch (argType) {
-  case 'A': {
-    if (style != 'L') {
-      if (style == 'C') putchar(',');
-      printAddr(proc, *(Addr *)arg);
-    } else
-      printf(styleConv, (ulongest_t)*(Addr *)arg);
-  } break;
-  case 'P': {
-    printf(styleConv, (ulongest_t)*(void **)arg);
-  } break;
-  case 'U': {
-    printf(styleConv, (ulongest_t)*(unsigned *)arg);
-  } break;
-  case 'W': {
-    printf(styleConv, (ulongest_t)*(Word *)arg);
-  } break;
-  case 'D': {
-    switch (style) {
-    case '\0':
-      printf(" %#8.3g", *(double *)arg); break;
-    case 'C':
-      printf(", %.10G", *(double *)arg); break;
-    case 'L':
-      printf(" %#.10G", *(double *)arg); break;
-    }
-  } break;
-  case 'S': {
+  if (style != 'L') {
     if (style == 'C') putchar(',');
-    putchar(' ');
-    printStr((EventStringStruct *)arg, (style == 'C' || style == 'L'));
-  } break;
-  default: everror("Can't print format >%c<", argType);
+    printAddr(proc, addr);
+  } else
+    printf(styleConv, (ulongest_t)addr);
+}
+
+static void printParamP(EventProc proc, char *styleConv, void *p)
+{
+  UNUSED(proc);
+  printf(styleConv, (ulongest_t)p);
+}
+
+static void printParamU(EventProc proc, char *styleConv, unsigned u)
+{
+  UNUSED(proc);
+  printf(styleConv, (ulongest_t)u);
+}
+
+static void printParamW(EventProc proc, char *styleConv, Word w)
+{
+  UNUSED(proc);
+  printf(styleConv, (ulongest_t)w);
+}
+
+static void printParamD(EventProc proc, char *styleConv, double d)
+{
+  UNUSED(proc);
+  switch (style) {
+  case '\0':
+    printf(" %#8.3g", d); break;
+  case 'C':
+    printf(", %.10G", d); break;
+  case 'L':
+    printf(" %#.10G", d); break;
   }
 }
 
+static void printParamS(EventProc proc, char *styleConv, EventStringStruct s)
+{
+  UNUSED(proc);
+  if (style == 'C') putchar(',');
+  putchar(' ');
+  printStr(&s, (style == 'C' || style == 'L'));
+}
+
+static void printParamB(EventProc proc, char *styleConv, Bool b)
+{
+  UNUSED(proc);
+  UNUSED(proc);
+  printf(styleConv, (ulongest_t)b);
+}
+
 
 static void readLog(EventProc proc)
 {
@@ -456,33 +472,37 @@ static void readLog(EventProc proc)
      }
 
      switch (event->any.code) {
-     case EventLabelCode: {
+
+     case EventLabelCode:
        switch (style) {
-       case '\0': case 'C': {
-         EventString sym = LabelText(proc, event->Label.f1);
-         printf(style == '\0' ?
-                " %08"PRIXLONGEST" " :
-                ", %"PRIuLONGEST", ",
-                (ulongest_t)event->Label.f0);
-         if (sym != NULL) {
-           printStr(sym, (style == 'C'));
-         } else {
+       case '\0': case 'C':
+         {
+           EventString sym = LabelText(proc, event->Label.f1);
            printf(style == '\0' ?
-                  "sym %05"PRIXLONGEST :
-                  "sym %"PRIXLONGEST"\"",
-                  (ulongest_t)event->Label.f1);
+                  " %08"PRIXLONGEST" " :
+                  ", %"PRIuLONGEST", ",
+                  (ulongest_t)event->Label.f0);
+           if (sym != NULL) {
+             printStr(sym, (style == 'C'));
+           } else {
+             printf(style == '\0' ?
+                    "sym %05"PRIXLONGEST :
+                    "sym %"PRIXLONGEST"\"",
+                    (ulongest_t)event->Label.f1);
+           }
          }
-       } break;
-       case 'L': {
+         break;
+       case 'L':
          printf(" %"PRIXLONGEST" %"PRIXLONGEST,
                 (ulongest_t)event->Label.f0,
                 (ulongest_t)event->Label.f1);
-       } break;
+         break;
        }
-     } break;
-     case EventMeterValuesCode: {
+       break;
+
+     case EventMeterValuesCode:
        switch (style) {
-       case '\0': {
+       case '\0':
          if (event->MeterValues.f3 == 0) {
            printf(" %08"PRIXLONGEST"        0      N/A      N/A      N/A      N/A",
                   (ulongest_t)event->MeterValues.f0);
@@ -498,25 +518,28 @@ static void readLog(EventProc proc)
                   mean, stddev);
          }
          printAddr(proc, (Addr)event->MeterValues.f0);
-       } break;
-       case 'C': {
+         break;
+
+       case 'C':
          putchar(',');
          printAddr(proc, (Addr)event->MeterValues.f0);
          printf(", %.10G, %.10G, %u, %u, %u",
                 event->MeterValues.f1, event->MeterValues.f2,
                 (uint)event->MeterValues.f3, (uint)event->MeterValues.f4,
                 (uint)event->MeterValues.f5);
-       } break;
-       case 'L': {
+         break;
+
+       case 'L':
          printf(" %"PRIXLONGEST" %#.10G %#.10G %X %X %X",
                 (ulongest_t)event->MeterValues.f0,
                 event->MeterValues.f1, event->MeterValues.f2,
                 (uint)event->MeterValues.f3, (uint)event->MeterValues.f4,
                 (uint)event->MeterValues.f5);
-       } break;
+         break;
        }
-     } break;
-     case EventPoolInitCode: { /* pool, arena, class */
+       break;
+
+     case EventPoolInitCode: /* pool, arena, class */
        printf(styleConv, (ulongest_t)event->PoolInit.f0);
        printf(styleConv, (ulongest_t)event->PoolInit.f1);
        /* class is a Pointer, but we label them, so call printAddr */
@@ -525,13 +548,16 @@ static void readLog(EventProc proc)
          printAddr(proc, (Addr)event->PoolInit.f2);
        } else
          printf(styleConv, (ulongest_t)event->PoolInit.f2);
-     } break;
+       break;
+
      default:
-       {
-         unsigned i;
-         for (i = 0; i < argCount; ++i)
-           printArg(proc, EventField(event, i), eventFormat[i], styleConv);
-       }
+#define EVENT_PARAM_PRINT(name, index, sort, ident) \
+         printParam##sort(proc, styleConv, event->name.f##index);
+#define EVENT_PRINT(X, name, code, always, kind) \
+       case code: \
+         EVENT_##name##_PARAMS(EVENT_PARAM_PRINT, name) \
+         break;
+       switch (event->any.code) { EVENT_LIST(EVENT_PRINT, X) }
      }
 
       if (style == 'L') putchar(')');
diff --git a/mps/code/eventcom.h b/mps/code/eventcom.h
index fbd9d0df212..c42dbeb4c61 100644
--- a/mps/code/eventcom.h
+++ b/mps/code/eventcom.h
@@ -150,12 +150,21 @@ EVENT_LIST(EVENT_ENUM, X)
  */
 
 /* Event field types -- similar to WriteF* */
-typedef void *EventFP;
-typedef Addr EventFA;
-typedef Word EventFW;
-typedef unsigned EventFU;
-typedef EventStringStruct EventFS;
-typedef double EventFD;
+typedef void *EventFP;                  /* pointer to C object */
+typedef Addr EventFA;                   /* address on the heap */
+typedef Word EventFW;                   /* word */
+typedef unsigned EventFU;               /* unsigned integer */
+typedef EventStringStruct EventFS;      /* string */
+typedef double EventFD;                 /* double */
+typedef int EventFB;                    /* boolean */
+
+#define EventFP_BITFIELD
+#define EventFA_BITFIELD
+#define EventFW_BITFIELD
+#define EventFU_BITFIELD
+#define EventFS_BITFIELD
+#define EventFD_BITFIELD
+#define EventFB_BITFIELD : 1
 
 /* Common prefix for all event structures.  The size field allows an event
    reader to skip over events whose codes it does not recognise. */
@@ -166,7 +175,7 @@ typedef struct EventAnyStruct {
 } EventAnyStruct;
 
 #define EVENT_STRUCT_FIELD(X, index, sort, ident) \
-  EventF##sort f##index;
+  EventF##sort f##index EventF##sort##_BITFIELD;
 
 #define EVENT_STRUCT(X, name, _code, always, kind) \
   typedef struct Event##name##Struct { \
diff --git a/mps/code/eventdef.h b/mps/code/eventdef.h
index fee64b8fce1..a0569bb4a16 100644
--- a/mps/code/eventdef.h
+++ b/mps/code/eventdef.h
@@ -365,7 +365,7 @@
 #define EVENT_BufferInit_PARAMS(PARAM, X) \
   PARAM(X,  0, P, buffer) \
   PARAM(X,  1, P, pool) \
-  PARAM(X,  2, U, isMutator)
+  PARAM(X,  2, B, isMutator)
 
 #define EVENT_BufferFinish_PARAMS(PARAM, X) \
   PARAM(X,  0, P, buffer)
@@ -444,9 +444,9 @@
   PARAM(X,  2, W, extendBy) \
   PARAM(X,  3, W, avgSize) \
   PARAM(X,  4, W, align) \
-  PARAM(X,  5, U, slotHigh) \
-  PARAM(X,  6, U, arenaHigh) \
-  PARAM(X,  7, U, firstFit)
+  PARAM(X,  5, B, slotHigh) \
+  PARAM(X,  6, B, arenaHigh) \
+  PARAM(X,  7, B, firstFit)
 
 #define EVENT_PoolInitMV_PARAMS(PARAM, X) \
   PARAM(X,  0, P, pool) \
@@ -497,12 +497,12 @@
 #define EVENT_BufferInitSeg_PARAMS(PARAM, X) \
   PARAM(X,  0, P, buffer) \
   PARAM(X,  1, P, pool) \
-  PARAM(X,  2, U, isMutator)
+  PARAM(X,  2, B, isMutator)
 
 #define EVENT_BufferInitRank_PARAMS(PARAM, X) \
   PARAM(X,  0, P, buffer) \
   PARAM(X,  1, P, pool) \
-  PARAM(X,  2, U, isMutator) \
+  PARAM(X,  2, B, isMutator) \
   PARAM(X,  3, U, rank)
 
 #define EVENT_ReservoirLimitSet_PARAMS(PARAM, X) \
@@ -538,7 +538,7 @@
 #define EVENT_SegMerge_PARAMS(PARAM, X) \
   PARAM(X,  0, P, segLo) \
   PARAM(X,  1, P, segHi) \
-  PARAM(X,  2, U, withReservoirPermit)
+  PARAM(X,  2, B, withReservoirPermit)
 
 #define EVENT_SegSplit_PARAMS(PARAM, X) \
   PARAM(X,  0, P, seg) \
diff --git a/mps/code/eventpro.c b/mps/code/eventpro.c
index 768d21adac6..f23fc189113 100644
--- a/mps/code/eventpro.c
+++ b/mps/code/eventpro.c
@@ -75,7 +75,6 @@ typedef struct {
   size_t size;          /* event record size, rounded up from structure */
   Count count;          /* Parameter count */
   char *format;         /* string format, e.g. "PPW" */
-  EventSize offsets[15]; /* FIXME: literal constant */
 } eventRecord;
 
 #define EVENT_COUNT_PARAM(X, index, sort, ident) + 1
@@ -90,11 +89,10 @@ typedef struct {
    code, \
    EventSizeAlign(sizeof(Event##name##Struct)), \
    0 EVENT_##name##_PARAMS(EVENT_COUNT_PARAM, X), \
-   "" EVENT_##name##_PARAMS(EVENT_FORMAT_PARAM, X), \
-   { EVENT_##name##_PARAMS(EVENT_OFFSETS_PARAM, name) 0 }},
+   "" EVENT_##name##_PARAMS(EVENT_FORMAT_PARAM, X)},
 
 static eventRecord eventTypes[] = {
-  {"(unused)", 0, 0, 0, "", {0}},
+  {"(unused)", 0, 0, 0, ""},
   EVENT_LIST(EVENT_INIT, X)
 };
 
@@ -148,19 +146,6 @@ char *EventCode2Format(EventCode code)
 }
 
 
-/* EventCode2Field -- find pointer to a field within an event */
-
-void *EventField(Event event, unsigned i)
-{
-  Index j = eventCode2Index(event->any.code, TRUE);
-  ptrdiff_t offset;
-  if (i >= eventTypes[j].count)
-    error("Event field %u out of bounds", i);
-  offset = eventTypes[j].offsets[i];
-  return (void *)((char *)event + offset);
-}
-
-
 Bool EventCodeIsValid(EventCode code)
 {
   return (eventCode2Index(code, FALSE) != 0);
diff --git a/mps/code/eventpro.h b/mps/code/eventpro.h
index 608b0a36bae..bd6cbebfc76 100644
--- a/mps/code/eventpro.h
+++ b/mps/code/eventpro.h
@@ -22,7 +22,6 @@ typedef Res (*EventProcReader)(void *, void *, size_t);
 extern EventCode EventName2Code(char *name);
 extern char *EventCode2Name(EventCode code);
 extern char *EventCode2Format(EventCode code);
-extern void *EventField(Event event, unsigned i);
 extern Bool EventCodeIsValid(EventCode code);
 
 extern Word AddrLabel(EventProc proc, Addr addr);