X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=dump.c;h=61ee61ac0c72639825ca6e258a4386606b40020e;hb=91e1d822895e84a15e17b15762c6d33629f83342;hp=be5139c6045a5eb2620242d9b2ca4212243e724d;hpb=68a20800ccdf1d5263e1a500f1acdaa982789419;p=pspp
diff --git a/dump.c b/dump.c
index be5139c604..61ee61ac0c 100644
--- a/dump.c
+++ b/dump.c
@@ -57,6 +57,15 @@ get_u32(void)
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)
{
@@ -225,6 +234,24 @@ get_end(void)
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);
+ //fprintf(stderr, "%c", c >= 32 && c < 127 ? c : '.');
+ }
+ fprintf(stderr, "\n");
+}
+
static char *
dump_counted_string(void)
{
@@ -232,7 +259,13 @@ dump_counted_string(void)
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
@@ -246,41 +279,26 @@ dump_counted_string(void)
return s;
}
-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);
- //fprintf(stderr, "%c", c >= 32 && c < 127 ? c : '.');
- }
- fprintf(stderr, "\n");
-}
-
static void
-dump_style(void)
+dump_style(FILE *stream)
{
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 */
+ 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(void)
+dump_nested_string(FILE *stream)
{
char *s = NULL;
@@ -288,8 +306,10 @@ dump_nested_string(void)
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();
+ dump_style(stream);
else
match_byte_assert(0x58);
match_byte_assert(0x58);
@@ -303,20 +323,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;
}
@@ -341,10 +365,12 @@ dump_optional_value(FILE *stream)
/* This counted-string appears to be a template string,
e.g. "Design\: [:^1:]1 Within Subjects Design\: [:^1:]2". */
- dump_counted_string();
+ char *template = dump_counted_string();
+ if (template)
+ fprintf(stream, " template=\"%s\"", template);
if (match_byte(0x31))
- dump_style();
+ dump_style(stream);
else
match_byte_assert(0x58);
if (match_byte(0x31))
@@ -372,32 +398,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(1))
- match_byte_assert(2);
- match_byte_assert(0);
- if (!match_u32 (2) && !match_u32(1))
- match_u32_assert(3);
- dump_nested_string();
+ fprintf(stream, "/>\n");
}
else
{
- match_u32_assert(3);
- fprintf(stream, "(special 3)");
- match_byte_assert(0);
+ int count = get_u32();
+ fprintf(stream, "\n");
}
}
else
@@ -468,7 +485,7 @@ dump_value(FILE *stream, int level)
unsigned int format;
double value;
- dump_optional_value(stream);
+ dump_value_modifier(stream);
format = get_u32 ();
value = get_double ();
fprintf (stream, "\n",
@@ -480,7 +497,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 ();
@@ -490,7 +507,7 @@ 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);
@@ -498,7 +515,7 @@ dump_value(FILE *stream, int level)
else if (match_byte (3))
{
char *text = get_string();
- dump_optional_value(stream);
+ dump_value_modifier(stream);
char *identifier = get_string();
char *text_eng = get_string();
fprintf (stream, "= 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;
@@ -670,7 +688,7 @@ 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");
@@ -700,10 +718,11 @@ 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");
@@ -790,8 +809,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");
@@ -836,7 +861,7 @@ dump_fonts(void)
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 (!match_u32(0) && !match_u32(2) && !match_u32(4))
{
if (i == 7)
match_u32_assert(0xfaad);
@@ -848,20 +873,18 @@ dump_fonts(void)
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(1))
- match_u32_assert(2);
+ pos += 12;
}
else
{
@@ -882,8 +905,9 @@ dump_fonts(void)
match_u32_assert(240);
pos += 240;
- match_u32_assert(18);
- pos += 18;
+ int skip = get_u32();
+ assert(skip == 18 || skip == 25);
+ pos += skip;
int x3 = get_u32();
if (version == 3)
@@ -901,8 +925,7 @@ dump_fonts(void)
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);
@@ -911,14 +934,16 @@ dump_fonts(void)
if (version > 1)
{
if (!match_byte(0x97) && !match_byte(0x98)
- && !match_byte(0x99) && !match_byte(0x9a))
- match_byte_assert(0x9b);
+ && !match_byte(0x99) && !match_byte(0x9a) && !match_byte(0x9b))
+ match_byte_assert(0x9c);
match_byte_assert(7);
match_byte_assert(0);
match_byte_assert(0);
}
else
- match_u32_assert(UINT32_MAX);
+ {
+ printf("%x\n", get_u32());
+ }
int decimal = data[pos];
int grouping = data[pos + 1];
@@ -930,7 +955,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("%d\n", get_u32());
match_u32_assert(0);
}
assert(pos == outer_end);
@@ -1048,7 +1073,9 @@ dump_fonts(void)
pos = outer_end;
}
else
- match_u32_assert(0);
+ {
+ pos = get_end();
+ }
}
int
@@ -1130,7 +1157,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))
@@ -1142,7 +1169,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);
@@ -1176,8 +1204,8 @@ main(int argc, char *argv[])
/* Offset 27. */
pos++;
pos++;
- match_byte_assert(0);
- match_byte_assert(0);
+ pos++;
+ pos++;
/* Offset 31.