X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/rsbs2/blobdiff_plain/3772880c0ada686aad13f578c0e219ecc1bd4d85..e8563c43527e7f0fcb338069f39d74d252340d28:/rsb-lz.c diff --git a/rsb-lz.c b/rsb-lz.c index 4f077b1..c68ac8d 100644 --- a/rsb-lz.c +++ b/rsb-lz.c @@ -2,9 +2,11 @@ #include #include #include +#include #include #include "rsb-crc.h" #include "rsb-lz.h" +#include "filesystem.h" /* TODO: IMPLEMET THIS! */ /* Probably very broken lzw implementation by Agilent: @@ -426,39 +428,67 @@ * 59b80: 46335053 undefined */ -void fn_59560(unsigned int arg1) +void fn_59788(const char *fname) { - fprintf(stderr,"%s\n", __func__); -} - -void fn_59578(unsigned int arg1, unsigned int arg2, unsigned int arg3, unsigned int arg4) -{ - fprintf(stderr,"%s\n", __func__); -} - -void fn_59788() -{ - fprintf(stderr,"error extracting...\n"); + fprintf(stderr,"%s: error extracting...\n", fname); exit(1); } struct s_59b78 { - unsigned char *start; - unsigned char *stop; + unsigned char *start; /* 0 */ + unsigned char *stop; /* 4 */ unsigned char y; /* 8 */ unsigned char x; /* 9 */ }; -unsigned int fn_59848(struct s_59b78 *data) +unsigned char fn_597c8(struct s_59b78 *r6_data) { - fprintf(stderr,"%s\n", __func__); - return 0; + unsigned char *r0; + unsigned char *r1; + unsigned char r5; + + r5 = 0; + + r0 = r6_data->start; + r1 = r6_data->stop; + + if (r1 < r0) + fn_59788(__func__); + + r5 = *r0; + r0++; + r6_data->start = r0; + + return r5; } -unsigned int fn_597c8(struct s_59b78 *r11_data) +unsigned int fn_59848(struct s_59b78 *r6_data) { - fprintf(stderr,"%s\n", __func__); - return 0; + unsigned char r1; + unsigned char r2; + unsigned int r5; + + r1 = r6_data->y; + if (r1 == 0x80) { + r6_data->x = fn_597c8(r6_data); + } + r1 = r6_data->y; + r2 = r6_data->x; + r1 = r1 & r2; + r5 = r1 & 0xff; + + r1 = r6_data->y; + r1 = r1 >> 1; + r6_data->y = r1; + if (r1 == 0) { + r1 = 0x80; + r6_data->y = r1; + } + + if (r5 == 0) + return 0; + + return 1; } unsigned int fn_598b4(struct s_59b78 *r11_data, unsigned int r10_arg2) @@ -468,18 +498,16 @@ unsigned int fn_598b4(struct s_59b78 *r11_data, unsigned int r10_arg2) unsigned int r6; unsigned int r7; - fprintf(stderr,"%s\n", __func__); - r1 = r10_arg2 - 1; r6 = 1 << r1; r7 = 0; - do { + while (r6 != 0) { r1 = r11_data->y; if (r1 == 0x80) { r1 = fn_597c8(r11_data); + r11_data->x = r1; } - r11_data->x = r1; r1 = r11_data->y; r2 = r11_data->x; r1 = r1 & r2; @@ -496,7 +524,7 @@ unsigned int fn_598b4(struct s_59b78 *r11_data, unsigned int r10_arg2) if(r1 == 0) { r11_data->y = 0x80; } - } while (r6 != 0); + } return r7; } @@ -509,8 +537,10 @@ void fn_5980c(unsigned int arg1, unsigned int mem[]) r1 = (unsigned char*)mem[0]; r2 = (unsigned char*)mem[1]; - if (r1 >= r2) - fn_59788(); + if (r1 > r2) { + printf("r1: 0x%08x, r2: 0x%08x\n", (unsigned int)r1, (unsigned int)r2); + fn_59788(__func__); + } *r1 = arg1 & 0xff; @@ -518,56 +548,56 @@ void fn_5980c(unsigned int arg1, unsigned int mem[]) mem[0] = (unsigned int)r1; } -void fn_5993c(struct s_59b78 *data, unsigned int mem[]) +void fn_5993c(struct s_59b78 *r10_data, unsigned int r13_mem[]) { unsigned int r5; unsigned int r2; - unsigned int r4; + unsigned char r4; unsigned int r6; unsigned int r7; unsigned int r11; - unsigned char arr_59b64[1024]; + unsigned char arr_59b64[2048]; r5 = 1; - do { - do { - r2 = fn_59848(data); + while (1) { + while (1) { + r2 = fn_59848(r10_data); if (r2 == 0) break; - r2 = fn_598b4(data, 8) & 0xff; + r2 = fn_598b4(r10_data, 8) & 0xff; r4 = r2; - fn_5980c(r4, mem); + fn_5980c(r4, r13_mem); arr_59b64[r5] = r4 & 0xff; r2 = r5 + 1; r2 = r2 << 22; r2 = r2 >> 22; r5 = r2; - } while(1); + } - r11 = fn_598b4(data, 0x0a); + r11 = fn_598b4(r10_data, 0x0a); if(r11 == 0) return; - r2 = fn_598b4(data, 0x04); + r2 = fn_598b4(r10_data, 0x04); r7 = r2 + 1; r6 = 0; - do { + while (r6 <= r7) { r2 = r6 + r11; r2 = r2 << 22; r2 = r2 >> 22; r4 = arr_59b64[r2]; - fn_5980c(r4, mem); - arr_59b64[r5] = r4 & 0xff; + fn_5980c(r4, r13_mem); + arr_59b64[r5] = r4; r2 = r5 + 1; r2 = r2 << 22; r2 = r2 >> 22; r5 = r2; r6++; - } while(r6 <= r7); - } while(1); + } + } } unsigned int crc_check_59684(unsigned char *arg1, unsigned int arg2, unsigned int magic) @@ -581,9 +611,11 @@ unsigned int crc_check_59684(unsigned char *arg1, unsigned int arg2, unsigned in return 1; #endif + /* ??? */ r4 = *((unsigned int*)arg1 + 0x20); r5 = *((unsigned int*)arg1 + 0x24); + printf("magic: 0x%08x <-> 0x%08x\n", r5, magic); if (r5 != magic) return 2; @@ -602,11 +634,6 @@ unsigned int crc_check_59684(unsigned char *arg1, unsigned int arg2, unsigned in return 4; } -void fn_59508() -{ - fprintf(stderr,"%s\n", __func__); -} - void extract_lz_file(unsigned char *buf, unsigned char *name) { unsigned char *r3; @@ -617,29 +644,23 @@ void extract_lz_file(unsigned char *buf, unsigned char *name) struct s_59b78 struct1; unsigned int arr_59b7c[1024]; - r7 = malloc(1024*1024*1024); - r10 = r7 + (1024*1024*1024); + if (*((unsigned int*)r11) != LZ_MAGIC) + fn_59788(__func__); + + r3 = r11 + 4; + r5 = *((unsigned int*)r3); + printf(", length: %d", r5); - if (r7 == NULL) { + if ((r7 = malloc(r5)) == NULL) { perror("malloc"); exit(1); } - - fn_59578(0, 0, 0x3f, 0x33); - fn_59578(4, 0x10000000, 0x33, 0x366); - fn_59578(5, 0x14000000, 0x1b, 0x733); - fn_59578(7, 0xc0000000, 0x3b, 0x33); - fn_59560(0x1005); - - if (*((unsigned int*)r11) != LZ_MAGIC) - fn_59788(); - r3 = r11 + 4; - r5 = *((unsigned int*)r3); - printf(", Length: %d\n", r5); + r10 = r7 + r5; + bzero(r7, r5); r3 = r7 + r5; if (r3 > r10) - fn_59788(); + fn_59788(__func__); struct1.start = r11 + 8; struct1.stop = r5 + r11; @@ -651,38 +672,18 @@ void extract_lz_file(unsigned char *buf, unsigned char *name) fn_5993c(&struct1, arr_59b7c); +#if 0 + /* This seems to still be completely broken */ r3 = r7 + 0x20; r5 = *((unsigned int*)r3); - if (crc_check_59684(r7, r5, 0x46335053) != 0) - fn_59788(); - - fn_59508(); + if ((ret = crc_check_59684(r7, r5, 0x46335053)) != 0) { + printf("crc_check return: %d\n", ret); + fn_59788(__func__); + } +#endif + write_file((char*)name, r7, r5); + free(r7); } - -void search_lz_sections(unsigned char *fw, int len) -{ - int i; - unsigned char *j; - - for(i = 0; i < len - 4; i++) { - if (*((unsigned int*)(fw+i)) == LZ_MAGIC) { - j = fw + i - 1; - if (*j != 0x00) - continue; - printf("0x%02x: ", i); - j--; - while (j > fw) { - if (*j == 0x00) { - printf("%s", j+1); - extract_lz_file(fw + i, j+1); - break; - } - j--; - } - printf("\n"); - } - } -}