X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=dump.c;h=8a2fbc4e5269e6c7a91279a3eb898d7c7964e066;hb=47d25abf6aac9a7b5d0cec09b72c30cc07eb38be;hp=5f1633e17465d6dfe1f9b7297bb710ac16101fea;hpb=7a6fbcadd78649104274d22587ff7906336ba006;p=pspp

diff --git a/dump.c b/dump.c
index 5f1633e174..8a2fbc4e52 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;
@@ -148,82 +148,102 @@ get_string(const char *where)
 #define get_string() get_string(WHERE)
 
 static void
-dump_value(int level)
+dump_value_31(void)
 {
-  for (int i = 0; i <= level; i++)
-    printf ("    ");
-
-  match_byte (0);
-  match_byte (0);
-  match_byte (0);
-  match_byte (0);
-  if (match_byte (3))
+  if (match_byte (0x31))
     {
-      get_string();
-      if (match_byte (0x31))
+      if (match_u32 (0))
         {
           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;
-            }
+            get_string();
           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;
-            }
+            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_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);
+        {
+          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, bool match1);
+static void dump_substs(void (*dump)(int level), int level);
+static void dump_value__(int level, bool match1);
+
+static void
+dump_value__with_preskip(int level)
+{
+  match_byte(0);
+  match_byte(0);
+  match_byte(0);
+  match_byte(0);
+  dump_value__ (level, false);
+  putchar('\n');
+}
+
+static void
+dump_value__(int level, bool match1)
+{
+  if (match_byte (3))
+    {
+      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
+        printf("string \"%s\" and \"%s\"", s1, s2);
+      if (!match_byte (0))
+        match_byte_assert(1);
+      if (match1)
+        match_byte (1);
     }
   else if (match_byte (5))
     {
-      match_byte_assert (0x58);
+      dump_value_31();
       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))
     {
@@ -240,13 +260,6 @@ dump_value(int level)
               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))
     {
@@ -262,281 +275,69 @@ dump_value(int level)
       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);
+      dump_value_31();
       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');
-                }
-            }
-        }
+      if (match1)
+        match_byte (1);
     }
   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');
-                }
-            }
-        }
-    }
+    dump_substs(dump_value__with_preskip, level + 1);
 }
 
 static void
-dump_dim_value(int level)
+dump_value(int level, bool match1)
 {
   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))
-    {
-      unsigned int format;
-      char *var, *vallab;
-      double value;
+  match_byte (0);
+  match_byte (0);
+  match_byte (0);
+  match_byte (0);
+  dump_value__(level, match1);
+  match_byte(0);
+  match_byte(0);
+  match_byte(0);
+}
 
-      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_u32 (3))
-        match_u32_assert (2);
-      match_byte (0);
-    }
-  else if (match_byte (1))
-    {
-      unsigned int format;
-      double value;
+static void
+dump_dim_value(int level)
+{
+  for (int i = 0; i <= level; i++)
+    printf ("    ");
 
-      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);
-    }
+  if (data[pos] == 3 || data[pos] == 5)
+    dump_value__(level, true);
   else
-    {
-      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\", 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);
-        }
-    }
+    dump_value(level, true);
 }
 
 static void
 dump_category(int level)
 {
-  match_byte (0);
-  match_byte (0);
-  match_byte (0);
-  match_byte (0);
-  dump_value (level);
+  dump_value (level, true);
 
-  if (match_u32 (2))
-    get_u32 ();
-  else if (match_u32 (1))
-    {
-      match_byte (0);
-      match_byte (0);
-      match_byte (0);
-      get_u32 ();
-    }
+  if (match_u32 (1))
+    match_byte (0);
   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 ();
     }
+  else if (!match_u32(2))
+    match_u32_assert (0);
+
+  get_u32 ();
 
   int n_categories = get_u32();
   if (n_categories > 0)
@@ -551,70 +352,7 @@ 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(1) || match_byte(0);
-    }
-  else if (match_byte(5)) 
-    {
-      match_byte_assert(0x58);
-      printf("variable \"%s\": ", get_string());
-      get_string();
-      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
-    {
-      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);
-        }
-    }
+  dump_dim_value(0);
 
   /* This byte is usually 0x02 but 0x00 and 0x75 (!) have also been spotted. */
   pos++;
