X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=dump.c;h=1b7a8ed8e78c5ddd68affbf69ccc3ede8b55e8fa;hb=0322f357aebb8e1c22f1d929f13bf5c555d95bb9;hp=1cdb749f81fc714f09876a9701391cb48416e2bb;hpb=2aed65a53e0d5ae8d7abc77f6cbd7cf055b37ceb;p=pspp
diff --git a/dump.c b/dump.c
index 1cdb749f81..1b7a8ed8e7 100644
--- a/dump.c
+++ b/dump.c
@@ -48,6 +48,12 @@ size_t pos;
#define STR(x) XSTR(x)
#define WHERE __FILE__":" STR(__LINE__)
+static uint8_t
+get_byte(void)
+{
+ return data[pos++];
+}
+
static unsigned int
get_u32(void)
{
@@ -57,6 +63,33 @@ get_u32(void)
return x;
}
+static unsigned long long int
+get_u64(void)
+{
+ uint64_t x;
+ memcpy(&x, &data[pos], 8);
+ pos += 8;
+ return x;
+}
+
+static unsigned int
+get_be32(void)
+{
+ uint32_t x;
+ x = (data[pos] << 24) | (data[pos + 1] << 16) | (data[pos + 2] << 8) | data[pos + 3];
+ pos += 4;
+ return x;
+}
+
+static unsigned int
+get_u16(void)
+{
+ uint16_t x;
+ memcpy(&x, &data[pos], 2);
+ pos += 2;
+ return x;
+}
+
static double
get_double(void)
{
@@ -66,6 +99,15 @@ get_double(void)
return x;
}
+static double __attribute__((unused))
+get_float(void)
+{
+ float x;
+ memcpy(&x, &data[pos], 4);
+ pos += 4;
+ return x;
+}
+
static bool
match_u32(uint32_t x)
{
@@ -87,6 +129,27 @@ match_u32_assert(uint32_t x, const char *where)
}
#define match_u32_assert(x) match_u32_assert(x, WHERE)
+static bool __attribute__((unused))
+match_be32(uint32_t x)
+{
+ if (get_be32() == x)
+ return true;
+ pos -= 4;
+ return false;
+}
+
+static void
+match_be32_assert(uint32_t x, const char *where)
+{
+ unsigned int y = get_be32();
+ if (x != y)
+ {
+ fprintf(stderr, "%s: 0x%x: expected be%u, got be%u\n", where, pos - 4, x, y);
+ exit(1);
+ }
+}
+#define match_be32_assert(x) match_be32_assert(x, WHERE)
+
static bool
match_byte(uint8_t b)
{
@@ -219,17 +282,71 @@ get_string(const char *where)
#define get_string() get_string(WHERE)
static char *
-dump_nested_string(void)
+get_string_be(const char *where)
{
- char *s = NULL;
+ 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 + 2] * 256 + data[pos + 3];
+ char *s = malloc(len + 1);
- match_byte_assert (0);
- match_byte_assert (0);
- int outer_end = pos + get_u32();
- int inner_end = pos + get_u32();
+ memcpy(s, &data[pos + 4], len);
+ s[len] = 0;
+ pos += 4 + len;
+ return s;
+ }
+ else
+ {
+ fprintf(stderr, "%s: 0x%x: expected string\n", where, pos);
+ exit(1);
+ }
+}
+#define get_string_be() get_string_be(WHERE)
+
+static int
+get_end(void)
+{
+ int len = get_u32();
+ return pos + len;
+}
+
+static void __attribute__((unused))
+hex_dump(int ofs, int n)
+{
+ for (int i = 0; i < n; i++)
+ {
+ int c = data[ofs + i];
+#if 1
+ if (i && !(i % 16))
+ fprintf(stderr, "-");
+ else
+ fprintf(stderr, " ");
+#endif
+ fprintf(stderr, "%02x", c);
+ }
+ for (int i = 0; i < n; i++)
+ {
+ int c = data[ofs + i];
+ fprintf(stderr, "%c", c >= 32 && c < 127 ? c : '.');
+ }
+ fprintf(stderr, "\n");
+}
+
+static char *
+dump_counted_string(void)
+{
+ char *s = NULL;
+ int inner_end = get_end();
if (pos != inner_end)
{
- match_u32_assert(0);
+ if (match_u32(5))
+ {
+ match_u32_assert(0);
+ match_byte_assert(0x58);
+ }
+ else
+ match_u32_assert(0);
if (match_byte(0x31))
s = get_string();
else
@@ -240,7 +357,42 @@ dump_nested_string(void)
exit(1);
}
}
- match_byte_assert(0x58);
+ return s;
+}
+
+static void
+dump_style(FILE *stream)
+{
+ match_byte(1);
+ match_byte(0);
+ match_byte(0);
+ match_byte(0);
+ match_byte_assert(1);
+ char *fg = get_string(); /* foreground */
+ char *bg = get_string(); /* background */
+ char *font = get_string(); /* font */
+ int size = data[pos];
+ if (!match_byte(14))
+ match_byte_assert(12); /* size? */
+ fprintf(stream, " fgcolor=\"%s\" bgcolor=\"%s\" font=\"%s\" size=\"%d\"",
+ fg, bg, font, size);
+}
+
+static char *
+dump_nested_string(FILE *stream)
+{
+ char *s = NULL;
+
+ match_byte_assert (0);
+ match_byte_assert (0);
+ int outer_end = get_end();
+ s = dump_counted_string();
+ if (s)
+ fprintf(stream, " \"%s\"", s);
+ if (match_byte(0x31))
+ dump_style(stream);
+ else
+ match_byte_assert(0x58);
match_byte_assert(0x58);
if (pos != outer_end)
{
@@ -252,16 +404,23 @@ dump_nested_string(void)
}
static void
-dump_optional_value(FILE *stream)
+dump_value_modifier(FILE *stream)
{
if (match_byte (0x31))
{
if (match_u32 (0))
{
+ fprintf(stream, "\n");
return;
}
- int outer_end = pos + get_u32();
- int inner_end = pos + get_u32();
- if (pos != inner_end)
- {
- match_u32_assert(0);
- if (match_byte(0x31))
- {
- /* Appears to be a template string, e.g. '^1 cells (^2) expf < 5. Min exp = ^3...'.
- Probably doesn't actually appear in output because many examples look unpolished,
- e.g. 'partial list cases value ^1 shown upper...' */
- get_string();
- }
- else
- match_byte_assert(0x58);
- if (pos != inner_end)
- {
- fprintf(stderr, "inner end discrepancy\n");
- exit(1);
- }
- }
+ int outer_end = get_end();
+
+ /* This counted-string appears to be a template string,
+ e.g. "Design\: [:^1:]1 Within Subjects Design\: [:^1:]2". */
+ char *template = dump_counted_string();
+ if (template)
+ fprintf(stream, " template=\"%s\"", template);
if (match_byte(0x31))
- {
- /* Only one example in the corpus. */
- match_byte(1);
- match_byte(0);
- match_byte(0);
- match_byte(0);
- match_byte_assert(1);
- get_string(); /* foreground */
- get_string(); /* background */
- get_string(); /* font */
- if (!match_byte(14))
- match_byte_assert(12); /* size? */
- }
+ dump_style(stream);
else
match_byte_assert(0x58);
if (match_byte(0x31))
@@ -344,32 +479,23 @@ dump_optional_value(FILE *stream)
fprintf(stderr, "outer end discrepancy\n");
exit(1);
}
- }
- else if (match_u32 (1))
- {
- fprintf(stream, "(footnote %d) ", get_u32());
- dump_nested_string();
- }
- else if (match_u32 (2))
- {
- fprintf(stream, "(special 2)");
- if (!match_byte(0))
- match_byte_assert(2);
- match_byte_assert(0);
- if (!match_u32 (2) && !match_u32(1))
- match_u32_assert(3);
- dump_nested_string(); /* Our corpus doesn't contain any examples with strings though. */
+ fprintf(stream, "/>\n");
}
else
{
- match_u32_assert(3);
- fprintf(stream, "(special 3)");
- match_byte_assert(0);
+ int count = get_u32();
+ fprintf(stream, "\n");
}
}
else
@@ -435,32 +561,16 @@ dump_value(FILE *stream, int level)
for (int i = 0; i <= level; i++)
fprintf (stream, " ");
- if (match_byte (3))
- {
- char *text = get_string();
- dump_optional_value(stream);
- char *identifier = get_string();
- char *text_eng = get_string();
- fprintf (stream, "\n");
- if (!match_byte (0))
- match_byte_assert(1);
- }
- else if (match_byte (5))
+ if (match_byte (1))
{
- dump_optional_value(stream);
- char *name = get_string ();
- char *label = get_string ();
- fprintf (stream, "\n");
- if (!match_byte(1) && !match_byte(2))
- match_byte_assert(3);
+ unsigned int format;
+ double value;
+
+ dump_value_modifier(stream);
+ format = get_u32 ();
+ value = get_double ();
+ fprintf (stream, "\n",
+ DBL_DIG, value, format_to_string(format >> 16), (format >> 8) & 0xff, format & 0xff);
}
else if (match_byte (2))
{
@@ -468,7 +578,7 @@ dump_value(FILE *stream, int level)
char *var, *vallab;
double value;
- dump_optional_value (stream);
+ dump_value_modifier (stream);
format = get_u32 ();
value = get_double ();
var = get_string ();
@@ -478,17 +588,32 @@ dump_value(FILE *stream, int level)
if (var[0])
fprintf (stream, " variable=\"%s\"", var);
if (vallab[0])
- fprintf (stream, " label=\"%s\"/>\n", vallab);
+ fprintf (stream, " label=\"%s\"", vallab);
fprintf (stream, "/>\n");
if (!match_byte (1) && !match_byte(2))
match_byte_assert (3);
}
+ else if (match_byte (3))
+ {
+ char *text = get_string();
+ dump_value_modifier(stream);
+ char *identifier = get_string();
+ char *text_eng = get_string();
+ fprintf (stream, "\n");
+ if (!match_byte (0))
+ match_byte_assert(1);
+ }
else if (match_byte (4))
{
unsigned int format;
char *var, *vallab, *value;
- match_byte_assert (0x58);
+ dump_value_modifier(stream);
format = get_u32 ();
vallab = get_string ();
var = get_string ();
@@ -503,20 +628,21 @@ dump_value(FILE *stream, int level)
fprintf (stream, " label=\"%s\"/>\n", vallab);
fprintf (stream, "/>\n");
}
- else if (match_byte (1))
+ else if (match_byte (5))
{
- unsigned int format;
- double value;
-
- dump_optional_value(stream);
- format = get_u32 ();
- value = get_double ();
- fprintf (stream, "\n",
- DBL_DIG, value, format_to_string(format >> 16), (format >> 8) & 0xff, format & 0xff);
+ dump_value_modifier(stream);
+ char *name = get_string ();
+ char *label = get_string ();
+ fprintf (stream, "\n");
+ if (!match_byte(1) && !match_byte(2))
+ match_byte_assert(3);
}
else
{
- dump_optional_value(stream);
+ dump_value_modifier(stream);
char *base = get_string();
int x = get_u32();
@@ -569,7 +695,8 @@ check_permutation(int *a, int n, const char *name)
}
static void
-dump_category(FILE *stream, int level, int *indexes, int *n_indexes, int max_indexes)
+dump_category(FILE *stream, int level, int **indexes, int *allocated_indexes,
+ int *n_indexes)
{
for (int i = 0; i <= level; i++)
fprintf (stream, " ");
@@ -619,12 +746,12 @@ dump_category(FILE *stream, int level, int *indexes, int *n_indexes, int max_ind
fprintf(stderr, "index not -1 but subcategories\n");
exit(1);
}
- if (*n_indexes >= max_indexes)
+ if (*n_indexes >= *allocated_indexes)
{
- fprintf(stderr, "too many categories (increase max_indexes)\n");
- exit(1);
+ *allocated_indexes = *allocated_indexes ? 2 * *allocated_indexes : 16;
+ *indexes = realloc(*indexes, *allocated_indexes * sizeof **indexes);
}
- indexes[(*n_indexes)++] = indx;
+ (*indexes)[(*n_indexes)++] = indx;
}
int expected_unindexed = indx == -1;
@@ -642,13 +769,13 @@ dump_category(FILE *stream, int level, int *indexes, int *n_indexes, int max_ind
fprintf (stream, "%d\n", indx);
}
for (int i = 0; i < n_categories; i++)
- dump_category (stream, level + 1, indexes, n_indexes, max_indexes);
+ dump_category (stream, level + 1, indexes, allocated_indexes, n_indexes);
for (int i = 0; i <= level; i++)
fprintf (stream, " ");
printf ("\n");
}
-static void
+static int
dump_dim(int indx)
{
int n_categories;
@@ -672,22 +799,28 @@ dump_dim(int indx)
match_u32_assert(indx);
n_categories = get_u32();
- int indexes[2048];
+ int *indexes = NULL;
int n_indexes = 0;
+ int allocated_indexes = 0;
for (int i = 0; i < n_categories; i++)
- dump_category (stdout, 0, indexes, &n_indexes, sizeof indexes / sizeof *indexes);
+ dump_category (stdout, 0, &indexes, &allocated_indexes, &n_indexes);
check_permutation(indexes, n_indexes, "categories");
fprintf (stdout, "\n");
+ return n_indexes;
}
int n_dims;
+static int dim_n_cats[64];
+#define MAX_DIMS (sizeof dim_n_cats / sizeof *dim_n_cats)
+
static void
dump_dims(void)
{
n_dims = get_u32();
+ assert(n_dims < MAX_DIMS);
for (int i = 0; i < n_dims; i++)
- dump_dim (i);
+ dim_n_cats[i] = dump_dim (i);
}
static void
@@ -715,7 +848,19 @@ dump_data(void)
printf ("\n");
for (int i = 0; i < x; i++)
{
- printf (" \n", get_u32());
+ unsigned int indx = get_u32();
+ printf (" \n");
match_u32_assert(0);
if (version == 1)
match_byte(0);
@@ -745,8 +890,14 @@ dump_title(void)
match_byte(1);
printf ("\n");
- match_byte(0);
- match_byte_assert(0x58);
+ if (match_byte(0x31))
+ {
+ printf ("\n");
+ dump_value(stdout, 0);
+ printf ("\n");
+ }
+ else
+ match_byte_assert(0x58);
if (match_byte(0x31))
{
printf ("\n");
@@ -781,102 +932,115 @@ dump_fonts(void)
match_byte_assert(i);
match_byte_assert(0x31);
printf(" font=\"%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(0x70))
- match_byte_assert(0x50);
- match_byte_assert(0x41);
- if (!match_u32(0) && !match_u32(1))
- match_u32_assert(2);
- match_byte_assert(0);
- /* OK, this seems really unlikely to be totally correct, but it matches my corpus... */
- if (!match_u32(0) && !match_u32(2))
- {
- if (i == 7)
- match_u32_assert(0xfaad);
- else
- match_u32_assert(0);
- }
+ printf(" size=\"%gpt\"", get_float());
+
+ int style = get_u32();
+ if (style & 1)
+ printf(" bold=\"true\"");
+ if (style & 2)
+ printf(" italic=\"true\"");
+
+ bool underline = data[pos++];
+ if (underline)
+ printf(" underline=\"true\"");
+
+ int halign = get_u32();
+ printf("\nhalign=%d\n", halign);
+
+ int valign = get_u32();
+ printf("\nvalign=%d\n", valign);
- if (!match_u32(0) && !match_u32(1) && !match_u32(2))
- match_u32_assert(3);
printf (" fgcolor=\"%s\"", get_string());
printf (" bgcolor=\"%s\"", get_string());
+
+ if (!match_byte(0))
+ match_byte_assert(1);
match_u32_assert(0);
- match_u32_assert(0);
- match_byte_assert(0);
+ char *othercolor = get_string();
+ if (othercolor[0])
+ printf(" othercolor=\"%s\"", othercolor);
if (version > 1)
{
- if (i != 3)
- {
- if (!match_u32(8))
- match_u32_assert(5);
- if (!match_u32(10) && !match_u32(11) && !match_u32(5))
- match_u32_assert(9);
- if (!match_u32(0))
- match_u32_assert(1);
- }
- else
- {
- get_u32();
- if (!match_u32(-1) && !match_u32(8))
- match_u32_assert(24);
- if (!match_u32(-1) && !match_u32(2))
- match_u32_assert(3);
- }
-
- /* Who knows? Ranges from -1 to 8 with no obvious pattern. */
- get_u32();
+ printf("\nfonts:");
+ for (int i = 0; i < 4; i++)
+ printf(" %2d", get_u32());
+ printf("\n");
}
printf ("/>\n");
}
- match_u32_assert(240);
- pos += 240;
+ int x1 = get_u32();
+ int x1_end = pos + x1;
+ printf("\n");
+ match_be32_assert(1);
+ int n_borders = get_be32();
+ for (int i = 0; i < n_borders; i++)
+ {
+ int type = get_be32();
+ int stroke = get_be32();
+ int color = get_be32();
+ printf(" \n",
+ type,
+ (stroke == 0 ? "none"
+ : stroke == 1 ? "solid"
+ : stroke == 2 ? "dashed"
+ : stroke == 3 ? "thick"
+ : stroke == 4 ? "thin"
+ : stroke == 5 ? "double"
+ : ""),
+ color);
+ }
+ bool grid = get_byte();
+ pos += 3;
+ printf(" \n", grid ? "yes" : "no");
+ printf("\n");
+ assert(pos == x1_end);
- match_u32_assert(18);
- pos += 18;
+ int skip = get_u32();
+ assert(skip == 18 || skip == 25);
+ pos += skip;
- if (match_u32(117))
- pos += 117;
- else if (match_u32(142))
- pos += 142;
- else if (match_u32(143))
- pos += 143;
- else if (match_u32(150))
- pos += 150;
- else
+ int x3 = get_u32();
+ int x3_end = pos + x3;
+ if (version == 3)
{
- match_u32_assert(16);
- pos += 16;
+ match_be32_assert(1);
+ get_be32();
+ printf("\n");
}
+ pos = x3_end;
int count = get_u32();
pos += 4 * count;
- const char *encoding = get_string();
- printf ("%s\n", encoding);
+ const char *locale = get_string();
+ printf ("%s\n", locale);
- if (!match_u32(0))
- match_u32_assert(UINT32_MAX);
+ get_u32(); /* Seen: 0, UINT32_MAX, 2, 3, 4, 5, 6, 8, 9, 21, 24. */
if (!match_byte(0))
match_byte_assert(1);
match_byte_assert(0);
if (!match_byte(0))
match_byte_assert(1);
- if (version > 1)
- {
- if (!match_byte(0x97) && !match_byte(0x98) && !match_byte(0x99))
- match_byte_assert(0x9a);
- match_byte_assert(7);
- match_byte_assert(0);
- match_byte_assert(0);
- }
- else
- match_u32_assert(UINT32_MAX);
+ printf("%d\n", get_u32());
int decimal = data[pos];
int grouping = data[pos + 1];
@@ -888,7 +1052,7 @@ dump_fonts(void)
else
{
match_byte_assert(',');
- if (!match_byte('.') && !match_byte(' '))
+ if (!match_byte('.') && !match_byte(' ') && !match_byte(','))
match_byte_assert(0);
}
printf("%s\n", get_string());
+ printf("%s\n", get_string());
+ printf("%s\n", get_string());
+ printf("%s\n", get_string());
+ printf("%s\n", get_string());
+
+ if (!match_byte(0))
+ match_byte_assert(1);
+ match_byte_assert(0);
+ if (!match_byte(0))
+ match_byte_assert(1);
+ if (!match_byte(0))
+ match_byte_assert(1);
+
+ printf("%d\n", get_u32());
+
+ if (match_byte('.'))
+ {
+ if (!match_byte(',') && !match_byte('\''))
+ match_byte_assert(' ');
+ }
+ else
+ {
+ match_byte_assert(',');
+ if (!match_byte('.') && !match_byte(' ') && !match_byte(','))
+ match_byte_assert(0);
+ }
+
+ pos += 8;
+ match_byte_assert(1);
+
+ if (outer_end - pos > 6)
+ {
+ /* There might be a pair of strings representing a dataset and
+ datafile name, or there might be a set of custom currency strings.
+ The custom currency strings start with a pair of integers, so we
+ can distinguish these from a string by checking for a null byte; a
+ small 32-bit integer will always contain a null and a text string
+ never will. */
+ int save_pos = pos;
+ int len = get_u32();
+ bool has_dataset = !memchr(&data[pos], '\0', len);
+ pos = save_pos;
+
+ if (has_dataset)
+ {
+ printf("%s\n", get_string());
+ printf("%s\n", get_string());
+
+ match_u32_assert(0);
+ get_u32();
+ match_u32_assert(0);
+ }
+ }
+
+ if (match_u32(5))
+ {
+ for (int i = 0; i < 5; i++)
+ printf("%s\n", 'A' + i, get_string(), 'A' + i);
+ }
+ else
+ match_u32_assert(0);
+
+ match_byte_assert(0x2e);
+ if (!match_byte(0))
+ match_byte_assert(1);
+
+ if (pos < outer_end)
+ {
+ printf("%d\n", get_u32());
+ match_u32_assert(0);
+ }
+ assert(pos == outer_end);
+
+ pos = outer_end;
+ }
+ else
+ {
+ pos = get_end();
+ }
}
int
@@ -985,7 +1249,7 @@ main(int argc, char *argv[])
/* This might be a version number of some kind, because value 1 seems
to only appear in an SPV file that also required its own weird
- special cases in dump_optional_value(). */
+ special cases in dump_value_modifier(). */
version = get_u32();
pos -= 4;
if (!match_u32(1))
@@ -997,7 +1261,8 @@ main(int argc, char *argv[])
/* Offset 8. */
match_byte_assert(0);
- match_byte_assert(0);
+ if (!match_byte(0))
+ match_byte_assert(1);
if (!match_byte(0))
match_byte_assert(1);
@@ -1031,17 +1296,11 @@ main(int argc, char *argv[])
/* Offset 27. */
pos++;
pos++;
- match_byte_assert(0);
- match_byte_assert(0);
-
- /* Offset 31.
-
- This is the tableId, e.g. -4154297861994971133 would be 0xdca00003.
- We don't have enough context to validate it. */
- pos += 4;
+ pos++;
+ pos++;
- /* Offset 35. */
- pos += 4;
+ /* Offset 31. */
+ printf("%lld", get_u64());
dump_title ();
dump_fonts();