X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvj.cpp;h=9dbfe023f6077b66a4129694e70e331b53fda5f0;hb=1251a56096b022ec2a5af15d0362a5aacead13f1;hp=5c6fb61e25b3d3be5d914dab7827a705decf7095;hpb=135a0c52a2bcbcc37192c61801de6e9c80aeebff;p=virtualjaguar diff --git a/src/vj.cpp b/src/vj.cpp index 5c6fb61..9dbfe02 100644 --- a/src/vj.cpp +++ b/src/vj.cpp @@ -6,91 +6,66 @@ // Cleanups/fixes by James L. Hammons // -// -// 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 // POSIX, but should compile with linux & mingw... #include #include -#include "SDLptc.h" #include "jaguar.h" #include "crc32.h" #include "unzip.h" +#include "gui.h" // 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="c:/jaguarEmu/newload.img"; 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]; -//static char romLoadDialog_filePath[1024]; +SDL_Surface * surface, * mainSurface; +int16 * backbuffer = NULL; +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 -// -// 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) -{ - fullscreen = !fullscreen; - if (fullscreen) - console.option("fullscreen output"); - else - console.option("windowed output"); - console.close(); - console.open("Virtual Jaguar", tom_width, tom_height, format); -} +bool useJoystick = false; +bool showGUI = false; // Added/changed by SDLEMU http://sdlemu.ngemu.com -uint32 totalFrames;//so we can grab this from somewhere else... +uint32 totalFrames;//temp, so we can grab this from elsewhere... 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 @@ -101,8 +76,6 @@ int main(int argc, char * argv[]) printf("Portions massaged by James L. Hammons (WIN32)\n"); printf("Contact: http://sdlemu.ngemu.com/ | sdlemu@ngemu.com\n"); - console.option("windowed output"); - // 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...! @@ -116,16 +89,15 @@ int main(int argc, char * argv[]) haveCart = true; // It looks like we have a cartridge! if (!strcmp(argv[i], "-fullscreen")) - { fullscreen = true; - console.option("fullscreen output"); - } - if (!strcmp(argv[i], "-window")) - console.option("windowed output"); +//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], "-joyport")) { @@ -157,18 +129,17 @@ int main(int argc, char * argv[]) { 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(" -? 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("\nInvoking Virtual Jagaur with no ROM file will cause it to boot up\n"); printf("with the Jaguar BIOS.\n"); - return true; + return 1; } } @@ -185,44 +156,89 @@ int main(int argc, char * argv[]) SET32(jaguar_mainRam, 0, 0x00200000); // Set top of stack... - // Get the cartridge ROM (if passed in) - if (haveCart) + 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)); + + // Set up SDL library + if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER | SDL_INIT_NOPARACHUTE) < 0) { - JaguarLoadCart(jaguar_mainRom, argv[1]); - eeprom_init(); + WriteLog("VJ: Could not initialize the SDL library: %s", SDL_GetError()); + exit(1); } - jaguar_reset(); - - // Setting up the backbuffer - int16 * backbuffer = (int16 *)malloc(845 * 525 * sizeof(int16)); - memset(backbuffer, 0xAA, tom_getVideoModeWidth() * tom_getVideoModeHeight() * sizeof(int16)); + // 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 info: %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; - // Setting up the primary SDL display - surface = new Surface(tom_getVideoModeWidth(), tom_getVideoModeHeight(), format); + // 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); + + if (mainSurface == NULL) + { + WriteLog("VJ: SDL is unable to set the video mode: %s\n", SDL_GetError()); + exit(1); + } + + SDL_WM_SetCaption("Virtual Jaguar", "Virtual Jaguar"); + + // Create the primary SDL display (16 BPP, 5/5/5 RGB format) + 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\n", SDL_GetError()); + exit(1); + } // Initialize Joystick support under SDL - if (console.JoyEnabled() == 1) + if (useJoystick) { if (SDL_NumJoysticks() <= 0) { - console.option("joystick disabled"); - printf("No joystick(s) or joypad(s) detected on your system. Using keyboard...\n"); + useJoystick = false; + printf("VJ: 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"); - printf("Unable to open a Joystick on port: %d\n", (int)nJoyport); + useJoystick = false; + printf("VJ: Unable to open a Joystick on port: %d\n", (int)nJoyport); } else - printf("Using: %s\n", SDL_JoystickName(nJoyport)); + printf("VJ: Using: %s\n", SDL_JoystickName(nJoyport)); } } - // Open the display and start emulating some 3l337 Atari Jaguar games :P - console.open("Virtual Jaguar", tom_getVideoModeWidth(), tom_getVideoModeHeight(), format); + // Get the cartridge ROM (if passed in) +// 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(); totalFrames = 0; startTime = clock(); @@ -258,18 +274,21 @@ int main(int argc, char * argv[]) jaguar_exec(backbuffer, false); #endif // Setting up new backbuffer with new pixels and data -// jaguar_exec(backbuffer, true); JaguarExecute(backbuffer, true); totalFrames++; + // GUI stuff here... + if (showGUI) + { + extern uint32 gpu_pc, dsp_pc; + DrawText(backbuffer, 8, 8, false, "GPU PC: %08X", gpu_pc); + DrawText(backbuffer, 8, 16, false, "DSP PC: %08X", dsp_pc); + } + // Simple frameskip if (nFrame == nFrameskip) { - int32 * vs = (int32 *)surface->lock(); - memcpy(vs, backbuffer, tom_width * tom_height * 2); - surface->unlock(); - surface->copy(console); - console.update(); + BlitBackbuffer(); nFrame = 0; } else @@ -284,15 +303,17 @@ int main(int argc, char * argv[]) int elapsedTime = clock() - startTime; int fps = (1000 * totalFrames) / elapsedTime; - fprintf(log_get(), "Statistics: %i FPS\n", fps); - - if (console.JoyEnabled() == 1) {} - + fprintf(log_get(), "VJ: Ran at an average of %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); + SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER); + SDL_Quit(); return 0; } @@ -302,42 +323,44 @@ int main(int argc, char * argv[]) // uint32 JaguarLoadROM(uint8 * rom, char * path) { - uint32 romSize; - - WriteLog("JagEm: Loading %s...", path); + uint32 romSize = 0; char * ext = strrchr(path, '.'); - if (strcmpi(ext, ".zip") == 0) + if (ext != NULL) { - // Handle ZIP file loading here... - WriteLog("(ZIPped)..."); + WriteLog("VJ: Loading %s...", path); - if (load_zipped_file(0, 0, path, NULL, &rom, &romSize) == -1) + if (strcmpi(ext, ".zip") == 0) { - WriteLog("Failed!\n"); - log_done(); - exit(0); - } - } - else - { - FILE * fp = fopen(path, "rb"); + // Handle ZIP file loading here... + WriteLog("(ZIPped)..."); - if (fp == NULL) + if (load_zipped_file(0, 0, path, NULL, &rom, &romSize) == -1) + { + WriteLog("Failed!\n"); + return 0; + } + } + else { - WriteLog("Failed!\n"); - log_done(); - exit(0); + FILE * fp = fopen(path, "rb"); + + if (fp == NULL) + { + WriteLog("Failed!\n"); + return 0; + } + + fseek(fp, 0, SEEK_END); + romSize = ftell(fp); + fseek(fp, 0, SEEK_SET); + fread(rom, 1, romSize, fp); + fclose(fp); } - 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); } - WriteLog("OK (%i bytes)\n", romSize); return romSize; } @@ -346,7 +369,31 @@ uint32 JaguarLoadROM(uint8 * rom, char * path) // 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); + uint32 romSize = JaguarLoadROM(mem, path); + + if (romSize == 0) + { + char newPath[2048]; + WriteLog("VJ: Trying GUI...\n"); + + if (!UserSelectFile(path, newPath)) + { + WriteLog("VJ: Could not find valid ROM in directory \"%s\"...\nAborting!\n", path); + log_done(); + exit(0); + } + + romSize = JaguarLoadROM(mem, newPath); + + if (romSize == 0) + { + WriteLog("VJ: Could not load ROM from file \"%s\"...\nAborting!\n", newPath); + log_done(); + exit(0); + } + } + + jaguar_mainRom_crc32 = crc32_calcCheckSum(jaguar_mainRom, romSize); + WriteLog("CRC: %08X\n", (unsigned int)jaguar_mainRom_crc32); + eeprom_init(); }