From: Shamus Hammons <jlhamm@acm.org>
Date: Wed, 22 Jun 2011 05:47:31 +0000 (+0000)
Subject: Rewrote file loading to be more sane and robust. Hopefully for the last time.
X-Git-Tag: 2.0.0~34^2~19
X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f400b282bbf71d7eab7d1f67828605f44b5445fd;p=virtualjaguar

Rewrote file loading to be more sane and robust. Hopefully for the last time.
---

diff --git a/src/file.cpp b/src/file.cpp
index 81b5e08..854507a 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -29,6 +29,13 @@
 
 static int gzfilelength(gzFile gd);
 static bool CheckExtension(const char * filename, const char * ext);
+static int ParseFileType(uint8 header1, uint8 header2, uint32 size);
+
+// Private variables/enums
+
+// JST = Jaguar Software Type
+enum { JST_NONE = 0, JST_ROM, JST_ALPINE, JST_ABS_TYPE1, JST_ABS_TYPE2, JST_JAGSERVER };
+//static int softwareType = JST_NONE;
 
 //
 // Generic ROM loading
@@ -98,24 +105,15 @@ uint32 JaguarLoadROM(uint8 * rom, char * path)
 //
 // Jaguar file loading
 //
-bool JaguarLoadFile(char * path)
+bool JaguarLoadFileOld(char * path)
 {
-//	jaguarRomSize = JaguarLoadROM(mem, path);
 	jaguarROMSize = JaguarLoadROM(jaguarMainROM, path);
 
-/*//This is not *nix friendly for some reason...
-//		if (!UserSelectFile(path, newPath))
-	if (!UserSelectFile((strlen(path) == 0 ? (char *)"." : path), newPath))
-	{
-		WriteLog("VJ: Could not find valid ROM in directory \"%s\"...\nAborting!\n", path);
-		log_done();
-		exit(0);
-	}*/
-
 	if (jaguarROMSize == 0)
 	{
 //			WriteLog("VJ: Could not load ROM from file \"%s\"...\nAborting!\n", newPath);
 		WriteLog("GUI: Could not load ROM from file \"%s\"...\nAborting load!\n", path);
+#warning "!!! Need error dialog here !!!"
 // Need to do something else here, like throw up an error dialog instead of aborting. !!! FIX !!!
 //		log_done();
 //		exit(0);
@@ -318,6 +316,101 @@ Start of Data Segment = 0x00803dd0
 	return true;
 }
 
+//
+// Jaguar file loading (second stab at it...)
+// We do a more intelligent file analysis here instead of relying on (possible false)
+// file extensions which people don't seem to give two shits about anyway. :-(
+//
+bool JaguarLoadFile(char * path)
+{
+// NOTE: We can further clean this up by fixing JaguarLoadROM to load to a buffer
+//       instead of assuming it goes into our ROM space.
+	jaguarROMSize = JaguarLoadROM(jaguarMainROM, path);
+
+	if (jaguarROMSize == 0)
+	{
+//			WriteLog("VJ: Could not load ROM from file \"%s\"...\nAborting!\n", newPath);
+		WriteLog("GUI: Could not load ROM from file \"%s\"...\nAborting load!\n", path);
+#warning "!!! Need error dialog here !!!"
+// Need to do something else here, like throw up an error dialog instead of aborting. !!! FIX !!!
+		return false;								// This is a start...
+	}
+
+	jaguarMainROMCRC32 = crc32_calcCheckSum(jaguarMainROM, jaguarROMSize);
+	WriteLog("CRC: %08X\n", (unsigned int)jaguarMainROMCRC32);
+// TODO: Check for EEPROM file in ZIP file. If there is no EEPROM in the user's EEPROM
+//       directory, copy the one from the ZIP file, if it exists.
+	EepromInit();
+	jaguarRunAddress = 0x802000;					// For non-BIOS runs, this is true
+	int fileType = ParseFileType(jaguarMainROM[0], jaguarMainROM[1], jaguarROMSize);
+
+	if (fileType == JST_ROM)
+		return true;
+	else if (fileType == JST_ALPINE)
+	{
+		// File extension ".ROM": Alpine image that loads/runs at $802000
+		WriteLog("GUI: Setting up Alpine ROM... Run address: 00802000, length: %08X\n", jaguarROMSize);
+
+		for(int i=jaguarROMSize-1; i>=0; i--)
+			jaguarMainROM[0x2000 + i] = jaguarMainROM[i];
+
+		memset(jaguarMainROM, 0xFF, 0x2000);
+
+// Maybe instead of this, we could try requiring the STUBULATOR ROM? Just a thought...
+		// Try setting the vector to say, $1000 and putting an instruction there that loops forever:
+		// This kludge works! Yeah!
+		SET32(jaguarMainRAM, 0x10, 0x00001000);
+		SET16(jaguarMainRAM, 0x1000, 0x60FE);		// Here: bra Here
+		return true;
+	}
+	else if (fileType == JST_ABS_TYPE1)
+	{
+		uint32 loadAddress = GET32(jaguarMainROM, 0x16),
+			codeSize = GET32(jaguarMainROM, 0x02) + GET32(jaguarMainROM, 0x06);
+		WriteLog("GUI: Setting up homebrew (ABS-1)... Run address: %08X, length: %08X\n", loadAddress, codeSize);
+
+		if (loadAddress < 0x800000)
+			memcpy(jaguarMainRAM + loadAddress, jaguarMainROM + 0x24, codeSize);
+		else
+		{
+			for(int i=codeSize-1; i>=0; i--)
+				jaguarMainROM[(loadAddress - 0x800000) + i] = jaguarMainROM[i + 0x24];
+		}
+
+		jaguarRunAddress = loadAddress;
+		return true;
+	}
+	else if (fileType == JST_ABS_TYPE2)
+	{
+		uint32 loadAddress = GET32(jaguarMainROM, 0x28), runAddress = GET32(jaguarMainROM, 0x24),
+			codeSize = GET32(jaguarMainROM, 0x18) + GET32(jaguarMainROM, 0x1C);
+		WriteLog("GUI: Setting up homebrew (ABS-2)... Run address: %08X, length: %08X\n", runAddress, codeSize);
+
+		if (loadAddress < 0x800000)
+			memcpy(jaguarMainRAM + loadAddress, jaguarMainROM + 0xA8, codeSize);
+		else
+		{
+			for(int i=codeSize-1; i>=0; i--)
+				jaguarMainROM[(loadAddress - 0x800000) + i] = jaguarMainROM[i + 0xA8];
+		}
+
+		jaguarRunAddress = runAddress;
+		return true;
+	}
+	else if (fileType == JST_JAGSERVER)
+	{
+		uint32 loadAddress = GET32(jaguarMainROM, 0x22), runAddress = GET32(jaguarMainROM, 0x2A);
+		WriteLog("GUI: Setting up homebrew (Jag Server)... Run address: %08X, length: %08X\n", runAddress, jaguarROMSize - 0x2E);
+		memcpy(jaguarMainRAM + loadAddress, jaguarMainROM + 0x2E, jaguarROMSize - 0x2E);
+		jaguarRunAddress = runAddress;
+		return true;
+	}
+
+	// We can assume we have JST_NONE at this point. :-P
+	// TODO: Add a dialog box that tells the user that they're trying to feed VJ a bogus file.
+	return false;
+}
+
 //
 // Get the length of a (possibly) gzipped file
 //
@@ -373,10 +466,14 @@ uint32 GetFileFromZIP(const char * zipFile, FileType type, uint8 * &buffer)
 		return 0;
 	}
 
