// by James L. Hammons
//
+#include <stdarg.h>
+#include <sys/types.h> // For MacOS <dirent.h> dependency
#include <dirent.h>
#include <SDL.h>
#include <string>
#include <vector>
#include <algorithm>
-#include "types.h"
+#include <ctype.h> // For toupper()
#include "settings.h"
#include "tom.h"
#include "video.h"
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);
// 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,
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[] = {
char separator[] = "--------------------------------------------------------";
-uint16 background[1280 * 240];
+//
+// Case insensitive string compare function
+// Taken straight out of Thinking In C++ by Bruce Eckel. Thanks Bruce!
+//
+
+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\92t run past the end
+ {
+ if (toupper(*p1) != toupper(*p2)) // Compare upper-cased chars
+ return (toupper(*p1) < toupper(*p2) ? -1 : 1);// Report which was lexically greater
+
+ p1++;
+ p2++;
+ }
+
+ // If they match up to the detected eos, say which was longer. Return 0 if the same.
+ return s2.size() - s1.size();
+}
//
// Local GUI classes
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;
static uint32 pitch;
};
+// Initialize class variables (Element)
int16 * Element::screenBuffer = NULL;
uint32 Element::pitch = 0;
{
// 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),
}
}*/
- 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());
}
{
// 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),
windowPtr -= limit;
}
}
-//How to handle these???
-/* if (key == SDLK_RETURN)
- done = true;
- if (key == SDLK_ESCAPE)
- {
- WriteLog("GUI: Aborting VJ by user request.\n");
- return false; // Bail out!
- }*/
else if (key >= SDLK_a && key <= SDLK_z)
{
// Advance cursor to filename with first letter pressed...
{
cursor = i - windowPtr;
if (i > windowPtr + limit - 1)
- windowPtr = i - limit + 1,
- cursor = limit - 1;
+ windowPtr = i - limit + 1, cursor = limit - 1;
if (i < windowPtr)
- windowPtr = i,
- cursor = 0;
+ windowPtr = i, cursor = 0;
break;
}
}
if (thumbClicked)
{
uint32 sbHeight = extents.h - 24,
- thumb = (uint32)(((float)limit / (float)item.size()) * (float)sbHeight);//,
-// thumbStart = (uint32)(((float)windowPtr / (float)item.size()) * (float)sbHeight);
+ thumb = (uint32)(((float)limit / (float)item.size()) * (float)sbHeight);
//yRelativePoint is the spot on the thumb where we clicked...
-// int32 thumbDelta = y - yRelativePoint;
int32 newThumbStart = y - yRelativePoint;
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());
//Check for cursor bounds as well... Or do we need to???
+//Actually, we don't...!
}
}
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)
{
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);
void ListBox::AddItem(string s)
{
- item.push_back(s);
- limit = (item.size() > charHeight ? charHeight : item.size());
-//WriteLog("ListBox: Adding item [%s], limit = %u...\n", s.c_str(), limit);
+ // Do a simple insertion sort
+ bool inserted = false;
+
+ for(vector<string>::iterator i=item.begin(); i<item.end(); i++)
+ {
+ if (stringCmpi(s, *i) == -1)
+ {
+ item.insert(i, s);
+ inserted = true;
+ break;
+ }
+ }
+
+ if (!inserted)
+ item.push_back(s);
- //Do this *every* time?
- //What other choice is there? :-p
- sort(item.begin(), item.end());
+ limit = (item.size() > charHeight ? charHeight : item.size());
}
string ListBox::GetSelectedItem(void)
AddElement(load);
load->SetNotificationElement(this);
-// DIR * dp = opendir(path);
+//!!! FIX !!! Directory might not exist--this shouldn't cause VJ to crash!
DIR * dp = opendir(vjs.ROMPath);
dirent * de;
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));
}
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);
event.type = SDL_USEREVENT, event.user.code = MENU_ITEM_CHOSEN;
event.user.data1 = (void *)ResetJaguar;
- SDL_PushEvent(&event);
-// }
+ SDL_PushEvent(&event);
+ }
+ else
+ {
+ SDL_Event event;
+ event.type = SDL_USEREVENT, event.user.code = WINDOW_CLOSE;
+ 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);
//Do we even *need* this?
+//Doesn't seem like it...
class RootWindow: public Window
{
public:
//
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;
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));
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))
{
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);
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();
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)
{
//This sucks... !!! FIX !!!
joystick_exec();
+//This is done here so that the crud below doesn't get on our GUI background...
if (finished)
break;
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;
}
//
// 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;
{
for(int xx=0; xx<width; xx++)
{
- if (*bitmap && x + xx < pitch) // NOTE: Still doesn't clip the Y val...
+ if (alpha == NULL)
+ {
+ if (*bitmap && x + xx < pitch) // NOTE: Still doesn't clip the Y val...
*(screen + address + xx + (yy * pitch)) = *bitmap;
- bitmap++;
+ }
+ else
+ {
+ uint8 trans = *alpha;
+ uint16 color = *bitmap;
+ uint16 existingColor = *(screen + address + xx + (yy * pitch));
+
+ uint8 eRed = (existingColor >> 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++;
}
}
}
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));
}
//
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, '.');
{
WriteLog("VJ: Loading \"%s\"...", path);
- if (stricmp(ext, ".zip") == 0)
+ if (strcasecmp(ext, ".zip") == 0)
{
// Handle ZIP file loading here...
WriteLog("(ZIPped)...");
fread(rom, 1, romSize, fp);
fclose(fp);*/
+ // Handle gzipped files transparently [Adam Green]...
+
gzFile fp = gzopen(path, "rb");
if (fp == NULL)
}
//
-// Jaguar cartridge ROM loading
+// Jaguar file loading
//
-void JaguarLoadCart(uint8 * mem, char * path)
+bool JaguarLoadFile(char * path)
{
- jaguarRomSize = JaguarLoadROM(mem, path);
-
-// if (romSize == 0)
-// {
-/* char newPath[2048];
- WriteLog("VJ: Trying GUI...\n");
+// jaguarRomSize = JaguarLoadROM(mem, path);
+ jaguarRomSize = JaguarLoadROM(jaguar_mainRom, path);
-//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;
+
+ 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);
+ 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! ;-)
//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 PD ROM... Run address: %08X, length: %08X\n", runAddress, jaguarRomSize - 0x2E);
- memcpy(jaguar_mainRam + loadAddress, jaguar_mainRom + 0x2E, jaguarRomSize - 0x2E);
+ 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;
+ jaguarRunAddress = runAddress;
+ }
+ else
+ return false;
}
+ // .J64 (Jaguar cartridge ROM image) is implied by the FileList object...
+
+ return true;
}
//
projects / virtualjaguar / blobdiff