X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=dump.c;h=991dd366b4515bae2da7fdb4bc243100bf99473a;hb=9f2d5103848c48c3c49b5c0d11f1b2506ab5487e;hp=9e1bfd9f960b2f97379db046204193bcd6cdfd6a;hpb=d311608bad61aa116bea4d1ff1b1ea9d45f798b7;p=pspp diff --git a/dump.c b/dump.c index 9e1bfd9f96..991dd366b4 100644 --- a/dump.c +++ b/dump.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include "u8-mbtouc.h" @@ -48,6 +49,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 +64,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 +100,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 +130,48 @@ match_u32_assert(uint32_t x, const char *where) } #define match_u32_assert(x) match_u32_assert(x, WHERE) +static bool __attribute__((unused)) +match_u64(uint64_t x) +{ + if (get_u64() == x) + return true; + pos -= 8; + return false; +} + +static void __attribute__((unused)) +match_u64_assert(uint64_t x, const char *where) +{ + unsigned long long int y = get_u64(); + if (x != y) + { + fprintf(stderr, "%s: 0x%x: expected u64:%llu, got u64:%llu\n", where, pos - 8, x, y); + exit(1); + } +} +#define match_u64_assert(x) match_u64_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) { @@ -218,6 +303,29 @@ get_string(const char *where) } #define get_string() get_string(WHERE) +static char * +get_string_be(const char *where) +{ + 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); + + 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) { @@ -225,6 +333,27 @@ 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)) + printf("-"); + else + printf(" "); +#endif + printf("%02x", c); + } + for (int i = 0; i < n; i++) + { + int c = data[ofs + i]; + printf("%c", c >= 32 && c < 127 ? c : '.'); + } +} + static char * dump_counted_string(void) { @@ -232,7 +361,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,8 +381,21 @@ dump_counted_string(void) return s; } +static void +dump_style(FILE *stream) +{ + for (int i = 0; i < 4; i++) + printf (" %d", get_byte()); + char *fg = get_string(); /* foreground */ + char *bg = get_string(); /* background */ + char *font = get_string(); /* font */ + int size = get_byte() * (72. / 96.); + fprintf(stream, " fgcolor=\"%s\" bgcolor=\"%s\" font=\"%s\" size=\"%dpt\"", + fg, bg, font, size); +} + static char * -dump_nested_string(void) +dump_nested_string(FILE *stream) { char *s = NULL; @@ -255,7 +403,12 @@ dump_nested_string(void) match_byte_assert (0); int outer_end = get_end(); s = dump_counted_string(); - match_byte_assert(0x58); + 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) { @@ -267,20 +420,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; } @@ -305,41 +462,36 @@ 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)) - { - /* 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)) { - /* Only two SPV files have anything like this, so it's hard to - generalize. */ - match_u32_assert(0); - match_u32_assert(0); - match_u32_assert(0); - match_u32_assert(0); - match_byte_assert(1); - match_byte_assert(0); - if (!match_byte(8) && !match_byte(1)) - match_byte_assert(2); - match_byte_assert(0); - match_byte_assert(8); - match_byte_assert(0); - match_byte_assert(10); - match_byte_assert(0); + uint32_t halign = get_u32(); + printf (" halign=\"%s\"", + halign == 0 ? "center" + : halign == 2 ? "left" + : halign == 4 ? "right" + : halign == 6 ? "decimal" + : halign == 0xffffffad ? "mixed" + : ""); + int valign = get_u32(); + printf (" valign=\"%s\"", + valign == 0 ? "center" + : valign == 1 ? "top" + : valign == 3 ? "bottom" + : ""); + printf (" %g", get_double()); + int l = get_u16(); + int r = get_u16(); + int t = get_u16(); + int b = get_u16(); + printf (" margins=\"%d %d %d %d\"", l, r, t, b); } else match_byte_assert(0x58); @@ -348,32 +500,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(); + fprintf(stream, "/>\n"); } else { - match_u32_assert(3); - fprintf(stream, "(special 3)"); - match_byte_assert(0); + int count = get_u32(); + fprintf(stream, "\n"); } } else @@ -444,7 +587,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", @@ -456,7 +599,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 (); @@ -466,7 +609,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); @@ -474,7 +617,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; @@ -646,7 +790,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"); @@ -676,10 +820,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"); @@ -766,8 +911,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"); @@ -792,24 +943,6 @@ dump_title(void) } } -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_fonts(void) { @@ -820,98 +953,139 @@ 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(" halign=%d", halign); + + int valign = get_u32(); + printf(" valign=%d", 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()); - match_u32_assert(0); - match_u32_assert(0); - match_byte_assert(0); + + if (!match_byte(0)) + match_byte_assert(1); + + char *alt_fgcolor = get_string(); + if (alt_fgcolor[0]) + printf (" altfg=\"%s\"", alt_fgcolor); + char *alt_bgcolor = get_string(); + if (alt_bgcolor[0]) + printf (" altbg=\"%s\"", alt_bgcolor); 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 + printf(" margins=\""); + for (int i = 0; i < 4; i++) { - get_u32(); - if (!match_u32(-1) && !match_u32(8)) - match_u32_assert(24); - if (!match_u32(-1) && !match_u32(2)) - match_u32_assert(3); + if (i) + putchar(' '); + printf("%d", get_u32()); } - - /* Who knows? Ranges from -1 to 8 with no obvious pattern. */ - get_u32(); + putchar('"'); } 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; int x3 = get_u32(); + int x3_end = pos + x3; if (version == 3) { - assert(x3 >= 117); - int len = data[pos + 0x34]; - if (len) - fprintf(stderr, "%.*s\n", len, &data[pos + 0x35]); + match_be32_assert(1); + get_be32(); + printf("\n"); } - pos += x3; + pos = x3_end; + /* Manual column widths, if present. */ int count = get_u32(); - pos += 4 * count; + if (count > 0) + { + printf(""); + for (int i = 0; i < count; i++) + { + if (i) + putchar(' '); + printf("%d", get_u32()); + } + printf("\n"); + } 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]; @@ -923,7 +1097,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()); if (match_byte('.')) { @@ -987,13 +1185,13 @@ dump_fonts(void) else { match_byte_assert(','); - if (!match_byte('.') && !match_byte(' ')) + if (!match_byte('.') && !match_byte(' ') && !match_byte(',')) match_byte_assert(0); } - pos += 8; - match_byte_assert(1); + printf ("small: %g\n", get_double()); + match_byte_assert(1); if (outer_end - pos > 6) { /* There might be a pair of strings representing a dataset and @@ -1013,7 +1211,13 @@ dump_fonts(void) printf("%s\n", get_string()); match_u32_assert(0); - get_u32(); + + time_t date = get_u32(); + struct tm tm = *localtime(&date); + char s[128]; + strftime(s, sizeof s, "%a, %d %b %Y %H:%M:%S %z", &tm); + printf("%s\n", s); + match_u32_assert(0); } } @@ -1026,16 +1230,23 @@ dump_fonts(void) else match_u32_assert(0); - match_byte_assert(0x2e); + match_byte_assert('.'); 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 - match_u32_assert(0); + { + pos = get_end(); + } } int @@ -1117,63 +1328,29 @@ 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)) match_u32_assert(3); match_byte_assert(1); - if (!match_byte(0)) - match_byte_assert(1); - - /* Offset 8. */ - match_byte_assert(0); - match_byte_assert(0); - if (!match_byte(0)) - match_byte_assert(1); - - /* Offset 11. */ - pos++; - match_byte_assert(0); - match_byte_assert(0); - match_byte_assert(0); - - /* Offset 15. */ - pos++; - if (!match_byte(0)) - match_byte_assert(1); - match_byte_assert(0); - match_byte_assert(0); - - /* Offset 19. */ - pos++; - if (!match_byte(0)) - match_byte_assert(1); - match_byte_assert(0); - match_byte_assert(0); - - /* Offset 23. */ - pos++; - if (!match_byte(0)) - match_byte_assert(1); - match_byte_assert(0); - match_byte_assert(0); - - /* 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; - - /* Offset 35. */ - pos += 4; + for (int i = 0; i < 4; i++) + if (!match_byte(0)) + match_byte_assert(1); + get_u32(); + + int min_col_width = get_u32(); + int max_col_width = get_u32(); + int min_row_width = get_u32(); + int max_row_width = get_u32(); + printf("\n", + min_col_width, max_col_width, + min_row_width, max_row_width); + + /* Offset 31. */ + printf("%lld", get_u64()); dump_title (); dump_fonts();