X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=dump-spo2.c;h=a7100e60689792445d0af54aa6dcbde8b0765390;hb=75a05a0a68046957d9801db0bfc02b0108736e36;hp=93606cd9b9a1f465ff4a8e41ff677409a75718f2;hpb=afb45b508e1aa6aa3bc2eba915c547178d4a4c4c;p=pspp diff --git a/dump-spo2.c b/dump-spo2.c index 93606cd9b9..a7100e6068 100644 --- a/dump-spo2.c +++ b/dump-spo2.c @@ -21,6 +21,8 @@ int version; unsigned int pos; +static int n_dims; + #define XSTR(x) #x #define STR(x) XSTR(x) #define WHERE __FILE__":" STR(__LINE__) @@ -256,33 +258,43 @@ all_utf8(const char *p_, size_t len) } static char * -get_string2(void) +pull_string(int len, const char *where) { - int len = data[pos] + data[pos + 1] * 256; - char *s = xmemdup0(&data[pos + 2], len); - pos += 2 + len; + assert (len >= 0); + for (int i = 0; i < len - 1; i++) + if (!data[pos + i]) + { + fprintf(stderr, "%s: %d-byte string starting at 0x%x has null byte " + "at offset %d: ", where, len, pos, i); + hex_dump(stderr, pos, len + 64); + exit(1); + } + + char *s = xmemdup0(&data[pos], len); + pos += len; return s; } static char * -get_string1(void) +get_string2(const char *where) +{ + return pull_string(get_u16(), where); +} +#define get_string2() get_string2(WHERE) + +static char * +get_string1(const char *where) { int len = data[pos++]; - if (len == 0xff) - return get_string2(); - else - { - char *s = xmemdup0(&data[pos], len); - pos += len; - return s; - } + return len == 0xff ? (get_string2)(where) : pull_string(len, where); } +#define get_string1() get_string1(WHERE) static void match_string1_assert(const char *exp, const char *where) { int start = pos; - char *act = get_string1(); + char *act = (get_string1)(where); if (strcmp(act, exp)) { fprintf(stderr, "%s: 0x%x: expected \"%s\", got \"%s\"\n", @@ -296,7 +308,7 @@ static void match_string2_assert(const char *exp, const char *where) { int start = pos; - char *act = get_string2(); + char *act = (get_string2)(where); if (strcmp(act, exp)) { fprintf(stderr, "%s: 0x%x: expected \"%s\", got \"%s\"\n", @@ -309,24 +321,8 @@ match_string2_assert(const char *exp, const char *where) static char * get_string4(const char *where) { - if (1 - /*data[pos + 1] == 0 && data[pos + 2] == 0 && data[pos + 3] == 0*/ - /*&& all_ascii(&data[pos + 4], data[pos])*/) - { - assert(data[pos + 3] == 0); - int len = data[pos] + data[pos + 1] * 256 + data[pos + 2] * 65536; - 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); - } + assert(data[pos + 3] == 0); + return pull_string(get_u32(), where); } #define get_string4() get_string4(WHERE) @@ -471,6 +467,7 @@ parse_heading(const char *name) match_u16_assert(0xffff); match_u16_assert(0); match_string2_assert(name); + printf("%#x: %s\n", pos, name); } static void @@ -508,10 +505,11 @@ put_safe(const char *s) static void parse_flexible(void); +static int count; static void parse_DspString(void) { - printf("%#x: DspString(", pos); + printf("%#x: DspString#%d(", pos, count++); if (match_byte(2)) { printf("%f, \"", get_double()); @@ -527,6 +525,7 @@ parse_DspString(void) put_safe(get_string1()); printf("\")\n"); } + } static void @@ -538,10 +537,8 @@ match_DspString(void) } static void -match_DspSimpleText(void) -{ /* 03 80 */ - match_byte_assert(3); - match_byte_assert(0x80); +parse_DspSimpleText(void) +{ match_byte_assert(0); if (match_byte(0)) { @@ -550,6 +547,15 @@ match_DspSimpleText(void) match_byte_assert(0); match_zeros_assert(4); } + /* Followed by DspString or DspNumber. */ +} + +static void +match_DspSimpleText(void) +{ /* 03 80 */ + match_byte_assert(3); + match_byte_assert(0x80); + parse_DspSimpleText(); } static void @@ -568,12 +574,11 @@ parse_weirdness(void) } static void -match_NavTreeViewItem(void) +parse_NavTreeViewItem(void) { /* 07 80 */ - match_byte_assert(7); - match_byte_assert(0x80); + int start_pos = pos; match_zeros_assert(1); - if (!match_byte(0) && !match_byte(7) && !match_byte(2)) + if (!match_byte(0) && !match_byte(7) && !match_byte(2) && !match_byte(0xc)) match_byte_assert(8); match_zeros_assert(3); pos++; @@ -636,13 +641,22 @@ match_NavTreeViewItem(void) match_zeros_assert(3); } //fprintf(stderr, "%#x ", pos - 16); + hex_dump(stdout, start_pos, pos - start_pos); +} + +static void +match_NavTreeViewItem(void) +{ + match_byte_assert(7); + match_byte_assert(0x80); + parse_NavTreeViewItem(); } static void parse_DspNumber(void) { + printf("%#x: DspNumber#%d(", pos, count++); match_byte_assert(1); - printf("DspNumber("); parse_format(); match_byte_assert(0x80); match_byte(2); @@ -653,7 +667,8 @@ parse_DspNumber(void) static void match_DspNumber(void) { - match_byte_assert(0x2a); + if (!match_byte(0x18) && !match_byte(0x19)) + match_byte_assert(0x2a); match_byte_assert(0x80); parse_DspNumber(); } @@ -662,8 +677,6 @@ static void parse_DspCell(void) { match_byte_assert(0); - match_DspSimpleText(); - parse_flexible(); /* DspString or DspNumber. */ } static void @@ -690,15 +703,88 @@ match_NavLog(void) } static void -parse_PMModelItemInfo(void) -{ /* 54 80 */ +parse_category(int level, int j, int *n_leaves) +{ + for (size_t k = 0; k < level; k++) + putchar('\t'); + get_u16(); match_byte_assert(0); + get_u16(); match_byte_assert(0); + int leaf_idx = get_u32(); + printf("%d ", leaf_idx); + match_u32_assert(0); + if (get_u16() == 0xffff) + match_u16_assert(0xffff); + else + match_u16_assert(0x0e74); match_byte_assert(0); - pos += 1; /* Counter */ - match_zeros_assert(7); - pos += 3; - if (!match_byte(0)) - match_byte_assert(0xe); + match_DspSimpleText(); + match_DspString(); + + int n_subcategories = get_u32(); + if (n_subcategories) + assert (leaf_idx == 0); + else + { + assert (leaf_idx == *n_leaves); + ++*n_leaves; + } + for (int k = 0; k < n_subcategories; k++) + parse_category(level + 1, k, n_leaves); +} + +static void +parse_dimension(int i) +{ + printf ("%#x: dimension %d\n", pos, i); + if (i == 0) + { + match_zeros_assert(5); + match_u32_assert(1); + } + else + { + match_zeros_assert(6); + + int n_units16 = get_u32(); + match_u16_assert(1); + for (int j = 0; j < n_units16; j++) + get_u16(); + + match_byte_assert(0); + + int n_units32 = get_u32(); + match_u16_assert(0); + for (int j = 0; j < n_units32; j++) + get_u32(); + + get_u16(); match_byte_assert(0); + + get_u16(); match_byte_assert(0); + get_u16(); match_byte_assert(0); + match_u32_assert(0); + match_u32_assert(1); + } + + get_u16(); + if (!match_u16(0xffff)) + match_u16_assert(0x0e74); match_byte_assert(0); + match_DspSimpleText(); + match_DspString(); + + int n_leaves = 0; + int n_categories = get_u32(); + for (int j = 0; j < n_categories; j++) + parse_category(1, j, &n_leaves); +} + +static void +parse_PMModelItemInfo(void) +{ + for (int i = 0; i < n_dims; i++) + parse_dimension(i); + printf("%#x: end of model\n", pos); + exit(0); } static void @@ -707,8 +793,8 @@ match_PMModelItemInfo(void) match_byte_assert(0x54); match_byte_assert(0x80); parse_PMModelItemInfo(); - match_DspSimpleText(); - match_DspString(); + /* DspSimpleText */ + /* DspString */ } static void @@ -730,8 +816,7 @@ parse_NavHead(void) if (!match_byte(1)) match_byte_assert(0); match_zeros_assert(3); - match_DspSimpleText(); - parse_flexible(); + /* DspSimpleText */ } static void @@ -813,48 +898,135 @@ static void parse_PVPivotView(void) { match_byte_assert(5); - match_zeros_assert(4); + printf ("PVPivotView(%d)\n", get_u32()); } static void parse_NDimensional__DspCell(void) { match_byte_assert(0); - match_u32_assert(1); + n_dims = get_u32(); + printf ("NDimensional__DspCell(n_dims=%d)\n", n_dims); } static void parse_IndexedCollection(void) +{ + printf("IndexedCollection"); + for (size_t i = 0; ; i++) + { + match_byte_assert(0); + printf("%c%d", i ? 'x' : '(', get_u32()); + match_u16_assert(1); + if (!match_u16(0x8011)) + break; + } + printf(")\n"); +} + +static void +parse_PTTableLook(void) +{ + match_byte_assert(2); + match_byte_assert(2); + match_zeros_assert(7); + match_u32_assert(0x36); + match_u32_assert(0x12); +} + +static void +parse_PVViewDimension(void) +{ + while (data[pos + 1] != 0x80 + && (data[pos] != 0xff || data[pos + 1] != 0xff)) + { + assert(pos < n); + pos++; + } +} + +static void +parse_PVSeparatorStyle(void) { match_byte_assert(0); - if (match_byte(0)) + match_byte_assert(1); + match_zeros_assert(15); + pos++; + match_byte_assert(0x80); + match_byte_assert(0); + + match_byte_assert(1); + match_zeros_assert(9); + while (data[pos + 1] != 0x80 + && (data[pos] != 0xff || data[pos + 1] != 0xff)) { - match_zeros_assert(12); + assert(pos < n); + pos++; } - else +} + +static void +parse_PVCellStyle(void) +{ + match_byte_assert(0); + match_byte_assert(1); + match_zeros_assert(5); + match_u32_assert(0xffffff); + match_zeros_assert(2); +} + +static void +skip_item(const char *name) +{ + int start_pos = pos; + printf("%#x: skipping %s bytes...", pos, name); + while (data[pos + 1] != 0x80 + && !(data[pos] == 0xff && data[pos + 1] == 0xff + && data[pos + 2] == 0 && data[pos + 3] == 0)) { - get_u32(); - match_u16_assert(1); + assert(pos < n); + pos++; } + printf("until %#x:", pos); + hex_dump(stdout, start_pos, pos - start_pos); } static void parse_flexible(void) { int start = pos; - if (data[pos] == 0xff && data[pos + 1] == 0xff) + if (match_u16(0xffff)) { - match_u16_assert(0xffff); match_u16_assert(0); char *heading = get_string2(); - if (!strcmp(heading, "DspCell")) + printf("%#x: %s\n", pos, heading); + if (!strcmp(heading, "NavRoot")) + { + match_byte_assert(2); + match_zeros_assert(32); + } + else if (!strcmp(heading, "NavPivot")) + { + hex_dump(stdout, pos, 021); + pos += 0x21; + } + else if (!strcmp(heading, "DspCell")) parse_DspCell(); + else if (!strcmp(heading, "DspSimpleText")) + parse_DspSimpleText(); else if (!strcmp(heading, "DspNumber")) parse_DspNumber(); else if (!strcmp(heading, "DspString")) parse_DspString(); else if (!strcmp(heading, "NavHead")) parse_NavHead(); + else if (!strcmp(heading, "NavTreeViewItem")) + { + if (0) + parse_NavTreeViewItem(); + else + skip_item(heading); + } else if (!strcmp(heading, "IndexedCollection")) parse_IndexedCollection(); else if (!strcmp(heading, "NavOleItem")) @@ -877,16 +1049,26 @@ parse_flexible(void) parse_PMModelItemInfo(); else if (!strcmp(heading, "AbstractTreeBranch")) match_byte_assert(0); + else if (!strcmp(heading, "PTTableLook")) + parse_PTTableLook(); + else if (!strcmp(heading, "PVViewDimension")) + parse_PVViewDimension(); + else if (!strcmp(heading, "PVSeparatorStyle")) + parse_PVSeparatorStyle(); + else if (!strcmp(heading, "PVCellStyle")) + parse_PVCellStyle(); + else if (!strcmp(heading, "PVTextStyle")) + exit(0); else { fprintf(stderr, "don't know %s at offset 0x%x: ", heading, start); - hex_dump(stderr, pos, 64); + hex_dump(stderr, pos, 128); assert(0); } } else if (data[pos + 1] == 0x80) { - if (data[pos] == 0x2a && data[pos + 1] == 0x80) + if ((data[pos] == 0x2a || data[pos] == 0x18 || data[pos] == 0x19) && data[pos + 1] == 0x80) match_DspNumber(); else if (data[pos] == 0x27 && data[pos + 1] == 0x80) match_DspCell(); @@ -901,20 +1083,24 @@ parse_flexible(void) { /* 3c 80 */ /* 39 80 */ + printf("%#x: %02x %02x ", pos, data[pos], data[pos + 1]); pos += 2; parse_format(); + printf ("\n"); /* match_byte_assert(0x01); match_byte_assert(0x02); match_byte_assert(0x0d); */ } - else if (data[pos] == 0x15 && data[pos + 1] == 0x80) + else if ((data[pos] == 0x15 || data[pos] == 0x14) + && data[pos + 1] == 0x80) { + /* 14 80 */ /* 15 80 */ pos += 2; if (match_byte(2)) { - printf ("15 80(%f", get_double()); - printf (" %s)\n", get_string1()); + printf ("%02x 80(%f", data[pos - 2], get_double()); + printf (" \"%s\")\n", get_string1()); if (match_byte(1)) { match_byte_assert(0); @@ -933,12 +1119,15 @@ parse_flexible(void) else { match_byte_assert(0); - if (match_u32(0xc)) - match_u16_assert(1); - else - match_zeros_assert(13); } } + else if (data[pos] == 0x17) + { + printf("%02x %02x(%02x %02x %02x)\n", + data[pos], data[pos + 1], + data[pos + 2], data[pos + 3], data[pos + 4]); + pos += 5; + } else if (data[pos] == 0x9 && data[pos + 1] == 0x80) { match_NavLog(); @@ -947,10 +1136,21 @@ parse_flexible(void) match_NavOleItem(); else if (data[pos] == 0x11 || data[pos] == 0x13) { + int type = data[pos]; pos += 2; match_byte_assert(0); - if (match_u32(0xc) || match_u32(0xd)) - match_u16_assert(1); + if (data[pos] != 0) + { + int x = get_u32(); + int y = get_u16(); + if (y == 0) + { + int index = get_u32(); + printf("%02x 80(footnote %d)\n", type, index); + } + else + printf("%02x 80(%d %d)\n", type, x, y); + } else match_zeros_assert(13); } @@ -1006,73 +1206,98 @@ parse_flexible(void) data[pos] == 0x3e || data[pos] == 0x46) { + printf ("%#x: %02x %02x(%02x %02x %02x)\n", + pos, data[pos], data[pos + 1], + data[pos + 2], data[pos + 3], data[pos + 4]); pos += 2; - parse_format(); + pos += 3; } else { -#if 0 - fprintf (stderr, "bad record 0x%02x at offset %x: ", - data[pos], pos); -#endif + fprintf (stderr, "%#x: unknown record", pos); hex_dump (stderr, pos, 64); - assert(0); + exit(1); } } else if (match_byte(0xa)) { - match_byte_assert(0); + if (!match_byte(7)) + match_byte_assert(0); if (match_u16(0x0e74)) match_byte_assert(0); else { match_zeros_assert(4); - assert(pos == n); - exit (0); + if (pos == n) + exit (0); + match_zeros_assert (2); } } +#if 0 else if (match_byte(1)) { match_byte_assert(0); get_string1(); if (!match_byte(2)) match_byte_assert(0); - match_zeros_assert(3); - get_string1(); - if (match_byte(0x08)) + if (match_byte(0)) { - match_byte_assert(0); - match_u16_assert(0x0e74); - match_byte_assert(0); - } - else if (match_byte(3)) - { - match_byte_assert(0); - if (match_u16(0x0e74)) - match_byte_assert(0); - else + match_zeros_assert(2); + get_string1(); + if (match_byte(0x08)) { - match_zeros_assert(6); - if (!match_byte(0xe) && !match_byte(0x11)) + match_byte_assert(0); + match_u16_assert(0x0e74); + match_byte_assert(0); + } + else if (match_byte(3)) + { + match_byte_assert(0); + if (match_u16(0x0e74)) match_byte_assert(0); + else + { + match_zeros_assert(6); + if (!match_byte(0xe) && !match_byte(0x11)) + match_byte_assert(0); + match_byte_assert(0); + if (!match_u16(0x0e74)) + match_u16_assert(0); + match_byte_assert(0); + } + } + else + { match_byte_assert(0); - if (!match_u16(0x0e74)) - match_u16_assert(0); + match_byte_assert(1); + match_zeros_assert(3); + match_byte_assert(1); match_byte_assert(0); } } - else - { - match_byte_assert(0); - match_byte_assert(1); - match_zeros_assert(3); - match_byte_assert(1); - match_byte_assert(0); - } } - else if (match_byte(7) || match_byte(4) || match_byte(5) || match_byte(6) || match_byte(8) || match_byte(9) || match_byte(0xb) || match_byte(0xc)) +#endif + else if (match_u16(1)) { + int start_pos = pos; + char *title = get_string1(); + printf("%#x: title(\"%s\", ", start_pos, title); + if (!match_u32(2)) + match_u32_assert(0); + char *id = get_string1(); + printf("\"%s\")\n", id); match_byte_assert(0); + if (!match_u32(2)) + match_u32_assert(3); + match_u16_assert(1); + } + else //if (match_u16(2) || match_u16(3) || match_u16(4) || match_u16(5) || match_u16(6) || match_u16(7) || match_u16(8) || match_u16(9)) + skip_item("unknown"); +#if 0 + else if (match_byte(7) || match_byte(4) || match_byte(5) || match_byte(6) || match_byte(8) || match_byte(9) || match_byte(0xb) || match_byte(0xc) || match_byte(0x15) || match_byte(0x16) || match_byte(0x17) || match_byte(0x18) || match_byte(0x1e) || match_byte(0x1a)) + { + if (!match_byte(7)) + match_byte_assert(0); if (!match_u16(0x0e74)) match_byte_assert(0); match_byte_assert(0); @@ -1082,24 +1307,62 @@ parse_flexible(void) match_byte_assert(0); if (!match_u16(0x0e74)) { - match_zeros_assert(6); + match_zeros_assert(2); if (match_byte(0)) - match_zeros_assert(4); - else { - pos++; - match_byte(0); - match_u16_assert(0x0e74); + match_zeros_assert(3); + if (match_byte(0)) + match_zeros_assert(4); + else + { + pos++; + match_byte(0); + match_u16_assert(0x0e74); + } } } //match_byte_assert(0); } + else if (match_byte(0xd) || match_byte(0xe) || match_byte(0xf) + || match_byte(0x11) || match_byte(0x12) || match_byte(0x13) + || match_byte(0x14) || match_byte(0x1b)) + { + if (!match_byte(0x07)) + match_byte_assert(0); + if (!match_u16(0x0e74)) + match_zeros_assert(11); + else + match_byte_assert(0); + } + else if (match_byte(0xe3) || match_byte(0xdb) || match_byte(0xd8) || match_byte(0xe9) || match_byte(0xf3)) + { + match_byte_assert(0x0e); + match_byte_assert(0x74); + match_byte_assert(0x0e); + match_byte_assert(0); + } + else if (match_byte(0x9d) || match_byte(0x9e) || match_byte(0x9c)) + match_u32_assert(0x000e741a); + else if (match_byte(0x10)) + { + match_byte_assert(0); + if (match_byte(0)) + match_zeros_assert(10); + else + { + match_u16_assert(0x0e74); + match_byte_assert(0); + } + } + else if (match_byte(0x39) || match_byte(0x3a) || match_byte(0x3b)) + match_u32_assert(0x000e7409); else { //fprintf (stderr, "bad record start at offset %x: ", pos); hex_dump (stderr, pos, 64); assert(0); } +#endif } @@ -1160,7 +1423,7 @@ main(int argc, char *argv[]) data[n + i] = i % 2 ? 0xaa : 0x55; close(fd); - setvbuf (stdout, NULL, _IOLBF, 0); + setvbuf (stdout, NULL, _IONBF, 0); match_byte_assert(4); match_u32_assert(0); @@ -1168,6 +1431,18 @@ main(int argc, char *argv[]) match_u32_assert(1); match_byte_assert(0x63); + for (;;) + { + if (data[pos] == 0) + { + //printf("zero\n"); + pos++; + } + else + parse_flexible(); + } + exit(0); + parse_heading("NavRoot"); match_byte_assert(2); match_zeros_assert(32); @@ -1235,7 +1510,10 @@ main(int argc, char *argv[]) for (;;) { if (data[pos] == 0) - pos++; + { + //printf("zero\n"); + pos++; + } else parse_flexible(); } @@ -1319,7 +1597,10 @@ main(int argc, char *argv[]) while (data[pos] != 1) { if (data[pos] == 0) - pos++; + { + printf("zero\n"); + pos++; + } else parse_flexible(); }