-	while (readzip(zip))
+	zipent * ze;
+	bool found = false;
+
+	// The order is here is important: If the file is found, we need to short-circuit the
+	// readzip() call because otherwise, 'ze' will be pointing to the wrong file!
+	while (!found && readzip(zip))
 	{
-		zipent * ze = &zip->ent;
-		bool found = false;
+		ze = &zip->ent;
 
 		// Here we simply rely on the file extension to tell the truth, but we know
 		// that extensions lie like sons-a-bitches. So this is naive, we need to do
@@ -399,36 +496,158 @@ uint32 GetFileFromZIP(const char * zipFile, FileType type, uint8 * &buffer)
 			found = true;
 			WriteLog("FILE: Found EEPROM file '%s'.\n", ze->name);
 		}
+	}
 
-		if (found)
-		{
-			WriteLog("FILE: Uncompressing...");
+	uint32 fileSize = 0;
+
+	if (found)
+	{
+		WriteLog("FILE: Uncompressing...");
 // Insert file size sanity check here...
-			buffer = new uint8[ze->uncompressed_size];
+		buffer = new uint8[ze->uncompressed_size];
 
-			if (readuncompresszip(zip, ze, (char *)buffer) == 0)
-			{
-				WriteLog("success! (%u bytes)\n", ze->uncompressed_size);
-				closezip(zip);
-				return ze->uncompressed_size;
-			}
-			else
-			{
-				WriteLog("FAILED!\n");
-				delete[] buffer;
-				buffer = NULL;
-				closezip(zip);
-				return 0;
-			}
+		if (readuncompresszip(zip, ze, (char *)buffer) == 0)
+		{
+			fileSize = ze->uncompressed_size;
+			WriteLog("success! (%u bytes)\n", fileSize);
+		}
+		else
+		{
+			delete[] buffer;
+			buffer = NULL;
+			WriteLog("FAILED!\n");
 		}
 	}
+	else
+		// Didn't find what we're looking for...
+		WriteLog("FILE: Failed to find file of type %s...\n", ftStrings[type]);
 
 	closezip(zip);
+	return fileSize;
+}
 
