release-win32.sh

@@ -2,15 +2,15 @@
 mkdir -p o
 
 # build compression functions (slow)
-~/c/mxe/usr/bin/i686-w64-mingw32.static-gcc -c -DNDEBUG -s -Ofast -flto -lm -Wall src/enc/*.c src/enc/lzo/*.c src/enc/ucl/comp/*.c src/enc/apultra/*.c
+i686-w64-mingw32.static-gcc -c -DNDEBUG -s -Ofast -flto -lm -Wall src/enc/*.c src/enc/lzo/*.c src/enc/ucl/comp/*.c src/enc/apultra/*.c
 mv *.o o
 
 # build stb functions (slow)
-~/c/mxe/usr/bin/i686-w64-mingw32.static-gcc -c -DNDEBUG src/stb/*.c -Wall -lm -s -Os -flto -lpthread -Wno-unused-function -Wno-unused-variable
+i686-w64-mingw32.static-gcc -c -DNDEBUG src/stb/*.c -Wall -lm -s -Os -flto -lpthread -Wno-unused-function -Wno-unused-variable
 mv *.o o
 
 # build everything else
-~/c/mxe/usr/bin/i686-w64-mingw32.static-gcc -o zzrtl.exe -DNDEBUG src/*.c o/*.o -Wall -lm -s -Os -flto -lpthread -Wno-unused-function -Wno-unused-variable
+i686-w64-mingw32.static-gcc -o zzrtl.exe -DNDEBUG src/*.c o/*.o -Wall -lm -s -Os -flto -lpthread -Wno-unused-function -Wno-unused-variable
 
 # move to bin directory
 mkdir -p bin/win32

src/sha1.h

@@ -52,6 +52,7 @@ static void stb__sha1(stb_uchar *chunk, stb_uint h[5])
    h[4] += e;
 }
 
+static
 void stb_sha1(stb_uchar output[20], stb_uchar *buffer, stb_uint len)
 {
    unsigned char final_block[128];
@@ -119,6 +120,7 @@ void stb_sha1(stb_uchar output[20], stb_uchar *buffer, stb_uint len)
 }
 
 // client can truncate this wherever they like
+static
 void stb_sha1_readable(char display[30], unsigned char sha[20])
 {
    char encoding[65] = "0123456789abcdefghijklmnopqrstuv"

src/wow.h

@@ -580,7 +580,28 @@ wow_system(char const *path)
 
 	return rval;
 #else /* not win32 unicode */
+	#ifdef _WIN32
 	return system(path);
+	#else
+	// allow win32 paths on linux builds
+	if (strchr(path, '\\'))
+	{
+		char *tmp = strdup(path);
+		int rval;
+
+		for (char *c = tmp; *c; ++c)
+			if (*c == '\\')
+				*c = '/';
+
+		rval = system(tmp);
+		free(tmp);
+		return rval;
+	}
+	else
+	{
+		return system(path);
+	}
+	#endif
 #endif
 }
 

src/xc.c

@@ -17,6 +17,7 @@
 #include "zzrtl.h"
 #include "preproc.h"
 #include "rnd.h" /* rnd_pcg */
+#include "sha1.h"
 
 #undef   fopen
 #undef   fread
@@ -227,7 +228,7 @@ zzrtl(void)
 	fprintf(
 		stderr, 
 		"/*************************\n"
-		" * zzrtl v1.0.5 <z64.me> *\n"
+		" * zzrtl v1.0.6 <z64.me> *\n"
 		" *************************/\n"
 	);
 	fprintf(
@@ -432,6 +433,8 @@ SCAT,SCMP,SCCM,EXIT
 	, ZZXC_string_list_file
 	, ZZXC_loadfile
 	, ZZXC_tsv_col_row
+	, ZZXC_sha1
+	, ZZXC_realloc
 /* directory */
 	, ZZXC_DIR_EXISTS
 	, ZZXC_DIR_ENTER
@@ -541,6 +544,8 @@ SCAT,SCMP,SCCM,EXIT
 " string_list_file " \
 " loadfile " \
 " tsv_col_row " \
+" sha1 " \
+" realloc " \
 /* directory */ \
 " dir_exists " \
 " dir_enter " \
@@ -647,6 +652,8 @@ SCAT,SCMP,SCCM,EXIT
 	",FSTR" /* string_list_file */ \
 	",LFIL" /* loadfile */ \
 	",TVCR" /* tsv_col_row */ \
+	",SHA1" /* sha1 */ \
+	",RALC" /* realloc */ \
 /* directory */ \
 	",DRXS" /* dir_exists */ \
 	",DREN" /* dir_enter */ \
@@ -2518,6 +2525,33 @@ ZZXC_FUNC_INST_STR[op * 5]
 		{
 			ax = (int)tsv_col_row((void *)sp[2], (char *)sp[1], *sp);
 		}
+
+		/* get sha1 checksum of a buffer */
+		else if (op == ZZXC_sha1)
+		{
+			unsigned char checksum[64];
+			char readable[64];
+
+			stb_sha1(checksum, (stb_uchar *)sp[1], *sp);
+			stb_sha1_readable(readable, checksum);
+
+			ax = (int)strdup(readable);
+		}
+
+		/* load a file */
+		else if (op == ZZXC_realloc)
+		{
+			void *src = (void*)sp[1];
+			int len = (REGXC_INT)*sp;
+			void *result = realloc(src, len);
+
+			//fprintf(stderr, "realloc %p %p\n", src, len);
+
+			ax = (int)result;
+
+			if (!result)
+				die("[!] realloc memory error");
+		}
 
 	/* directory */
 		else if (op == ZZXC_DIR_EXISTS)

src/zzrtl.c

@@ -1894,6 +1894,9 @@ loadfile(char *fn, int *sz, int optional)
 	if (!fn)
 		die_i("loadfile no filename given");
 
+	/* if fn starts with '*', grab by extension */
+	fn = find_extension(fn, 0);
+
 	data = file_load(fn, &Nsz, 16);
 	if (!data && !optional)
 		die_i("loadfile failed to load '%s'", fn);
@@ -2563,6 +2566,7 @@ rom_compress(struct rom *rom, char *enc, int mb)
 	int i;
 	float total_compressed = 0;
 	float total_decompressed = 0;
+	const float toMib = 1.0 / (1024 * 1024);
 
 	struct compThread *compThread = 0;
 	int numThread = 4; /* TODO make this external */
@@ -2923,8 +2927,8 @@ rom_compress(struct rom *rom, char *enc, int mb)
 #endif
 //		fprintf(stdout, "%08X: %08X %08X\n", dma - rom->dma, dma->Pstart, dma->Pend);
 //		fprintf(stdout, "%08X: %08X %08X %08X\n", dma - rom->dma, dma->start, dma->Pstart, dma->Pend);
-		if (dma->Pend > compsz)
-			die_i("i ran out of compressed rom space");
+		if (comp_total > compsz)
+			continue;
 
 		/* external cached file logic */
 		if (g_use_cache)
@@ -2941,6 +2945,16 @@ rom_compress(struct rom *rom, char *enc, int mb)
 			memcpy(dst, dma->compbuf, dma->compSz);
 		}
 	}
+
+	if (comp_total > compsz)
+		die_i(
+			"ran out of compressed rom space\n"
+			"(have: %.2f mib, need: %.2f mib)\n"
+			"(0x%X bytes over limit)"
+			, compsz * toMib, comp_total * toMib
+			, comp_total - compsz
+		);
+
 	fprintf(stderr, "success!\n");
 
 	fprintf(