X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=dump-spo2.c;h=847dcac45c96ebb568ad515d3429edce9f2c018d;hb=96c7d3dc94c2e3f2d587e42382b541c5ec70ec9a;hp=a76aff97621ba9a17efa4d7299a662a4eeee1ad7;hpb=044a792171add4cdec5f5ee1e2d4d47059665232;p=pspp

diff --git a/dump-spo2.c b/dump-spo2.c
index a76aff9762..847dcac45c 100644
--- a/dump-spo2.c
+++ b/dump-spo2.c
@@ -249,13 +249,27 @@ all_utf8(const char *p_, size_t len)
   return true;
 }
 
+static char *
+get_string2(void)
+{
+  int len = data[pos] + data[pos + 1] * 256;
+  char *s = xmemdup0(&data[pos + 2], len);
+  pos += 2 + len;
+  return s;
+}
+
 static char *
 get_string1(void)
 {
   int len = data[pos++];
-  char *s = xmemdup0(&data[pos], len);
-  pos += len;
-  return s;
+  if (len == 0xff)
+    return get_string2();
+  else
+    {
+      char *s = xmemdup0(&data[pos], len);
+      pos += len;
+      return s;
+    }
 }
 
 static void
@@ -272,15 +286,6 @@ match_string1_assert(const char *exp, const char *where)
 }
 #define match_string1_assert(x) match_string1_assert(x, WHERE)
 
-static char *
-get_string2(void)
-{
-  int len = data[pos] + data[pos + 1] * 256;
-  char *s = xmemdup0(&data[pos + 2], len);
-  pos += 2 + len;
-  return s;
-}
-
 static void
 match_string2_assert(const char *exp, const char *where)
 {
@@ -476,17 +481,42 @@ match_zeros_assert(int count, const char *where)
 }
 #define match_zeros_assert(count) match_zeros_assert(count, WHERE)
 
+static void
+put_safe(const char *s)
+{
+  while (*s)
+    {
+      if (*s == '\n')
+        printf ("\\n");
+      else if (*s == '\r')
+        printf ("\\r");
+      else if (*s < 0x20 || *s > 0x7e)
+        printf ("\\x%02"PRIx8, (uint8_t) *s);
+      else
+        putchar (*s);
+      s++;
+    }
+}
+
 static void
 parse_DspString(void)
 {
-  match_byte_assert(1);
-  match_byte_assert(2);
-  match_byte_assert(40);
-  if (!match_byte(0))
-    match_byte_assert(5);
-  match_byte_assert(0);
-  match_byte_assert(1);
-  printf ("DspString(\"%s\")\n", get_string1());
+  if (match_byte(2))
+    {
+      printf("DspString(%f, \"", get_double());
+      printf("%s\")\n", get_string1());
+    }
+  else
+    {
+      match_byte_assert(1);
+      printf ("DspString(");
+      parse_format();
+      printf(" \"");
+      match_byte_assert(0);
+      match_byte_assert(1);
+      put_safe(get_string1());
+      printf("\")\n");
+    }
 }
 
 static void
@@ -502,7 +532,10 @@ match_DspSimpleText(void)
 {                               /* 03 80 */
   match_byte_assert(3);
   match_byte_assert(0x80);
-  match_zeros_assert(10);
+  match_zeros_assert(5);
+  if (!match_byte(0x10))
+    match_byte_assert(0);
+  match_zeros_assert(4);
 }
 
 static void
@@ -523,7 +556,129 @@ match_NavTreeViewItem(void)
   match_zeros_assert(5);
   match_byte_assert(1);
   match_zeros_assert(5);
