X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=dump.c;h=12db0c07b3dec6912f8640700d0018d6b5512817;hb=23090df8c7b2e9fe742248eec5b2a24e68136b73;hp=ce87e86b2d9b396486b26aa86a9573c6dd36ea55;hpb=94d6bf282238ff6f4d4f354624cc3cffa2468882;p=pspp

diff --git a/dump.c b/dump.c
index ce87e86b2d..12db0c07b3 100644
--- a/dump.c
+++ b/dump.c
@@ -19,15 +19,41 @@ all_ascii(const uint8_t *p, size_t n)
 }
 
 static size_t
-find(const char *target, size_t target_len)
+try_find(const char *target, size_t target_len)
 {
   const uint8_t *pos = (const uint8_t *) memmem (data, n, target, target_len);
+  return pos ? pos - data : 0;
+}
+
+static size_t
+try_find_tail(const char *target, size_t target_len)
+{
+  size_t pos = try_find(target, target_len);
+  return pos ? pos + target_len : 0;
+}
+
+static size_t
+find(const char *target, size_t target_len)
+{
+  size_t pos = try_find(target, target_len);
+  if (!pos)
+    {
+      fprintf (stderr, "not found\n");
+      exit(1);
+    }
+  return pos;
+}
+
+static size_t
+find_tail(const char *target, size_t target_len)
+{
+  size_t pos = try_find_tail(target, target_len);
   if (!pos)
     {
       fprintf (stderr, "not found\n");
       exit(1);
     }
-  return pos - data;
+  return pos;
 }
 
 size_t pos;
@@ -99,28 +125,30 @@ match_byte_assert(uint8_t b, const char *where)
 #define match_byte_assert(b) match_byte_assert(b, WHERE)
 
 static char *
-get_string(void)
+get_string(const char *where)
 {
-  if (data[pos + 1] == 0 && data[pos + 2] == 0 && data[pos + 3] == 0
-      && all_ascii(&data[pos + 4], data[pos]))
+  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
     {
-      fprintf(stderr, "0x%x: expected string\n", pos);
+      fprintf(stderr, "%s: 0x%x: expected string\n", where, pos);
       exit(1);
     }
 }
+#define get_string() get_string(WHERE)
 
 static void
