X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=dump.c;h=ff5dcfd4e2c040d2a4e4ad3ff1f8d18b9b30d44f;hb=e4eab5f61a02dad8cd22e01d099e5e2a2ac63f6a;hp=952cf7336e3eb921e423a62d4ef8a6041bbb4222;hpb=b57ac124cbbd907431dc3813640d2d4203f09bea;p=pspp

diff --git a/dump.c b/dump.c
index 952cf7336e..ff5dcfd4e2 100644
--- a/dump.c
+++ b/dump.c
@@ -104,7 +104,7 @@ match_u32_assert(uint32_t x, const char *where)
 static bool
 match_byte(uint8_t b)
 {
-  if (data[pos] == b)
+  if (pos < n && data[pos] == b)
     {
       pos++;
       return true;
@@ -127,15 +127,16 @@ match_byte_assert(uint8_t b, const char *where)
 static char *
 get_string(const char *where)
 {
-  if (data[pos + 1] == 0 && data[pos + 2] == 0 && data[pos + 3] == 0
+  if (1
+      /*data[pos + 1] == 0 && data[pos + 2] == 0 && data[pos + 3] == 0*/
       /*&& all_ascii(&data[pos + 4], data[pos])*/)
     {
-      int len = data[pos];
+      int len = data[pos] + data[pos + 1] * 256;
       char *s = malloc(len + 1);
 
       memcpy(s, &data[pos + 4], len);
       s[len] = 0;
-      pos += 4 + data[pos];
+      pos += 4 + len;
       return s;
     }
   else
@@ -146,6 +147,59 @@ get_string(const char *where)
 }
 #define get_string() get_string(WHERE)
 
+static void
+dump_value_31(void)
+{
+  if (match_byte (0x31))
+    {
+      if (match_u32 (0))
+        {
+          match_u32_assert (0);
+          int subn = get_u32 ();
+          printf ("nested %d bytes", subn);
+          pos += subn;
+        }
+      else if (match_u32 (1))
+        {
+          printf("(footnote %d) ", get_u32());
+          match_byte_assert (0);
+          match_byte_assert (0);
+          int subn = get_u32 ();
+          printf ("nested %d bytes", subn);
+          pos += subn;
+        }
+      else if (match_u32 (2))
+        {
+          printf("(special 2)");
+          match_byte_assert(0);
+          match_byte_assert(0);
+          match_u32_assert(1);
+          match_byte_assert(0);
+          match_byte_assert(0);
+          int subn = get_u32 ();
+          printf ("nested %d bytes", subn);
+          pos += subn;
+        }
+      else
+        {
+          match_u32_assert(3);
+          printf("(special 3)");
+          match_byte_assert(0);
+          match_byte_assert(0);
+          match_byte_assert(1);
+          match_byte_assert(0);
+          int subn = get_u32 ();
+          printf ("nested %d bytes, ", subn);
+          pos += subn;
+          subn = get_u32 ();
+          printf ("nested %d bytes, ", subn);
+          pos += subn;
+        }
+    }
+  else
+    match_byte_assert (0x58);
+}
+
 static void
 dump_value(int level)
 {
@@ -158,50 +212,14 @@ dump_value(int level)
   match_byte (0);
   if (match_byte (3))
     {
-      get_string();
-      if (match_byte (0x31))
-        {
-          if (match_u32 (1))
-            {
-              printf("(footnote %d) ", get_u32());
-              match_byte_assert (0);
-              match_byte_assert (0);
-              int subn = get_u32 ();
-              printf ("nested %d bytes", subn);
-              pos += subn;
-            }
-          else if (match_u32 (2))
-            {
-              printf("(special 2)");
-              match_byte_assert(0);
-              match_byte_assert(0);
-              match_u32_assert(1);
-              match_byte_assert(0);
-              match_byte_assert(0);
-              int subn = get_u32 ();
-              printf ("nested %d bytes", subn);
-              pos += subn;
-            }
-          else
-            {
-              match_u32_assert(3);
-              printf("(special 3)");
-              match_byte_assert(0);
-              match_byte_assert(0);
-              match_byte_assert(1);
-              match_byte_assert(0);
-              int subn = get_u32 ();
-              printf ("nested %d bytes, ", subn);
-              pos += subn;
-              subn = get_u32 ();
-              printf ("nested %d bytes, ", subn);
-              pos += subn;
-            }
-        }
+      char *s1 = get_string();
+      dump_value_31();
+      char *s2 = get_string();
+      char *s3 = get_string();
+      if (strcmp(s1, s3))
+        printf("strings \"%s\", \"%s\" and \"%s\"", s1, s2, s3);
       else
-        match_byte_assert (0x58);
-      get_string();
-      printf("string \"%s\"", get_string());
+        printf("string \"%s\" and \"%s\"", s1, s2);
       match_byte (0);
       match_byte (0);
       match_byte (0);
@@ -271,20 +289,7 @@ dump_value(int level)
       unsigned int format;
       double value;
 
-      if (match_byte (0x31))
-        {
-          if (match_u32 (1))
-            {
-              printf("(footnote %d) ", get_u32());
-              match_byte_assert (0);
-              match_byte_assert (0);
-              int subn = get_u32 ();
-              printf ("nested %d bytes", subn);
-              pos += subn;
-            }
-        }
-      else
-        match_byte_assert (0x58);
+      dump_value_31();
       format = get_u32 ();
       value = get_double ();
       printf ("value %g format %d(%d.%d)", value, format >> 16, (format >> 8) & 0xff, format & 0xff);
@@ -294,75 +299,9 @@ dump_value(int level)
       match_byte (0);
       match_byte (1);
     }
-  else if (match_byte (0x31))
-    {
-      int subn;
-
-      if (match_u32 (1))
-        {
-          printf("(footnote %d) ", get_u32());
-          match_byte_assert (0);
-          match_byte_assert (0);
-          int subn = get_u32 ();
-          printf ("nested %d bytes", subn);
-          pos += subn;
-        }
-      else
-        {
-          match_u32_assert (0);
-          match_u32_assert (0);
-          subn = get_u32 ();
-          printf ("nested %d bytes", subn);
-          pos += subn;
-        }
-      char *base = get_string();
-      int x = get_u32();
-      printf ("\"%s\"; %d variables:\n", base, x);
-      if (match_u32(0))
-        {
-          for (int i = 0; i < x; i++)
-            {
-              dump_value (level+1);
-              putchar('\n');
-            }
-        }
-      else
-        {
-          for (int i = 0; i < x; i++)
-            {
-              int y = get_u32();
-              match_u32_assert(0);
-              for (int j = 0; j <= level; j++)
-                printf ("    ");
-              printf("variable %d has %d values:\n", i, y);
-              for (int j = 0; j < y; j++)
-                {
-                  if (match_byte(3))
-                    {
-                      char *a = get_string();
-                      match_byte_assert(0x58);
-                      char *b = get_string();
-                      char *c = get_string();
-                      for (int k = 0; k <= level + 1; k++)
-                        printf ("    ");
-                      printf ("\"%s\", \"%s\", \"%s\"", a, b, c);
-                      match_byte(0);
-                      match_byte(0);
-                      match_byte(0);
-                      match_byte(0);
-                      match_byte(0);
-                    }
-                  else
-                    dump_value (level+1);
-                  putchar('\n');
-                }
-            }
-        }
-    }
   else
     {
-
-      match_byte_assert (0x58);
+      dump_value_31();
       char *base = get_string();
       int x = get_u32();
       printf ("\"%s\" with %d variables:\n", base, x);
@@ -641,11 +580,11 @@ dump_dim(void)
     dump_category (0);
 }
 
+int n_dims;
 static void
 dump_dims(void)
 {
-  int n_dims = get_u32();
-
+  n_dims = get_u32();
   printf ("%u dimensions\n", n_dims);
   for (int i = 0; i < n_dims; i++)
     {
@@ -655,16 +594,75 @@ dump_dims(void)
 }
 
 static void
-dump_data(void)
+dump_data_value_31(void)
 {
-  if (!match_u32 (0) || !match_u32 (1) || !match_u32(1) || !match_u32(0) || !match_u32(1))
+  if (match_byte (0x31))
     {
-      printf ("skipping data\n");
-      return;
+      if (match_u32 (0))
+        {
+          if (match_u32 (1))
+            get_string();
+          else
+            match_u32_assert (0);
+          int subn = get_u32 ();
+          printf ("nested %d bytes", subn);
+          pos += subn;
+        }
+      else if (match_u32 (1))
+        {
+          printf("(footnote %d) ", get_u32());
+          match_byte_assert (0);
+          match_byte_assert (0);
+          int subn = get_u32 ();
+          printf ("nested %d bytes", subn);
+          pos += subn;
+        }
+      else if (match_u32 (2))
+        {
+          printf("(special 2)");
+          match_byte_assert(0);
+          match_byte_assert(0);
+          match_u32_assert(1);
+          match_byte_assert(0);
+          match_byte_assert(0);
+          int subn = get_u32 ();
+          printf ("nested %d bytes", subn);
+          pos += subn;
+        }
+      else
+        {
+          match_u32_assert(3);
+          printf("(special 3)");
+          match_byte_assert(0);
+          match_byte_assert(0);
+          match_byte_assert(1);
+          match_byte_assert(0);
+          int subn = get_u32 ();
+          printf ("nested %d bytes, ", subn);
+          pos += subn;
+          subn = get_u32 ();
+          printf ("nested %d bytes, ", subn);
+          pos += subn;
+        }
     }
-#if 0
-  fprintf (stderr,"data intro:");
-  for (int i = 0; i < 5; i++)
+  else
+    match_byte_assert (0x58);
+}
+
+static void
+dump_data(void)
+{
+#if 1
+  int a[16];
+  for (int i = 0; i < 3 + n_dims; i++)
+    a[i] = get_u32();
+  printf ("data intro:");
+  for (int i = 0; i < 3 + n_dims; i++)
+    printf(" %d", a[i]);
+  printf("\n");
+#else
+  fprintf (stderr,"data intro (%d dims):", n_dims);
+  for (int i = 0; i < 3+n_dims; i++)
     fprintf (stderr," %d", get_u32());
   fprintf(stderr,"\n");
 #endif
@@ -674,25 +672,16 @@ dump_data(void)
     {
       printf("%08x, index %d:\n", pos, get_u32());
       match_u32_assert(0);
+      match_byte(0);
+      match_byte(0);
+      match_byte(0);
+      match_byte(0);
       if (match_byte (1))
         {
           unsigned int format;
           double value;
 
-          if (match_byte (0x31))
-            {
-              if (match_u32 (1))
-                {
-                  printf("(footnote %d) ", get_u32());
-                  match_byte_assert (0);
-                  match_byte_assert (0);
-                  int subn = get_u32 ();
-                  printf ("nested %d bytes", subn);
-                  pos += subn;
-                }
-            }
-          else
-            match_byte_assert (0x58);
+          dump_data_value_31();
           format = get_u32 ();
           value = get_double ();
           printf ("    value %g format %d(%d.%d)", value, format >> 16, (format >> 8) & 0xff, format & 0xff);
@@ -700,47 +689,7 @@ dump_data(void)
       else if (match_byte (3))
         {
           get_string();
-          if (match_byte (0x31))
-            {
-              if (match_u32 (1))
-                {
-                  printf("(footnote %d) ", get_u32());
-                  match_byte_assert (0);
-                  match_byte_assert (0);
-                  int subn = get_u32 ();
-                  printf ("nested %d bytes", subn);
-                  pos += subn;
-                }
-              else if (match_u32 (2))
-                {
-                  printf("(special 2)");
-                  match_byte_assert(0);
-                  match_byte_assert(0);
-                  match_u32_assert(1);
-                  match_byte_assert(0);
-                  match_byte_assert(0);
-                  int subn = get_u32 ();
-                  printf ("nested %d bytes", subn);
-                  pos += subn;
-                }
-              else
-                {
-                  match_u32_assert(3);
-                  printf("(special 3)");
-                  match_byte_assert(0);
-                  match_byte_assert(0);
-                  match_byte_assert(1);
-                  match_byte_assert(0);
-                  int subn = get_u32 ();
-                  printf ("nested %d bytes, ", subn);
-                  pos += subn;
-                  subn = get_u32 ();
-                  printf ("nested %d bytes, ", subn);
-                  pos += subn;
-                }
-            }
-          else
-            match_byte_assert (0x58);
+          dump_data_value_31();
           get_string();
           printf("string \"%s\"", get_string());
           match_byte (0);
@@ -776,28 +725,676 @@ dump_data(void)
           printf ("value \"%s\" format %d(%d.%d) var \"%s\" vallab \"%s\"",
                   value, format >> 16, (format >> 8) & 0xff, format & 0xff, var, vallab);
         }
+      else if (match_byte (5))
+        {
+          match_byte_assert (0x58);
+          printf ("variable \"%s\"", get_string());
+          get_string();
+          if (!match_byte(1) && !match_byte(2))
+            match_byte_assert(3);
+          match_byte (0);
+          match_byte (0);
+          match_byte (0);
+          match_byte (0);
+        }
       else
-        dump_value(0);
-      putchar('\n');
-    }
-}
-
-int
-main(int argc, char *argv[])
-{
-  size_t start;
-  struct stat s;
+        {
+          dump_data_value_31();
+          char *base = get_string();
+          int x = get_u32();
+          printf ("\"%s\"; %d variables:\n", base, x);
+          for (int i = 0; i < x; i++)
+            {
+              int y = get_u32();
+              if (!y)
+                y = 1;
+              else
+                match_u32_assert(0);
+              for (int j = 0; j <= 0; j++)
+                printf ("    ");
+              printf("variable %d has %d values:\n", i, y);
+              for (int j = 0; j < y; j++)
+                {
+                  if (match_byte (1))
+                    {
+                      unsigned int format;
+                      double value;
 
-  if (isatty(STDIN_FILENO))
-    {
-      fprintf(stderr, "redirect stdin from a .bin file\n");
-      exit(1);
-    }
-  if (fstat(STDIN_FILENO, &s))
-    {
-      perror("fstat");
-      exit(1);
-    }
+                      dump_data_value_31();
+                      format = get_u32 ();
+                      value = get_double ();
+                      printf ("    value %g format %d(%d.%d)", value, format >> 16, (format >> 8) & 0xff, format & 0xff);
+                    }
+                  else if (match_byte(3))
+                    {
+                      char *a = get_string();
+                      match_byte_assert(0x58);
+                      char *b = get_string();
+                      char *c = get_string();
+                      for (int k = 0; k <= 1; k++)
+                        printf ("    ");
+                      printf ("\"%s\", \"%s\", \"%s\"", a, b, c);
+                      match_byte(0);
+                      match_byte(0);
+                      match_byte(0);
+                      match_byte(0);
+                    }
+                  else if (match_byte(5))
+                    {
+                      match_byte_assert (0x58);
+                      printf ("variable \"%s\"", get_string());
+                      get_string();
+                      if (!match_byte(1) && !match_byte(2))
+                        match_byte_assert(3);
+                      match_byte (0);
+                      match_byte (0);
+                      match_byte (0);
+                      match_byte (0);
+                    }
+                  else
+                    dump_value (0);
+                  putchar('\n');
+                }
+            }
+        }
+      putchar('\n');
+    }
+}
+
+static void
+dump_title_value_31(int level)
+{
+  if (match_byte (0x31))
+    {
+      if (match_u32 (0))
+        {
+          match_u32_assert (0);
+          int subn = get_u32 ();
+          printf ("nested %d bytes", subn);
+          pos += subn;
+        }
+      else if (match_u32 (1))
+        {
+          printf("(footnote %d) ", get_u32());
+          match_byte_assert (0);
+          match_byte_assert (0);
+          int subn = get_u32 ();
+          printf ("nested %d bytes", subn);
+          pos += subn;
+        }
+      else if (match_u32 (2))
+        {
+          printf("(special 2)");
+          match_byte_assert(0);
+          match_byte_assert(0);
+          if (!match_u32(2))
+            match_u32_assert(1);
+          match_byte_assert(0);
+          match_byte_assert(0);
+          int subn = get_u32 ();
+          printf ("nested %d bytes", subn);
+          pos += subn;
+        }
+      else
+        {
+          match_u32_assert(3);
+          printf("(special 3)");
+          match_byte_assert(0);
+          match_byte_assert(0);
+          match_byte_assert(1);
+          match_byte_assert(0);
+          int subn = get_u32 ();
+          printf ("nested %d bytes, ", subn);
+          pos += subn;
+          subn = get_u32 ();
+          printf ("nested %d bytes, ", subn);
+          pos += subn;
+        }
+    }
+  else
+    match_byte_assert (0x58);
+}
+
+static void
+dump_title_value(int level)
+{
+  for (int i = 0; i <= level; i++)
+    printf ("    ");
+
+  match_byte (0);
+  match_byte (0);
+  match_byte (0);
+  match_byte (0);
+  match_byte (0);
+  if (match_byte (3))
+    {
+      get_string();
+      dump_title_value_31(level);
+      get_string();
+      printf("string \"%s\"", get_string());
+      match_byte (0);
+      match_byte (0);
+      match_byte (0);
+      match_byte (1);
+      match_byte (1);
+      match_byte (0);
+      match_byte (0);
+      match_byte (0);
+      match_byte (1);
+    }
+  else if (match_byte (5))
+    {
+      dump_title_value_31(level);
+      printf ("variable \"%s\"", get_string());
+      get_string();
+      if (!match_byte(1) && !match_byte(2))
+        match_byte_assert(3);
+    }
+  else if (match_byte (2))
+    {
+      unsigned int format;
+      char *var, *vallab;
+      double value;
+
+      match_byte_assert (0x58);
+      format = get_u32 ();
+      value = get_double ();
+      var = get_string ();
+      vallab = get_string ();
+      printf ("value %g format %d(%d.%d) var \"%s\" vallab \"%s\"",
+              value, format >> 16, (format >> 8) & 0xff, format & 0xff, var, vallab);
+      if (!match_byte (1) && !match_byte(2))
+        match_byte_assert (3);
+      match_byte (0);
+      match_byte (0);
+      match_byte (0);
+      match_byte (0);
+      match_byte (0);
+      match_byte (0);
+      match_byte (0);
+    }
+  else if (match_byte (4))
+    {
+      unsigned int format;
+      char *var, *vallab, *value;
+
+      match_byte_assert (0x58);
+      format = get_u32 ();
+      vallab = get_string ();
+      var = get_string ();
+      if (!match_byte(1) && !match_byte(2))
+        match_byte_assert (3);
+      value = get_string ();
+      printf ("value \"%s\" format %d(%d.%d) var \"%s\" vallab \"%s\"",
+              value, format >> 16, (format >> 8) & 0xff, format & 0xff, var, vallab);
+      match_byte (0);
+      match_byte (0);
+      match_byte (0);
+      match_byte (0);
+    }
+  else if (match_byte (1))
+    {
+      unsigned int format;
+      double value;
+
+      dump_title_value_31(level);
+      format = get_u32 ();
+      value = get_double ();
+      printf ("value %g format %d(%d.%d)", value, format >> 16, (format >> 8) & 0xff, format & 0xff);
+      match_byte (1);
+      match_byte (0);
+      match_byte (0);
+      match_byte (0);
+      match_byte (1);
+    }
+  else
+    {
+      dump_title_value_31(level);
+
+      char *base = get_string();
+      int x = get_u32();
+      printf ("\"%s\" with %d variables:\n", base, x);
+      for (int i = 0; i < x; i++)
+        {
+          int y = get_u32();
+          if (!y)
+            y = 1;
+          else
+            match_u32_assert(0);
+          for (int j = 0; j <= level; j++)
+            printf ("    ");
+          printf("variable %d has %d values:\n", i, y);
+          for (int j = 0; j < y; j++)
+            {
+              match_byte(0);
+              if (match_byte(3))
+                {
+                  char *a = get_string();
+                  match_byte_assert(0x58);
+                  char *b = get_string();
+                  char *c = get_string();
+                  for (int k = 0; k <= level + 1; k++)
+                    printf ("    ");
+                  printf ("\"%s\", \"%s\", \"%s\"", a, b, c);
+                }
+              else
+                dump_title_value (level+1);
+              putchar('\n');
+            }
+        }
+    }
+}
+
+static void
+dump_footnote_value(int level)
+{
+  for (int i = 0; i <= level; i++)
+    printf ("    ");
+
+  match_byte (0);
+  match_byte (0);
+  match_byte (0);
+  match_byte (0);
+  if (match_byte (3))
+    {
+      get_string();
+      if (match_byte (0x31))
+        {
+          if (match_u32 (1))
+            {
+              printf("(footnote %d) ", get_u32());
+              match_byte_assert (0);
+              match_byte_assert (0);
+              int subn = get_u32 ();
+              printf ("nested %d bytes", subn);
+              pos += subn;
+            }
+          else if (match_u32 (2))
+            {
+              printf("(special 2)");
+              match_byte_assert(0);
+              match_byte_assert(0);
+              match_u32_assert(1);
+              match_byte_assert(0);
+              match_byte_assert(0);
+              int subn = get_u32 ();
+              printf ("nested %d bytes", subn);
+              pos += subn;
+            }
+          else
+            {
+              match_u32_assert(3);
+              printf("(special 3)");
+              match_byte_assert(0);
+              match_byte_assert(0);
+              match_byte_assert(1);
+              match_byte_assert(0);
+              int subn = get_u32 ();
+              printf ("nested %d bytes, ", subn);
+              pos += subn;
+              subn = get_u32 ();
+              printf ("nested %d bytes, ", subn);
+              pos += subn;
+            }
+        }
+      else
+        match_byte_assert (0x58);
+      get_string();
+      printf("string \"%s\"", get_string());
+      if (!match_byte (0))
+        match_byte_assert (1);
+    }
+  else if (match_byte (5))
+    {
+      match_byte_assert (0x58);
+      printf ("variable \"%s\"", get_string());
+      get_string();
+      if (!match_byte(1) && !match_byte(2))
+        match_byte_assert(3);
+    }
+  else if (match_byte (2))
+    {
+      unsigned int format;
+      char *var, *vallab;
+      double value;
+
+      match_byte_assert (0x58);
+      format = get_u32 ();
+      value = get_double ();
+      var = get_string ();
+      vallab = get_string ();
+      printf ("value %g format %d(%d.%d) var \"%s\" vallab \"%s\"",
+              value, format >> 16, (format >> 8) & 0xff, format & 0xff, var, vallab);
+      if (!match_byte (1) && !match_byte(2))
+        match_byte_assert (3);
+      match_byte (0);
+      match_byte (0);
+      match_byte (0);
+      match_byte (0);
+      match_byte (0);
+      match_byte (0);
+      match_byte (0);
+    }
+  else if (match_byte (4))
+    {
+      unsigned int format;
+      char *var, *vallab, *value;
+
+      match_byte_assert (0x58);
+      format = get_u32 ();
+      vallab = get_string ();
+      var = get_string ();
+      if (!match_byte(1) && !match_byte(2))
+        match_byte_assert (3);
+      value = get_string ();
+      printf ("value \"%s\" format %d(%d.%d) var \"%s\" vallab \"%s\"",
+              value, format >> 16, (format >> 8) & 0xff, format & 0xff, var, vallab);
+      match_byte (0);
+      match_byte (0);
+      match_byte (0);
+      match_byte (0);
+    }
+  else if (match_byte (1))
+    {
+      unsigned int format;
+      double value;
+
+      if (match_byte (0x31))
+        {
+          if (match_u32 (1))
+            {
+              printf("(footnote %d) ", get_u32());
+              match_byte_assert (0);
+              match_byte_assert (0);
+              int subn = get_u32 ();
+              printf ("nested %d bytes", subn);
+              pos += subn;
+            }
+        }
+      else
+        match_byte_assert (0x58);
+      format = get_u32 ();
+      value = get_double ();
+      printf ("value %g format %d(%d.%d)", value, format >> 16, (format >> 8) & 0xff, format & 0xff);
+    }
+  else if (match_byte (0x31))
+    {
+      if (match_u32 (1))
+        {
+          printf("(footnote %d) ", get_u32());
+          match_byte_assert (0);
+          match_byte_assert (0);
+          int subn = get_u32 ();
+          printf ("nested %d bytes", subn);
+          pos += subn;
+        }
+      else
+        {
+          match_u32_assert (0);
+          match_u32_assert (0);
+          int subn = get_u32 ();
+          printf ("nested %d bytes", subn);
+          pos += subn;
+        }
+      char *base = get_string();
+      int x = get_u32();
+      printf ("\"%s\"; %d variables:\n", base, x);
+      for (int i = 0; i < x; i++)
+        {
+          int y = get_u32();
+          if (!y)
+            y = 1;
+          else
+            match_u32_assert(0);
+          for (int j = 0; j <= level; j++)
+            printf ("    ");
+          printf("variable %d has %d values:\n", i, y);
+          for (int j = 0; j < y; j++)
+            {
+              if (match_byte(3))
+                {
+                  char *a = get_string();
+                  match_byte_assert(0x58);
+                  char *b = get_string();
+                  char *c = get_string();
+                  for (int k = 0; k <= level + 1; k++)
+                    printf ("    ");
+                  printf ("\"%s\", \"%s\", \"%s\"", a, b, c);
+                  if (!match_byte(1))
+                    match_byte_assert(0);
+                }
+              else
+                dump_footnote_value (level+1);
+              putchar('\n');
+            }
+        }
+    }
+  else
+    {
+
+      match_byte_assert (0x58);
+      char *base = get_string();
+      int x = get_u32();
+      printf ("\"%s\" with %d variables:\n", base, x);
+      for (int i = 0; i < x; i++)
+        {
+          int y = get_u32();
+          if (!y)
+            y = 1;
+          else
+            match_u32_assert(0);
+          for (int j = 0; j <= level; j++)
+            printf ("    ");
+          printf("variable %d has %d values:\n", i, y);
+          for (int j = 0; j < y; j++)
+            {
+              if (match_byte(3))
+                {
+                  char *a = get_string();
+                  match_byte_assert(0x58);
+                  char *b = get_string();
+                  char *c = get_string();
+                  for (int k = 0; k <= level + 1; k++)
+                    printf ("    ");
+                  printf ("\"%s\", \"%s\", \"%s\"", a, b, c);
+                  match_byte_assert(0);
+                }
+              else
+                dump_footnote_value (level+1);
+              putchar('\n');
+            }
+        }
+    }
+}
+
+static void
+dump_title(void)
+{
+  pos = 0x27;
+  dump_title_value(0); putchar('\n');
+  dump_title_value(0); putchar('\n');
+  match_byte_assert(0x31);
+  dump_title_value(0); putchar('\n');
+  match_byte(0);
+  match_byte_assert(0x58);
+  if (match_byte(0x31))
+    {
+      dump_footnote_value(0); putchar('\n');
+    }
+  else
+    match_byte_assert(0x58);
+
+
+  int n_footnotes = get_u32();
+  if (n_footnotes >= 20)
+    {
+      fprintf(stderr, "%08x: %d footnotes\n", pos - 4, n_footnotes);
+      exit(1);
+    }
+
+  printf("------\n%d footnotes\n", n_footnotes);
+  if (n_footnotes < 20)
+    {
+      for (int i = 0; i < n_footnotes; i++)
+        {
+          printf("footnote %d:\n", i);
+          dump_footnote_value(0);
+          match_byte(0);
+          match_byte(0);
+          match_byte(0);
+          match_byte(0);
+          if (match_byte (1))
+            {
+              unsigned int format;
+              double value;
+
+              if (match_byte (0x31))
+                {
+                  if (match_u32 (1))
+                    {
+                      printf("(footnote %d) ", get_u32());
+                      match_byte_assert (0);
+                      match_byte_assert (0);
+                      int subn = get_u32 ();
+                      printf ("nested %d bytes", subn);
+                      pos += subn;
+                    }
+                }
+              else
+                match_byte_assert (0x58);
+              format = get_u32 ();
+              value = get_double ();
+              printf ("value %g format %d(%d.%d)", value, format >> 16, (format >> 8) & 0xff, format & 0xff);
+              match_byte (1);
+              match_byte (0);
+              match_byte (0);
+              match_byte (0);
+              match_byte (1);
+            }
+          else if (match_byte (0x31))
+            {
+              match_byte_assert(3);
+              get_string();
+              match_byte_assert(0x58);
+              match_u32_assert(0);
+              get_string();
+              match_byte(0);
+            }
+          else
+            match_byte_assert (0x58);
+          printf("(%d)\n", get_u32());
+        }
+    }
+}
+
+static int
+find_dimensions(void)
+{
+  {
+    const char dimensions[] = "-,,,.\0";
+    int x = try_find_tail(dimensions, sizeof dimensions - 1);
+    if (x)
+      return x;
+  }
+
+  const char dimensions[] = "-,,, .\0";
+  return find_tail(dimensions, sizeof dimensions - 1);
+}
+
+static void
+dump_fonts(void)
+{
+  printf("fonts: offset=%08x\n", pos);
+  match_byte(0);
+  for (int i = 1; i <= 8; i++)
+    {
+      printf("%08x: font %d, ", pos, i);
+      match_byte_assert(i);
+      match_byte_assert(0x31);
+      printf("%s, ", get_string());
+      match_byte_assert(0);
+      match_byte_assert(0);
+      if (!match_byte(0x40) && !match_byte(0x20) && !match_byte(0x80) && !match_byte(0x10))
+        match_byte_assert(0x50);
+      if (!match_byte(0x41))
+        match_byte_assert(0x51);
+      pos += 13;
+      printf ("%s, ", get_string());
+      printf ("%s, ", get_string());
+      match_u32_assert(0);
+      match_u32_assert(0);
+      pos++;
+      get_u32();
+      get_u32();
+      get_u32();
+      get_u32();
+      putchar('\n');
+    }
+
+  match_u32_assert(240);
+  pos += 240;
+
+  match_u32_assert(18);
+  pos += 18;
+
+  if (match_u32(117))
+    pos += 117;
+  else
+    {
+      match_u32_assert(142);
+      pos += 142;
+    }
+
+  int count = get_u32();
+  pos += 4 * count;
+
+  char *encoding = get_string();
+  printf("encoding=%s\n", encoding);
+
+  if (!match_u32(0))
+    match_u32_assert(UINT32_MAX);
+  if (!match_byte(0))
+    match_byte_assert(1);
+  match_byte_assert(0);
+  if (!match_byte(0))
+    match_byte_assert(1);
+  if (!match_byte(0x99) && !match_byte(0x98))
+    match_byte_assert(0x97);
+  match_byte_assert(7);
+  match_byte_assert(0);
+  match_byte_assert(0);
+  if (match_byte('.'))
+    match_byte_assert(',');
+  else
+    {
+      match_byte_assert(',');
+      if (!match_byte('.'))
+        match_byte_assert(' ');
+    }
+  match_u32_assert(5);
+  for (int i = 0; i < 5; i++)
+    get_string();
+  pos += get_u32();
+  if (pos != find_dimensions())
+    fprintf (stderr, "%08x / %08x\n", pos, find_dimensions());
+}
+
+int
+main(int argc, char *argv[])
+{
+  size_t start;
+  struct stat s;
+
+  if (isatty(STDIN_FILENO))
+    {
+      fprintf(stderr, "redirect stdin from a .bin file\n");
+      exit(1);
+    }
+  if (fstat(STDIN_FILENO, &s))
+    {
+      perror("fstat");
+      exit(1);
+    }
   n = s.st_size;
   data = malloc(n);
   if (!data)
@@ -823,7 +1420,12 @@ main(int argc, char *argv[])
             printf ("<unknown>\n");
           return 0;
         }
-      if (!strcmp(argv[1], "title"))
+      else if (!strcmp(argv[1], "title"))
+        {
+          dump_title();
+          exit(0);
+        }
+      else if (!strcmp(argv[1], "titleraw"))
         {
           const char fonts[] = "\x01\x31\x09\0\0\0SansSerif";
           start = 0x27;
@@ -843,23 +1445,36 @@ main(int argc, char *argv[])
           start = find(styles, sizeof styles - 1);
           n = find(dimensions, sizeof dimensions - 1) + sizeof dimensions - 1;
         }
-      else if (!strcmp(argv[1], "dimensions"))
+      else if (!strcmp(argv[1], "dimensions") || !strcmp(argv[1], "all"))
         {
-          {
-            const char dimensions[] = "-,,,.\0";
-            start = try_find_tail(dimensions, sizeof dimensions - 1);
-          }
-
-          if (!start)
-            {
-              const char dimensions[] = "-,,, .\0";
-              start = find_tail(dimensions, sizeof dimensions - 1);
-            }
-
-          pos = start;
+          pos = 0;
+          match_byte_assert(1);
+          match_byte_assert(0);
+          match_u32_assert(3);
+          match_byte_assert(1);
+          if (!match_byte(0))
+            match_byte_assert(1);
+          match_byte_assert(0);
+          match_byte_assert(0);
+          if (!match_byte(0))
+            match_byte_assert(1);
+          pos++;
+          match_byte_assert(0);
+          match_byte_assert(0);
+          match_byte_assert(0);
+          dump_title ();
+          dump_fonts();
           dump_dims ();
+          printf("\n\ndata:\n");
           dump_data ();
-          start = pos;
+          if (pos == n - 1)
+            match_byte_assert (1);
+          if (pos != n)
+            {
+              fprintf (stderr, "%x / %x\n", pos, n);
+              exit(1);
+            }
+          exit(0);
         }
       else
         {
@@ -874,17 +1489,17 @@ main(int argc, char *argv[])
     {
       if (i + 5 <= n
           && data[i]
-          && !data[i + 1]
+          //&& !data[i + 1]
           && !data[i + 2]
           && !data[i + 3]
-          && i + 4 + data[i] <= n
-          && all_ascii(&data[i + 4], data[i]))
+          && i + 4 + data[i] + data[i + 1] * 256 <= n
+          && all_ascii(&data[i + 4], data[i] + data[i + 1] * 256))
         {
           fputs("\n\"", stdout);
-          fwrite(&data[i + 4], 1, data[i], stdout);
+          fwrite(&data[i + 4], 1, data[i] + data[i + 1] * 256, stdout);
           fputs("\" ", stdout);
 
-          i += 4 + data[i];
+          i += 4 + data[i] + data[i + 1] * 256;
         }
       else if (i + 12 <= n
                && data[i + 1] == 40