X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvj.cpp;h=0619b0523d070f2de61b07053a0ca800aaffa9cf;hb=94e1e961b57f253b760298ab0bae96a7de6d20fa;hp=5c6fb61e25b3d3be5d914dab7827a705decf7095;hpb=135a0c52a2bcbcc37192c61801de6e9c80aeebff;p=virtualjaguar diff --git a/src/vj.cpp b/src/vj.cpp index 5c6fb61..0619b05 100644 --- a/src/vj.cpp +++ b/src/vj.cpp @@ -1,137 +1,82 @@ // // 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 // -// -// Important info: -// -// NTSC PAL -// GPU/DSP/video clock rate 26.590906 26.593900 -// 68000 clock rate 13.295453 13.296950 -// (clock rates in MHz) -// - -// Added by SDLEMU (http://sdlemu.ngemu.com) -// Added for GCC UNIX compatibility -#ifdef __GCCUNIX__ -#include -#endif // __GCCUNIX__ - -#include #include -#include "SDLptc.h" +#include +#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 *); // -// Various paths +// The main emulator loop (what else?) // - -//static char *jaguar_bootRom_path="c:/jaguarEmu/newload.img"; -static char * jaguar_bootRom_path = "./bios/jagboot.rom"; -//static char *jaguar_bootRom_path="./bios/JagOS.bin"; -char * jaguar_eeproms_path = "./eeproms/"; -char jaguar_boot_dir[1024]; -//static char romLoadDialog_filePath[1024]; - - -Console console; -Surface * surface; -Format format(16, 0x007C00, 0x00003E0, 0x0000001F); -bool finished = false; -bool fullscreen = false; -bool hardwareTypeNTSC = true; // Set to false for PAL - -// -// External variables -// - -extern bool jaguar_use_bios; -extern bool dsp_enabled; -extern uint8 * jaguar_mainRam; -extern uint8 * jaguar_bootRom; -extern uint8 * jaguar_mainRom; - - -void main_screen_switch(void) +//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[]) { - fullscreen = !fullscreen; - if (fullscreen) - console.option("fullscreen output"); - else - console.option("windowed output"); - console.close(); - console.open("Virtual Jaguar", tom_width, tom_height, format); -} - -// Added/changed by SDLEMU http://sdlemu.ngemu.com +//NOTE: This isn't actually used anywhere... !!! FIX !!! + int32 nFrameskip = 0; // Default: Show every frame -uint32 totalFrames;//so we can grab this from somewhere else... -int main(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"); +#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 3) - nJoyport = 3; + vjs.joyport = atoi(argv[++i]) + 1; + if (vjs.joyport > 3) + vjs.joyport = 3; } if (!strcmp(argv[i], "-frameskip")) @@ -139,214 +84,131 @@ int main(int argc, char * argv[]) 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], "-dspon")) - dsp_enabled = 1; + if (!strcmp(argv[i], "-dsp")) + vjs.DSPEnabled = true; - if (!strcmp(argv[i], "-pal")) - hardwareTypeNTSC = false; + if (!strcmp(argv[i], "-nodsp")) + vjs.DSPEnabled = false; - 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 \n"); - printf(" -window : Enable windowed mode (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("\nInvoking Virtual Jagaur with no ROM file will cause it to boot up\n"); - printf("with the Jaguar BIOS.\n"); - return true; - } - } + if (!strcmp(argv[i], "-pipeline")) + vjs.usePipelinedDSP = true; - getcwd(jaguar_boot_dir, 1024); - log_init("vj.log"); - memory_init(); - version_init(); - version_display(log_get()); - jaguar_init(); + if (!strcmp(argv[i], "-nopipeline")) + vjs.usePipelinedDSP = false; - // Get the BIOS ROM - if (jaguar_use_bios) - JaguarLoadROM(jaguar_bootRom, jaguar_bootRom_path); + if (!strcmp(argv[i], "-gl")) + vjs.useOpenGL = true; - SET32(jaguar_mainRam, 0, 0x00200000); // Set top of stack... + if (!strcmp(argv[i], "-nogl")) + vjs.useOpenGL = false; - // Get the cartridge ROM (if passed in) - if (haveCart) - { - JaguarLoadCart(jaguar_mainRom, argv[1]); - eeprom_init(); - } + if (!strcmp(argv[i], "-fullscreen")) + vjs.fullscreen = true; - jaguar_reset(); - - // Setting up the backbuffer - int16 * backbuffer = (int16 *)malloc(845 * 525 * sizeof(int16)); - memset(backbuffer, 0xAA, tom_getVideoModeWidth() * tom_getVideoModeHeight() * sizeof(int16)); + if (!strcmp(argv[i], "-window")) + vjs.fullscreen = false; - // Setting up the primary SDL display - surface = new Surface(tom_getVideoModeWidth(), tom_getVideoModeHeight(), format); + if (!strcmp(argv[i], "-pal")) + vjs.hardwareTypeNTSC = false; - // Initialize Joystick support under SDL - if (console.JoyEnabled() == 1) - { - if (SDL_NumJoysticks() <= 0) - { - console.option("joystick disabled"); - printf("No joystick(s) or joypad(s) detected on your system. Using keyboard...\n"); - } - else + if (!strcmp(argv[i], "-ntsc")) + vjs.hardwareTypeNTSC = true; + + if (!strcmp(argv[i], "--help") || !strcmp(argv[i], "-?")) { - if ((console.joystick = SDL_JoystickOpen(nJoyport)) == 0) - { - console.option("joystick disabled"); - printf("Unable to open a Joystick on port: %d\n", (int)nJoyport); - } - else - printf("Using: %s\n", SDL_JoystickName(nJoyport)); + printf("Usage: \n\n"); + printf("vj [romfile] [switches]\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 VJ GUI.\n"); + return 1; } - } - - // Open the display and start emulating some 3l337 Atari Jaguar games :P - console.open("Virtual Jaguar", tom_getVideoModeWidth(), tom_getVideoModeHeight(), format); - - totalFrames = 0; - startTime = clock(); - nNormalLast = 0; // Last value of timeGetTime() - nNormalFrac = 0; // Extra fraction we did - nNormalLast = SDL_GetTicks(); //timeGetTime(); + } - while (!finished) + // Set up SDL library + if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER) < 0) { -#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; ilock(); - memcpy(vs, backbuffer, tom_width * tom_height * 2); - surface->unlock(); - surface->copy(console); - console.update(); - nFrame = 0; - } - else - nFrame++; - - joystick_exec(); - -#ifdef SPEED_CONTROL - } -#endif + WriteLog("VJ: Could not initialize the SDL library: %s\n", SDL_GetError()); + return -1; } - int elapsedTime = clock() - startTime; - int fps = (1000 * totalFrames) / elapsedTime; - fprintf(log_get(), "Statistics: %i FPS\n", fps); - - if (console.JoyEnabled() == 1) {} - - jaguar_done(); - version_done(); - memory_done(); - log_done(); - console.close(); // Close SDL items as last! - - return 0; -} + WriteLog("VJ: SDL successfully initialized.\n"); -// -// Generic ROM loading -// -uint32 JaguarLoadROM(uint8 * rom, char * path) -{ - uint32 romSize; +// 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(); - WriteLog("JagEm: Loading %s...", path); + // 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 - char * ext = strrchr(path, '.'); - if (strcmpi(ext, ".zip") == 0) - { - // Handle ZIP file loading here... - WriteLog("(ZIPped)..."); + SET32(jaguarMainRAM, 0, 0x00200000); // Set top of stack... - if (load_zipped_file(0, 0, path, NULL, &rom, &romSize) == -1) - { - WriteLog("Failed!\n"); - log_done(); - exit(0); - } - } - else - { - FILE * fp = fopen(path, "rb"); +WriteLog("Initializing video subsystem...\n"); + VideoInit(); +WriteLog("Initializing GUI subsystem...\n"); +#warning "!!! FIX !!! (GUIInit())" +// GUIInit(); - if (fp == NULL) - { - WriteLog("Failed!\n"); - log_done(); - exit(0); - } + // Now with crunchy GUI goodness! +WriteLog("About to start GUI...\n"); +#warning "!!! FIX !!! (GUIMain(...))" +// GUIMain(haveCart ? argv[1] : NULL); - fseek(fp, 0, SEEK_END); - romSize = ftell(fp); - fseek(fp, 0, SEEK_SET); - fread(rom, 1, romSize, fp); - fclose(fp); - } +//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); - WriteLog("OK (%i bytes)\n", romSize); - return romSize; -} + JaguarDone(); + VideoDone(); +// MemoryDone(); + LogDone(); -// -// 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); + // Free SDL components last...! + SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER); + SDL_Quit(); + + return 0; }