-dump_category(int level)
+dump_value(int level)
 {
   for (int i = 0; i <= level; i++)
     printf ("    ");
@@ -132,11 +160,54 @@ dump_category(int level)
   if (match_byte (3))
     {
       get_string();
-      match_byte_assert (0x58);
+      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());
       match_byte (0);
-      match_byte_assert (1);
+      match_byte (0);
+      match_byte (0);
+      match_byte (1);
+      match_byte (1);
       match_byte (0);
       match_byte (0);
       match_byte (0);
@@ -147,11 +218,232 @@ dump_category(int level)
       match_byte_assert (0x58);
       printf ("variable \"%s\"", get_string());
       get_string();
-      if (!match_byte (3))
-        match_byte_assert (2);
+      if (!match_byte(1) && !match_byte(2))
+        match_byte_assert(3);
+      match_byte (0);
+      match_byte (0);
+      match_byte (0);
+      match_byte (0);
+    }
+  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);
+      match_byte (1);
+      match_byte (0);
+      match_byte (0);
+      match_byte (0);
+      match_byte (1);
+    }
+  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);
+      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);
+      char *base = get_string();
+      int x = get_u32();
+      printf ("\"%s\" with %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');
+                }
+            }
+        }
+    }
+}
+
+static void
+dump_dim_value(int level)
+{
+  for (int i = 0; i <= level; i++)
+    printf ("    ");
+
+  if (match_byte (3))
+    {
+      get_string();
+      if (match_byte (0x31))
+        {
+          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);
+      get_string();
+      printf("string \"%s\"", get_string());
+      match_byte (0);
+      match_byte_assert (1);
       match_byte (0);
       match_byte (0);
       match_byte (0);
+      match_byte (1);
+    }
+  else if (match_byte (5))
+    {
+      match_byte_assert (0x58);
+      printf ("variable \"%s\"", get_string());
+      get_string();
+      match_byte_assert (2);
     }
   else if (match_byte (2))
     {
@@ -168,6 +460,7 @@ dump_category(int level)
               value, format >> 16, (format >> 8) & 0xff, format & 0xff, var, vallab);
       if (!match_u32 (3))
         match_u32_assert (2);
+      match_byte (0);
     }
   else if (match_byte (1))
     {
@@ -188,20 +481,39 @@ dump_category(int level)
     {
       int subn;
 
+      match_byte (0);
       match_byte_assert (0x31);
       match_u32_assert (0);
       match_u32_assert (0);
       subn = get_u32 ();
       printf ("nested %d bytes", subn);
       pos += subn;
-      printf ("; \"%s\"", get_string());
-      fprintf (stderr, "got %02x\n", data[pos]);
-      match_byte (1);
-      match_byte (0);
-      match_byte (0);
-      match_byte (0);
-      goto next;
+      printf ("; \"%s\", substitutions:", get_string());
+      int total_subs = get_u32();
+      int x = get_u32();
+      if (x)
+        {
+          total_subs = (total_subs - 1) + x;
+          match_u32_assert (0);
+        }
+      printf (" (total %d)", total_subs);
+
+      for (int i = 0; i < total_subs; i++)
+        {
+          putc ('\n', stdout);
+          dump_value (level + 1);
+        }
     }
+}
+
+static void
+dump_category(int level)
+{
+  match_byte (0);
+  match_byte (0);
+  match_byte (0);
+  match_byte (0);
+  dump_value (level);
 
   if (match_u32 (2))
     get_u32 ();
@@ -212,12 +524,20 @@ dump_category(int level)
       match_byte (0);
       get_u32 ();
     }
+  else if (match_byte (1))
+    {
+      match_byte (0);
+      if (!match_u32 (2))
+        match_u32_assert (1);
+      match_byte (0);
+      get_u32();
+    }
   else
     {
       match_u32_assert (0);
       get_u32 ();
     }
-next:;
+
   int n_categories = get_u32();
   if (n_categories > 0)
     printf (", %d subcategories:", n_categories);
@@ -230,15 +550,17 @@ static void
 dump_dim(void)
 {
   int n_categories;
+  printf("next dim\n");
+  match_byte(0);
   if (match_byte(3))
     {
       get_string();
       match_byte_assert(0x58);
       get_string();
       printf("string \"%s\": ", get_string());
-      match_byte_assert(1);
+      match_byte(1) || match_byte(0);
     }
-  else if (match_byte(5))
+  else if (match_byte(5)) 
     {
       match_byte_assert(0x58);
       printf("variable \"%s\": ", get_string());
@@ -246,16 +568,61 @@ dump_dim(void)
       if (!match_byte(2))
         match_byte_assert(3);
     }
+  else if (match_byte(0x31))
+    {
+      int subn;
+      int total_subs = 1;
+
+      match_u32_assert (0);
+      match_u32_assert (0);
+      subn = get_u32 ();
+      printf ("nested %d bytes", subn);
+      pos += subn;
+      printf ("; \"%s\", substitutions:", get_string());
+      for (;;)
+        {
+          int n_subst = get_u32();
+          if (!n_subst)
+            break;
+          printf (" %d", n_subst);
+          total_subs *= n_subst;
+        }
+
+      for (int i = 0; i < total_subs; i++)
+        {
+          putc ('\n', stdout);
+          dump_dim_value (0);
+        }
+    }
   else
     {
-      fprintf(stderr, "%08x: unexpected byte\n", pos);
-      exit(1);
+      int total_subs = 1;
+
+      match_byte_assert (0x58);
+      printf ("\"%s\" with substitutions:", get_string());
+      for (;;)
+        {
+          int n_subst = get_u32();
+          if (!n_subst)
+            break;
+          printf (" %d", n_subst);
+          total_subs *= n_subst;
+        }
+
+      for (int i = 0; i < total_subs; i++)
+        {
+          putc ('\n', stdout);
+          dump_dim_value (0);
+        }
     }
 
-  match_byte_assert(0);
+  /* This byte is usually 0x02 but 0x00 and 0x75 (!) have also been spotted. */
+  pos++;
+
   if (!match_byte(0) && !match_byte(1))
     match_byte_assert(2);
-  match_u32_assert(2);
+  if (!match_u32(0))
+    match_u32_assert(2);
   if (!match_byte(0))
     match_byte_assert(1);
   match_byte(0);
@@ -273,11 +640,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++)
     {
@@ -286,6 +653,937 @@ dump_dims(void)
     }
 }
 
