Sync with r410 for Linux. Give that GIF Warning that I get to see over and over again on the console a line break.

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@411 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
arcum42 2008-12-11 06:53:39 +00:00 committed by Gregory Hainaut
parent c228e982cc
commit 9863f8095d
4 changed files with 36 additions and 15 deletions

View File

@ -743,7 +743,7 @@ static bool _gsGIFSoftReset( int mask )
if( GSgifSoftReset == NULL )
{
SysPrintf( "GIF Warning > Soft reset requested, but the GS plugin doesn't support it!" );
SysPrintf( "GIF Warning > Soft reset requested, but the GS plugin doesn't support it!\n" );
return false;
}

View File

@ -344,7 +344,7 @@ void OnDebug_Debugger(GtkMenuItem *menuitem, gpointer user_data) {
if (OpenPlugins(NULL) == -1) return;
if (needReset) {
SysReset();
SysReset();
needReset = FALSE;
}

View File

@ -124,13 +124,16 @@ void SignalExit(int sig) {
void RunExecute(int run)
{
if (needReset == TRUE) SysReset();
if (needReset == TRUE)
if (!SysReset())
return;
gtk_widget_destroy(MainWindow);
gtk_main_quit();
while (gtk_events_pending()) gtk_main_iteration();
if (OpenPlugins(NULL) == -1) {
if (OpenPlugins(NULL) == -1)
{
RunGui();
return;
}
@ -139,12 +142,10 @@ void RunExecute(int run)
signal(SIGPIPE, SignalExit);
FixCPUState();
if (needReset == TRUE) {
if( RunExe == 0 )
cpuExecuteBios();
if(!efile)
efile=GetPS2ElfName(elfname);
if (needReset == TRUE)
{
if ( RunExe == 0 ) cpuExecuteBios();
if (!efile) efile=GetPS2ElfName(elfname);
loadElfFile(elfname);
RunExe = 0;
@ -768,6 +769,14 @@ void setAdvancedOptions()
LinuxsseMXCSR = Config.sseMXCSR;
LinuxsseVUMXCSR = Config.sseVUMXCSR;
if( !cpucaps.hasStreamingSIMD2Extensions )
{
// SSE1 cpus do not support Denormals Are Zero flag.
LinuxsseMXCSR &= ~FLAG_DENORMAL_ZERO;
LinuxsseVUMXCSR &= ~FLAG_DENORMAL_ZERO;
}
switch((Config.sseMXCSR & 0x6000) >> 13)
{
case 0:

View File

@ -31,6 +31,8 @@ TESTRUNARGS g_TestRun;
GtkWidget *MsgDlg;
static int sinit=0;
int main(int argc, char *argv[]) {
char *file = NULL;
char elfname[g_MaxPath];
@ -380,7 +382,10 @@ void SysMessage(const char *fmt, ...) {
gtk_main();
}
int SysInit() {
int SysInit()
{
sinit=0;
mkdir(SSTATES_DIR, 0755);
mkdir(MEMCARDS_DIR, 0755);
@ -406,21 +411,28 @@ int SysInit() {
exit(1);
}
sinit = 1;
return 0;
}
void SysReset() {
cpuReset();
int SysReset() {
if (sinit == 0) return 1;
// Resetting
if( !cpuReset() ) return 0;
return 1;
}
void SysClose() {
if (sinit == 0) return;
cpuShutdown();
ReleasePlugins();
if (emuLog != NULL) {
if (emuLog != NULL)
{
fclose(emuLog);
emuLog = NULL;
}
}
sinit=0;
}
void SysPrintf(const char *fmt, ...) {