//
// Virtual Jaguar Emulator
//
-// by cal2
+// Original codebase by David Raingeard (Cal2)
// GCC/SDL port by Niels Wagenaar (Linux/WIN32) and Caz (BeOS)
-// Cleanups/fixes by James L. Hammons
+// Cleanups/fixes/enhancements by James L. Hammons and Adam Green
//
-// Added by SDLEMU (http://sdlemu.ngemu.com)
-// Added for GCC UNIX compatibility
-#ifdef __GCCUNIX__
-#include <unistd.h>
-#endif // __GCCUNIX__
-
-#include <time.h>
#include <SDL.h>
-//#include "SDLptc.h" // Ick! Aargh! Bleah!
+#include <time.h>
+#include "file.h"
+//#include "gui.h"
#include "jaguar.h"
-#include "crc32.h"
-#include "unzip.h"
+#include "log.h"
+#include "memory.h"
+#include "sdlemu_opengl.h"
+#include "settings.h" // Pull in "vjs" struct
+#include "video.h"
+
+// Uncomment this to use built-in BIOS/CD-ROM BIOS
+// You'll need a copy of jagboot.h & jagcd.h for this to work...!
+//#define USE_BUILT_IN_BIOS
+
+// Uncomment this for an official Virtual Jaguar release
+//#define VJ_RELEASE_VERSION "1.1.0"
+#warning !!! FIX !!! Figure out how to use this in GUI.CPP as well!
+
+#ifdef USE_BUILT_IN_BIOS
+#include "jagboot.h"
+#include "jagcd.h"
+#endif
-// Uncomment this for speed control
-//#define SPEED_CONTROL
// Private function prototypes
-uint32 JaguarLoadROM(uint8 *, char *);
-void JaguarLoadCart(uint8 *, char *);
-
-// External variables
-
-//These two should be local!
-extern bool jaguar_use_bios;
-extern bool dsp_enabled;
-
-extern uint8 * jaguar_mainRam;
-extern uint8 * jaguar_bootRom;
-extern uint8 * jaguar_mainRom;
-
-// Various paths
-
-static char * jaguar_bootRom_path = "./bios/jagboot.rom";
-//static char *jaguar_bootRom_path="c:/jaguarEmu/newload.img";
-//static char *jaguar_bootRom_path="./bios/JagOS.bin";
-char * jaguar_eeproms_path = "./eeproms/";
-char jaguar_boot_dir[1024];
-
-SDL_Surface * surface, * mainSurface;
-SDL_Joystick * joystick;
-Uint32 mainSurfaceFlags = SDL_SWSURFACE;
-
-//Console console;
-//Surface * surface;
-//Format format(16, 0x007C00, 0x00003E0, 0x0000001F);
-bool finished = false;
-bool fullscreen = false;
-bool hardwareTypeNTSC = true; // Set to false for PAL
-
-bool useJoystick = false;
-
-
-// Added/changed by SDLEMU http://sdlemu.ngemu.com
-
-uint32 totalFrames;//so we can grab this from elsewhere...
-int main(int argc, char * argv[])
+//
+// The main emulator loop (what else?)
+//
+//Maybe we should move the video stuff to TOM? Makes more sense to put it there...
+//Actually, it would probably be better served in VIDEO.CPP... !!! FIX !!! [DONE]
+//uint32 totalFrames;//temp, so we can grab this from elsewhere...
+int main_old(int argc, char * argv[])
{
- uint32 startTime;//, totalFrames;//, endTime;//, w, h;
-// int32 * vs;
- uint32 nNormalLast = 0;
- int32 nNormalFrac = 0;
-// int32 i = 0;
-//unused int32 nTime = 0;
-//unused int32 nCount = 0;
- int32 nFrameskip = 0; // Default: Show every frame
- int32 nFrame = 0; // No. of Frame
- int32 nJoyport = 0; // Joystick port
-
- printf("Virtual Jaguar/SDL v1.0.5 (GCC/SDL Port)\n");
- printf("Based upon Virtual Jaguar core v1.0.0 by cal2 of Potato emulation.\n");
- printf("Written by Niels Wagenaar (Linux/WIN32) and Caz (BeOS)\n");
- printf("Portions massaged by James L. Hammons (WIN32)\n");
+//NOTE: This isn't actually used anywhere... !!! FIX !!!
+ int32 nFrameskip = 0; // Default: Show every frame
+
+#ifdef VJ_RELEASE_VERSION
+ printf("Virtual Jaguar GCC/SDL Portable Jaguar Emulator v%s\n", VJ_RELEASE_VERSION);
+#else
+ printf("Virtual Jaguar GCC/SDL Portable Jaguar Emulator SVN %s\n", __DATE__);
+#endif
+ printf("Based upon Virtual Jaguar core v1.0.0 by David Raingeard.\n");
+ printf("Written by Niels Wagenaar (Linux/WIN32), Carwin Jones (BeOS),\n");
+ printf("James L. Hammons (WIN32) and Adam Green (MacOS)\n");
printf("Contact: http://sdlemu.ngemu.com/ | sdlemu@ngemu.com\n");
-// console.option("windowed output");
+ bool haveCart = false; // Assume there is no cartridge...!
- // BIOS is now ON by default--use the -nobios switch to turn it off!
- jaguar_use_bios = true;
- bool haveCart = false; // Assume there is no cartridge...!
+ LogInit("vj.log");
+ LoadVJSettings(); // Get config file settings...
- // Checking the switches ;)
+ // Check the switches... ;-)
+ // NOTE: Command line switches can override any config file settings, thus the
+ // proliferation of the noXXX switches. ;-)
for(int i=1; i<argc || argv[i]!=NULL; i++)
{
// This would be the most likely place to do the cart loading...
if (argv[i][0] != '-')
- haveCart = true; // It looks like we have a cartridge!
-
- if (!strcmp(argv[i], "-fullscreen"))
-// {
- fullscreen = true;
-// console.option("fullscreen output");
-// }
+ haveCart = true; // It looks like we have a cartridge!
-//We *don't* need this option!
-/* if (!strcmp(argv[i], "-window"))
-// console.option("windowed output");
- fullscreen = false;*/
-
- if (!strcmp(argv[i], "-joystick"))
-// console.option("joystick enabled");
- useJoystick = true;
+ if (!strcmp(argv[i], "-joystick"))
+ vjs.useJoystick = true;
if (!strcmp(argv[i], "-joyport"))
{
- nJoyport = atoi(argv[++i]) + 1;
- if (nJoyport > 3)
- nJoyport = 3;
+ vjs.joyport = atoi(argv[++i]) + 1;
+ if (vjs.joyport > 3)
+ vjs.joyport = 3;
}
if (!strcmp(argv[i], "-frameskip"))
nFrameskip = atoi(argv[++i]) + 1;
if (nFrameskip > 10)
nFrameskip = 10;
-#ifdef SPEED_CONTROL
- nFrameskip = 0;
-#endif
}
+ if (!strcmp(argv[i], "-bios"))
+ vjs.useJaguarBIOS = true;
+
if (!strcmp(argv[i], "-nobios"))
- jaguar_use_bios = false;
+ vjs.useJaguarBIOS = false;
+
+ if (!strcmp(argv[i], "-dsp"))
+ vjs.DSPEnabled = true;
+
+ if (!strcmp(argv[i], "-nodsp"))
+ vjs.DSPEnabled = false;
+
+ if (!strcmp(argv[i], "-pipeline"))
+ vjs.usePipelinedDSP = true;
+
+ if (!strcmp(argv[i], "-nopipeline"))
+ vjs.usePipelinedDSP = false;
+
+ if (!strcmp(argv[i], "-gl"))
+ vjs.useOpenGL = true;
- if (!strcmp(argv[i], "-dspon"))
- dsp_enabled = 1;
+ if (!strcmp(argv[i], "-nogl"))
+ vjs.useOpenGL = false;
+
+ if (!strcmp(argv[i], "-fullscreen"))
+ vjs.fullscreen = true;
+
+ if (!strcmp(argv[i], "-window"))
+ vjs.fullscreen = false;
if (!strcmp(argv[i], "-pal"))
- hardwareTypeNTSC = false;
+ vjs.hardwareTypeNTSC = false;
+
+ if (!strcmp(argv[i], "-ntsc"))
+ vjs.hardwareTypeNTSC = true;
- if (!strcmp(argv[i], "-help") || !strcmp(argv[i], "-?"))
+ if (!strcmp(argv[i], "--help") || !strcmp(argv[i], "-?"))
{
printf("Usage: \n\n");
printf("vj [romfile] [switches]\n");
- printf(" -? or -help : Display usage and switches \n");
- printf(" -fullscreen : Enable fullscreen mode (windowed default)\n");
- printf(" -frameskip 1-10 : Enable frameskip 1 (default) - 10 \n");
- printf(" -joystick : Enable joystick/gamepad \n");
- printf(" -joyport 0-3 : Select desired joystick port \n");
- printf(" -nobios : Boot cart without using Jaguar BIOS ROM \n");
- printf(" -dspon : Force VJ to use the DSP \n");
- printf(" -pal : Force VJ to PAL mode (default is NTSC) \n");
+ printf(" -? or --help : Display usage and switches \n");
+ printf(" -frameskip 1-10 : Enable frameskip 1 - 10 (default: none) \n");
+ printf(" -joystick : Enable joystick/gamepad \n");
+ printf(" -joyport 0-3 : Select desired joystick port \n");
+ printf(" -bios : Boot cart using Jaguar BIOS ROM \n");
+ printf(" -nobios : Boot cart without using Jaguar BIOS ROM \n");
+ printf(" -dsp : Force VJ to use the DSP \n");
+ printf(" -nodsp : Force VJ to run without the DSP \n");
+ printf(" -pipeline : Use the DSP pipelined core \n");
+ printf(" -nopipeline : Use the DSP non-pipelined core \n");
+ printf(" -gl : Use OpenGL rendering \n");
+ printf(" -nogl : Use old non-OpenGL rendering \n");
+ printf(" -fullscreen : Enable fullscreen mode (default: windowed)\n");
+ printf(" -window : Enable windowed mode \n");
+ printf(" -pal : Force VJ to PAL mode (default: NTSC) \n");
+ printf(" -ntsc : Force VJ to NTSC mode \n");
printf("\nInvoking Virtual Jagaur with no ROM file will cause it to boot up\n");
- printf("with the Jaguar BIOS.\n");
+ printf("with the VJ GUI.\n");
return 1;
}
}
- getcwd(jaguar_boot_dir, 1024);
- log_init("vj.log");
- memory_init();
- version_init();
- version_display(log_get());
- jaguar_init();
-
- // Get the BIOS ROM
- if (jaguar_use_bios)
- JaguarLoadROM(jaguar_bootRom, jaguar_bootRom_path);
-
- SET32(jaguar_mainRam, 0, 0x00200000); // Set top of stack...
-
- // Get the cartridge ROM (if passed in)
- if (haveCart)
- JaguarLoadCart(jaguar_mainRom, argv[1]);
-
- jaguar_reset();
-
- // Set up the backbuffer
- int16 * backbuffer = (int16 *)malloc(845 * 525 * sizeof(int16));
- memset(backbuffer, 0xAA, tom_getVideoModeWidth() * tom_getVideoModeHeight() * sizeof(int16));
-
// Set up SDL library
- if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER | SDL_INIT_NOPARACHUTE) < 0)
+ if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER) < 0)
{
- WriteLog("VJ: Could not initialize the SDL library: %s", SDL_GetError());
- exit(1);
+ WriteLog("VJ: Could not initialize the SDL library: %s\n", SDL_GetError());
+ return -1;
}
- // Let's get proper info about the platform we're running on.
- const SDL_VideoInfo * info = SDL_GetVideoInfo();
-
- if (!info)
- {
- WriteLog("VJ: SDL is unable to get the video query: %s\n", SDL_GetError());
- exit(1);
- }
-
- if (info->hw_available)
- mainSurfaceFlags = SDL_HWSURFACE | SDL_HWPALETTE | SDL_DOUBLEBUF;
-
- if (info->blit_hw)
- mainSurfaceFlags |= SDL_HWACCEL;
-
- if (fullscreen)
- mainSurfaceFlags |= SDL_FULLSCREEN;
-
- // Note: mainSurface is *never* used again!
- //Not true--had to look at what's what here...
- mainSurface = SDL_SetVideoMode(tom_getVideoModeWidth(), tom_getVideoModeHeight(), 16, mainSurfaceFlags);
+ WriteLog("VJ: SDL successfully initialized.\n");
- if (mainSurface == NULL)
- {
- WriteLog("VJ: SDL is unable to set the video mode: %s\n", SDL_GetError());
- exit(1);
- }
+// WriteLog("Initializing memory subsystem...\n");
+// MemoryInit();
+#ifdef VJ_RELEASE_VERSION
+ WriteLog("Virtual Jaguar %s (Last full build was on %s %s)\n", VJ_RELEASE_VERSION, __DATE__, __TIME__);
+#else
+ WriteLog("Virtual Jaguar SVN %s (Last full build was on %s %s)\n", __DATE__, __DATE__, __TIME__);
+#endif
+ WriteLog("Initializing jaguar subsystem...\n");
+ JaguarInit();
- SDL_WM_SetCaption("Virtual Jaguar", "Virtual Jaguar");
+ // Get the BIOS ROM
+#ifdef USE_BUILT_IN_BIOS
+ WriteLog("VJ: Using built in BIOS/CD BIOS...\n");
+ memcpy(jaguarBootROM, jagBootROM, 0x20000);
+ memcpy(jaguarCDBootROM, jagCDROM, 0x40000);
+ BIOSLoaded = CDBIOSLoaded = true;
+#else
+// What would be nice here would be a way to check if the BIOS was loaded so that we
+// could disable the pushbutton on the Misc Options menu... !!! FIX !!! [DONE here, but needs to be fixed in GUI as well!]
+WriteLog("About to attempt to load BIOSes...\n");
+ BIOSLoaded = (JaguarLoadROM(jaguarBootROM, vjs.jagBootPath) == 0x20000 ? true : false);
+ WriteLog("VJ: BIOS is %savailable...\n", (BIOSLoaded ? "" : "not "));
+ CDBIOSLoaded = (JaguarLoadROM(jaguarCDBootROM, vjs.CDBootPath) == 0x40000 ? true : false);
+ WriteLog("VJ: CD BIOS is %savailable...\n", (CDBIOSLoaded ? "" : "not "));
+#endif
- // Create the primary SDL display (16 BPP, 5/5/5 RGB format)
-// surface = new Surface(tom_getVideoModeWidth(), tom_getVideoModeHeight(), format);
-//Format format(16, 0x007C00, 0x00003E0, 0x0000001F);
- surface = SDL_CreateRGBSurface(SDL_SWSURFACE, tom_getVideoModeWidth(),
- tom_getVideoModeHeight(), 16, 0x7C00, 0x03E0, 0x001F, 0);
- if (surface == NULL)
- {
- WriteLog("VJ: Could not create primary SDL surface: %s", SDL_GetError());
- exit(1);
- }
+ SET32(jaguarMainRAM, 0, 0x00200000); // Set top of stack...
- // Initialize Joystick support under SDL
-// if (console.JoyEnabled() == 1)
- if (useJoystick)
- {
- if (SDL_NumJoysticks() <= 0)
- {
-// console.option("joystick disabled");
- useJoystick = false;
- printf("No joystick(s) or joypad(s) detected on your system. Using keyboard...\n");
- }
- else
- {
-// if ((console.joystick = SDL_JoystickOpen(nJoyport)) == 0)
- if ((joystick = SDL_JoystickOpen(nJoyport)) == 0)
- {
-// console.option("joystick disabled");
- useJoystick = false;
- printf("Unable to open a Joystick on port: %d\n", (int)nJoyport);
- }
- else
- printf("Using: %s\n", SDL_JoystickName(nJoyport));
- }
- }
+WriteLog("Initializing video subsystem...\n");
+ VideoInit();
+WriteLog("Initializing GUI subsystem...\n");
+#warning "!!! FIX !!! (GUIInit())"
+// GUIInit();
- // Open the display and start emulating some 3l337 Atari Jaguar games :P
-// console.open("Virtual Jaguar", tom_getVideoModeWidth(), tom_getVideoModeHeight(), format);
+ // Now with crunchy GUI goodness!
+WriteLog("About to start GUI...\n");
+#warning "!!! FIX !!! (GUIMain(...))"
+// GUIMain(haveCart ? argv[1] : NULL);
- totalFrames = 0;
- startTime = clock();
- nNormalLast = 0; // Last value of timeGetTime()
- nNormalFrac = 0; // Extra fraction we did
- nNormalLast = SDL_GetTicks(); //timeGetTime();
+//This is no longer accurate...!
+// int elapsedTime = clock() - startTime;
+// int fps = (1000 * totalFrames) / elapsedTime;
+// WriteLog("VJ: Ran at an average of %i FPS.\n", fps);
- while (!finished)
- {
-#ifdef SPEED_CONTROL
- nTime = SDL_GetTicks() - nNormalLast; // calcule le temps écoulé depuis le dernier affichage
- // nTime est en mili-secondes.
- // détermine le nombre de trames à passer + 1
- nCount = (nTime * 600 - nNormalFrac) / 10000;
-
- // si le nombre de trames à passer + 1 est nul ou négatif,
- // ne rien faire pendant 2 ms
- if (nCount <= 0)
- {
- //Sleep(2);
- //SDL_Delay(1);
- } // No need to do anything for a bit
- else
- {
- nNormalFrac += nCount * 10000; //
- nNormalLast += nNormalFrac / 600; // add the duration of nNormalFrac frames
- nNormalFrac %= 600; //
-
- // Pas plus de 9 (10-1) trames non affichées
- if (nCount > 10)
- nCount = 10;
- for(int i=0; i<nCount-1; i++)
- jaguar_exec(backbuffer, false);
-#endif
- // Setting up new backbuffer with new pixels and data
-// jaguar_exec(backbuffer, true);
- JaguarExecute(backbuffer, true);
- totalFrames++;
-
- // Simple frameskip
- if (nFrame == nFrameskip)
- {
-// int32 * vs = (int32 *)surface->lock();
- if (SDL_MUSTLOCK(surface))
- while (SDL_LockSurface(surface) < 0)
- SDL_Delay(10);
-// uint8 * vs = (Uint8 *)surface->pixels;
-// memcpy(vs, backbuffer, tom_width * tom_height * 2);
- memcpy(surface->pixels, backbuffer, tom_width * tom_height * 2);
-// surface->unlock();
- if (SDL_MUSTLOCK(surface))
- SDL_UnlockSurface(surface);
-// surface->copy(console);
- SDL_Rect srcrect, dstrect;
- srcrect.x = srcrect.y = 0, srcrect.w = surface->w, srcrect.h = surface->h;
- dstrect.x = dstrect.y = 0, dstrect.w = surface->w, dstrect.h = surface->h;
-// SDL_LowerBlit(surface, &srcrect, dst.surface, &dstrect);
- SDL_BlitSurface(surface, &srcrect, mainSurface, &dstrect);
-// dst.updates[dst.nupdates++] = dstrect;
-// console.update();
- SDL_Flip(mainSurface);
-// nupdates = 0;
-
- nFrame = 0;
- }
- else
- nFrame++;
-
- joystick_exec();
-
-#ifdef SPEED_CONTROL
- }
-#endif
- }
+ JaguarDone();
+ VideoDone();
+// MemoryDone();
+ LogDone();
- int elapsedTime = clock() - startTime;
- int fps = (1000 * totalFrames) / elapsedTime;
- fprintf(log_get(), "Statistics: %i FPS\n", fps);
-
- jaguar_done();
- version_done();
- memory_done();
- log_done();
-// console.close(); // Close SDL items as last!
- SDL_JoystickClose(joystick);
- SDL_FreeSurface(surface);
+ // Free SDL components last...!
SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER);
SDL_Quit();
- return 0;
-}
-
-//
-// Generic ROM loading
-//
-uint32 JaguarLoadROM(uint8 * rom, char * path)
-{
- uint32 romSize;
-
- WriteLog("JagEm: Loading %s...", path);
-
- char * ext = strrchr(path, '.');
- if (strcmpi(ext, ".zip") == 0)
- {
- // Handle ZIP file loading here...
- WriteLog("(ZIPped)...");
-
- if (load_zipped_file(0, 0, path, NULL, &rom, &romSize) == -1)
- {
- WriteLog("Failed!\n");
- log_done();
- exit(0);
- }
- }
- else
- {
- FILE * fp = fopen(path, "rb");
-
- if (fp == NULL)
- {
- WriteLog("Failed!\n");
- log_done();
- exit(0);
- }
-
- fseek(fp, 0, SEEK_END);
- romSize = ftell(fp);
- fseek(fp, 0, SEEK_SET);
- fread(rom, 1, romSize, fp);
- fclose(fp);
- }
-
- WriteLog("OK (%i bytes)\n", romSize);
- return romSize;
-}
-
-//
-// Jaguar cartridge ROM loading
-//
-void JaguarLoadCart(uint8 * mem, char * path)
-{
- uint32 romsize = JaguarLoadROM(mem, path);
- jaguar_mainRom_crc32 = crc32_calcCheckSum(jaguar_mainRom, romsize);
- WriteLog( "CRC: %08X\n", (unsigned int)jaguar_mainRom_crc32);
- eeprom_init();
+ return 0;
}
projects / virtualjaguar / blobdiff