+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
+  int x = get_u32();
+  printf ("%d data values, starting at %08x\n", x, pos);
+  for (int i = 0; i < x; i++)
+    {
+      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 (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
+                {
+                  match_u32_assert(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_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 (3))
+        {
+          get_string();
+          if (match_byte (0x31))
+            {
+              if (match_u32 (0))
+                {
+                  match_u32_assert (1);
+                  get_string ();
+                  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);
+          get_string();
+          printf("string \"%s\"", get_string());
+          match_byte (0);
+        }
+      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);
+        }
+      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);
+        }
+      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 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 <= 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 (match_byte (0x31))
+                        {
+                          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
+                            {
+                              match_u32_assert(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_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(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');
+                }
+            }
+        }
+      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 <= 0; 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 <= 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 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
+                    dump_value (1);
+                  putchar('\n');
+                }
+            }
+        }
+      putchar('\n');
+    }
+}
+
+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();
+      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);
+              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);
+      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))
+    {
+      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);
+      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);
+      match_byte (1);
+      match_byte (0);
+      match_byte (0);
+      match_byte (0);
+      match_byte (1);
+    }
+  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 if (match_u32 (0))
+        {
+          match_u32_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 *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);
+                  match_byte(0);
+                }
+              else
+                dump_title_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);
+                }
+              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());
+      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))
+    {
+      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 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);
+                  match_byte(0);
+                  match_byte(0);
+                  match_byte(0);
+                  match_byte(0);
+                  match_byte(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(0);
+                  match_byte(0);
+                  match_byte(0);
+                  match_byte(0);
+                  match_byte(0);
+                }
+              else
+                dump_footnote_value (level+1);
+              putchar('\n');
+            }
+        }
+    }
+}
+
+static void
+dump_title(void)
+{
+  pos = 0x27;
+  dump_title_value(0); putchar('\n'); putchar('\n');
+  dump_title_value(0); putchar('\n'); putchar('\n');
+  match_byte_assert(0x31);
+  dump_title_value(0); putchar('\n'); putchar('\n');
+  match_byte(0);
+  match_byte_assert(0x58);
+  if (match_byte(0x31))
+    {
+      dump_title_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());
+        }
+    }
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -317,7 +1615,22 @@ main(int argc, char *argv[])
 
   if (argc > 1)
     {
-      if (!strcmp(argv[1], "title"))
+      if (!strcmp(argv[1], "title0"))
+        {
+          pos = 0x27;
+          if (match_byte (0x03)
+              || (match_byte (0x05) && match_byte (0x58)))
+            printf ("%s\n", get_string());
+          else
+            printf ("<unknown>\n");
+          return 0;
+        }
+      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;
@@ -337,13 +1650,25 @@ 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 = find(dimensions, sizeof dimensions - 1) + sizeof dimensions - 1;
+          {
+            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;
           dump_dims ();
-          return 0;
+          dump_data ();
+          if (!strcmp(argv[1], "all"))
+            dump_title ();
+          exit(0);
         }
       else
         {
@@ -358,17 +1683,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