X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ffile.cpp;h=71f33e7199ad6bd2b59088c2d3880990ddfba6e5;hb=2d556a3eb52664e928014a72ad18edc13281de7e;hp=1319dc8d48fb4fe4f1ce26e6961876acfe6deb9f;hpb=786e438a8bcaf738b84ab79733015ea2b1f4bbb9;p=virtualjaguar diff --git a/src/file.cpp b/src/file.cpp index 1319dc8..71f33e7 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -103,39 +103,34 @@ uint32 JaguarLoadROM(uint8 * &rom, char * path) } // -// Jaguar file loading (second stab at it...) +// Jaguar file loading // 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. (Now, we do! :-) uint8 * buffer = NULL; jaguarROMSize = JaguarLoadROM(buffer, path); -// 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... + // It's up to the GUI to report errors, not us. :-) + WriteLog("FILE: Could not load ROM from file \"%s\"...\nAborting load!\n", path); + return false; } -// jaguarMainROMCRC32 = crc32_calcCheckSum(jaguarMainROM, jaguarROMSize); jaguarMainROMCRC32 = crc32_calcCheckSum(buffer, 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); int fileType = ParseFileType(buffer[0], buffer[1], jaguarROMSize); + jaguarCartInserted = false; if (fileType == JST_ROM) { + jaguarCartInserted = true; memcpy(jagMemSpace + 0x800000, buffer, jaguarROMSize); delete[] buffer; return true; @@ -143,10 +138,7 @@ bool JaguarLoadFile(char * path) 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]; + WriteLog("FILE: Setting up Alpine ROM... Run address: 00802000, length: %08X\n", jaguarROMSize); memset(jagMemSpace + 0x800000, 0xFF, 0x2000); memcpy(jagMemSpace + 0x802000, buffer, jaguarROMSize); delete[] buffer; @@ -161,58 +153,28 @@ bool JaguarLoadFile(char * path) else if (fileType == JST_ABS_TYPE1) { // For ABS type 1, run address == load address -// uint32 loadAddress = GET32(jaguarMainROM, 0x16), -// codeSize = GET32(jaguarMainROM, 0x02) + GET32(jaguarMainROM, 0x06); uint32 loadAddress = GET32(buffer, 0x16), codeSize = GET32(buffer, 0x02) + GET32(buffer, 0x06); - WriteLog("GUI: Setting up homebrew (ABS-1)... Run address: %08X, length: %08X\n", loadAddress, codeSize); - -#if 0 - 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]; - } -#else + WriteLog("FILE: Setting up homebrew (ABS-1)... Run address: %08X, length: %08X\n", loadAddress, codeSize); memcpy(jagMemSpace + loadAddress, buffer + 0x24, codeSize); delete[] buffer; -#endif - 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); uint32 loadAddress = GET32(buffer, 0x28), runAddress = GET32(buffer, 0x24), codeSize = GET32(buffer, 0x18) + GET32(buffer, 0x1C); - WriteLog("GUI: Setting up homebrew (ABS-2)... Run address: %08X, length: %08X\n", runAddress, codeSize); - -#if 0 - 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]; - } -#else + WriteLog("FILE: Setting up homebrew (ABS-2)... Run address: %08X, length: %08X\n", runAddress, codeSize); memcpy(jagMemSpace + loadAddress, buffer + 0xA8, codeSize); delete[] buffer; -#endif - jaguarRunAddress = runAddress; return true; } else if (fileType == JST_JAGSERVER) { -// uint32 loadAddress = GET32(jaguarMainROM, 0x22), runAddress = GET32(jaguarMainROM, 0x2A); uint32 loadAddress = GET32(buffer, 0x22), runAddress = GET32(buffer, 0x2A); - WriteLog("GUI: Setting up homebrew (Jag Server)... Run address: %08X, length: %08X\n", runAddress, jaguarROMSize - 0x2E); -// memcpy(jaguarMainRAM + loadAddress, jaguarMainROM + 0x2E, jaguarROMSize - 0x2E); + WriteLog("FILE: Setting up homebrew (Jag Server)... Run address: %08X, length: %08X\n", runAddress, jaguarROMSize - 0x2E); memcpy(jagMemSpace + loadAddress, buffer + 0x2E, jaguarROMSize - 0x2E); delete[] buffer; jaguarRunAddress = runAddress; @@ -220,10 +182,47 @@ bool JaguarLoadFile(char * path) } // 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; } +// +// "Alpine" file loading +// Since the developers were coming after us with torches and pitchforks, we decided to +// allow this kind of thing. ;-) But ONLY FOR THE DEVS, DAMMIT! >:-U O_O +// +bool AlpineLoadFile(char * path) +{ + uint8 * buffer = NULL; + jaguarROMSize = JaguarLoadROM(buffer, path); + + if (jaguarROMSize == 0) + { + // It's up to the GUI to deal with failure, not us. ;-) + WriteLog("FILE: Could not load Alpine from file \"%s\"...\nAborting load!\n", path); + return false; + } + + jaguarMainROMCRC32 = crc32_calcCheckSum(buffer, jaguarROMSize); + WriteLog("CRC: %08X\n", (unsigned int)jaguarMainROMCRC32); + EepromInit(); + + jaguarRunAddress = 0x802000; + + WriteLog("FILE: Setting up Alpine ROM with non-standard length... Run address: 00802000, length: %08X\n", jaguarROMSize); + + memset(jagMemSpace + 0x800000, 0xFF, 0x2000); + memcpy(jagMemSpace + 0x802000, buffer, jaguarROMSize); + delete[] buffer; + +// 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); // Set Exception #4 (Illegal Instruction) + SET16(jaguarMainRAM, 0x1000, 0x60FE); // Here: bra Here + + return true; +} + // // Get the length of a (possibly) gzipped file // @@ -255,7 +254,15 @@ static int gzfilelength(gzFile gd) // static bool CheckExtension(const char * filename, const char * ext) { + // Sanity checking... + if ((filename == NULL) || (ext == NULL)) + return false; + const char * filenameExt = strrchr(filename, '.'); // Get the file's extension (if any) + + if (filenameExt == NULL) + return false; + return (strcasecmp(filenameExt, ext) == 0 ? true : false); } @@ -300,7 +307,8 @@ uint32 GetFileFromZIP(const char * zipFile, FileType type, uint8 * &buffer) if ((type == FT_SOFTWARE) && (CheckExtension(ze->name, ".j64") || CheckExtension(ze->name, ".rom") || CheckExtension(ze->name, ".abs") - || CheckExtension(ze->name, ".cof") || CheckExtension(ze->name, ".jag"))) + || CheckExtension(ze->name, ".cof") || CheckExtension(ze->name, ".coff") + || CheckExtension(ze->name, ".jag"))) { found = true; WriteLog("FILE: Found software file '%s'.\n", ze->name); @@ -364,7 +372,8 @@ uint32 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) + // (We also check for the Memory Track cartridge size here as well...) + if ((size % 1048576) == 0 || size == 131072) return JST_ROM; // If the file size + 8192 bytes is divisible by 1M, we probably have an