Cleanup mednafen.cpp - leave only what we need

This commit is contained in:
twinaphex 2012-11-29 23:21:44 +01:00
parent 8feb7dca20
commit ff5e3569a6
3 changed files with 124 additions and 367 deletions

View File

@ -1,4 +1,5 @@
#include "mednafen/mednafen.h"
#include "mednafen/mempatcher.h"
#include "mednafen/git.h"
#include "mednafen/general.h"
#ifdef NEED_DEINTERLACER
@ -162,13 +163,10 @@ static void check_system_specs(void)
void retro_init()
{
std::vector<MDFNGI*> ext;
MDFNI_InitializeModules(ext);
MDFNI_InitializeModule();
const char *dir = NULL;
std::vector<MDFNSetting> settings;
if (environ_cb(RETRO_ENVIRONMENT_GET_SYSTEM_DIRECTORY, &dir) && dir)
{
retro_base_directory = dir;
@ -251,7 +249,20 @@ bool retro_load_game(const struct retro_game_info *info)
void retro_unload_game()
{
MDFNI_CloseGame();
if(game)
{
MDFN_FlushGameCheats(0);
game->CloseGame();
if(game->name)
{
free(game->name);
game->name=0;
}
MDFNMP_Kill();
game = NULL;
}
}
static unsigned retro_devices[2];
@ -260,6 +271,7 @@ static unsigned retro_devices[2];
// See mednafen/psx/input/gamepad.cpp
static void update_input(void)
{
MDFNGI *currgame = game;
#if defined(WANT_PSX_EMU)
union
{
@ -340,10 +352,10 @@ static void update_input(void)
switch (retro_devices[j])
{
case RETRO_DEVICE_ANALOG:
game->SetInput(j, "dualanalog", &buf.u8[j]);
currgame->SetInput(j, "dualanalog", &buf.u8[j]);
break;
default:
game->SetInput(j, "gamepad", &buf.u8[j]);
currgame->SetInput(j, "gamepad", &buf.u8[j]);
break;
}
}
@ -382,7 +394,7 @@ static void update_input(void)
// Possible endian bug ...
for (unsigned i = 0; i < 5; i++)
game->SetInput(i, "gamepad", &input_buf[i][0]);
currgame->SetInput(i, "gamepad", &input_buf[i][0]);
#elif defined(WANT_WSWAN_EMU)
static uint16_t input_buf;
input_buf = 0;
@ -414,7 +426,7 @@ static void update_input(void)
input_buf = u.b[0] | u.b[1] << 8;
#endif
game->SetInput(0, "gamepad", &input_buf);
currgame->SetInput(0, "gamepad", &input_buf);
#elif defined(WANT_NGP_EMU)
static uint16_t input_buf;
input_buf = 0;
@ -442,7 +454,7 @@ static void update_input(void)
input_buf = u.b[0] | u.b[1] << 8;
#endif
game->SetInput(0, "gamepad", &input_buf);
currgame->SetInput(0, "gamepad", &input_buf);
#elif defined(WANT_GBA_EMU)
static uint16_t input_buf;
input_buf = 0;
@ -473,7 +485,7 @@ static void update_input(void)
#endif
// Possible endian bug ...
game->SetInput(0, "gamepad", &input_buf);
currgame->SetInput(0, "gamepad", &input_buf);
#elif defined(WANT_SNES_EMU)
static uint8_t input_buf[5][2];
@ -516,7 +528,7 @@ static void update_input(void)
// Possible endian bug ...
for (unsigned i = 0; i < 5; i++)
game->SetInput(i, "gamepad", &input_buf[i][0]);
currgame->SetInput(i, "gamepad", &input_buf[i][0]);
#elif defined(WANT_VB_EMU)
static uint16_t input_buf[1];
input_buf[0] = 0;
@ -554,7 +566,7 @@ static void update_input(void)
}
// Possible endian bug ...
game->SetInput(0, "gamepad", &input_buf[0]);
currgame->SetInput(0, "gamepad", &input_buf[0]);
#elif defined(WANT_PCFX_EMU)
static uint16_t input_buf[2];
input_buf[0] = input_buf[1] = 0;
@ -588,7 +600,7 @@ static void update_input(void)
input_buf[j] = u.b[0] | u.b[1] << 8;
#endif
game->SetInput(j, "gamepad", &input_buf[j]);
currgame->SetInput(j, "gamepad", &input_buf[j]);
}
#else
static uint16_t input_buf[1];
@ -611,7 +623,7 @@ static void update_input(void)
}
// Possible endian bug ...
game->SetInput(0, "gamepad", &input_buf[0]);
currgame->SetInput(0, "gamepad", &input_buf[0]);
#endif
}
@ -619,6 +631,8 @@ static uint64_t video_frames, audio_frames;
void retro_run()
{
MDFNGI *curgame = game;
input_poll_cb();
update_input();
@ -652,7 +666,7 @@ void retro_run()
last_sound_rate = spec.SoundRate;
}
MDFNGameInfo->Emulate(&spec);
curgame->Emulate(&spec);
#ifdef NEED_DEINTERLACER
if(spec.InterlaceOn)
@ -671,7 +685,7 @@ void retro_run()
PrevInterlaced = false;
#endif
int16 *const SoundBuf = spec.SoundBuf + spec.SoundBufSizeALMS * MDFNGameInfo->soundchan;
int16 *const SoundBuf = spec.SoundBuf + spec.SoundBufSizeALMS * curgame->soundchan;
int32 SoundBufSize = spec.SoundBufSize - spec.SoundBufSizeALMS;
const int32 SoundBufMaxSize = spec.SoundBufMaxSize - spec.SoundBufSizeALMS;
@ -837,12 +851,13 @@ static size_t serialize_size;
size_t retro_serialize_size(void)
{
MDFNGI *curgame = game;
//if (serialize_size)
// return serialize_size;
if (!game->StateAction)
if (!curgame->StateAction)
{
fprintf(stderr, "[mednafen]: Module %s doesn't support save states.\n", game->shortname);
fprintf(stderr, "[mednafen]: Module %s doesn't support save states.\n", curgame->shortname);
return 0;
}
@ -851,7 +866,7 @@ size_t retro_serialize_size(void)
if (!MDFNSS_SaveSM(&st, 0, 0, NULL, NULL, NULL))
{
fprintf(stderr, "[mednafen]: Module %s doesn't support save states.\n", game->shortname);
fprintf(stderr, "[mednafen]: Module %s doesn't support save states.\n", curgame->shortname);
return 0;
}

View File

@ -48,7 +48,7 @@ MDFNGI *MDFNI_LoadGame(const char *force_module, const char *path);
MDFNGI *MDFNI_LoadCD(const char *sysname, const char *devicename);
// Call this function as early as possible, even before MDFNI_Initialize()
bool MDFNI_InitializeModules(const std::vector<MDFNGI *> &ExternalSystems);
bool MDFNI_InitializeModule(void);
/* allocates memory. 0 on failure, 1 on success. */
/* Also pass it the base directory to load the configuration file. */

View File

@ -46,59 +46,57 @@
MDFNGI *MDFNGameInfo = NULL;
#ifdef NEED_CD
static std::vector<CDIF *> CDInterfaces; // FIXME: Cleanup on error out.
#if defined(WANT_NES_EMU)
extern MDFNGI EmulatedNES;
#define MDFNGI_CORE &EmulatedNES
#elif defined WANT_SNES_EMU
extern MDFNGI EmulatedSNES;
#define MDFNGI_CORE &EmulatedSNES
extern MDFNGI EmulatedGB;
#elif defined WANT_GB_EMU
#define MDFNGI_CORE &EmulatedGB
#elif defined WANT_GBA_EMU
extern MDFNGI EmulatedGBA;
#define MDFNGI_CORE &EmulatedGBA
#elif defined WANT_PCE_EMU
extern MDFNGI EmulatedPCE;
#define MDFNGI_CORE &EmulatedPCE
#elif defined WANT_PCE_FAST_EMU
extern MDFNGI EmulatedPCE_Fast;
#define MDFNGI_CORE &EmulatedPCE_Fast
#elif defined WANT_LYNX_EMU
extern MDFNGI EmulatedLynx;
#define MDFNGI_CORE &EmulatedLynx
#elif defined WANT_MD_EMU
extern MDFNGI EmulatedMD;
#define MDFNGI_CORE &EmulatedMD
#elif defined WANT_PCFX_EMU
extern MDFNGI EmulatedPCFX;
#define MDFNGI_CORE &EmulatedPCFX
#elif defined WANT_NGP_EMU
extern MDFNGI EmulatedNGP;
#define MDFNGI_CORE &EmulatedNGP
#elif defined WANT_PSX_EMU
extern MDFNGI EmulatedPSX;
#define MDFNGI_CORE &EmulatedPSX
#elif defined WANT_VB_EMU
extern MDFNGI EmulatedVB;
#define MDFNGI_CORE &EmulatedVB
#elif defined WANT_WSWAN_EMU
extern MDFNGI EmulatedWSwan;
#define MDFNGI_CORE &EmulatedWSwan
#elif defined WANT_SMS_EMU
extern MDFNGI EmulatedSMS;
#define MDFNGI_CORE &EmulatedSMS
#elif defined(WANT_SMS_EMU) && defined(WANT_GG_EMU)
extern MDFNGI EmulatedGG;
#define MDFNGI_CORE &EmulatedGG
#endif
/* forward declarations */
extern void MDFND_DispMessage(unsigned char *str);
void MDFNI_CloseGame(void)
{
if(MDFNGameInfo)
{
MDFN_FlushGameCheats(0);
MDFNGameInfo->CloseGame();
if(MDFNGameInfo->name)
{
free(MDFNGameInfo->name);
MDFNGameInfo->name=0;
}
MDFNMP_Kill();
MDFNGameInfo = NULL;
#ifdef NEED_CD
for(unsigned i = 0; i < CDInterfaces.size(); i++)
delete CDInterfaces[i];
CDInterfaces.clear();
#endif
}
#ifdef WANT_DEBUGGER
MDFNDBG_Kill();
#endif
}
std::vector<MDFNGI *> MDFNSystems;
static std::list<MDFNGI *> MDFNSystemsPrio;
bool MDFNSystemsPrio_CompareFunc(MDFNGI *first, MDFNGI *second)
{
if(first->ModulePriority > second->ModulePriority)
return(true);
return(false);
}
static void AddSystem(MDFNGI *system)
{
MDFNSystems.push_back(system);
}
void MDFN_DispMessage(const char *format, ...)
{
va_list ap;
@ -118,24 +116,6 @@ void MDFN_ResetMessages(void)
#ifdef NEED_CD
bool CDIF_DumpCD(const char *fn);
void MDFNI_DumpModulesDef(const char *fn)
{
FILE *fp = fopen(fn, "wb");
for(unsigned int i = 0; i < MDFNSystems.size(); i++)
{
fprintf(fp, "%s\n", MDFNSystems[i]->shortname);
fprintf(fp, "%s\n", MDFNSystems[i]->fullname);
fprintf(fp, "%d\n", MDFNSystems[i]->nominal_width);
fprintf(fp, "%d\n", MDFNSystems[i]->nominal_height);
}
fclose(fp);
}
static void ReadM3U(std::vector<std::string> &file_list, std::string path, unsigned depth = 0)
{
std::vector<std::string> ret;
@ -175,8 +155,9 @@ static void ReadM3U(std::vector<std::string> &file_list, std::string path, unsig
MDFNGI *MDFNI_LoadCD(const char *force_module, const char *devicename)
{
uint8 LayoutMD5[16];
MDFNI_CloseGame();
#ifdef NEED_CD
std::vector<CDIF *> CDInterfaces; // FIXME: Cleanup on error out.
#endif
MDFN_printf(_("Loading %s...\n\n"), devicename ? devicename : _("PHYSICAL CD"));
@ -256,51 +237,6 @@ MDFNGI *MDFNI_LoadCD(const char *force_module, const char *devicename)
layout_md5.finish(LayoutMD5);
}
MDFNGameInfo = NULL;
for(std::list<MDFNGI *>::iterator it = MDFNSystemsPrio.begin(); it != MDFNSystemsPrio.end(); it++)
{
char tmpstr[256];
trio_snprintf(tmpstr, 256, "%s.enable", (*it)->shortname);
if(force_module)
{
if(!strcmp(force_module, (*it)->shortname))
{
MDFNGameInfo = *it;
break;
}
}
else
{
// Is module enabled?
if(!MDFN_GetSettingB(tmpstr))
continue;
if(!(*it)->LoadCD || !(*it)->TestMagicCD)
continue;
if((*it)->TestMagicCD(&CDInterfaces))
{
MDFNGameInfo = *it;
break;
}
}
}
if(!MDFNGameInfo)
{
if(force_module)
{
MDFN_PrintError(_("Unrecognized system \"%s\"!"), force_module);
return(0);
}
// This code path should never be taken, thanks to "cdplay"
MDFN_PrintError(_("Could not find a system that supports this CD."));
return(0);
}
// This if statement will be true if force_module references a system without CDROM support.
if(!MDFNGameInfo->LoadCD)
{
@ -310,7 +246,6 @@ MDFNGI *MDFNI_LoadCD(const char *force_module, const char *devicename)
MDFN_printf(_("Using module: %s(%s)\n\n"), MDFNGameInfo->shortname, MDFNGameInfo->fullname);
// TODO: include module name in hash
memcpy(MDFNGameInfo->MD5, LayoutMD5, 16);
@ -339,51 +274,29 @@ MDFNGI *MDFNI_LoadCD(const char *force_module, const char *devicename)
}
#endif
// Return FALSE on fatal error(IPS file found but couldn't be applied),
// or TRUE on success(IPS patching succeeded, or IPS file not found).
static bool LoadIPS(MDFNFILE &GameFile, const char *path)
{
return(1);
}
MDFNGI *MDFNI_LoadGame(const char *force_module, const char *name)
{
MDFNFILE GameFile;
std::vector<FileExtensionSpecStruct> valid_iae;
MDFNGameInfo = MDFNGI_CORE;
#ifdef NEED_CD
if(strlen(name) > 4 && (!strcasecmp(name + strlen(name) - 4, ".cue") || !strcasecmp(name + strlen(name) - 4, ".toc") || !strcasecmp(name + strlen(name) - 4, ".m3u")))
return(MDFNI_LoadCD(force_module, name));
#endif
MDFNI_CloseGame();
MDFNGameInfo = NULL;
MDFN_printf(_("Loading %s...\n"),name);
MDFN_indent(1);
// Construct a NULL-delimited list of known file extensions for MDFN_fopen()
for(unsigned int i = 0; i < MDFNSystems.size(); i++)
{
const FileExtensionSpecStruct *curexts = MDFNSystems[i]->FileExtensions;
const FileExtensionSpecStruct *curexts = MDFNGameInfo->FileExtensions;
// If we're forcing a module, only look for extensions corresponding to that module
if(force_module && strcmp(MDFNSystems[i]->shortname, force_module))
continue;
if(curexts)
while(curexts->extension && curexts->description)
{
valid_iae.push_back(*curexts);
curexts++;
}
}
{
FileExtensionSpecStruct tmpext = { NULL, NULL };
valid_iae.push_back(tmpext);
}
if(!GameFile.Open(name, &valid_iae[0], _("game")))
{
@ -391,82 +304,9 @@ MDFNGI *MDFNI_LoadGame(const char *force_module, const char *name)
return 0;
}
if(!LoadIPS(GameFile, MDFN_MakeFName(MDFNMKF_IPS, 0, 0).c_str()))
{
MDFNGameInfo = NULL;
GameFile.Close();
return(0);
}
MDFNGameInfo = NULL;
for(std::list<MDFNGI *>::iterator it = MDFNSystemsPrio.begin(); it != MDFNSystemsPrio.end(); it++) //_unsigned int x = 0; x < MDFNSystems.size(); x++)
{
char tmpstr[256];
trio_snprintf(tmpstr, 256, "%s.enable", (*it)->shortname);
if(force_module)
{
if(!strcmp(force_module, (*it)->shortname))
{
if(!(*it)->Load)
{
GameFile.Close();
#ifdef NEED_CD
if((*it)->LoadCD)
MDFN_PrintError(_("Specified system only supports CD(physical, or image files, such as *.cue and *.toc) loading."));
else
#endif
MDFN_PrintError(_("Specified system does not support normal file loading."));
MDFN_indent(-1);
MDFNGameInfo = NULL;
return 0;
}
MDFNGameInfo = *it;
break;
}
}
else
{
// Is module enabled?
if(!MDFN_GetSettingB(tmpstr))
continue;
if(!(*it)->Load || !(*it)->TestMagic)
continue;
if((*it)->TestMagic(name, &GameFile))
{
MDFNGameInfo = *it;
break;
}
}
}
if(!MDFNGameInfo)
{
GameFile.Close();
if(force_module)
MDFN_PrintError(_("Unrecognized system \"%s\"!"), force_module);
else
MDFN_PrintError(_("Unrecognized file format. Sorry."));
MDFN_indent(-1);
MDFNGameInfo = NULL;
return 0;
}
MDFN_printf(_("Using module: %s(%s)\n\n"), MDFNGameInfo->shortname, MDFNGameInfo->fullname);
MDFN_indent(1);
assert(MDFNGameInfo->soundchan != 0);
MDFNGameInfo->soundrate = 0;
MDFNGameInfo->name = NULL;
MDFNGameInfo->rotated = 0;
//
// Load per-game settings
//
@ -485,8 +325,6 @@ MDFNGI *MDFNI_LoadGame(const char *force_module, const char *name)
MDFN_LoadGameCheats(NULL);
MDFNMP_InstallReadPatches();
//MDFNI_SetLayerEnableMask(~0ULL);
#ifdef WANT_DEBUGGER
MDFNDBG_PostGameLoad();
#endif
@ -511,107 +349,12 @@ MDFNGI *MDFNI_LoadGame(const char *force_module, const char *name)
*tmp = 0;
}
return(MDFNGameInfo);
}
#if defined(WANT_PSX_EMU)
extern MDFNGI EmulatedPSX;
#elif defined(WANT_PCE_EMU)
extern MDFNGI EmulatedPCE;
#elif defined(WANT_PCE_FAST_EMU)
extern MDFNGI EmulatedPCE_Fast;
#elif defined(WANT_WSWAN_EMU)
extern MDFNGI EmulatedWSwan;
#elif defined(WANT_NGP_EMU)
extern MDFNGI EmulatedNGP;
#elif defined(WANT_GBA_EMU)
extern MDFNGI EmulatedGBA;
#elif defined(WANT_SNES_EMU)
extern MDFNGI EmulatedSNES;
#elif defined(WANT_VB_EMU)
extern MDFNGI EmulatedVB;
#elif defined(WANT_PCFX_EMU)
extern MDFNGI EmulatedPCFX;
#endif
bool MDFNI_InitializeModules(const std::vector<MDFNGI *> &ExternalSystems)
bool MDFNI_InitializeModule(void)
{
static MDFNGI *InternalSystems[] =
{
#ifdef WANT_NES_EMU
&EmulatedNES,
#endif
#ifdef WANT_SNES_EMU
&EmulatedSNES,
#endif
#ifdef WANT_GB_EMU
&EmulatedGB,
#endif
#ifdef WANT_GBA_EMU
&EmulatedGBA,
#endif
#ifdef WANT_PCE_EMU
&EmulatedPCE,
#endif
#ifdef WANT_PCE_FAST_EMU
&EmulatedPCE_Fast,
#endif
#ifdef WANT_LYNX_EMU
&EmulatedLynx,
#endif
#ifdef WANT_MD_EMU
&EmulatedMD,
#endif
#ifdef WANT_PCFX_EMU
&EmulatedPCFX,
#endif
#ifdef WANT_NGP_EMU
&EmulatedNGP,
#endif
#ifdef WANT_PSX_EMU
&EmulatedPSX,
#endif
#ifdef WANT_VB_EMU
&EmulatedVB,
#endif
#ifdef WANT_WSWAN_EMU
&EmulatedWSwan,
#endif
#ifdef WANT_SMS_EMU
&EmulatedSMS,
&EmulatedGG,
#endif
};
std::string i_modules_string, e_modules_string;
for(unsigned int i = 0; i < sizeof(InternalSystems) / sizeof(MDFNGI *); i++)
{
AddSystem(InternalSystems[i]);
if(i)
i_modules_string += " ";
i_modules_string += std::string(InternalSystems[i]->shortname);
}
MDFNI_printf(_("Internal emulation modules: %s\n"), i_modules_string.c_str());
for(unsigned int i = 0; i < MDFNSystems.size(); i++)
MDFNSystemsPrio.push_back(MDFNSystems[i]);
MDFNSystemsPrio.sort(MDFNSystemsPrio_CompareFunc);
#ifdef NEED_CD
CDUtility::CDUtility_Init();
@ -620,7 +363,6 @@ bool MDFNI_InitializeModules(const std::vector<MDFNGI *> &ExternalSystems)
return(1);
}
static std::string settings_file_path;
int MDFNI_Initialize(const char *basedir)
{
#ifdef WANT_DEBUGGER
@ -714,7 +456,7 @@ void MDFN_DebugPrintReal(const char *file, const int line, const char *format, .
va_start(ap, format);
temp = trio_vaprintf(format, ap);
printf("%s:%d %s\n", file, line, temp);
fprintf(stderr, "%s:%d %s\n", file, line, temp);
free(temp);
va_end(ap);