From f6ae5595fc830b467cb0b300622643f30fd70187 Mon Sep 17 00:00:00 2001 From: Frode Solheim Date: Sat, 19 Sep 2015 00:57:10 +0200 Subject: [PATCH] JIT: Remove unused comp options --- cfgfile.cpp | 12 ------------ include/options.h | 9 ++------- jit/compemu_prefs.cpp | 36 ------------------------------------ jit/compemu_support.cpp | 5 +---- 4 files changed, 3 insertions(+), 59 deletions(-) diff --git a/cfgfile.cpp b/cfgfile.cpp index 1b37c340..f531bb06 100644 --- a/cfgfile.cpp +++ b/cfgfile.cpp @@ -108,10 +108,8 @@ static const struct cfg_lines opttable[] = {_T("comp_trustlong"), _T("How to access longs in compiler (direct/indirect/indirectKS/afterPic") }, {_T("comp_nf"), _T("Whether to optimize away flag generation where possible") }, {_T("comp_fpu"), _T("Whether to provide JIT FPU emulation") }, - {_T("compforcesettings"), _T("Whether to force the JIT compiler settings") }, {_T("cachesize"), _T("How many MB to use to buffer translated instructions")}, {_T("override_dga_address"),_T("Address from which to map the frame buffer (upper 16 bits) (DANGEROUS!)")}, - {_T("avoid_cmov"), _T("Set to yes on machines that lack the CMOV instruction") }, {_T("avoid_dga"), _T("Set to yes if the use of DGA extension creates problems") }, {_T("avoid_vid"), _T("Set to yes if the use of the Vidmode extension creates problems") }, {_T("parallel_on_demand"), _T("") }, @@ -1404,9 +1402,6 @@ void cfgfile_save_options (struct zfile *f, struct uae_prefs *p, int type) #ifdef USE_JIT_FPU cfgfile_write_bool (f, _T("compfpu"), p->compfpu); #endif - cfgfile_write_bool (f, _T("comp_midopt"), p->comp_midopt); - cfgfile_write_bool (f, _T("comp_lowopt"), p->comp_lowopt); - cfgfile_write_bool (f, _T("avoid_cmov"), p->avoid_cmov); cfgfile_write (f, _T("cachesize"), _T("%d"), p->cachesize); for (i = 0; i < MAX_JPORTS; i++) { @@ -2559,7 +2554,6 @@ static int cfgfile_parse_host (struct uae_prefs *p, TCHAR *option, TCHAR *value) || cfgfile_yesno (option, value, _T("sound_cdaudio"), &p->sound_cdaudio) || cfgfile_yesno (option, value, _T("sound_stereo_swap_paula"), &p->sound_stereo_swap_paula) || cfgfile_yesno (option, value, _T("sound_stereo_swap_ahi"), &p->sound_stereo_swap_ahi) - || cfgfile_yesno (option, value, _T("avoid_cmov"), &p->avoid_cmov) || cfgfile_yesno (option, value, _T("log_illegal_mem"), &p->illegal_mem) || cfgfile_yesno (option, value, _T("filesys_no_fsdb"), &p->filesys_no_uaefsdb) || cfgfile_yesno (option, value, _T("gfx_blacker_than_black"), &p->gfx_blackerthanblack) @@ -4278,12 +4272,9 @@ static int cfgfile_parse_hardware (struct uae_prefs *p, const TCHAR *option, TCH || 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) - || cfgfile_yesno (option, value, _T("compforcesettings"), &dummybool) #ifdef USE_JIT_FPU || cfgfile_yesno (option, value, _T("compfpu"), &p->compfpu) #endif - || cfgfile_yesno (option, value, _T("comp_midopt"), &p->comp_midopt) - || cfgfile_yesno (option, value, _T("comp_lowopt"), &p->comp_lowopt) || cfgfile_yesno (option, value, _T("rtg_nocustom"), &p->picasso96_nocustom) || cfgfile_yesno (option, value, _T("floppy_write_protect"), &p->floppy_read_only) || cfgfile_yesno (option, value, _T("uae_hide_autoconfig"), &p->uae_hide_autoconfig) @@ -6032,9 +6023,6 @@ void default_prefs (struct uae_prefs *p, int type) p->compfpu = 0; #endif p->cachesize = 0; - p->avoid_cmov = 0; - p->comp_midopt = 0; - p->comp_lowopt = 0; p->gfx_framerate = 1; p->gfx_autoframerate = 50; diff --git a/include/options.h b/include/options.h index daca454e..ef116e4a 100644 --- a/include/options.h +++ b/include/options.h @@ -387,18 +387,13 @@ struct uae_prefs { int comptrustnaddr; bool compnf; bool compfpu; - bool comp_midopt; - bool comp_lowopt; - bool fpu_strict; - bool fpu_softfloat; - bool comp_hardflush; bool comp_constjump; bool comp_oldsegv; - int cachesize; + bool fpu_strict; - bool avoid_cmov; + bool fpu_softfloat; int gfx_framerate, gfx_autoframerate; struct wh gfx_size_win; diff --git a/jit/compemu_prefs.cpp b/jit/compemu_prefs.cpp index 0882f6ad..d1754585 100644 --- a/jit/compemu_prefs.cpp +++ b/jit/compemu_prefs.cpp @@ -52,12 +52,8 @@ bool check_prefs_changed_comp (void) if(currprefs.cachesize) currprefs.illegal_mem = changed_prefs.illegal_mem;// = 0; - currprefs.comp_midopt = changed_prefs.comp_midopt; - currprefs.comp_lowopt = changed_prefs.comp_lowopt; - if ((!canbang || !currprefs.cachesize) && currprefs.comptrustbyte != 1) { // Set all of these to indirect when canbang == 0 - // Basically, set the compforcesettings option... currprefs.comptrustbyte = 1; currprefs.comptrustword = 1; currprefs.comptrustlong = 1; @@ -80,37 +76,5 @@ bool check_prefs_changed_comp (void) currprefs.comptrustbyte, currprefs.comptrustword, currprefs.comptrustlong, currprefs.compfpu, currprefs.compnf, currprefs.comp_constjump, currprefs.comp_hardflush); -#if 0 - if (!currprefs.compforcesettings) { - int stop=0; - if (currprefs.comptrustbyte!=0 && currprefs.comptrustbyte!=3) - stop = 1, write_log (_T("JIT: comptrustbyte is not 'direct' or 'afterpic'\n")); - if (currprefs.comptrustword!=0 && currprefs.comptrustword!=3) - stop = 1, write_log (_T("JIT: comptrustword is not 'direct' or 'afterpic'\n")); - if (currprefs.comptrustlong!=0 && currprefs.comptrustlong!=3) - stop = 1, write_log (_T("JIT: comptrustlong is not 'direct' or 'afterpic'\n")); - if (currprefs.comptrustnaddr!=0 && currprefs.comptrustnaddr!=3) - stop = 1, write_log (_T("JIT: comptrustnaddr is not 'direct' or 'afterpic'\n")); - if (currprefs.compnf!=1) - stop = 1, write_log (_T("JIT: compnf is not 'yes'\n")); - if (currprefs.cachesize<1024) - stop = 1, write_log (_T("JIT: cachesize is less than 1024\n")); - if (currprefs.comp_hardflush) - stop = 1, write_log (_T("JIT: comp_flushmode is 'hard'\n")); - if (!canbang) - stop = 1, write_log (_T("JIT: Cannot use most direct memory access,\n") - " and unable to recover from failed guess!\n"); - if (stop) { - gui_message("JIT: Configuration problems were detected!\n" - "JIT: These will adversely affect performance, and should\n" - "JIT: not be used. For more info, please see README.JIT-tuning\n" - "JIT: in the UAE documentation directory. You can force\n" - "JIT: your settings to be used by setting\n" - "JIT: 'compforcesettings=yes'\n" - "JIT: in your config file\n"); - exit(1); - } - } -#endif return changed; } diff --git a/jit/compemu_support.cpp b/jit/compemu_support.cpp index 4a6c7981..b58c0c03 100644 --- a/jit/compemu_support.cpp +++ b/jit/compemu_support.cpp @@ -4226,9 +4226,7 @@ int failure; #define TARGET_NATIVE TARGET_ARM #endif -#ifdef UAE -/* FIXME: disasm_* functions disabled */ -#else +static void disasm_block(int /* target */, uint8 * /* start */, size_t /* length */) { if (!JITDebug) @@ -4244,7 +4242,6 @@ static inline void disasm_m68k_block(uint8 *start, size_t length) { disasm_block(TARGET_M68K, start, length); } -#endif #ifdef UAE static inline unsigned int get_opcode_cft_map(unsigned int f) -- 2.47.3