-	WriteLog("FILE: Failed to find file of type %s...\n", ftStrings[type]);
-	// Didn't find what we're looking for...
-	return 0;
+//
+// Parse the file type based upon file size and/or headers.
+//
+static int ParseFileType(uint8 header1, uint8 header2, uint32 size)
+{
+	// If the file size is divisible by 1M, we probably have an regular ROM.
+	// We can also check our CRC32 against the internal ROM database to be sure.
+	if ((size % 1048576) == 0)
+		return JST_ROM;
+
+	// If the file size + 8192 bytes is divisible by 1M, we probably have an
+	// Alpine format ROM.
+	if (((size + 8192) % 1048576) == 0)
+		return JST_ALPINE;
+
+	// So much for low hanging fruit. Now try some other types.
+
+	// ABS/COFF type 1
+	if (header1 == 0x60 && header2 == 0x1B)
+		return JST_ABS_TYPE1;
+
+	// ABS/COFF type 2
+	if (header1 == 0x01 && header2 == 0x50)
+		return JST_ABS_TYPE2;
+
+	// Jag Server
+	if (header1 == 0x60 && header2 == 0x1A)
+		return JST_JAGSERVER;
+
+	// Headerless crap
+	return JST_NONE;
 }
 
-//ParseFileType, etc.
+#if 0
+// Misc. doco
 