@@ -642,15 +380,59 @@ dump_dim(void)
 
 int n_dims;
 static void
-dump_dims(void)
+dump_dims(void)
+{
+  n_dims = get_u32();
+  printf ("%u dimensions\n", n_dims);
+  for (int i = 0; i < n_dims; i++)
+    {
+      printf("\n");
+      dump_dim ();
+    }
+}
+
+static void
+dump_substs(void (*dump)(int level), int level)
+{
+  dump_value_31();
+
+  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++)
+        {
+          dump (level+1);
+          putchar('\n');
+        }
+    }
+}
+
+static void
+dump_data_value(int level)
 {
-  n_dims = get_u32();
-  printf ("%u dimensions\n", n_dims);
-  for (int i = 0; i < n_dims; i++)
-    {
-      printf("\n");
-      dump_dim ();
-    }
+  for (int i = 0; i <= level; i++)
+    printf ("    ");
+
+  match_byte(0);
+  match_byte(0);
+  match_byte(0);
+  match_byte(0);
+  if (data[pos] == 1 || data[pos] == 2 || data[pos] == 3 || data[pos] == 4)
+    dump_value__(0, false);
+  else if (data[pos] == 5)
+    dump_value (0, true);
+  else
+    dump_substs (dump_data_value, level + 1);
 }
 
 static void
@@ -676,329 +458,7 @@ 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 (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');
-                }
-            }
-        }
+      dump_data_value(0);
       putchar('\n');
     }
 }
@@ -1013,272 +473,174 @@ dump_title_value(int level)
   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 (data[pos] == 1 || data[pos] == 2 || data[pos] == 3 || data[pos] == 4)
+    dump_value(level, true);
+  else if (data[pos] == 5)
+    dump_value__(level, true);
+  else
+    dump_substs(dump_title_value, level + 1);
+}
+
+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 (data[pos] == 2 || data[pos] == 4)
+    dump_value(level, true);
+  else if (data[pos] == 1 || data[pos] == 3 || data[pos] == 5)
+    dump_value__(level, false);
+  else
+    dump_substs(dump_footnote_value, level + 1);
+}
+
+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))
     {
-      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);
+      dump_footnote_value(0); putchar('\n');
     }
-  else if (match_byte (2))
-    {
-      unsigned int format;
-      char *var, *vallab;
-      double value;
+  else
+    match_byte_assert(0x58);
 
-      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))
+  int n_footnotes = get_u32();
+  if (n_footnotes >= 20)
     {
-      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);
+      fprintf(stderr, "%08x: %d footnotes\n", pos - 4, n_footnotes);
+      exit(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
+  printf("------\n%d footnotes\n", n_footnotes);
+  if (n_footnotes < 20)
     {
-      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++)
+      for (int i = 0; i < n_footnotes; 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++)
+          printf("footnote %d:\n", i);
+          dump_footnote_value(0);
+          match_byte(0);
+          match_byte(0);
+          match_byte(0);
+          match_byte(0);
+          if (match_byte (0x31))
             {
-              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');
+              /* Custom footnote marker string. */
+              match_byte_assert(3);
+              get_string();
+              match_byte_assert(0x58);
+              match_u32_assert(0);
+              get_string();
             }
+          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_title(void)
+dump_fonts(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');
+  printf("fonts: offset=%08x\n", pos);
   match_byte(0);
-  match_byte_assert(0x58);
-  if (match_byte(0x31))
+  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
     {
-      dump_title_value(0); putchar('\n');
+      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(0x58);
+    {
+      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
@@ -1349,22 +711,33 @@ main(int argc, char *argv[])
         }
       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 ();
-          if (!strcmp(argv[1], "all"))
-            dump_title ();
+          if (pos == n - 1)
+            match_byte_assert (1);
+          if (pos != n)
+            {
+              fprintf (stderr, "%x / %x\n", pos, n);
+              exit(1);
+            }
           exit(0);
         }
       else