X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui.cpp;h=0ff948f70e182f2c1f33761eece233f1e0383463;hb=f3e5bb2807319c210d124d6150e019130c54867b;hp=9c8ec59e80f39f6678d9016dc74875d5e5f0f52b;hpb=eaebdeb622e4c586a024073a10219c1313fb0919;p=virtualjaguar diff --git a/src/gui.cpp b/src/gui.cpp index 9c8ec59..0ff948f 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -7,7 +7,6 @@ #include "gui.h" -#include #include // For MacOS dependency #include #include @@ -23,12 +22,10 @@ #include "font14pt.h" // Also 15, 16, 17, 18 #include "guielements.h" #include "crc32.h" -#include "zlib.h" -#include "unzip.h" #include "sdlemu_opengl.h" #include "log.h" #include "jaguar.h" -#include "eeprom.h" +#include "file.h" using namespace std; // For STL stuff @@ -55,22 +52,16 @@ Window * Quit(void); Window * About(void); Window * MiscOptions(void); -int gzfilelength(gzFile gd); - -// External variables - -extern uint8 * jaguar_mainRam; -extern uint8 * jaguar_mainRom; -extern uint8 * jaguar_bootRom; -extern uint8 * jaguar_CDBootROM; -extern bool BIOSLoaded; -extern bool CDBIOSLoaded; - // Local global variables +bool showGUI = false; bool exitGUI = false; // GUI (emulator) done variable int mouseX = 0, mouseY = 0; uint32 background[1280 * 256]; // GUI background buffer +bool showMessage = false; +//uint32 showMessageTimeout; +//char messageBuffer[200]; +bool finished = false; const char separator[] = "--------------------------------------------------------"; @@ -942,7 +933,7 @@ FileList::FileList(uint32 x, uint32 y, uint32 w, uint32 h): Window(x, y, w, h) AddElement(load); load->SetNotificationElement(this); -//!!! FIX !!! Directory might not exist--this shouldn't cause VJ to crash! +#warning !!! FIX !!! Directory might not exist--this shouldn't cause VJ to crash! DIR * dp = opendir(vjs.ROMPath); dirent * de; @@ -1642,7 +1633,7 @@ WriteLog("GUI: Inside GUIMain...\n"); pointerBGSave[1] = 8; // Need to set things up so that it loads and runs a file if given on the command line. !!! FIX !!! [DONE] - extern uint32 * backbuffer; +// extern uint32 * backbuffer; // bool done = false; SDL_Event event; Window * mainWindow = NULL; @@ -2046,12 +2037,12 @@ doGPUDis = true;//*/ bool debounceRunKey = true; Window * RunEmu(void) { - extern uint32 * backbuffer; +// extern uint32 * backbuffer; uint32 * overlayPixels = (uint32 *)sdlemuGetOverlayPixels(); memset(overlayPixels, 0x00, 640 * 480 * 4); // Clear out overlay... //This is crappy... !!! FIX !!! - extern bool finished, showGUI; +// extern bool finished, showGUI; sdlemuDisableOverlay(); @@ -2225,321 +2216,3 @@ Window * MiscOptions(void) return window; } - - -// -// Generic ROM loading -// -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 !!! - uint32 romSize = 0; - -WriteLog("JaguarLoadROM: Attempting to load file '%s'...", path); - char * ext = strrchr(path, '.'); -if (ext == NULL) - WriteLog("FAILED!\n"); -else - WriteLog("Succeeded in finding extension (%s)!\n", ext); - - if (ext != NULL) - { - WriteLog("VJ: Loading \"%s\"...", path); - - if (strcasecmp(ext, ".zip") == 0) - { - // Handle ZIP file loading here... - WriteLog("(ZIPped)..."); - - if (load_zipped_file(0, 0, path, NULL, &rom, &romSize) == -1) - { - WriteLog("Failed!\n"); - return 0; - } - } - else - { -/* FILE * fp = fopen(path, "rb"); - - if (fp == NULL) - { - WriteLog("Failed!\n"); - return 0; - } - - fseek(fp, 0, SEEK_END); - romSize = ftell(fp); - fseek(fp, 0, SEEK_SET); - fread(rom, 1, romSize, fp); - fclose(fp);*/ - - // Handle gzipped files transparently [Adam Green]... - - gzFile fp = gzopen(path, "rb"); - - if (fp == NULL) - { - WriteLog("Failed!\n"); - return 0; - } - - romSize = gzfilelength(fp); - gzseek(fp, 0, SEEK_SET); - gzread(fp, rom, romSize); - gzclose(fp); - } - - WriteLog("OK (%i bytes)\n", romSize); - } - - return romSize; -} - -// -// Jaguar file loading -// -bool JaguarLoadFile(char * path) -{ -// jaguarRomSize = JaguarLoadROM(mem, path); - jaguarRomSize = JaguarLoadROM(jaguar_mainRom, 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); -// 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... - } - - jaguar_mainRom_crc32 = crc32_calcCheckSum(jaguar_mainRom, jaguarRomSize); - WriteLog("CRC: %08X\n", (unsigned int)jaguar_mainRom_crc32); - eeprom_init(); - - 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.) - 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--) - jaguar_mainRom[0x2000 + i] = jaguar_mainRom[i]; - - memset(jaguar_mainRom, 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(jaguar_mainRam, 0x10, 0x00001000); - SET16(jaguar_mainRam, 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 (jaguar_mainRom[0] == 0x60 && jaguar_mainRom[1] == 0x1B) - { - uint32 loadAddress = GET32(jaguar_mainRom, 0x16), //runAddress = GET32(jaguar_mainRom, 0x2A), - codeSize = GET32(jaguar_mainRom, 0x02) + GET32(jaguar_mainRom, 0x06); - WriteLog("GUI: Setting up homebrew (ABS-1)... Run address: %08X, length: %08X\n", loadAddress, codeSize); - - if (loadAddress < 0x800000) - memcpy(jaguar_mainRam + loadAddress, jaguar_mainRom + 0x24, codeSize); - else - { - for(int i=codeSize-1; i>=0; i--) - jaguar_mainRom[(loadAddress - 0x800000) + i] = jaguar_mainRom[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 (jaguar_mainRom[0] == 0x01 && jaguar_mainRom[1] == 0x50) - { - uint32 loadAddress = GET32(jaguar_mainRom, 0x28), runAddress = GET32(jaguar_mainRom, 0x24), - codeSize = GET32(jaguar_mainRom, 0x18) + GET32(jaguar_mainRom, 0x1C); - WriteLog("GUI: Setting up homebrew (ABS-2)... Run address: %08X, length: %08X\n", runAddress, codeSize); - - if (loadAddress < 0x800000) - memcpy(jaguar_mainRam + loadAddress, jaguar_mainRom + 0xA8, codeSize); - else - { - for(int i=codeSize-1; i>=0; i--) - jaguar_mainRom[(loadAddress - 0x800000) + i] = jaguar_mainRom[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 format: %02X %02X\n", jaguar_mainRom[0], jaguar_mainRom[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 (jaguar_mainRom[0] == 0x60 && jaguar_mainRom[1] == 0x1A) - { - uint32 loadAddress = GET32(jaguar_mainRom, 0x22), runAddress = GET32(jaguar_mainRom, 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(jaguar_mainRam + loadAddress, jaguar_mainRom + 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; -} - -// -// Get the length of a (possibly) gzipped file -// -int gzfilelength(gzFile gd) -{ - int size = 0, length = 0; - unsigned char buffer[0x10000]; - - gzrewind(gd); - - do - { - // Read in chunks until EOF - size = gzread(gd, buffer, 0x10000); - - if (size <= 0) - break; - - length += size; - } - while (!gzeof(gd)); - - gzrewind(gd); - return length; -}