-  puts(get_string1());
+
+  put_safe(get_string1());
+  putc('\n', stdout);
+}
+
+static void
+parse_DspNumber(void)
+{
+  match_byte_assert(1);
+  printf("DspNumber(");
+  parse_format();
+  match_byte_assert(0x80);
+  match_byte(2);
+  printf (" %f", get_double());
+  printf (" \"%s\")\n", get_string1());
+}
+
+static void
+match_DspNumber(void)
+{
+  match_byte_assert(0x2a);
+  match_byte_assert(0x80);
+  parse_DspNumber();
+}
+
+static void parse_flexible(void);
+
+static void
+parse_DspCell(void)
+{
+  match_byte_assert(0);
+  match_DspSimpleText();
+  parse_flexible();             /* DspString or DspNumber. */
+}
+
+static void
+match_DspCell(void)
+{                               /* 27 80 */
+  match_byte_assert(0x27);
+  match_byte_assert(0x80);
+  parse_DspCell();
+}
+
+static void
+parse_PMModelItemInfo(void)
+{                               /* 54 80 */
+  match_byte_assert(0);
+  pos += 1;                     /* Counter */
+  match_zeros_assert(7);
+  pos += 3;
+  if (!match_byte(0))
+    match_byte_assert(0xe);
+  match_byte_assert(0);
+}
+
+static void
+match_PMModelItemInfo(void)
+{                               /* 54 80 */
+  match_byte_assert(0x54);
+  match_byte_assert(0x80);
+  parse_PMModelItemInfo();
+  match_DspSimpleText();
+  match_DspString();
+}
+
+static void
+match_PMPivotItemTree(void)
+{                               /* 52 80 */
+  match_byte_assert(0x52);
+  match_byte_assert(0x80);
+  match_byte_assert(0);
+  match_PMModelItemInfo();
+}
+
+static void
+parse_flexible(void)
+{
+  if (data[pos] == 0xff && data[pos + 1] == 0xff)
+    {
+      match_u16_assert(0xffff);
+      match_u16_assert(0);
+      char *heading = get_string2();
+      if (!strcmp(heading, "DspCell"))
+        parse_DspCell();
+      else if (!strcmp(heading, "DspNumber"))
+        parse_DspNumber();
+      else if (!strcmp(heading, "DspString"))
+        parse_DspString();
+      else
+        assert(0);
+    }
+  else if (data[pos] == 0x2a && data[pos + 1] == 0x80)
+    match_DspNumber();
+  else if (data[pos] == 0x27 && data[pos + 1] == 0x80)
+    match_DspCell();
+  else if (data[pos] == 0x5 && data[pos + 1] == 0x80)
+    match_DspString();
+  else if ((data[pos] == 0x3c || data[pos] == 0x39)
+            && data[pos + 1] == 0x80)
+    {
+      /* 3c 80 */
+      /* 39 80 */
+      pos += 2;
+      parse_format();
+/*      match_byte_assert(0x01);
+      match_byte_assert(0x02);
+      match_byte_assert(0x0d); */
+    }
+  else if (data[pos] == 0x15 && data[pos + 1] == 0x80)
+    {
+      /* 15 80 */
+      data += 2;
+      match_byte_assert(2);
+      printf ("15 80(%f", get_double());
+      printf (" %s)\n", get_string1());
+    }
+  else
+    {
+      fprintf (stderr, "bad data cell 0x%02x at offset %x\n",
+               data[pos], pos);
+      hex_dump (stderr, pos, 64);
+      assert(0);
+    }
 }
 
 int
@@ -712,17 +867,105 @@ main(int argc, char *argv[])
   match_byte_assert(1);
   match_byte_assert(0);
 
-  parse_heading("DspCell");
+  while (data[pos] != 1)
+    {
+      if (data[pos] == 0)
+        pos++;
+      else
+        parse_flexible();
+    }
+
+  match_byte_assert(1);
   match_byte_assert(0);
-  match_DspSimpleText();
+  puts(get_string1());
+  if (!match_u32(0))
+    match_u32_assert(2);
+  puts(get_string1());
 
-  parse_heading("DspNumber");
+  match_byte_assert(0);
   match_byte_assert(1);
-  parse_format();
-  match_byte_assert(0x80);
-  match_byte(2);
-  printf (" %f", get_double());
-  printf (" \"%s\"\n", get_string1());
+  match_byte_assert(0);
+  match_byte_assert(0);
+  match_byte_assert(0);
+  match_byte_assert(1);
+  match_byte_assert(0);
+
+  exit (0);
+
+  parse_heading("PMPivotItemTree");
+  match_byte_assert(0);
+
+  parse_heading("AbstractTreeBranch");
+  match_byte_assert(0);
+
+  parse_heading("PMModelItemInfo");
+  parse_PMModelItemInfo();
+  match_DspSimpleText();
+  match_DspString();
+
+  match_u32_assert(7);
+  match_PMPivotItemTree();
+
+  match_u32_assert(0);
+  match_PMPivotItemTree();
+
+  match_u32_assert(0);
+  match_PMPivotItemTree();
+
+  match_u32_assert(6);
+  match_PMPivotItemTree();
+
+  match_u32_assert(0);
+  match_PMPivotItemTree();
+
+  match_u32_assert(0);
+  match_PMPivotItemTree();
+
+  match_u32_assert(0);
+  match_PMPivotItemTree();
+
+  match_u32_assert(0);
+  match_PMPivotItemTree();
+
+  match_u32_assert(0);
+  match_PMPivotItemTree();
+
+  match_u32_assert(0);
+  match_PMPivotItemTree();
+
+  match_u32_assert(2);
+  match_PMPivotItemTree();
+
+  match_u32_assert(0);
+  match_PMPivotItemTree();
+
+  match_u32_assert(0);
+  match_PMPivotItemTree();
+
+  match_u32_assert(0);
+  match_PMPivotItemTree();
+
+  match_u32_assert(0);
+  match_PMPivotItemTree();
+
+  match_u32_assert(2);
+  match_PMPivotItemTree();
+
+  match_u32_assert(0);
+  match_PMPivotItemTree();
+
+  match_u32_assert(0);
+
+  /* ...unknown... */
+
+  while (data[pos] != 0xff || data[pos + 1] != 0xff)
+    pos++;
+  parse_heading("PVViewDimension");
+
+  int i;
+  for (i = 0; data[pos + i] != 0xff || data[pos + i + 1] != 0xff; i++)
+    ;
+  hex_dump(stdout, pos, i);
 
   printf ("%#x: end of successful parse\n", pos);