X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/rsbs2/blobdiff_plain/1f1fa7b6b361da6fba6ec7f651ca589cb81a88c5..2363a0d6a8cf44f7288e0795ff29e081ecf3a08f:/rsb-lz.c

diff --git a/rsb-lz.c b/rsb-lz.c
index 3e6e638..c90f5df 100644
--- a/rsb-lz.c
+++ b/rsb-lz.c
@@ -6,7 +6,7 @@
 #include <errno.h>
 #include "rsb-crc.h"
 #include "rsb-lz.h"
-#include "extract.h"
+#include "filesystem.h"
 
 /* TODO: IMPLEMET THIS! */
 /* Probably very broken lzw implementation by Agilent:
@@ -428,20 +428,25 @@
  * 59b80:	46335053 	undefined
  */
 
-void fn_59788(const char *fname)
+void err_exit(const char *fname)
 {
 	fprintf(stderr,"%s: error extracting...\n", fname);
 	exit(1);
 }
 
-struct s_59b78 {
+struct data_in_s {
 	unsigned char *start; /* 0 */
 	unsigned char *stop; /* 4 */
-	unsigned char y; /* 8 */
+	unsigned char bit; /* 8 */
 	unsigned char x; /* 9 */
 };
 
-unsigned char fn_597c8(struct s_59b78 *r6_data)
+struct data_out_s {
+	unsigned char *pos;
+	unsigned char *end;
+};
+
+unsigned char fn_597c8(struct data_in_s *r6_data)
 {
 	unsigned char *r0;
 	unsigned char *r1;
@@ -453,7 +458,7 @@ unsigned char fn_597c8(struct s_59b78 *r6_data)
 	r1 = r6_data->stop;
 
 	if (r1 < r0)
-		fn_59788(__func__);
+		err_exit(__func__);
 
 	r5 = *r0;
 	r0++;
@@ -462,27 +467,27 @@ unsigned char fn_597c8(struct s_59b78 *r6_data)
 	return r5;
 }
 
-unsigned int fn_59848(struct s_59b78 *r6_data)
+unsigned int fn_59848(struct data_in_s *r6_data)
 {
 	unsigned char r1;
 	unsigned char r2;
 	unsigned int r5;
 
-	r1 = r6_data->y;
+	r1 = r6_data->bit;
 	if (r1 == 0x80) {
 		r6_data->x = fn_597c8(r6_data);
 	}
-	r1 = r6_data->y;
+	r1 = r6_data->bit;
 	r2 = r6_data->x;
 	r1 = r1 & r2;
 	r5 = r1 & 0xff;
 
-	r1 = r6_data->y;
+	r1 = r6_data->bit;
 	r1 = r1 >> 1;
-	r6_data->y = r1;
+	r6_data->bit = r1;
 	if (r1 == 0) {
 		r1 = 0x80;
-		r6_data->y = r1;
+		r6_data->bit = r1;
 	}
 
 	if (r5 == 0)
@@ -491,7 +496,7 @@ unsigned int fn_59848(struct s_59b78 *r6_data)
 	return 1;
 }
 
-unsigned int fn_598b4(struct s_59b78 *r11_data, unsigned int r10_arg2)
+unsigned int fn_598b4(struct data_in_s *r11_data, unsigned int r10_arg2)
 {
 	unsigned int r1;
 	unsigned int r2;
@@ -503,12 +508,12 @@ unsigned int fn_598b4(struct s_59b78 *r11_data, unsigned int r10_arg2)
 
 	r7 = 0;
 	while (r6 != 0) {
-		r1 = r11_data->y;
+		r1 = r11_data->bit;
 		if (r1 == 0x80) {
 			r1 = fn_597c8(r11_data);
 			r11_data->x = r1;
 		}
-		r1 = r11_data->y;
+		r1 = r11_data->bit;
 		r2 = r11_data->x;
 		r1 = r1 & r2;
 		if (r1 != 0)
@@ -516,39 +521,39 @@ unsigned int fn_598b4(struct s_59b78 *r11_data, unsigned int r10_arg2)
 
 		r6 = r6 >> 1;
 
-		r2 = r11_data->y;
+		r2 = r11_data->bit;
 		r2 = r2 >> 1;
-		r11_data->y = r2;
+		r11_data->bit = r2;
 
-		r1 = r11_data->y;
+		r1 = r11_data->bit;
 		if(r1 == 0) {
-			r11_data->y = 0x80;
+			r11_data->bit = 0x80;
 		}
 	}
 
 	return r7;
 }
 
-void fn_5980c(unsigned int arg1, unsigned int mem[])
+void fn_5980c(unsigned int arg1, struct data_out_s *data_out)
 {
 	unsigned char *r1;
 	unsigned char *r2;
 
-	r1 = (unsigned char*)mem[0];
-	r2 = (unsigned char*)mem[1];
+	r1 = data_out->pos;
+	r2 = data_out->end;
 
 	if (r1 > r2) {
 		printf("r1: 0x%08x, r2: 0x%08x\n", (unsigned int)r1, (unsigned int)r2);
-		fn_59788(__func__);
+		err_exit(__func__);
 	}
 
 	*r1 = arg1 & 0xff;
 
 	r1++;
-	mem[0] = (unsigned int)r1;
+	data_out->pos = r1;
 }
 
-void fn_5993c(struct s_59b78 *r10_data, unsigned int r13_mem[])
+void lz_expand(struct data_in_s *r10_data, struct data_out_s *data_out)
 {
 	unsigned int r5;
 	unsigned int r2;
@@ -569,7 +574,7 @@ void fn_5993c(struct s_59b78 *r10_data, unsigned int r13_mem[])
 			r2 = fn_598b4(r10_data, 8) & 0xff;
 			r4 = r2;
 
-			fn_5980c(r4, r13_mem);
+			fn_5980c(r4, data_out);
 			arr_59b64[r5] = r4 & 0xff;
 			r2 = r5 + 1;
 			r2 = r2 << 22;
@@ -589,7 +594,7 @@ void fn_5993c(struct s_59b78 *r10_data, unsigned int r13_mem[])
 			r2 = r2 << 22;
 			r2 = r2 >> 22;
 			r4 = arr_59b64[r2];
-			fn_5980c(r4, r13_mem);
+			fn_5980c(r4, data_out);
 			arr_59b64[r5] = r4;
 			r2 = r5 + 1;
 			r2 = r2 << 22;
@@ -634,43 +639,35 @@ unsigned int crc_check_59684(unsigned char *arg1, unsigned int arg2, unsigned in
 	return 4;
 }
 
-void extract_lz_file(unsigned char *buf, unsigned char *name)
+void extract_lz_file(unsigned char *inbuf, unsigned char *name)
 {
-	unsigned char *r3;
-	unsigned int r5;
-	unsigned char *r7 = NULL; /* Arg1, mem start */
-	unsigned char *r10 = NULL; /* Arg2, mem end */
-	unsigned char *r11 = buf; /* Arg3 */
-	struct s_59b78 struct1;
-	unsigned int arr_59b7c[1024];
+	unsigned int len;
+	unsigned char *outbuf;
+	struct data_in_s data_in;
+	struct data_out_s data_out;
 
-	if (*((unsigned int*)r11) != LZ_MAGIC)
-		fn_59788(__func__);
+	if (*((unsigned int*)inbuf) != LZ_MAGIC)
+		err_exit(__func__);
 
-	r3 = r11 + 4;
-	r5 = *((unsigned int*)r3);
-	printf(", length: %d", r5);
+	len = *((unsigned int*)(inbuf + 4));
+	printf(", length: %d", len);
 
-	if ((r7 = malloc(r5)) == NULL) {
+	if ((outbuf = malloc(len)) == NULL) {
 		perror("malloc");
 		exit(1);
 	}
-	r10 = r7 + r5;
-	bzero(r7, r5);
 
-	r3 = r7 + r5;
-	if (r3 > r10)
-		fn_59788(__func__);
-	
-	struct1.start = r11 + 8;
-	struct1.stop = r5 + r11;
-	struct1.x = 0;
-	struct1.y = 0x80;
+	bzero(outbuf, len);
+
+	data_in.start = inbuf + 8;
+	data_in.stop = inbuf + len;
+	data_in.x = 0;
+	data_in.bit = 0x80;
 
-	arr_59b7c[0] = (unsigned int)r7;
-	arr_59b7c[1] = (unsigned int)(r5 + r7);
+	data_out.pos = outbuf;
+	data_out.end = outbuf + len;
 
-	fn_5993c(&struct1, arr_59b7c);
+	lz_expand(&data_in, &data_out);
 
 #if 0
 	/* This seems to still be completely broken */
@@ -679,11 +676,11 @@ void extract_lz_file(unsigned char *buf, unsigned char *name)
 
 	if ((ret = crc_check_59684(r7, r5, 0x46335053)) != 0) {
 		printf("crc_check return: %d\n", ret);
-		fn_59788(__func__);
+		err_exit(__func__);
 	}
 #endif
 
-	write_file((char*)name, r7, r5);
+	write_file((char*)name, outbuf, len);
 	
-	free(r7);
+	free(outbuf);
 }