X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=dump.c;h=f1f212bd3d43ee3a76b615ff17ebc37ad31f7632;hb=f6998b8f77ceeb3f8bb7e09762299d2c14738ccb;hp=e758a5b71bacc6e1847fa5100e7eae88959a7c3b;hpb=1862ebd5fc64ec2692b3a93fefbcf7cc091c0511;p=pspp diff --git a/dump.c b/dump.c index e758a5b71b..f1f212bd3d 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; @@ -124,68 +124,179 @@ match_byte_assert(uint8_t b, const char *where) } #define match_byte_assert(b) match_byte_assert(b, WHERE) +static void +dump_raw(FILE *stream, int start, int end, const char *separator) +{ + for (size_t i = start; i < end; ) + { + if (i + 5 <= n + && data[i] + //&& !data[i + 1] + && !data[i + 2] + && !data[i + 3] + && i + 4 + data[i] + data[i + 1] * 256 <= end + && all_ascii(&data[i + 4], data[i] + data[i + 1] * 256)) + { + fprintf(stream, "%s\"", separator); + fwrite(&data[i + 4], 1, data[i] + data[i + 1] * 256, stream); + fputs("\" ", stream); + + i += 4 + data[i] + data[i + 1] * 256; + } + else if (i + 12 <= end + && data[i + 1] == 40 + && data[i + 2] == 5 + && data[i + 3] == 0) + { + double d; + + memcpy (&d, &data[i + 4], 8); + fprintf (stream, "F40.%d(%.*f)%s", data[i], data[i], d, separator); + i += 12; + } + else if (i + 12 <= end + && data[i + 1] == 40 + && data[i + 2] == 31 + && data[i + 3] == 0) + { + double d; + + memcpy (&d, &data[i + 4], 8); + fprintf (stream, "PCT40.%d(%.*f)%s", data[i], data[i], d, separator); + i += 12; + } + else if (i + 4 <= end + && (data[i] && data[i] != 88 && data[i] != 0x41) + && !data[i + 1] + && !data[i + 2] + && !data[i + 3]) + { + fprintf (stream, "i%d ", data[i]); + i += 4; + } + else + { + fprintf(stream, "%02x ", data[i]); + i++; + } + } + + +} + static char * -get_string(void) +get_string(const char *where) { - if (data[pos + 1] == 0 && data[pos + 2] == 0 && data[pos + 3] == 0 + 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_value(int level) +dump_nested(void) { - for (int i = 0; i <= level; i++) - printf (" "); + int subn = get_u32 (); + fprintf (stderr, "nested %d bytes: ", subn); + dump_raw(stderr, pos, pos + subn, ""); + putc('\n', stderr); + pos += subn; +} - if (match_byte (3)) +static void +dump_value_31(void) +{ + if (match_byte (0x31)) { - get_string(); - if (match_byte (0x31)) + if (match_u32 (0)) + { + if (match_u32 (1)) + get_string(); + else + match_u32_assert (0); + dump_nested(); + } + else if (match_u32 (1)) { - 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; + dump_nested(); + } + 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); + dump_nested(); } 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); + { + match_u32_assert(3); + printf("(special 3)"); + match_byte_assert(0); + match_byte_assert(0); + match_byte_assert(1); + match_byte_assert(0); + dump_nested(); + dump_nested(); + } + } + else + match_byte_assert (0x58); +} + +static void +dump_value__(int level, bool match1) +{ + for (int i = 0; i <= level; i++) + printf (" "); + + match_byte(0); + match_byte(0); + match_byte(0); + match_byte(0); + + 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 (3)) - match_byte_assert (2); - match_byte (0); - match_byte (0); - match_byte (0); - match_byte (0); + if (!match_byte(1) && !match_byte(2)) + match_byte_assert(3); } else if (match_byte (2)) { @@ -200,9 +311,8 @@ dump_value(int level) 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); + if (!match_byte (1) && !match_byte(2)) + match_byte_assert (3); } else if (match_byte (4)) { @@ -213,189 +323,113 @@ dump_value(int level) format = get_u32 (); vallab = get_string (); var = get_string (); - match_byte_assert (2); + 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; - 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); + if (match1) + match_byte (1); } else { - int subn; - int total_subs = 1; + dump_value_31(); - 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()); - for (;;) + char *base = get_string(); + int x = get_u32(); + printf ("\"%s\" with %d variables:\n", base, x); + for (int i = 0; i < x; i++) { - 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_value (level + 1); + 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_value__ (level + 1, false); + putchar('\n'); + } } } } +static int +compare_int(const void *a_, const void *b_) +{ + const int *a = a_; + const int *b = b_; + return *a < *b ? -1 : *a > *b; +} + static void -dump_dim_value(int level) +check_permutation(int *a, int n, const char *name) { - for (int i = 0; i <= level; i++) - printf (" "); + int b[n]; + memcpy(b, a, n * sizeof *a); + qsort(b, n, sizeof *b, compare_int); + for (int i = 0; i < n; i++) + if (b[i] != i) + { + fprintf(stderr, "bad %s permutation:", name); + for (int i = 0; i < n; i++) + fprintf(stderr, " %d", a[i]); + putc('\n', stderr); + exit(1); + } +} - 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; +static void +dump_category(int level, int *indexes, int *n_indexes) +{ + dump_value__ (level, true); + 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); - } + if (match_u32 (1)) + match_byte (0); else if (match_byte (1)) { - unsigned int format; - double value; - - 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); + if (!match_u32 (2)) + match_u32_assert (1); match_byte (0); - match_byte (0); - match_byte (1); } - else - { - int subn; - int total_subs = 1; + else if (!match_u32(2)) + match_u32_assert (0); - 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()); - 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++) + int indx = get_u32(); + int n_categories = get_u32(); + if (indx != -1) + { + if (n_categories != 0) { - putc ('\n', stdout); - dump_value (level + 1); + fprintf(stderr, "index not -1 but subcategories\n"); + exit(1); } + indexes[(*n_indexes)++] = indx; } -} - -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 (); - else if (match_u32 (1)) - { - match_byte (0); - match_byte (0); - match_byte (0); - get_u32 (); - } - else - { - match_u32_assert (0); - get_u32 (); - } - - int n_categories = get_u32(); if (n_categories > 0) printf (", %d subcategories:", n_categories); + else + printf (", index %d", indx); printf("\n"); for (int i = 0; i < n_categories; i++) - dump_category (level + 1); + dump_category (level + 1, indexes, n_indexes); } static void @@ -403,77 +437,37 @@ 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); - } - 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 - { - int subn; - int total_subs = 1; - - 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()); - for (;;) - { - int n_subst = get_u32(); - if (!n_subst) - break; - printf (" %d", n_subst); - total_subs *= n_subst; - } + dump_value__ (0, false); - for (int i = 0; i < total_subs; i++) - { - putc ('\n', stdout); - dump_dim_value (0); - } - } + /* This byte is usually 0x02 but 0x00 and 0x75 (!) have also been spotted. */ + pos++; - match_byte_assert(0); 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); - match_byte(0); - match_byte(0); - match_byte(0); - get_u32(); - match_byte(0); - match_byte(0); - match_byte(0); - match_byte(0); + if (!match_byte(0)) + match_byte_assert(1); + match_byte_assert(1); + static int dim_indx = 0; + match_u32_assert(dim_indx++); n_categories = get_u32(); printf("%d nested categories\n", n_categories); + + int indexes[1024]; + int n_indexes = 0; for (int i = 0; i < n_categories; i++) - dump_category (0); + dump_category (0, indexes, &n_indexes); + check_permutation(indexes, n_indexes, "categories"); } +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++) { @@ -482,6 +476,171 @@ dump_dims(void) } } +static void +dump_data(void) +{ + /* The first three numbers add to the number of dimensions. */ + int t = get_u32(); + t += get_u32(); + match_u32_assert(n_dims - t); + + /* The next n_dims numbers are a permutation of the dimension numbers. */ + int a[n_dims]; + for (int i = 0; i < n_dims; i++) + a[i] = get_u32(); + check_permutation(a, n_dims, "dimensions"); + + 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); + dump_value__(0, false); + putchar('\n'); + } +} + +static void +dump_title(void) +{ + pos = 0x27; + dump_value__(0, true); putchar('\n'); + dump_value__(0, true); putchar('\n'); + match_byte_assert(0x31); + dump_value__(0, true); putchar('\n'); + match_byte(0); + match_byte_assert(0x58); + if (match_byte(0x31)) + { + dump_value__(0, false); 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_value__(0, false); + if (match_byte (0x31)) + { + /* 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_fonts(void) +{ + printf("fonts: offset=%08x\n", pos); + match_byte(0); + 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 + { + 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(','); + 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 main(int argc, char *argv[]) { @@ -523,7 +682,12 @@ main(int argc, char *argv[]) printf ("\n"); return 0; } - if (!strcmp(argv[1], "title")) + 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; @@ -543,22 +707,35 @@ 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 = try_find_tail(dimensions, sizeof dimensions - 1); - } - - if (!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 (); + match_byte (1); + if (pos != n) { - const char dimensions[] = "-,,, .\0"; - start = find_tail(dimensions, sizeof dimensions - 1); + fprintf (stderr, "%x / %x\n", pos, n); + exit(1); } - - pos = start; - dump_dims (); - return 0; + exit(0); } else { @@ -569,59 +746,7 @@ main(int argc, char *argv[]) else start = 0x27; - for (size_t i = start; i < n; ) - { - if (i + 5 <= n - && data[i] - && !data[i + 1] - && !data[i + 2] - && !data[i + 3] - && i + 4 + data[i] <= n - && all_ascii(&data[i + 4], data[i])) - { - fputs("\n\"", stdout); - fwrite(&data[i + 4], 1, data[i], stdout); - fputs("\" ", stdout); - - i += 4 + data[i]; - } - else if (i + 12 <= n - && data[i + 1] == 40 - && data[i + 2] == 5 - && data[i + 3] == 0) - { - double d; - - memcpy (&d, &data[i + 4], 8); - printf ("F40.%d(%.*f)\n", data[i], data[i], d); - i += 12; - } - else if (i + 12 <= n - && data[i + 1] == 40 - && data[i + 2] == 31 - && data[i + 3] == 0) - { - double d; - - memcpy (&d, &data[i + 4], 8); - printf ("PCT40.%d(%.*f)\n", data[i], data[i], d); - i += 12; - } - else if (i + 4 <= n - && (data[i] && data[i] != 88 && data[i] != 0x41) - && !data[i + 1] - && !data[i + 2] - && !data[i + 3]) - { - printf ("i%d ", data[i]); - i += 4; - } - else - { - printf("%02x ", data[i]); - i++; - } - } + dump_raw(stdout, start, n, "\n"); return 0; }