//
// Virtual Jaguar Emulator
//
-// by cal2
+// Original codebase by 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__
+#endif
+#include <dirent.h> // POSIX, but should compile with linux & mingw...
#include <time.h>
#include <SDL.h>
#include "jaguar.h"
#include "crc32.h"
+#include "zlib.h"
#include "unzip.h"
+#include "video.h"
#include "gui.h"
+#include "sdlemu_opengl.h" // For testing only... ;-)
// Uncomment this for speed control
//#define SPEED_CONTROL
// Private function prototypes
+void InitSDL(void);
uint32 JaguarLoadROM(uint8 *, char *);
void JaguarLoadCart(uint8 *, char *);
+int gzfilelength(gzFile gd);
// 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;
char jaguar_boot_dir[1024];
SDL_Surface * surface, * mainSurface;
+int16 * backbuffer = NULL;
SDL_Joystick * joystick;
Uint32 mainSurfaceFlags = SDL_SWSURFACE;
bool finished = false;
bool fullscreen = false;
-bool hardwareTypeNTSC = true; // Set to false for PAL
+bool hardwareTypeNTSC = true; // Set to false for PAL
bool useJoystick = false;
+int32 nJoyport = 0; // Joystick port
bool showGUI = false;
+//These two should be local!
+// And now they are! ;-)
+bool jaguar_use_bios = false; // Default is now to USE the BIOS
+bool dsp_enabled = false;
+
+// Keybindings in order of L, R, U, D, C, B, A, Op, Pa, 0-9, #, *
+uint16 p1KeyBindings[21] = {};
+uint16 p2KeyBindings[21] = {};
+bool showMessage = false;
+uint32 showMessageTimeout;
+char messageBuffer[200];
-// Added/changed by SDLEMU http://sdlemu.ngemu.com
+bool useOpenGL = true; // ! ;-)
-uint32 totalFrames;//so we can grab this from elsewhere...
+//
+// The main emulator loop (what else?)
+//
+//Maybe we should move the video stuff to TOM? Makes more sense to put it there...
+uint32 totalFrames;//temp, so we can grab this from elsewhere...
int main(int argc, char * argv[])
{
uint32 startTime;//, totalFrames;//, endTime;//, w, h;
int32 nNormalFrac = 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("Virtual Jaguar/SDL v1.0.6 (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");
// 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...!
+ bool haveCart = false; // Assume there is no cartridge...!
// Checking the switches ;)
{
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(" -fullscreen : Enable fullscreen mode (default: windowed)\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(" -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("\nInvoking Virtual Jagaur with no ROM file will cause it to boot up\n");
printf("with the Jaguar BIOS.\n");
return 1;
SET32(jaguar_mainRam, 0, 0x00200000); // Set top of stack...
+//This is done here, so that we get valid numbers from TOM... !!! FIX !!!
+ jaguar_reset();
+
+ // Set up the backbuffer
+// int16 * backbuffer = (int16 *)malloc(845 * 525 * sizeof(int16));
+ backbuffer = (int16 *)malloc(845 * 525 * sizeof(int16));
+ memset(backbuffer, 0x22, tom_getVideoModeWidth() * tom_getVideoModeHeight() * sizeof(int16));
+
+ InitSDL();
+
// Get the cartridge ROM (if passed in)
- if (haveCart)
- JaguarLoadCart(jaguar_mainRom, argv[1]);
+// if (haveCart)
+// JaguarLoadCart(jaguar_mainRom, argv[1]);
+ // Now with crunchy GUI goodness!
+ JaguarLoadCart(jaguar_mainRom, (haveCart ? argv[1] : (char *)""));
+//Do this again??? Hmm... This is not very nice.
+//Maybe it's not necessary??? Seems to be, at least for PD ROMs... !!! FIX !!!
jaguar_reset();
- // Set up the backbuffer
- int16 * backbuffer = (int16 *)malloc(845 * 525 * sizeof(int16));
- memset(backbuffer, 0xAA, tom_getVideoModeWidth() * tom_getVideoModeHeight() * sizeof(int16));
+ totalFrames = 0;
+ startTime = clock();
+ nNormalLast = 0; // Last value of timeGetTime()
+ nNormalFrac = 0; // Extra fraction we did
+ nNormalLast = SDL_GetTicks(); //timeGetTime();
+
+ 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
+ JaguarExecute(backbuffer, true);
+ totalFrames++;
+
+ // GUI stuff here...
+ if (showGUI)
+ {
+ extern uint32 gpu_pc, dsp_pc;
+ DrawString(backbuffer, 8, 8, false, "GPU PC: %08X", gpu_pc);
+ DrawString(backbuffer, 8, 16, false, "DSP PC: %08X", dsp_pc);
+ }
+
+ // Simple frameskip
+ if (nFrame == nFrameskip)
+ {
+ RenderBackbuffer();
+ nFrame = 0;
+ }
+ else
+ nFrame++;
+
+ joystick_exec();
+
+#ifdef SPEED_CONTROL
+ }
+#endif
+ }
+ int elapsedTime = clock() - startTime;
+ int fps = (1000 * totalFrames) / elapsedTime;
+ fprintf(log_get(), "VJ: Ran at an average of %i FPS.\n", fps);
+
+ jaguar_done();
+ version_done();
+ memory_done();
+ log_done();
+
+ if (useOpenGL)
+ sdlemu_close_opengl();
+ SDL_JoystickClose(joystick);
+ SDL_FreeSurface(surface);
+ SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER);
+ SDL_Quit();
+
+ return 0;
+}
+
+//
+// Prime SDL and create surfaces
+//
+void InitSDL(void)
+{
// Set up SDL library
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER | SDL_INIT_NOPARACHUTE) < 0)
{
exit(1);
}
- // Let's get proper info about the platform we're running on...
+ // Get proper info about the platform we're running on...
const SDL_VideoInfo * info = SDL_GetVideoInfo();
if (!info)
exit(1);
}
- if (info->hw_available)
- mainSurfaceFlags = SDL_HWSURFACE | SDL_HWPALETTE | SDL_DOUBLEBUF;
+ if (useOpenGL)
+ {
+ mainSurfaceFlags = SDL_HWSURFACE | SDL_HWPALETTE | SDL_DOUBLEBUF | SDL_OPENGL;
+ SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+ }
+ else
+ {
+ if (info->hw_available)
+ mainSurfaceFlags = SDL_HWSURFACE | SDL_HWPALETTE | SDL_DOUBLEBUF;
- if (info->blit_hw)
- mainSurfaceFlags |= SDL_HWACCEL;
+ 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... It's the primary surface...
- mainSurface = SDL_SetVideoMode(tom_getVideoModeWidth(), tom_getVideoModeHeight(), 16, mainSurfaceFlags);
+// mainSurface = SDL_SetVideoMode(tom_getVideoModeWidth(), tom_getVideoModeHeight(), 16, mainSurfaceFlags);
+//Testing purposes... :-)
+ mainSurface = SDL_SetVideoMode(tom_getVideoModeWidth()*2, tom_getVideoModeHeight()*2, 16, mainSurfaceFlags);
if (mainSurface == NULL)
{
exit(1);
}
+ if (useOpenGL)
+// sdlemu_init_opengl(surface, 1/*method*/, 1/*size*/, 0/*texture type (linear, nearest)*/);
+//Testing purposes... :-)
+ sdlemu_init_opengl(surface, 1/*method*/, 2/*size*/, 0/*texture type (linear, nearest)*/);
+
// Initialize Joystick support under SDL
if (useJoystick)
{
printf("VJ: Using: %s\n", SDL_JoystickName(nJoyport));
}
}
+}
- totalFrames = 0;
- startTime = clock();
- nNormalLast = 0; // Last value of timeGetTime()
- nNormalFrac = 0; // Extra fraction we did
- nNormalLast = SDL_GetTicks(); //timeGetTime();
+//
+// Generic ROM loading
+//
+uint32 JaguarLoadROM(uint8 * rom, char * path)
+{
+ uint32 romSize = 0;
- while (!finished)
+ char * ext = strrchr(path, '.');
+ if (ext != NULL)
{
-#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;
+ WriteLog("VJ: Loading %s...", path);
- // 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
+ if (stricmp(ext, ".zip") == 0)
{
- nNormalFrac += nCount * 10000; //
- nNormalLast += nNormalFrac / 600; // add the duration of nNormalFrac frames
- nNormalFrac %= 600; //
+ // Handle ZIP file loading here...
+ WriteLog("(ZIPped)...");
- // 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
- JaguarExecute(backbuffer, true);
- totalFrames++;
-
- // GUI stuff here...
- if (showGUI)
+ if (load_zipped_file(0, 0, path, NULL, &rom, &romSize) == -1)
{
- extern uint32 gpu_pc;
- extern uint32 dsp_pc;
- DrawText(backbuffer, 8, 0, "Friendly GUI brought to you by JLH ;-)");
- DrawText(backbuffer, 8, 8, "GPU PC: %08X", gpu_pc);
- DrawText(backbuffer, 8, 16, "DSP PC: %08X", dsp_pc);
+ WriteLog("Failed!\n");
+ return 0;
}
+ }
+ else
+ {
+/* FILE * fp = fopen(path, "rb");
- // Simple frameskip
- if (nFrame == nFrameskip)
+ if (fp == NULL)
{
- if (SDL_MUSTLOCK(surface))
- while (SDL_LockSurface(surface) < 0)
- SDL_Delay(10);
+ WriteLog("Failed!\n");
+ return 0;
+ }
- memcpy(surface->pixels, backbuffer, tom_width * tom_height * 2);
+ fseek(fp, 0, SEEK_END);
+ romSize = ftell(fp);
+ fseek(fp, 0, SEEK_SET);
+ fread(rom, 1, romSize, fp);
+ fclose(fp);*/
- if (SDL_MUSTLOCK(surface))
- SDL_UnlockSurface(surface);
+ gzFile fp = gzopen(path, "rb");
- 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_BlitSurface(surface, &srcrect, mainSurface, &dstrect);
- SDL_Flip(mainSurface);
- nFrame = 0;
+ if (fp == NULL)
+ {
+ WriteLog("Failed!\n");
+ return 0;
}
- else
- nFrame++;
- joystick_exec();
-
-#ifdef SPEED_CONTROL
+ //fseek(fp, 0, SEEK_END);
+ romSize = gzfilelength(fp);//ftell(fp);
+ gzseek(fp, 0, SEEK_SET);
+ gzread(fp, rom, romSize);
+ gzclose(fp);
}
-#endif
- }
- int elapsedTime = clock() - startTime;
- int fps = (1000 * totalFrames) / elapsedTime;
- fprintf(log_get(), "VJ: Ran at an average of %i FPS.\n", fps);
-
- jaguar_done();
- version_done();
- memory_done();
- log_done();
-
- SDL_JoystickClose(joystick);
- SDL_FreeSurface(surface);
- SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER);
- SDL_Quit();
+ WriteLog("OK (%i bytes)\n", romSize);
+ }
- return 0;
+ return romSize;
}
//
-// Generic ROM loading
+// Jaguar cartridge ROM loading
//
-uint32 JaguarLoadROM(uint8 * rom, char * path)
+void JaguarLoadCart(uint8 * mem, char * path)
{
- uint32 romSize;
+ uint32 romSize = JaguarLoadROM(mem, path);
- WriteLog("JagEm: Loading %s...", path);
-
- char * ext = strrchr(path, '.');
- if (strcmpi(ext, ".zip") == 0)
+ if (romSize == 0)
{
- // Handle ZIP file loading here...
- WriteLog("(ZIPped)...");
+ char newPath[2048];
+ WriteLog("VJ: Trying GUI...\n");
- if (load_zipped_file(0, 0, path, NULL, &rom, &romSize) == -1)
+//This is not *nix friendly for some reason...
+// if (!UserSelectFile(path, newPath))
+ if (!UserSelectFile((path == "" ? (char *)"." : path), newPath))
{
- WriteLog("Failed!\n");
+ WriteLog("VJ: Could not find valid ROM in directory \"%s\"...\nAborting!\n", path);
log_done();
exit(0);
}
- }
- else
- {
- FILE * fp = fopen(path, "rb");
- if (fp == NULL)
+ romSize = JaguarLoadROM(mem, newPath);
+
+ if (romSize == 0)
{
- WriteLog("Failed!\n");
+ WriteLog("VJ: Could not load ROM from file \"%s\"...\nAborting!\n", newPath);
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_mainRom_crc32 = crc32_calcCheckSum(jaguar_mainRom, romSize);
+ WriteLog("CRC: %08X\n", (unsigned int)jaguar_mainRom_crc32);
+ eeprom_init();
}
//
-// Jaguar cartridge ROM loading
+// Get the length of a (possibly) gzipped file
//
-void JaguarLoadCart(uint8 * mem, char * path)
+int gzfilelength(gzFile gd)
{
- uint32 romsize = JaguarLoadROM(mem, path);
- jaguar_mainRom_crc32 = crc32_calcCheckSum(jaguar_mainRom, romsize);
- WriteLog( "CRC: %08X\n", (unsigned int)jaguar_mainRom_crc32);
- eeprom_init();
+ 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;
}
projects / virtualjaguar / blobdiff