[Scummvm-cvs-logs] SF.net SVN: scummvm:[38747] scummvm/trunk/engines/sci/engine/vm.cpp

[fingolfin at users.sourceforge.net]

Revision: 38747
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38747&view=rev
Author:   fingolfin
Date:     2009-02-21 21:22:07 +0000 (Sat, 21 Feb 2009)

Log Message:
-----------
SCI: Removed setjmp code

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/vm.cpp

Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp	2009-02-21 21:16:41 UTC (rev 38746)
+++ scummvm/trunk/engines/sci/engine/vm.cpp	2009-02-21 21:22:07 UTC (rev 38747)
@@ -34,10 +34,6 @@
 #include "sci/engine/gc.h"
 #include "sci/sfx/sfx_player.h"
 
-#ifdef HAVE_SETJMP_H
-#include <setjmp.h>
-#endif
-
 namespace Sci {
 
 reg_t NULL_REG = NULL_REG_INITIALIZER;
@@ -63,11 +59,6 @@
 int bp_flag = 0;
 static reg_t _dummy_register = NULL_REG_INITIALIZER;
 
-#ifdef HAVE_SETJMP_H
-static int jump_initialized = 0;
-static jmp_buf vm_error_address;
-#endif
-
 // validation functionality
 
 #ifndef DISABLE_VALIDATIONS
@@ -536,10 +527,6 @@
 
 void vm_handle_fatal_error(EngineState *s, int line, const char *file) {
 	fprintf(stderr, "Fatal VM error in %s, L%d; aborting...\n", file, line);
-#ifdef HAVE_SETJMP_H
-	if (jump_initialized)
-		longjmp(vm_error_address, 0);
-#endif
 	error("Could not recover, exitting...\n");
 }
 
@@ -624,11 +611,6 @@
 		return;
 	}
 
-#ifdef HAVE_SETJMP_H
-	setjmp(vm_error_address);
-	jump_initialized = 1;
-#endif
-
 	if (!restoring)
 		s->execution_stack_base = s->execution_stack_pos;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.