diff options
| author | Max Horn | 2009-02-21 21:22:07 +0000 |
|---|---|---|
| committer | Max Horn | 2009-02-21 21:22:07 +0000 |
| commit | 6288e0456fb2c83269d16b19cf245cb35ec1e5a7 (patch) | |
| tree | bf9130b4a40d42845181500f6a645bd8b32aa1fc | |
| parent | ff17899d8ef0a9bf82334819444646b4c323b29e (diff) | |
| download | scummvm-rg350-6288e0456fb2c83269d16b19cf245cb35ec1e5a7.tar.gz scummvm-rg350-6288e0456fb2c83269d16b19cf245cb35ec1e5a7.tar.bz2 scummvm-rg350-6288e0456fb2c83269d16b19cf245cb35ec1e5a7.zip | |
SCI: Removed setjmp code
svn-id: r38747
| -rw-r--r-- | engines/sci/engine/vm.cpp | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp index ca94438d10..45f8954ad7 100644 --- a/engines/sci/engine/vm.cpp +++ b/engines/sci/engine/vm.cpp @@ -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 send_calls_allocated = 0; 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 @@ exec_stack_t *add_exec_stack_entry(EngineState *s, reg_t pc, stack_ptr_t sp, reg 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 @@ void run_vm(EngineState *s, int restoring) { return; } -#ifdef HAVE_SETJMP_H - setjmp(vm_error_address); - jump_initialized = 1; -#endif - if (!restoring) s->execution_stack_base = s->execution_stack_pos; |