X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ffile.cpp;h=7fd96ef59edaad467be216dbc7e9875928aac9c7;hb=80871c4045dd1aa9b60e03b9cc92e7d2835a2387;hp=78b4233c6eb53cda59df23bdfabd8e06be021915;hpb=5da604521611a960140b58a2fb0f236c65610b70;p=virtualjaguar diff --git a/src/file.cpp b/src/file.cpp index 78b4233..7fd96ef 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -38,7 +38,7 @@ static bool CheckExtension(const char * filename, const char * ext); // // Generic ROM loading // -uint32 JaguarLoadROM(uint8 * rom, char * path) +uint32 JaguarLoadROM(uint8 * &rom, char * path) { // We really should have some kind of sanity checking for the ROM size here to prevent // a buffer overflow... !!! FIX !!! @@ -65,8 +65,9 @@ uint32 JaguarLoadROM(uint8 * rom, char * path) // Handle ZIP file loading here... WriteLog("(ZIPped)..."); - uint8_t * buffer = NULL; - romSize = GetFileFromZIP(path, FT_SOFTWARE, buffer); +// uint8_t * buffer = NULL; +// romSize = GetFileFromZIP(path, FT_SOFTWARE, buffer); + romSize = GetFileFromZIP(path, FT_SOFTWARE, rom); if (romSize == 0) { @@ -74,8 +75,8 @@ uint32 JaguarLoadROM(uint8 * rom, char * path) return 0; } - memcpy(rom, buffer, romSize); - delete[] buffer; +// memcpy(rom, buffer, romSize); +// delete[] buffer; } else { @@ -90,6 +91,7 @@ uint32 JaguarLoadROM(uint8 * rom, char * path) } romSize = gzfilelength(fp); + rom = new uint8[romSize]; gzseek(fp, 0, SEEK_SET); gzread(fp, rom, romSize); gzclose(fp); @@ -102,257 +104,44 @@ uint32 JaguarLoadROM(uint8 * rom, char * path) // // Jaguar file loading -// -bool JaguarLoadFileOld(char * 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 !!! -// log_done(); -// exit(0); - return false; // This is a start... - } - - jaguarMainROMCRC32 = crc32_calcCheckSum(jaguarMainROM, jaguarROMSize); - WriteLog("CRC: %08X\n", (unsigned int)jaguarMainROMCRC32); - EepromInit(); - - jaguarRunAddress = 0x802000; - - char * ext = strrchr(path, '.'); // Get the file's extension for non-cartridge checking - -//NOTE: Should fix JaguarLoadROM() to replace .zip with what's *in* the zip (.abs, .j64, etc.) -#warning "!!! Need more robust file type checking in JaguarLoadROM() !!!" - if (strcasecmp(ext, ".rom") == 0) - { - // File extension ".ROM": Alpine image that loads/runs at $802000 - WriteLog("GUI: Setting up homebrew (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); -/* memcpy(jaguar_mainRam, jaguar_mainRom, jaguarRomSize); - memset(jaguar_mainRom, 0xFF, 0x600000); - memcpy(jaguar_mainRom + 0x2000, jaguar_mainRam, jaguarRomSize); - memset(jaguar_mainRam, 0x00, 0x400000);*/ - -/* -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);//*/ - - // 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 - } - else if (strcasecmp(ext, ".abs") == 0) - { - // File extension ".ABS": Atari linker output file with header (w/o is useless to us here) - -/* -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 -*/ - if (jaguarMainROM[0] == 0x60 && jaguarMainROM[1] == 0x1B) - { - uint32 loadAddress = GET32(jaguarMainROM, 0x16), //runAddress = GET32(jaguar_mainRom, 0x2A), - 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]; -/* memcpy(jaguar_mainRam, jaguar_mainRom + 0x24, codeSize); - memset(jaguar_mainRom, 0xFF, 0x600000); - memcpy(jaguar_mainRom + (loadAddress - 0x800000), jaguar_mainRam, codeSize); - memset(jaguar_mainRam, 0x00, 0x400000);*/ - } - - jaguarRunAddress = loadAddress; - } - else if (jaguarMainROM[0] == 0x01 && jaguarMainROM[1] == 0x50) - { - 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]; -/* memcpy(jaguar_mainRam, jaguar_mainRom + 0xA8, codeSize); - memset(jaguar_mainRom, 0xFF, 0x600000); - memcpy(jaguar_mainRom + (loadAddress - 0x800000), jaguar_mainRam, codeSize); - memset(jaguar_mainRam, 0x00, 0x400000);*/ - } - - jaguarRunAddress = runAddress; - } - else - { - WriteLog("GUI: Couldn't find correct ABS/COF format: %02X %02X\n", jaguarMainROM[0], jaguarMainROM[1]); - return false; - } - } - else if (strcasecmp(ext, ".jag") == 0) - { - // File extension ".JAG": Atari server file with header -//NOTE: The bytes 'JAGR' should also be at position $1C... -// Also, there's *always* a $601A header at position $00... - if (jaguarMainROM[0] == 0x60 && jaguarMainROM[1] == 0x1A) - { - uint32 loadAddress = GET32(jaguarMainROM, 0x22), runAddress = GET32(jaguarMainROM, 0x2A); -//This is not always right! Especially when converted via bin2jag1!!! -//We should have access to the length of the furshlumiger file that was loaded anyway! -//Now, we do! ;-) -// uint32 progLength = GET32(jaguar_mainRom, 0x02); -//jaguarRomSize -//jaguarRunAddress -// WriteLog("Jaguar: Setting up PD ROM... Run address: %08X, length: %08X\n", runAddress, progLength); -// memcpy(jaguar_mainRam + loadAddress, jaguar_mainRom + 0x2E, progLength); - WriteLog("GUI: Setting up homebrew (JAG)... Run address: %08X, length: %08X\n", runAddress, jaguarROMSize - 0x2E); - memcpy(jaguarMainRAM + loadAddress, jaguarMainROM + 0x2E, jaguarROMSize - 0x2E); -// SET32(jaguar_mainRam, 4, runAddress); - jaguarRunAddress = runAddress; - } - else - return false; - } - // .J64 (Jaguar cartridge ROM image) is implied by the FileList object... - - 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); + uint8 * buffer = NULL; + jaguarROMSize = JaguarLoadROM(buffer, 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; + } 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); + 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; // 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: @@ -363,52 +152,77 @@ bool JaguarLoadFile(char * path) } 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]; - } - + // For ABS type 1, run address == load address + uint32 loadAddress = GET32(buffer, 0x16), + codeSize = GET32(buffer, 0x02) + GET32(buffer, 0x06); + WriteLog("FILE: Setting up homebrew (ABS-1)... Run address: %08X, length: %08X\n", loadAddress, codeSize); + memcpy(jagMemSpace + loadAddress, buffer + 0x24, codeSize); + delete[] buffer; 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]; - } - + uint32 loadAddress = GET32(buffer, 0x28), runAddress = GET32(buffer, 0x24), + codeSize = GET32(buffer, 0x18) + GET32(buffer, 0x1C); + WriteLog("FILE: Setting up homebrew (ABS-2)... Run address: %08X, length: %08X\n", runAddress, codeSize); + memcpy(jagMemSpace + loadAddress, buffer + 0xA8, codeSize); + delete[] buffer; 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); + uint32 loadAddress = GET32(buffer, 0x22), runAddress = GET32(buffer, 0x2A); + 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; 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; } +// +// "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); + SET16(jaguarMainRAM, 0x1000, 0x60FE); // Here: bra Here + + return true; +} + // // Get the length of a (possibly) gzipped file // @@ -440,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); } @@ -483,7 +305,9 @@ uint32 GetFileFromZIP(const char * zipFile, FileType type, uint8 * &buffer) WriteLog("FILE: Found image file '%s'.\n", ze->name); } - if ((type == FT_SOFTWARE) && (CheckExtension(ze->name, ".j64") || CheckExtension(ze->name, ".rom") || CheckExtension(ze->name, ".abs") || CheckExtension(ze->name, ".cof"))) + if ((type == FT_SOFTWARE) && (CheckExtension(ze->name, ".j64") + || CheckExtension(ze->name, ".rom") || CheckExtension(ze->name, ".abs") + || CheckExtension(ze->name, ".cof") || CheckExtension(ze->name, ".jag"))) { found = true; WriteLog("FILE: Found software file '%s'.\n", ze->name); @@ -529,17 +353,7 @@ uint32 GetFileFromZIP(const char * zipFile, FileType type, uint8 * &buffer) // 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) - 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. + // Check headers first... // ABS/COFF type 1 if (header1 == 0x60 && header2 == 0x1B) @@ -553,6 +367,19 @@ uint32 ParseFileType(uint8 header1, uint8 header2, uint32 size) if (header1 == 0x60 && header2 == 0x1A) return JST_JAGSERVER; + // And if that fails, try file sizes... + + // 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. + // (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 + // Alpine format ROM. + if (((size + 8192) % 1048576) == 0) + return JST_ALPINE; + // Headerless crap return JST_NONE; }