JIT: Removed oldsegv option

diff --git a/cfgfile.cpp b/cfgfile.cpp
index f531bb06aef0e267f2c0a63f61b78503ddde430a..f7c1cfb64f92e40f9e9394a406437a324e13af3c 100644 (file)
--- a/cfgfile.cpp
+++ b/cfgfile.cpp
@@ -1397,7 +1397,6 @@ void cfgfile_save_options (struct zfile *f, struct uae_prefs *p, int type)
        cfgfile_write_str (f, _T("comp_trustnaddr"), compmode[p->comptrustnaddr]);
        cfgfile_write_bool (f, _T("comp_nf"), p->compnf);
        cfgfile_write_bool (f, _T("comp_constjump"), p->comp_constjump);
-       cfgfile_write_bool (f, _T("comp_oldsegv"), p->comp_oldsegv);
        cfgfile_write_str (f, _T("comp_flushmode"), flushmode[p->comp_hardflush]);
 #ifdef USE_JIT_FPU
        cfgfile_write_bool (f, _T("compfpu"), p->compfpu);
@@ -4271,7 +4270,6 @@ static int cfgfile_parse_hardware (struct uae_prefs *p, const TCHAR *option, TCH
                || cfgfile_yesno (option, value, _T("fpu_softfloat"), &p->fpu_softfloat)
                || cfgfile_yesno (option, value, _T("comp_nf"), &p->compnf)
                || cfgfile_yesno (option, value, _T("comp_constjump"), &p->comp_constjump)
-               || cfgfile_yesno (option, value, _T("comp_oldsegv"), &p->comp_oldsegv)
 #ifdef USE_JIT_FPU
                || cfgfile_yesno (option, value, _T("compfpu"), &p->compfpu)
 #endif
@@ -6016,7 +6014,6 @@ void default_prefs (struct uae_prefs *p, int type)
        p->compnf = 1;
        p->comp_hardflush = 0;
        p->comp_constjump = 1;
-       p->comp_oldsegv = 0;
 #ifdef USE_JIT_FPU
        p->compfpu = 1;
 #else

diff --git a/include/options.h b/include/options.h
index ef116e4ab46c43b4b577feed25524ea11f31b60c..20da48b7161429df0de3ff81d619674fad258cad 100644 (file)
--- a/include/options.h
+++ b/include/options.h
@@ -389,7 +389,6 @@ struct uae_prefs {
        bool compfpu;
        bool comp_hardflush;
        bool comp_constjump;
-       bool comp_oldsegv;
        int cachesize;
        bool fpu_strict;
 

diff --git a/jit/compemu_prefs.cpp b/jit/compemu_prefs.cpp
index d1754585b40073e86fe58aeb0ae3ead70996c56d..3d14214a2db8ae6d3277539394f9fe83ea4f7c03 100644 (file)
--- a/jit/compemu_prefs.cpp
+++ b/jit/compemu_prefs.cpp
@@ -16,7 +16,6 @@ bool check_prefs_changed_comp (void)
                currprefs.compnf != changed_prefs.compnf ||
                currprefs.comp_hardflush != changed_prefs.comp_hardflush ||
                currprefs.comp_constjump != changed_prefs.comp_constjump ||
-               currprefs.comp_oldsegv != changed_prefs.comp_oldsegv ||
                currprefs.compfpu != changed_prefs.compfpu ||
                currprefs.fpu_strict != changed_prefs.fpu_strict)
                changed = 1;
@@ -28,7 +27,6 @@ bool check_prefs_changed_comp (void)
        currprefs.compnf = changed_prefs.compnf;
        currprefs.comp_hardflush = changed_prefs.comp_hardflush;
        currprefs.comp_constjump = changed_prefs.comp_constjump;
-       currprefs.comp_oldsegv = changed_prefs.comp_oldsegv;
        currprefs.compfpu = changed_prefs.compfpu;
        currprefs.fpu_strict = changed_prefs.fpu_strict;
 

diff --git a/jit/exception_handler.cpp b/jit/exception_handler.cpp
index f4966c2ec84c657036b4bdfce5f244e68b60b402..2672f5eb98a30fd4ff1dac2e612b45a6765df25c 100644 (file)
--- a/jit/exception_handler.cpp
+++ b/jit/exception_handler.cpp
@@ -311,38 +311,7 @@ static int handle_access(uintptr_t fault_addr, CONTEXT_T context)
                    abort ();
                }
                if (pr) {
-                       if (currprefs.comp_oldsegv) {
-                               uae_u32 addr = uae_p32(fault_addr) - uae_p32(NATMEM_OFFSET);
-#ifdef DEBUG_ACCESS
-                               if ((addr >= 0x10000000 && addr < 0x40000000) ||
-                                       (addr >= 0x50000000)) {
-                                               write_log (_T("JIT: Suspicious address 0x%x in SEGV handler.\n"), addr);
-                               }
-#endif
-                               if (dir==SIG_READ) {
-                                       switch (size) {
-                                       case 1: *((uae_u8*)pr)=get_byte (addr); break;
-                                       case 2: *((uae_u16*)pr)=swap16(get_word (addr)); break;
-                                       case 4: *((uae_u32*)pr)=swap32(get_long (addr)); break;
-                                       default: abort();
-                                       }
-                               }
-                               else { /* write */
-                                       switch (size) {
-                                       case 1: put_byte (addr,*((uae_u8*)pr)); break;
-                                       case 2: put_word (addr,swap16(*((uae_u16*)pr))); break;
-                                       case 4: put_long (addr,swap32(*((uae_u32*)pr))); break;
-                                       default: abort();
-                                       }
-                               }
-#ifdef DEBUG_ACCESS
-                               write_log (_T("JIT: Handled one access!\n"));
-#endif
-                               fflush(stdout);
-                               segvcount++;
-                               CONTEXT_PC(context) += len;
-                       }
-                       else {
+                       {
                                uae_u32 addr = uae_p32(fault_addr) - uae_p32(NATMEM_OFFSET);
 #ifdef DEBUG_ACCESS
                                if ((addr >= 0x10000000 && addr < 0x40000000) ||