X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui.cpp;h=1278a2689c8b5ad382f507c88902f05ef47b66d1;hb=6aa04f4c35e217f50ffb0c4bb11af9f3a0db8a31;hp=5575496243fac23d18a63697fc3f31cd2a96f4eb;hpb=ee350277fa74790fbd2611b9434cbb30f3b2472d;p=virtualjaguar diff --git a/src/gui.cpp b/src/gui.cpp index 5575496..1278a26 100644 --- a/src/gui.cpp +++ b/src/gui.cpp @@ -5,13 +5,14 @@ // by James L. Hammons // +#include +#include // For MacOS dependency #include #include #include #include #include -#include // For toupper() -#include "types.h" +#include // For toupper() #include "settings.h" #include "tom.h" #include "video.h" @@ -27,11 +28,12 @@ using namespace std; // For STL stuff class Window; // Forward declaration... -void DrawTransparentBitmap(int16 * screen, uint32 x, uint32 y, uint16 * bitmap); +void DrawTransparentBitmap(int16 * screen, uint32 x, uint32 y, uint16 * bitmap, uint8 * alpha = NULL); void DrawStringTrans(int16 * screen, uint32 x, uint32 y, uint16 color, uint8 opacity, const char * text, ...); void DrawStringOpaque(int16 * screen, uint32 x, uint32 y, uint16 color1, uint16 color2, const char * text, ...); Window * LoadROM(void); Window * ResetJaguar(void); +Window * ResetJaguarCD(void); Window * RunEmu(void); Window * Quit(void); Window * About(void); @@ -42,12 +44,17 @@ int gzfilelength(gzFile gd); // External variables extern uint8 * jaguar_mainRam; -extern uint8 * jaguar_bootRom; extern uint8 * jaguar_mainRom; +extern uint8 * jaguar_bootRom; +extern uint8 * jaguar_CDBootROM; +extern bool BIOSLoaded; +extern bool CDBIOSLoaded; // Local global variables +bool exitGUI = false; // GUI (emulator) done variable int mouseX, mouseY; +uint16 background[1280 * 240]; // GUI background buffer uint16 mousePic[] = { 6, 8, @@ -118,27 +125,49 @@ uint16 downArrowBox[] = { uint16 pushButtonUp[] = { 8, 8, - 0x0000,0x0000,0x0000,0x000A,0x000A,0x0000,0x0000,0x0000, // ...##... - 0x0000,0x000A,0x000A,0x000A,0x000A,0x000A,0x000A,0x0000, // .######. - 0x0000,0x000A,0x000A,0x000A,0x000A,0x000A,0x000A,0x0000, // .######. - 0x000A,0x000A,0x000A,0x000A,0x000A,0x000A,0x000A,0x000A, // ######## - 0x000A,0x000A,0x000A,0x000A,0x000A,0x000A,0x000A,0x000A, // ######## - 0x0000,0x000A,0x000A,0x000A,0x000A,0x000A,0x000A,0x0000, // .######. - 0x0000,0x000A,0x000A,0x000A,0x000A,0x000A,0x000A,0x0000, // .######. - 0x0000,0x0000,0x0000,0x000A,0x000A,0x0000,0x0000,0x0000 // ...##... + 0x0000, 0x0C63, 0x394A, 0x494A, 0x4108, 0x2CC6, 0x0421, 0x0000, + 0x0C63, 0x518C, 0x48E7, 0x48C6, 0x48A5, 0x48A5, 0x3CE7, 0x0421, + 0x3D4A, 0x48E7, 0x48C6, 0x48C6, 0x44A5, 0x48A5, 0x48A5, 0x2CC6, + 0x494A, 0x48C6, 0x48C6, 0x44A5, 0x44A5, 0x44A5, 0x48A5, 0x40E7, + 0x4529, 0x48A5, 0x44A5, 0x44A5, 0x44A5, 0x44A5, 0x4CA5, 0x40E7, + 0x2CC6, 0x48A5, 0x48A5, 0x44A5, 0x44A5, 0x48A5, 0x4CA5, 0x2CC6, + 0x0421, 0x3CE7, 0x48A5, 0x48A5, 0x4CA5, 0x4CA5, 0x44E7, 0x0421, + 0x0000, 0x0421, 0x28C6, 0x40E7, 0x40E7, 0x2CC6, 0x0421, 0x0000 +}; + +uint8 pbuAlpha[] = { + 0xFF, 0xE4, 0xA0, 0x99, 0xA4, 0xBE, 0xF0, 0xFF, + 0xE3, 0x85, 0x00, 0x00, 0x00, 0x00, 0xAF, 0xF0, + 0x9F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, + 0x98, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAD, + 0xA3, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAC, + 0xBD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBF, + 0xF1, 0xAD, 0x00, 0x00, 0x00, 0x00, 0xAC, 0xF1, + 0xFF, 0xF2, 0xC0, 0xAD, 0xAD, 0xC0, 0xF2, 0xFF }; uint16 pushButtonDown[] = { 8, 8, - 0x0000,0x0000,0x0000,0x000A,0x000A,0x0000,0x0000,0x0000, // ...@@... - 0x0000,0x000A,0x000A,0x0C7F,0x0C7F,0x000A,0x000A,0x0000, // .@@##@@. - 0x0000,0x000A,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x000A,0x0000, // .@####@. - 0x000A,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x000A, // @######@ - 0x000A,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x000A, // @######@ - 0x0000,0x000A,0x0C7F,0x0C7F,0x0C7F,0x0C7F,0x000A,0x0000, // .@####@. - 0x0000,0x000A,0x000A,0x0C7F,0x0C7F,0x000A,0x000A,0x0000, // .@@##@@. - 0x0000,0x0000,0x0000,0x000A,0x000A,0x0000,0x0000,0x0000 // ...@@... + 0x0000, 0x0C63, 0x4A31, 0x5631, 0x4DCE, 0x2D4A, 0x0421, 0x0000, + 0x0C63, 0x6AF7, 0x714A, 0x7908, 0x7908, 0x6908, 0x418C, 0x0421, + 0x4A31, 0x714A, 0x7508, 0x6CE7, 0x6CE7, 0x74E7, 0x68E7, 0x2929, + 0x5A31, 0x7908, 0x6CE7, 0x6CE7, 0x6CE7, 0x6CE7, 0x78E7, 0x3D6B, + 0x4DCE, 0x7908, 0x6CE7, 0x6CE7, 0x6CE7, 0x6CE7, 0x78E7, 0x416B, + 0x2D4A, 0x6D08, 0x74E7, 0x6CE7, 0x6CE7, 0x74E7, 0x6CE7, 0x2929, + 0x0842, 0x418C, 0x6CE7, 0x78E7, 0x78E7, 0x6CE7, 0x416B, 0x0842, + 0x0000, 0x0842, 0x2929, 0x416B, 0x416B, 0x2929, 0x0842, 0x0000 +}; + +uint8 pbdAlpha[] = { + 0xFF, 0xE4, 0x72, 0x68, 0x7E, 0xA7, 0xF0, 0xFF, + 0xE4, 0x3E, 0x00, 0x00, 0x00, 0x00, 0x93, 0xF0, + 0x71, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB2, + 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9A, + 0x7D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9A, + 0xA6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB1, + 0xEF, 0x91, 0x00, 0x00, 0x00, 0x00, 0x96, 0xEF, + 0xFF, 0xEF, 0xAE, 0x98, 0x97, 0xAF, 0xEF, 0xFF }; uint16 slideSwitchUp[] = { @@ -198,8 +227,6 @@ uint16 slideSwitchDown[] = { char separator[] = "--------------------------------------------------------"; -uint16 background[1280 * 240]; - // // Case insensitive string compare function // Taken straight out of Thinking In C++ by Bruce Eckel. Thanks Bruce! @@ -210,9 +237,9 @@ int stringCmpi(const string &s1, const string &s2) // Select the first element of each string: string::const_iterator p1 = s1.begin(), p2 = s2.begin(); - while (p1 != s1.end() && p2 != s2.end()) // Don’t run past the end + while (p1 != s1.end() && p2 != s2.end()) // Don’t run past the end { - if (toupper(*p1) != toupper(*p2)) // Compare upper-cased chars + if (toupper(*p1) != toupper(*p2)) // Compare upper-cased chars return (toupper(*p1) < toupper(*p2) ? -1 : 1);// Report which was lexically greater p1++; @@ -234,7 +261,7 @@ class Element public: Element(uint32 x = 0, uint32 y = 0, uint32 w = 0, uint32 h = 0) { extents.x = x, extents.y = y, extents.w = w, extents.h = h; } - virtual void HandleKey(SDLKey key) = 0; + virtual void HandleKey(SDLKey key) = 0; // These are "pure" virtual functions... virtual void HandleMouseMove(uint32 x, uint32 y) = 0; virtual void HandleMouseButton(uint32 x, uint32 y, bool mouseDown) = 0; virtual void Draw(uint32, uint32) = 0; @@ -253,6 +280,7 @@ class Element static uint32 pitch; }; +// Initialize class variables (Element) int16 * Element::screenBuffer = NULL; uint32 Element::pitch = 0; @@ -351,6 +379,9 @@ class PushButton: public Element { // How to handle? // Save state externally? +//We pass in a state variable if we want to track it externally, otherwise we use our own +//internal state var. Still need to do some kind of callback for pushbuttons that do things +//like change from fullscreen to windowed... !!! FIX !!! public: // PushButton(uint32 x = 0, uint32 y = 0, uint32 w = 0, uint32 h = 0): Element(x, y, w, h), @@ -432,7 +463,8 @@ void PushButton::Draw(uint32 offsetX/*= 0*/, uint32 offsetY/*= 0*/) } }*/ - DrawTransparentBitmap(screenBuffer, extents.x + offsetX, extents.y + offsetY, (*state ? pushButtonDown : pushButtonUp)); +// DrawTransparentBitmap(screenBuffer, extents.x + offsetX, extents.y + offsetY, (*state ? pushButtonDown : pushButtonUp)); + DrawTransparentBitmap(screenBuffer, extents.x + offsetX, extents.y + offsetY, (*state ? pushButtonDown : pushButtonUp), (*state ? pbdAlpha : pbuAlpha)); if (text.length() > 0) DrawString(screenBuffer, extents.x + offsetX + 12, extents.y + offsetY, false, "%s", text.c_str()); } @@ -442,6 +474,7 @@ class SlideSwitch: public Element { // How to handle? // Save state externally? +//Seems to be handled the same as PushButton, but without sanity checks. !!! FIX !!! public: SlideSwitch(uint32 x, uint32 y, bool * st, string s1, string s2): Element(x, y, 8, 16), state(st), @@ -752,7 +785,7 @@ void ListBox::HandleMouseMove(uint32 x, uint32 y) if (newThumbStart < 0) newThumbStart = 0; - if (newThumbStart > sbHeight - thumb) + if ((uint32)newThumbStart > sbHeight - thumb) newThumbStart = sbHeight - thumb; windowPtr = (uint32)(((float)newThumbStart / (float)sbHeight) * (float)item.size()); @@ -766,13 +799,13 @@ void ListBox::HandleMouseButton(uint32 x, uint32 y, bool mouseDown) if (Inside(x, y) && mouseDown) { // Why do we have to do this??? (- extents.y?) - // I guess it's because only the Window class has offsetting implemented... + // I guess it's because only the Window class has offsetting implemented... !!! FIX !!! cursor = (y - extents.y) / 8; } // Check for a hit on the scrollbar... - if (x > (extents.x + extents.w) && x <= (extents.x + extents.w + 8) - && y > (extents.y + 8) && y <= (extents.y + extents.h - 16)) + if (x > (uint32)(extents.x + extents.w) && x <= (uint32)(extents.x + extents.w + 8) + && y > (uint32)(extents.y + 8) && y <= (uint32)(extents.y + extents.h - 16)) { if (mouseDown) { @@ -785,10 +818,15 @@ void ListBox::HandleMouseButton(uint32 x, uint32 y, bool mouseDown) if (y >= (extents.y + 8 + thumbStart) && y < (extents.y + 8 + thumbStart + thumb)) thumbClicked = true, yRelativePoint = y - thumbStart; } - else - thumbClicked = false; +//Seems that this is useless--never reached except in rare cases and that the code outside is +//more effective... +// else +// thumbClicked = false; } + if (!mouseDown) + thumbClicked = false; + upArrow.HandleMouseButton(x - extents.x, y - extents.y, mouseDown); downArrow.HandleMouseButton(x - extents.x, y - extents.y, mouseDown); upArrow2.HandleMouseButton(x - extents.x, y - extents.y, mouseDown); @@ -902,6 +940,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! DIR * dp = opendir(vjs.ROMPath); dirent * de; @@ -910,7 +949,9 @@ FileList::FileList(uint32 x, uint32 y, uint32 w, uint32 h): Window(x, y, w, h) char * ext = strrchr(de->d_name, '.'); if (ext != NULL) - if (stricmp(ext, ".zip") == 0 || stricmp(ext, ".jag") == 0) + if (strcasecmp(ext, ".zip") == 0 || strcasecmp(ext, ".j64") == 0 + || strcasecmp(ext, ".abs") == 0 || strcasecmp(ext, ".jag") == 0 + || strcasecmp(ext, ".rom") == 0) files->AddItem(string(de->d_name)); } @@ -939,25 +980,27 @@ void FileList::Notify(Element * e) strcat(filename, files->GetSelectedItem().c_str()); // uint32 romSize = JaguarLoadROM(jaguar_mainRom, filename); - JaguarLoadCart(jaguar_mainRom, filename); - -// if (romSize == 0) -//We need better error checking here... !!! FIX !!! -// WriteLog("VJ: Could not load ROM from file \"%s\"...", files->GetSelectedItem().c_str()); -// else -// { -// jaguar_mainRom_crc32 = crc32_calcCheckSum(jaguar_mainRom, romSize); -// WriteLog("CRC: %08X\n", (unsigned int)jaguar_mainRom_crc32); -// eeprom_init(); +// JaguarLoadCart(jaguar_mainRom, filename); + if (JaguarLoadFile(filename)) + { + SDL_Event event; + event.type = SDL_USEREVENT, event.user.code = WINDOW_CLOSE; + SDL_PushEvent(&event); - SDL_Event event; - event.type = SDL_USEREVENT, event.user.code = WINDOW_CLOSE; - SDL_PushEvent(&event); + event.type = SDL_USEREVENT, event.user.code = MENU_ITEM_CHOSEN; + event.user.data1 = (void *)ResetJaguar; + SDL_PushEvent(&event); + } + else + { + SDL_Event event; + event.type = SDL_USEREVENT, event.user.code = WINDOW_CLOSE; + SDL_PushEvent(&event); - event.type = SDL_USEREVENT, event.user.code = MENU_ITEM_CHOSEN; - event.user.data1 = (void *)ResetJaguar; - SDL_PushEvent(&event); -// } + // Handle the error, but don't run... + // Tell the user that we couldn't run their file for some reason... !!! FIX !!! +//how to kludge: Make a function like ResetJaguar which creates the dialog window + } } else Window::Notify(e); @@ -1170,6 +1213,7 @@ void Menu::Add(MenuItems mi) //Do we even *need* this? +//Doesn't seem like it... class RootWindow: public Window { public: @@ -1330,8 +1374,9 @@ void DrawStringTrans(int16 * screen, uint32 x, uint32 y, uint16 color, uint8 tra // bool GUIMain(void) { +// Need to set things up so that it loads and runs a file if given on the command line. !!! FIX !!! extern int16 * backbuffer; - bool done = false; +// bool done = false; SDL_Event event; Window * mainWindow = NULL; @@ -1340,9 +1385,11 @@ bool GUIMain(void) Menu mainMenu; MenuItems mi; - mi.title = "File"; + mi.title = "Jaguar"; mi.item.push_back(NameAction("Load...", LoadROM, SDLK_l)); - mi.item.push_back(NameAction("Reset", ResetJaguar)); + mi.item.push_back(NameAction("Reset", ResetJaguar, SDLK_r)); + if (CDBIOSLoaded) + mi.item.push_back(NameAction("Reset CD", ResetJaguarCD, SDLK_c)); mi.item.push_back(NameAction("Run", RunEmu, SDLK_ESCAPE)); mi.item.push_back(NameAction("")); mi.item.push_back(NameAction("Quit", Quit, SDLK_q)); @@ -1361,12 +1408,14 @@ bool GUIMain(void) bool showMouse = true; //This is crappy!!! !!! FIX !!! +//Is this even needed any more? Hmm. Maybe. Dunno. jaguar_reset(); // Set up our background save... memset(background, 0x11, tom_getVideoModeWidth() * 240 * 2); - while (!done) +// while (!done) + while (!exitGUI) { while (SDL_PollEvent(&event)) { @@ -1416,7 +1465,12 @@ bool GUIMain(void) mouseX = event.motion.x, mouseY = event.motion.y; if (vjs.useOpenGL) +// This is evil, Evil, EVIL! But we'll keep it until we can figure out WTF is going on here. +#ifdef _OSX_ + mouseX /= 2, mouseY = (480 - mouseY) / 2; +#else mouseX /= 2, mouseY /= 2; +#endif if (mainWindow) mainWindow->HandleMouseMove(mouseX, mouseY); @@ -1456,6 +1510,8 @@ bool GUIMain(void) memcpy(backbuffer, background, tom_getVideoModeWidth() * 240 * 2); mainMenu.Draw(); +//Could do multiple windows here by using a vector + priority info... +//Though the way ZSNES does it seems to be by a bool (i.e., they're always active, just not shown) if (mainWindow) mainWindow->Draw(); @@ -1485,6 +1541,16 @@ Window * ResetJaguar(void) return RunEmu(); } +Window * ResetJaguarCD(void) +{ + memcpy(jaguar_mainRom, jaguar_CDBootROM, 0x40000); + jaguarRunAddress = 0x802000; + jaguar_mainRom_crc32 = crc32_calcCheckSum(jaguar_mainRom, 0x40000); + jaguar_reset(); + + return RunEmu(); +} + bool debounceRunKey = true; Window * RunEmu(void) { @@ -1521,6 +1587,7 @@ Window * RunEmu(void) //This sucks... !!! FIX !!! joystick_exec(); +//This is done here so that the crud below doesn't get on our GUI background... if (finished) break; @@ -1584,30 +1651,33 @@ doGPUDis = true;//*/ Window * Quit(void) { -//This is crap. We need some REAL exit code, instead of this psuedo crap... !!! FIX !!! +//This is crap. We need some REAL exit code, instead of this psuedo crap... !!! FIX !!! [DONE] WriteLog("GUI: Quitting due to user request.\n"); -// log_done(); - jaguar_done(); + exitGUI = true; +/* jaguar_done(); version_done(); memory_done(); VideoDone(); // Free SDL components last...! - log_done(); + log_done(); - exit(0); + exit(0);//*/ - return NULL; // We never get here... + return NULL; } Window * About(void) { Window * window = new Window(8, 16, 304, 160); window->AddElement(new Text(8, 8, "Virtual Jaguar 1.0.7")); +// window->AddElement(new Text(8, 8, "Virtual Jaguar CVS 20040317")); window->AddElement(new Text(8, 24, "Coders:")); window->AddElement(new Text(16, 32, "Niels Wagenaar (nwagenaar)")); window->AddElement(new Text(16, 40, "Carwin Jones (Caz)")); window->AddElement(new Text(16, 48, "James L. Hammons (shamus)")); window->AddElement(new Text(16, 56, "Adam Green")); + window->AddElement(new Text(8, 72, "Testers:")); + window->AddElement(new Text(16, 80, "Guruma")); return window; } @@ -1638,8 +1708,9 @@ Window * MiscOptions(void) // // Draw "picture" // Uses zero as transparent color +// Can also use an optional alpha channel // -void DrawTransparentBitmap(int16 * screen, uint32 x, uint32 y, uint16 * bitmap) +void DrawTransparentBitmap(int16 * screen, uint32 x, uint32 y, uint16 * bitmap, uint8 * alpha/*=NULL*/) { uint16 width = bitmap[0], height = bitmap[1]; bitmap += 2; @@ -1651,9 +1722,38 @@ void DrawTransparentBitmap(int16 * screen, uint32 x, uint32 y, uint16 * bitmap) { for(int xx=0; xx> 10) & 0x1F, + eGreen = (existingColor >> 5) & 0x1F, + eBlue = existingColor & 0x1F, + + nRed = (color >> 10) & 0x1F, + nGreen = (color >> 5) & 0x1F, + nBlue = color & 0x1F; + + uint8 invTrans = 255 - trans; + uint16 bRed = (eRed * trans + nRed * invTrans) / 255; + uint16 bGreen = (eGreen * trans + nGreen * invTrans) / 255; + uint16 bBlue = (eBlue * trans + nBlue * invTrans) / 255; + + uint16 blendedColor = (bRed << 10) | (bGreen << 5) | bBlue; + + *(screen + address + xx + (yy * pitch)) = blendedColor; + + alpha++; + } + + bitmap++; } } } @@ -1679,7 +1779,7 @@ GUIMain(); char * ext = strrchr(de->d_name, '.'); if (ext != NULL) - if (stricmp(ext, ".zip") == 0 || stricmp(ext, ".jag") == 0) + if (strcasecmp(ext, ".zip") == 0 || strcasecmp(ext, ".jag") == 0) fileList.push_back(string(de->d_name)); } @@ -1834,6 +1934,8 @@ GUIMain(); // 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; char * ext = strrchr(path, '.'); @@ -1841,7 +1943,7 @@ uint32 JaguarLoadROM(uint8 * rom, char * path) { WriteLog("VJ: Loading \"%s\"...", path); - if (stricmp(ext, ".zip") == 0) + if (strcasecmp(ext, ".zip") == 0) { // Handle ZIP file loading here... WriteLog("(ZIPped)..."); @@ -1868,6 +1970,8 @@ uint32 JaguarLoadROM(uint8 * rom, char * path) fread(rom, 1, romSize, fp); fclose(fp);*/ + // Handle gzipped files transparently [Adam Green]... + gzFile fp = gzopen(path, "rb"); if (fp == NULL) @@ -1889,61 +1993,105 @@ uint32 JaguarLoadROM(uint8 * rom, char * path) } // -// Jaguar cartridge ROM loading +// Jaguar file loading // -void JaguarLoadCart(uint8 * mem, char * path) +bool JaguarLoadFile(char * path) { - jaguarRomSize = JaguarLoadROM(mem, path); +// jaguarRomSize = JaguarLoadROM(mem, path); + jaguarRomSize = JaguarLoadROM(jaguar_mainRom, path); -// if (romSize == 0) -// { -/* char newPath[2048]; - WriteLog("VJ: Trying GUI...\n"); - -//This is not *nix friendly for some reason... +/*//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 (!UserSelectFile((strlen(path) == 0 ? (char *)"." : path), newPath)) + { + WriteLog("VJ: Could not find valid ROM in directory \"%s\"...\nAborting!\n", path); + log_done(); + exit(0); + }*/ - romSize = JaguarLoadROM(mem, newPath); -*/ - if (jaguarRomSize == 0) - { + if (jaguarRomSize == 0) + { // WriteLog("VJ: Could not load ROM from file \"%s\"...\nAborting!\n", newPath); - WriteLog("VJ: Could not load ROM from file \"%s\"...\nAborting!\n", path); - log_done(); - exit(0); - } -// } + 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; -//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) + + 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) { - 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("Jaguar: Setting up homebrew... 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; + // 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): @@ -1991,7 +2139,80 @@ 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