+/*
+Stubulator ROM vectors...
+handler 001 at $00E00008
+handler 002 at $00E008DE
+handler 003 at $00E008E2
+handler 004 at $00E008E6
+handler 005 at $00E008EA
+handler 006 at $00E008EE
+handler 007 at $00E008F2
+handler 008 at $00E0054A
+handler 009 at $00E008FA
+handler 010 at $00000000
+handler 011 at $00000000
+handler 012 at $00E008FE
+handler 013 at $00E00902
+handler 014 at $00E00906
+handler 015 at $00E0090A
+handler 016 at $00E0090E
+handler 017 at $00E00912
+handler 018 at $00E00916
+handler 019 at $00E0091A
+handler 020 at $00E0091E
+handler 021 at $00E00922
+handler 022 at $00E00926
+handler 023 at $00E0092A
+handler 024 at $00E0092E
+handler 025 at $00E0107A
+handler 026 at $00E0107A
+handler 027 at $00E0107A
+handler 028 at $00E008DA
+handler 029 at $00E0107A
+handler 030 at $00E0107A
+handler 031 at $00E0107A
+handler 032 at $00000000
+
+Let's try setting up the illegal instruction vector for a stubulated jaguar...
+
+		SET32(jaguar_mainRam, 0x08, 0x00E008DE);
+		SET32(jaguar_mainRam, 0x0C, 0x00E008E2);
+		SET32(jaguar_mainRam, 0x10, 0x00E008E6);	// <-- Should be here (it is)...
+		SET32(jaguar_mainRam, 0x14, 0x00E008EA);//*/
+
+/*
+ABS Format sleuthing (LBUGDEMO.ABS):
+
+000000  60 1B 00 00 05 0C 00 04 62 C0 00 00 04 28 00 00
+000010  12 A6 00 00 00 00 00 80 20 00 FF FF 00 80 25 0C
+000020  00 00 40 00
+
+DRI-format file detected...
+Text segment size = 0x0000050c bytes
+Data segment size = 0x000462c0 bytes
+BSS Segment size = 0x00000428 bytes
+Symbol Table size = 0x000012a6 bytes
+Absolute Address for text segment = 0x00802000
+Absolute Address for data segment = 0x0080250c
+Absolute Address for BSS segment = 0x00004000
+
+(CRZDEMO.ABS):
+000000  01 50 00 03 00 00 00 00 00 03 83 10 00 00 05 3b
+000010  00 1c 00 03 00 00 01 07 00 00 1d d0 00 03 64 98
+000020  00 06 8b 80 00 80 20 00 00 80 20 00 00 80 3d d0
+
+000030  2e 74 78 74 00 00 00 00 00 80 20 00 00 80 20 00 .txt (+36 bytes)
+000040  00 00 1d d0 00 00 00 a8 00 00 00 00 00 00 00 00
+000050  00 00 00 00 00 00 00 20
+000058  2e 64 74 61 00 00 00 00 00 80 3d d0 00 80 3d d0 .dta (+36 bytes)
+000068  00 03 64 98 00 00 1e 78 00 00 00 00 00 00 00 00
+000078  00 00 00 00 00 00 00 40
+000080  2e 62 73 73 00 00 00 00 00 00 50 00 00 00 50 00 .bss (+36 bytes)
+000090  00 06 8b 80 00 03 83 10 00 00 00 00 00 00 00 00
+0000a0  00 00 00 00 00 00 00 80
+
+Header size is $A8 bytes...
+
+BSD/COFF format file detected...
+3 sections specified
+Symbol Table offset = 230160				($00038310)
+Symbol Table contains 1339 symbol entries	($0000053B)
+The additional header size is 28 bytes		($001C)
+Magic Number for RUN_HDR = 0x00000107
+Text Segment Size = 7632					($00001DD0)
+Data Segment Size = 222360					($00036498)
+BSS Segment Size = 428928					($00068B80)
+Starting Address for executable = 0x00802000
+Start of Text Segment = 0x00802000
+Start of Data Segment = 0x00803dd0
+*/
+#endif
diff --git a/src/gui/configwin.cpp b/src/gui/configwin.cpp
index 484e03b..f72c410 100644
--- a/src/gui/configwin.cpp
+++ b/src/gui/configwin.cpp
@@ -13,3 +13,4 @@
 
 #include "configwin.h"
 
+#warning "!!! I NEED TO BE WRITTEN !!! PLEASE WRITE ME !!!"