Merge branch 'master' into remove_dynablocklist

.github/workflows/release.yml

@@ -34,21 +34,21 @@ jobs:
         include:
           - platform: TEGRAX1
             type: Release
-            os: ubuntu-20.04
+            os: ubuntu-18.04
           - platform: TEGRAX1
             type: Trace
-            os: ubuntu-20.04
+            os: ubuntu-18.04
           - platform: TEGRAX1ARM32
             type: Release
-            os: ubuntu-20.04
+            os: ubuntu-18.04
           - platform: TEGRAX1ARM32
             type: Trace
-            os: ubuntu-20.04
+            os: ubuntu-18.04
 
     runs-on: ${{ matrix.os }}
     steps:
       - name: "Checkout Box86 Repository"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
       - name: "Environment preparation"
         run: |
@@ -111,7 +111,7 @@ jobs:
           ctest -j$(nproc)
 
       - name: "Upload Artifact"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: box86-${{ matrix.platform }}-${{ matrix.type }}
           path: build/box86

.gitignore

@@ -5,5 +5,4 @@ build*/
 src/git_head.h
 backup/
 box86_update.sh
-restore_backup.sh
-.cache
+restore_backup.sh

CMakeLists.txt

@@ -5,12 +5,10 @@ option(PYRA "Set to ON if targeting an OpenPandora device" ${PYRA})
 option(RPI2 "Set to ON if targeting an RaspberryPI2 device" ${RPI2})
 option(RPI3 "Set to ON if targeting an RaspberryPI3 device" ${RPI3})
 option(RPI4 "Set to ON if targeting an RaspberryPI4 device" ${RPI4})
-option(RPI3ARM64 "Set to ON if targeting an RaspberryPI3 device with multiarch arm64 and armhf" ${RPI3ARM64})
 option(RPI4ARM64 "Set to ON if targeting an RaspberryPI4 device with multiarch arm64 and armhf" ${RPI4ARM64})
 option(GOA_CLONE "Set to ON if targeting GO Advance clones, like RG351p/v, Gameforce Chi, RGB10..." ${GOA_CLONE})
 option(RK3288 "Set to ON if targeting an Rockchip RK3288 based device" ${RK3288})
 option(RK3399 "Set to ON if targeting an Rockchip RK3399 based device" ${RK3399})
-option(RK3588 "Set to ON if targeting an Rockchip RK3588 / RK3588S based device" ${RK3588})
 option(ODROIDN2 "Set to ON if targeting an Odroid-N2 device" ${ODROIDN2})
 option(TEGRAX1 "Set to ON if targeting an Tegra X1 (ARM64) based device" ${TEGRAX1})
 option(TEGRAX1ARM32 "Set to ON if targeting an Tegra X1 (ARM32) based device" ${TEGRAX1ARM32})
@@ -20,8 +18,6 @@ option(ODROID "Set to ON if targeting an ODroid device" ${ODROID})
 option(POWER9 "Set to ON if targeting a POWER9 processor" ${POWER9})
 option(SD845 "Set to ON if targeting a Snapragon 845 based device" ${SD845})
 option(A64 "Set to ON if targeting an Allwinner A64 based device" ${A64})
-option(ARM64 "Set to ON if targeting a generic ARM64 based device" ${ARM64})
-option(BAD_SIGNAL "Set to ON to activate the workaround for incoherent si_info on SIGSEGV" ${BAD_SIGNAL})
 option(LX2160A "Set to ON if targeting an LX2160A based device" ${LX2160A})
 option(ANDROID "Set to ON if targeting an Android device" ${ANDROID})
 option(USE_CCACHE "Set to ON to use ccache if present in the system" ${USE_CCACHE})
@@ -29,16 +25,10 @@ option(HAVE_TRACE "Set to ON to have Trace ability (needs ZydisInfo library)" ${
 option(NOLOADADDR "Set to ON to avoid fixing the load address of Box86" ${NO_LOADAADR})
 option(NOGETCLOCK "Set to ON to avoid using clock_gettime with CLOCK_MONOTONIC_COARSE for RDTSC opcode (use gltimeofday instead)" ${NOGETCLOCK})
 option(NOGIT "Set to ON if not building from a git clone repo (like when building from a zip download from github)" ${NOGIT})
-option(NO_LIB_INSTALL "Set ON to not install a few x86 libs that are used by many program" ${NO_LIB_INSTALL})
-option(NO_CONF_INSTALL "Set ON to not install config files" ${NO_CONF_INSTALL})
-
-if(PANDORA OR PYRA OR RPI2 OR RPI3 OR RPI4 OR GAMESHELL OR ODROID OR GOA_CLONE OR RK3288 OR RK3399 OR ODROIDN2 OR TEGRAX1 OR TEGRAX1ARM32 OR RPI3ARM64 OR RPI4ARM64 OR PHYTIUM OR SD845 OR A64 OR LX2160A OR ARM64 OR RK3588)
+if(PANDORA OR PYRA OR RPI2 OR RPI3 OR RPI4 OR GAMESHELL OR ODROID OR GOA_CLONE OR RK3288 OR RK3399 OR ODROIDN2 OR TEGRAX1 OR TEGRAX1ARM32 OR RPI4ARM64 OR PHYTIUM OR SD845 OR A64 OR LX2160A)
     set(LD80BITS OFF CACHE BOOL "")
     set(NOALIGN OFF CACHE BOOL "")
     set(ARM_DYNAREC ON CACHE BOOL "")
-    if(RK3588)
-        set(BAD_SIGNAL ON CACHE BOOL "")
-    endif()
 endif()
 if(ANDROID)
     set(NOLOADADDR ON CACHE BOOL "")
@@ -71,7 +61,7 @@ string(COMPARE EQUAL "${CMAKE_HOST_SYSTEM_PROCESSOR}" "x86_64"  _x86_64)
 string(COMPARE EQUAL "${CMAKE_HOST_SYSTEM_PROCESSOR}" "aarch64"  _aarch64)
 string(COMPARE EQUAL "${CMAKE_HOST_SYSTEM_PROCESSOR}" "armhf"  _armhf)
 
-if(_aarch64 AND (RK3399 OR ODROIDN2 OR TEGRAX1 OR RPI3ARM64 OR RPI4ARM64 OR PHYTIUM OR SD845 OR A64 OR LX2160A OR RK3588 OR ARM64))
+if(_aarch64 AND (RK3399 OR ODROIDN2 OR TEGRAX1 OR RPI4ARM64 OR PHYTIUM OR SD845 OR A64 OR LX2160A))
     set(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc)
     #set(CMAKE_ASM_COMPILER arm-linux-gnueabihf-as) #will use gcc in fact
     set(CMAKE_C_COMPILER_TARGET arm-linux-gnueabihf)
@@ -91,7 +81,6 @@ endif()
 if(PANDORA)
     add_definitions(-DPANDORA)
     #add_definitions(-mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp -ftree-vectorize -fsingle-precision-constant -ffast-math)
-    set(CMAKE_ASM_FLAGS  "-marm -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp")
 elseif(GAMESHELL)
     add_definitions(-DGAMESHELL)
     add_definitions(-marm -mcpu=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard)
@@ -115,11 +104,6 @@ elseif(RPI4)
     add_definitions(-DRPI4)
     add_definitions(-marm -march=armv8-a+crc -mtune=cortex-a72 -mfpu=neon-fp-armv8 -mfloat-abi=hard)
     set(CMAKE_ASM_FLAGS  "-marm -march=armv8-a+crc -mtune=cortex-a72 -mfpu=neon-fp-armv8 -mfloat-abi=hard")
-elseif(RPI3ARM64)
-    add_definitions(-DRPI)
-    add_definitions(-DRPI3ARM64)
-    add_definitions(-marm -march=armv8-a+crc -mtune=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard)
-    set(CMAKE_ASM_FLAGS  "-marm -march=armv8-a+crc -mtune=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard")
 elseif(RPI4ARM64)
     add_definitions(-DRPI)
     add_definitions(-DRPI4ARM64)
@@ -149,15 +133,6 @@ elseif(RK3399)
     add_definitions(-DRK3399)
     add_definitions(-pipe -march=armv8-a+crc+simd+crypto -mcpu=cortex-a72+crypto -mfpu=neon-fp-armv8 -mfloat-abi=hard)
     set(CMAKE_ASM_FLAGS  "-pipe -march=armv8-a+crc+simd+crypto -mcpu=cortex-a72+crypto -mfpu=neon-fp-armv8 -mfloat-abi=hard")
-elseif(RK3588)
-    add_definitions(-DRK3588)
-    add_definitions(-pipe -mcpu=cortex-a76.cortex-a55+crypto -mfpu=neon-fp-armv8 -mfloat-abi=hard)
-    add_definitions(-DBAD_SIGNAL)
-    set(CMAKE_ASM_FLAGS  "-pipe -mcpu=cortex-a76.cortex-a55+crypto -mfpu=neon-fp-armv8 -mfloat-abi=hard")
-elseif(ARM64)
-    add_definitions(-DARM64)
-    add_definitions(-pipe -march=armv8-a+crc+simd+crypto -mfpu=neon-fp-armv8 -mfloat-abi=hard)
-    set(CMAKE_ASM_FLAGS  "-pipe -march=armv8-a+crc+simd+crypto -mfpu=neon-fp-armv8 -mfloat-abi=hard")
 elseif(ODROIDN2)
     add_definitions(-DODROIDN2)
     add_definitions(-pipe -march=armv8-a+crc+simd+crypto -mcpu=cortex-a73.cortex-a53+crypto -mfpu=crypto-neon-fp-armv8 -mfloat-abi=hard)
@@ -185,10 +160,6 @@ elseif(ARM_DYNAREC)
     set(CMAKE_ASM_FLAGS  "-pipe -march=armv7-a+simd -mfpu=neon")
 endif()
 
-if(BAD_SIGNAL)
-    add_definitions(-DBAD_SIGNAL)
-endif()
-
 if(POWER9)
   add_definitions(-mcpu=power9 -mtune=power9)
 endif()
@@ -289,7 +260,6 @@ set(ELFLOADER_SRC
     "${BOX86_ROOT}/src/tools/box86stack.c"
     "${BOX86_ROOT}/src/tools/my_cpuid.c"
     "${BOX86_ROOT}/src/tools/gtkclass.c"
-    "${BOX86_ROOT}/src/tools/rcfile.c"
     "${BOX86_ROOT}/src/tools/wine_tools.c"
     "${BOX86_ROOT}/src/elfs/elfloader.c"
     "${BOX86_ROOT}/src/elfs/elfparser.c"
@@ -300,6 +270,9 @@ set(ELFLOADER_SRC
     "${BOX86_ROOT}/src/librarian/symbols.c"
     "${BOX86_ROOT}/src/librarian/globalsymbols.c"
     "${BOX86_ROOT}/src/emu/x86emu.c"
+    "${BOX86_ROOT}/src/emu/x86run.c"
+    "${BOX86_ROOT}/src/emu/x86run66.c"
+    "${BOX86_ROOT}/src/emu/x86run660f.c"
     "${BOX86_ROOT}/src/emu/x86run_private.c"
     "${BOX86_ROOT}/src/emu/x86syscall.c"
     "${BOX86_ROOT}/src/emu/x86primop.c"
@@ -307,6 +280,7 @@ set(ELFLOADER_SRC
     "${BOX86_ROOT}/src/emu/x86int3.c"
     "${BOX86_ROOT}/src/emu/x86tls.c"
     "${BOX86_ROOT}/src/emu/x87emu_private.c"
+    "${BOX86_ROOT}/src/emu/x87run.c"
     "${BOX86_ROOT}/src/libtools/auxval.c"
     "${BOX86_ROOT}/src/libtools/myalign.c"
     "${BOX86_ROOT}/src/libtools/myalign64.c"
@@ -323,33 +297,6 @@ if(NOT ANDROID)
     list(APPEND ELFLOADER_SRC "${BOX86_ROOT}/src/libtools/obstack.c")
 endif()
 
-set(INTERPRETER
-    "${BOX86_ROOT}/src/emu/x86run.c"
-    "${BOX86_ROOT}/src/emu/x86run0f.c"
-    "${BOX86_ROOT}/src/emu/x86run64.c"
-    "${BOX86_ROOT}/src/emu/x86run640f.c"
-    "${BOX86_ROOT}/src/emu/x86run6466.c"
-    "${BOX86_ROOT}/src/emu/x86run6467.c"
-    "${BOX86_ROOT}/src/emu/x86run66.c"
-    "${BOX86_ROOT}/src/emu/x86run660f.c"
-    "${BOX86_ROOT}/src/emu/x86run66d9.c"
-    "${BOX86_ROOT}/src/emu/x86run66dd.c"
-    "${BOX86_ROOT}/src/emu/x86run67.c"
-    "${BOX86_ROOT}/src/emu/x86run6766.c"
-    "${BOX86_ROOT}/src/emu/x86rund8.c"
-    "${BOX86_ROOT}/src/emu/x86rund9.c"
-    "${BOX86_ROOT}/src/emu/x86runda.c"
-    "${BOX86_ROOT}/src/emu/x86rundb.c"
-    "${BOX86_ROOT}/src/emu/x86rundc.c"
-    "${BOX86_ROOT}/src/emu/x86rundd.c"
-    "${BOX86_ROOT}/src/emu/x86runde.c"
-    "${BOX86_ROOT}/src/emu/x86rundf.c"
-    "${BOX86_ROOT}/src/emu/x86runf0.c"
-    "${BOX86_ROOT}/src/emu/x86runf066.c"
-    "${BOX86_ROOT}/src/emu/x86runf20f.c"
-    "${BOX86_ROOT}/src/emu/x86runf30f.c"
-)
-
 set(WRAPPEDS
     "${BOX86_ROOT}/src/wrapped/wrappedlibc.c"
     "${BOX86_ROOT}/src/wrapped/wrappedlibpthread.c"
@@ -380,7 +327,6 @@ set(WRAPPEDS
     "${BOX86_ROOT}/src/wrapped/wrappedpng16.c"
     "${BOX86_ROOT}/src/wrapped/wrappedlibxxf86vm.c"
     "${BOX86_ROOT}/src/wrapped/wrappedlibxrandr.c"
-    "${BOX86_ROOT}/src/wrapped/wrappedlibxpresent.c"
     "${BOX86_ROOT}/src/wrapped/wrappedlibxext.c"
     "${BOX86_ROOT}/src/wrapped/wrappedxinerama.c"
     "${BOX86_ROOT}/src/wrapped/wrappedlibxfixes.c"
@@ -462,7 +408,6 @@ set(WRAPPEDS
     "${BOX86_ROOT}/src/wrapped/wrappedgsttag.c"
     "${BOX86_ROOT}/src/wrapped/wrappedgstbase.c"
     "${BOX86_ROOT}/src/wrapped/wrappedgstapp.c"
-    "${BOX86_ROOT}/src/wrapped/wrappedlibibus.c"
     "${BOX86_ROOT}/src/wrapped/wrappeddbusmenugtk.c"
     "${BOX86_ROOT}/src/wrapped/wrappeddbusmenuglib.c"
     "${BOX86_ROOT}/src/wrapped/wrappedappindicator.c"
@@ -473,7 +418,6 @@ set(WRAPPEDS
     "${BOX86_ROOT}/src/wrapped/wrappedpangocairo.c"
     "${BOX86_ROOT}/src/wrapped/wrappedgthread2.c"
     "${BOX86_ROOT}/src/wrapped/wrappedcairo.c"
-    "${BOX86_ROOT}/src/wrapped/wrappedcairogobject.c"
     "${BOX86_ROOT}/src/wrapped/wrappedpango.c"
     "${BOX86_ROOT}/src/wrapped/wrappeddbusglib1.c"
     "${BOX86_ROOT}/src/wrapped/wrappedgudev1.c"
@@ -518,7 +462,6 @@ set(WRAPPEDS
     "${BOX86_ROOT}/src/wrapped/wrappedpcap.c"
     "${BOX86_ROOT}/src/wrapped/wrappedfaudio.c"
     "${BOX86_ROOT}/src/wrapped/wrappedtbbmallocproxy.c"
-    "${BOX86_ROOT}/src/wrapped/wrappedlibfuse.c"
 )
 if(ANDROID)
     list(APPEND WRAPPEDS
@@ -572,9 +515,8 @@ if(ARM_DYNAREC)
 
         "${BOX86_ROOT}/src/dynarec/dynarec_arm.c"
         "${BOX86_ROOT}/src/dynarec/dynarec_arm_functions.c"
-        "${BOX86_ROOT}/src/dynarec/dynarec_arm_jmpnext.c"
         "${BOX86_ROOT}/src/dynarec/arm_printer.c"
-        "${BOX86_ROOT}/src/emu/x86test.c"
+        "${BOX86_ROOT}/src/dynarec/arm_jmpnext.c"
 
         "${BOX86_ROOT}/src/dynarec/arm_prolog.S"
         "${BOX86_ROOT}/src/dynarec/arm_epilog.S"
@@ -622,8 +564,6 @@ if(ARM_DYNAREC)
     set_target_properties(arm_pass2 PROPERTIES COMPILE_FLAGS "-DSTEP=2")
     add_library(arm_pass3 OBJECT ${DYNAREC_PASS})
     set_target_properties(arm_pass3 PROPERTIES COMPILE_FLAGS "-DSTEP=3")
-    add_library(test_interpreter OBJECT ${INTERPRETER})
-    set_target_properties(test_interpreter PROPERTIES COMPILE_FLAGS "-DTEST_INTERPRETER")
     add_dependencies(arm_pass0 WRAPPERS)
     add_dependencies(arm_pass1 WRAPPERS)
     add_dependencies(arm_pass2 WRAPPERS)
@@ -635,7 +575,6 @@ if(ARM_DYNAREC)
         $<TARGET_OBJECTS:arm_pass1>
         $<TARGET_OBJECTS:arm_pass2>
         $<TARGET_OBJECTS:arm_pass3>
-        $<TARGET_OBJECTS:test_interpreter>
     )
 
 endif()
@@ -645,18 +584,16 @@ if(ARM_DYNAREC)
     add_custom_command(
         OUTPUT "${BOX86_ROOT}/src/git_head.h"
         COMMAND bash -c "echo \\\#define GITREV \\\"$(git rev-parse --short HEAD)\\\">\"${BOX86_ROOT}/src/git_head.h\""
-        DEPENDS dynarec ${ELFLOADER_SRC} ${INTERPRETER} ${WRAPPEDS}
+        DEPENDS dynarec ${ELFLOADER_SRC} ${WRAPPEDS}
         VERBATIM)
 else()
     add_custom_command(
         OUTPUT "${BOX86_ROOT}/src/git_head.h"
         COMMAND bash -c "echo \\\#define GITREV \\\"$(git rev-parse --short HEAD)\\\">\"${BOX86_ROOT}/src/git_head.h\""
-        DEPENDS ${ELFLOADER_SRC} ${INTERPRETER} ${WRAPPEDS}
+        DEPENDS ${ELFLOADER_SRC} ${WRAPPEDS}
         VERBATIM)
 endif()
 
-add_library(interpreter OBJECT ${INTERPRETER})
-
 if(BOX86LIB)
 #build a static or dynamic lib...
 if(BOX86DYNAMIC)
@@ -666,9 +603,9 @@ else()
 endif()
 if(ARM_DYNAREC)
     if(ANDROID)
-        target_link_libraries(${BOX86} dynarec interpreter m dl)
+        target_link_libraries(${BOX86} dynarec m dl)
     else()
-        target_link_libraries(${BOX86} dynarec interpreter m dl rt pthread resolv)
+        target_link_libraries(${BOX86} dynarec m dl rt pthread resolv)
     endif()
 endif()
 if(${CMAKE_VERSION} VERSION_LESS "3.13")
@@ -694,9 +631,7 @@ else()
     set_target_properties(${BOX86} PROPERTIES LINK_FLAGS "-Wl,--no-as-needed -lc -lm -ldl -lrt -lpthread -lresolv -Wl,--as-needed -pthread")
 endif()
 if(ARM_DYNAREC)
-    target_link_libraries(${BOX86} dynarec interpreter)
-else()
-    target_link_libraries(${BOX86} interpreter)
+    target_link_libraries(${BOX86} dynarec)
 endif()
 
 if(${CMAKE_VERSION} VERSION_LESS "3.13")
@@ -715,17 +650,12 @@ endif()
 if(NOT _x86 AND NOT _x86_64)
   install(TARGETS ${BOX86}
     RUNTIME DESTINATION bin)
-  if(NOT NO_CONF_INSTALL)
-    configure_file(system/box86.conf.cmake system/box86.conf)
-    install(FILES ${CMAKE_BINARY_DIR}/system/box86.conf DESTINATION /etc/binfmt.d/)
-    install(FILES ${CMAKE_SOURCE_DIR}/system/box86.box86rc DESTINATION /etc/)
-  endif()
-  if(NOT NO_LIB_INSTALL)
-    install(FILES ${CMAKE_SOURCE_DIR}/x86lib/libstdc++.so.6 DESTINATION /usr/lib/i386-linux-gnu/)
-    install(FILES ${CMAKE_SOURCE_DIR}/x86lib/libstdc++.so.5 DESTINATION /usr/lib/i386-linux-gnu/)
-    install(FILES ${CMAKE_SOURCE_DIR}/x86lib/libgcc_s.so.1 DESTINATION /usr/lib/i386-linux-gnu/)
-    install(FILES ${CMAKE_SOURCE_DIR}/x86lib/libpng12.so.0 DESTINATION /usr/lib/i386-linux-gnu/)
-  endif()
+  configure_file(system/box86.conf.cmake system/box86.conf)
+  install(FILES ${CMAKE_BINARY_DIR}/system/box86.conf DESTINATION /etc/binfmt.d/)
+  install(FILES ${CMAKE_SOURCE_DIR}/x86lib/libstdc++.so.6 DESTINATION /usr/lib/i386-linux-gnu/)
+  install(FILES ${CMAKE_SOURCE_DIR}/x86lib/libstdc++.so.5 DESTINATION /usr/lib/i386-linux-gnu/)
+  install(FILES ${CMAKE_SOURCE_DIR}/x86lib/libgcc_s.so.1 DESTINATION /usr/lib/i386-linux-gnu/)
+  install(FILES ${CMAKE_SOURCE_DIR}/x86lib/libpng12.so.0 DESTINATION /usr/lib/i386-linux-gnu/)
 endif()
 
 if(NOT TARGET uninstall)
@@ -855,7 +785,7 @@ add_test(NAME sse COMMAND ${CMAKE_COMMAND} -D TEST_PROGRAM=${CMAKE_BINARY_DIR}/$
     -D TEST_REFERENCE=${CMAKE_SOURCE_DIR}/tests/ref17.txt
     -P ${CMAKE_SOURCE_DIR}/runTest.cmake )
 
-set_tests_properties(sse PROPERTIES ENVIRONMENT "BOX86_DYNAREC_FASTNAN=0;BOX86_DYNAREC_FASTROUND=0")
+set_tests_properties(sse PROPERTIES ENVIRONMENT "BOX86_DYNAREC_FASTNAN=0")
 
 add_test(NAME longjumpInSignals COMMAND ${CMAKE_COMMAND} -D TEST_PROGRAM=${CMAKE_BINARY_DIR}/${BOX86} 
     -D TEST_ARGS=${CMAKE_SOURCE_DIR}/tests/test18 -D TEST_OUTPUT=tmpfile18.txt 
@@ -881,11 +811,4 @@ foreach(file ${extension_tests})
         -P ${CMAKE_SOURCE_DIR}/runTest.cmake)
 endforeach()
 
-add_test(NAME sse_optimized COMMAND ${CMAKE_COMMAND} -D TEST_PROGRAM=${CMAKE_BINARY_DIR}/${BOX86} 
-    -D TEST_ARGS=${CMAKE_SOURCE_DIR}/tests/test17_o2 -D TEST_OUTPUT=tmpfile17_o2.txt 
-    -D TEST_REFERENCE=${CMAKE_SOURCE_DIR}/tests/ref17_o2.txt
-    -P ${CMAKE_SOURCE_DIR}/runTest.cmake )
-
-set_tests_properties(sse_optimized PROPERTIES ENVIRONMENT "BOX86_DYNAREC_FASTNAN=0;BOX86_DYNAREC_FASTROUND=0")
-
 endif(BOX86LIB)

debian/changelog

@@ -1,64 +1,3 @@
-box86 (0.3.0) unstable; urgency=low
-
- * Added rcfile handling: box86 now read "/etc/box86.box86rc" and "~/.box86rc" and apply per process parameters
- * Added BOX86_DYNAREC_FORWARD to allow bigger Dynarec block to be build
- * Refactored Strong Memory Model emulation (faster and more accurate)
- * Box86 now return a custom name for the CPU instal of P4, build with Box86 and the cpu name it's running on
- * Improved memory protection tracking and signal handling, again
- * More wrapped libs (especially on the gtk familly)
- * More wrapped functions
- * Added support for CreateDeviceEx in d3dadapter9, for better gallium nine support
- * Improved dladdr/dladdr1 wrapped function
- * Some fixes to flags handling in the Dynarec on some special cases
- * Added specific suppport for RK3588 board (needed some hack in signal handling, probably due to the use of a non mainlined kernel)
- * Lots of improvment in the Rounding of float & double (Dynarec and Interpretor), and proper handling of denormals when converting to/from 80 bits long double
- * Added specific suppport for RK3588 board (needed some hack in signal handling, probably due to the use of a non mainlined kernel)
-
- -- Sebastien Chevalier <[email protected]>  Thu, 10 Mar 2023 10:20:33 -0500
-
-box86 (0.2.8) unstable; urgency=low
-
-  * Wrapped more Vulkan functions, dxvk2.0 now works
-  * Added support for overridden malloc/free functions
-  * Improved elf loader
-  * Improved dlsym handling with RTLD_NEXT
-  * Added BOX86_DYNAREC_SAFEFLAGS to allow finetuning Dynarec generated code handling of flags accross function calls and returns.
-  * Added BOX86_BASH to setup x86 bash binary, so shell script can be run in x86 world
-  * Added BOX86_ROLLING_LOG to have details log only on crash
-  * Improved TLS Size handling (Unity3D games now works)
-  * Improved execv family of function to have better box86 integration
-  * Added a few more wrapped libs, like FAudio
-  * Improved gtk, SDL2, GL, vulkan (and more) wrapping
-  * Improved Signal Handling and memory protection traking
-  * Added some basic support for statically linked program. Thread are not working yet, but memory allocation and file access does.
-  * add LX2160A config by @lizthegrey in #612
-  * Grammar and formatting COMPILE.md by @Radiicall in #615
-  * Update README.md by @everypizza1 in #617
-  * docs: add instructions for Debian-based Linux by @ryanfortner in #622
-  * Fix typoes in readme by @ryanfortner in #621
-  * Various improvements to install_steam.sh by @ryanfortner in #620
-  * docs: remove unnecessary newline by @ryanfortner in #624
-  * fix: the first parameter of realpath may be null by @ye-yeshun in #630
-  * Add 6 wrapped function to libdrm, and 2 to libexpat. by @cjy880927 in #632
-  * Fix #610 by @rajdakin in #634
-  * some floating point instructions by @ye-yeshun in #637
-  * Fix Typo in readme x86_64 -> x86 by @Jai-JAP in #642
-  * Fix grammar by @Jai-JAP in #645
-  * Test wine preload by @ptitSeb in #649
-  * Align address when call mprotect by @wannacu in #651
-  * Added 66 0F 7D HSUBPD opcode by @wannacu in #652
-  * add TEGRAX1 and TEGRAX1ARM32 targets on ubuntu-18.04 by @theofficialgman in #654
-  * automatically install 32 bit libraries if 64 bit OS is detected in install_steam.sh by @Moldytzu in #659
-  * mention gcc-arm-linux-gnueabihf in compile.md by @Moldytzu in #660
-  * Add libc6:armhf install to RPi4 aarch64 build info by @WheezyE in #685
-  * Updated wine install for RPiOS bullseye 32/64bit by @WheezyE in #689
-  * Add atomic add opcodes by @Trass3r in #695
-  * steam: disable modern login and pass arguments to client by @Moldytzu in #700
-  * Modify sizeof(instsize_t) to 1 byte by @liuli0217 in #721
-  * Add MOV GS:od, AL by @liuli0217 in #722
-
- -- Sebastien Chevalier <[email protected]>  Thu, 17 Nov 2022 11:20:33 -0500
-
 box86 (0.2.6) unstable; urgency=low
 
   * Added an option to get generated -NAN on SSE2 operation

debian/rules

@@ -6,8 +6,7 @@
 override_dh_auto_configure:
 	dh_auto_configure -- \
 	      -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-	      -DARM_DYNAREC=1 \
-		  -DNOGIT=1
+	      -DARM_DYNAREC=1
 
 override_dh_shlibdeps:
 	dh_shlibdeps --exclude=libgcc_s.so.1 --exclude=libpng12.so.0 --exclude=libstdc++.so.5 --exclude=libstdc++.so.6 

docs/CHANGELOG.md

@@ -1,53 +1,3 @@
-v0.3.2
-======
-* Better syscall handling
-* Fixed some wrapped functions, added some others
-* Introduced another wrapper helper
-* Added some more opcodes
-* Added a cosimulation mode (to compare the behaviour of the dynarec against the interpreter)
-* Added support of FASTNAN for some more opcodes
-* Reduced memory footprint
-* Added BOX86_NOSANDBOX (adds an argument to the command line)
-* Added an ukrainian translation
-=> Mostly a stability update with improved elfloader, fixed opcodes and refined profiles
-
-v0.3.0
-======
-* Added rcfile handling: box86 now read `/etc/box86.box86rc` and `~/.box86rc` and apply per process parameters
-    => Every program can be finetuned, for speed or just to make them work
-* Added BOX86_DYNAREC_FORWARD to allow bigger Dynarec block to be build
-* Refactored Strong Memory Model emulation (faster and more accurate)
-* Box86 now return a custom name for the CPU instal of P4, build with Box86 and the cpu name it's running on
-* Improved memory protection tracking and signal handling, again
-* More wrapped libs (especially on the gtk familly)
-* More wrapped functions
-* Added support for CreateDeviceEx in d3dadapter9, for better gallium nine support
-* Improved dladdr/dladdr1 wrapped function
-* Some fixes to flags handling in the Dynarec on some special cases
-* Added specific suppport for RK3588 board (needed some hack in signal handling, probably due to the use of a non mainlined kernel)
-* Lots of improvment in the Rounding of float & double (Dynarec and Interpretor), and proper handling of denormals when converting to/from 80 bits long double
-* Added specific suppport for RK3588 board (needed some hack in signal handling, probably due to the use of a non mainlined kernel)
-
-
-v0.2.8
-======
-* Wrapped more vulkan function, dxvk 2.0 now works
-* Added support for overriden malloc/free functions
-* Improved elf loader
-* Improved dlsym handling with RTLD_NEXT
-* Added BOX86_DYNAREC_SAFEFLAGS to allow finetuning Dynarec generated code handling of flags accross function calls and returns.
-* Added BOX86_BASH to setup x86 bash binary, so shell script can be run in x86 world 
-* Added BOX86_ROLLING_LOG to have details log only on crash
-* Improved TLS Size handling (Unity3D games now works)
-* Improved `execv` family of function to have better box86 integration
-* Added a few more wrapped libs, like FAudio
-* Improved gtk, SDL2, GL, vulkan (and more) wrapping
-* Improved Signal Handling and memory protection traking
-* Added some basic support for statically linked program. Thread are not working yet, but memory allocation and file access does.
-=> with the use of the new SafeFlags, some C# Windows program now runs fine (it's forced when the Vara family of software is detected)
-=> With the basic support of statcaly linked program, old emulator like modeler for linux works. Program with threads like mugen for linux still doesn't
-=> The bash integration is usefull for device with no binfmt integration or for script that check the machine it's running on
-
 v0.2.6
 ======
 * Added an option to get generated -NAN on SSE2 operation

docs/COMPILE.md

@@ -6,12 +6,10 @@ You can use [@Itai-Nelken](https://github.com/Itai-Nelken)'s apt repository to i
 
 ```
 sudo wget https://itai-nelken.github.io/weekly-box86-debs/debian/box86.list -O /etc/apt/sources.list.d/box86.list
-wget -qO- https://itai-nelken.github.io/weekly-box86-debs/debian/KEY.gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/box86-debs-archive-keyring.gpg
+wget -qO- https://itai-nelken.github.io/weekly-box86-debs/debian/KEY.gpg | sudo apt-key add -
 sudo apt update && sudo apt install box86 -y
 ```
 
-**Note:** On a 64bit OS, install the `box86:armhf` package.
-
 Alternatively, you can generate your own package using the [instructions below](https://github.com/ptitSeb/box86/blob/master/docs/COMPILE.md#debian-packaging). 
 
 #### for Pandora
@@ -54,7 +52,7 @@ _Build box86:armhf on RPiOS 64-bit ARM (aarch64)_
 sudo apt install gcc-arm-linux-gnueabihf # building 32-bit ARM code on aarch64 requires this armhf gcc cross-compiler toolchain 
 git clone https://github.com/ptitSeb/box86
 cd box86
-mkdir build; cd build; cmake .. -DRPI4ARM64=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo # -DRPI4ARM64=1 for Pi4 aarch64 (use `-DRPI3ARM64=1` for a PI3 model)
+mkdir build; cd build; cmake .. -DRPI4ARM64=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo # -DRPI4ARM64=1 for Pi4 aarch64 (use `-DRPI2ARM64=1` etc for other models)
 make -j2
 sudo make install
 sudo systemctl restart systemd-binfmt
@@ -72,22 +70,6 @@ As most RK3399 devices run an AARCH64 OS, you'll need an `armhf` multiarch envir
 
 Also, on armbian, you may need to install `libc6-dev-armhf-cross` or you may have an issue with `crt1.o` and a few other files not included with box86.
 
-#### for RK3588 / RK3588S
-
-`mkdir build; cd build; cmake .. -DRK3588=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo; make -j4`
-
-As most RK3588 devices run an AARCH64 OS, you'll need an `armhf` multiarch environment, and an armhf gcc: On debian, install it with `sudo apt install gcc-arm-linux-gnueabihf`. 
-
-Also, on armbian, you may need to install `libc6-dev-armhf-cross` or you may have an issue with `crt1.o` and a few other files not included with box86.
-
-#### for ODROID N2/N2+
-
-`mkdir build; cd build; cmake .. -DODROIDN2=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo; make -j3`
-
-As most ODROID N2/N2+ devices run an AARCH64 OS, you'll need an `armhf` multiarch environment, and an armhf gcc: On debian, install it with `sudo apt install gcc-arm-linux-gnueabihf`. 
-
-Also, on armbian, you may need to install `libc6-dev-armhf-cross` or you may have an issue with `crt1.o` and a few other files not included with box86.
-
 #### for Tinker Board (1/1S) or RK3288
 
 `mkdir build; cd build; cmake .. -DRK3288=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo; make -j3`
@@ -112,25 +94,12 @@ As most Snapdragon 845 devices run an AARCH64 OS, you'll need an `armhf` multiar
 
 As most Phytium (D2000 or FT2000/4) devices run an AARCH64 OS, you'll need an `armhf` multiarch environment, and an armhf gcc: On debian, install it with `sudo apt install gcc-arm-linux-gnueabihf`. 
 
-
-Also, on armbian, you may need to install `libc6-dev-armhf-cross` or you may have an issue with `crt1.o` and a few other files not included with box86.
-
-#### for Other ARM64 64bits Linux platform
-
-`mkdir build; cd build; cmake .. -DARM64=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo; make -j3`
-
-You can also add `-DBAD_SIGNAL=ON` to the cmake command if you are on Linux Kernel mixed with Android, like on RK3588 or maybe Termux
-
-You'll need an `armhf` multiarch environment, and an armhf gcc: On debian, install it with `sudo apt install gcc-arm-linux-gnueabihf`. 
-
 Also, on armbian, you may need to install `libc6-dev-armhf-cross` or you may have an issue with `crt1.o` and a few other files not included with box86.
 
 #### for Other ARM Linux platforms
 
  `mkdir build; cd build; cmake .. -DARM_DYNAREC=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo; make -j3`
 
-You can also add `-DBAD_SIGNAL=ON` to the cmake command if you are on Linux Kernel mixed with Android, like on RK3588 or maybe Termux
-
 #### for x86 Linux
 
  `mkdir build; cd build; cmake .. -DCMAKE_C_FLAGS="-m32" -DLD80BITS=1 -DNOALIGN=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo; make -j3`
@@ -194,5 +163,5 @@ NVIDIA doesn't provide armhf libraries for their GPU drivers at this time. There
 
 Debian Packaging
 ----
-Box86 can also be packaged into a .deb file ***using the source code zip from the releases page*** with `DEB_BUILD_OPTIONS=nostrip dpkg-buildpackage -us -uc -nc`. Configure any additional cmake options you might want in `debian/rules`.
+Box86 can also be packaged into a .deb file with `DEB_BUILD_OPTIONS=nostrip dpkg-buildpackage -us -uc -nc`.
 

docs/README.md

@@ -2,7 +2,7 @@
 
 Linux Userspace x86 Emulator with a twist
 
-[View changelog](https://github.com/ptitSeb/box86/blob/master/docs/CHANGELOG.md) | [中文](https://github.com/ptitSeb/box86/blob/master/docs/README_CN.md) | [Українська](https://github.com/ptitSeb/box86/blob/master/docs/README_UK.md) | [Report an error](https://github.com/ptitSeb/box86/issues/new)
+[View changelog](https://github.com/ptitSeb/box86/blob/master/docs/CHANGELOG.md) | [中文](https://github.com/ptitSeb/box86/blob/master/docs/README_CN.md) | [Report an error](https://github.com/ptitSeb/box86/issues/new)
 
 ![build](https://app.travis-ci.com/ptitSeb/box86.svg?branch=master) ![stars](https://img.shields.io/github/stars/ptitSeb/box86) ![forks](https://img.shields.io/github/forks/ptitSeb/box86) ![contributors](https://img.shields.io/github/contributors/ptitSeb/box86) ![prs](https://img.shields.io/github/issues-pr/ptitSeb/box86) ![issues](https://img.shields.io/github/issues/ptitSeb/box86)
 
@@ -12,13 +12,13 @@ Box86 lets you run x86 Linux programs (such as games) on non-x86 Linux systems,
 
 You *NEED* a 32-bit subsystem to run and build Box86. Box86 is useless on 64-bit only systems. Also, you *NEED* a 32-bit toolchain to build Box86. A toolchain that only supports 64-bit will not compile Box86, and you'll get errors (typically on aarch64, you get "-marm" not recognized, and you'll need a multiarch or chroot environment).
 
-Because Box86 uses the native versions of some "system" libraries, like libc, libm, SDL, and OpenGL, it's easy to integrate and use with most applications, and performance can be surprisingly high in many cases. Take a look at those bench analysis for an example [here](https://box86.org/index.php/2021/06/game-performances/). That also means that you will need a 32bits userspace on 64bits OS, like `armhf` on top an `aarch64` 64bits OS.
+Because Box86 uses the native versions of some "system" libraries, like libc, libm, SDL, and OpenGL, it's easy to integrate and use with most applications, and performance can be surprisingly high in many cases. Take a look at those bench analysis for an example [here](https://box86.org/index.php/2021/06/game-performances/).
 
-Most x86 Games need OpenGL, so on ARM platforms a solution like [gl4es](https://github.com/ptitSeb/gl4es) might be necessary. (Some ARM platforms only support OpenGL ES and/or their OpenGL implementation is dodgy. (see OpenGL on Android))
+Most x86 Games need OpenGL, so on ARM platforms a solution like [gl4es](https://github.com/ptitSeb/gl4es) is usually necessary. (Most ARM platforms only support OpenGL ES and/or their OpenGL implementation is dodgy (see OpenGL on Android).)
 
 Box86 now integrates a DynaRec (dynamic recompiler) for the ARM platform, providing a speed boost between 5 to 10 times faster than only using the interpreter. Some high level information on how the Dynarec work can be found [here](https://box86.org/2021/07/inner-workings-a-high%e2%80%91level-view-of-box86-and-a-low%e2%80%91level-view-of-the-dynarec/).
 
-Many games just work without much tweaking, for example: WorldOfGoo, Airline Tycoon Deluxe, and FTL. Many of the GameMaker Linux games also run fine. (there's a long list, among them are UNDERTALE, A Risk of Rain, and Cook Serve Delicious). Unity3D games also works fine, but the OpenGL requirement might be an issue on some ARM platforms.
+Many games already work without much tweaking, for example: WorldOfGoo, Airline Tycoon Deluxe, and FTL. Many of the GameMaker Linux games also run fine. (there's a long list, among them are UNDERTALE, A Risk of Rain, and Cook Serve Delicious)
 
 If you are serious about developing Box86, you should install ccache and build Box86 with it. (Use ccmake for example.)
 To enable TRACE (i.e. dumping to stdout all individual x86 instructions executed, with dump of registers), you'll also need [Zydis library](https://github.com/zyantific/zydis) available on your system.
@@ -56,7 +56,7 @@ There are a few environment variables to control the behaviour of Box86.
 
 See [here](USAGE.md) for all environment variables and what they do.
 
-Note: Box86's Dynarec uses a mechanism with Memory Protection and a SegFault signal handler to handle JIT code. In simpler terms, if you want to use GDB to debug a running program that use JIT'd code (like mono/Unity3D), you will still have many "normal" segfaults triggering. It is suggested to use something like `handle SIGSEGV nostop` in GDB to not stop at each segfault, and maybe put a breakpoint inside `my_box86signalhandler` in `signals.c` if you want to trap SegFaults.
+Note: Box86's Dynarec uses a mechanism with Memory Protection and a SegFault signal handler to handle JIT code. In simpler terms, if you want to use GDB to debug a running program that use JIT'd code (like mono/Unity3D), you will still have many "normal" segfaults triggering. It is suggested to use something like `handle SIGSEGV nostop` in GDB to not stop at each segfault, and maybe put a breakpoint inside `my_memprotectionhandler` in `signals.c` if you want to trap SegFaults.
 
 ----
 
@@ -76,40 +76,28 @@ If you look at a 64bits version of box86, look at [Box64](https://github.com/pti
 
 ----
 
-Notes about Box86 configuration
-----
-
-Box86 now have configurations files. There are 2 files loaded. `/etc/box4.box86rc` and `~/.box86rc`. Both files have the same syntax, and is basicaly an ini files. Section in square brakets define the process name, and the rest is the env. var. to set. Looke at [Usage](USAGE.md) for detail on what parameters can be put. Box86 comes with a default file that should be installed for better stability. The file in in `system/box86.box86rc` and should be installed to `/etc/box86.box86rc` If, for some reasons, you don't want to install that file here, at least copy it to `~/.box86rc` or some game may not function correctly.
-Note that the priority is: `~/.bashrc` > `/etc/box86.box86rc` > command line
-So, your settings in `~/.bashrc` may override the setting from your command line...
-
-----
-
 Notes about Unity game emulation
 ----
 
-Running Unity games should generaly work now, but you should also note that many Unity3D games require OpenGL 3+ which can be tricky to provide on ARM SBC (single-board computers) for now.
-Hint: on Pi4, use `MESA_GL_VERSION_OVERRIDE=3.2` and with Panfrost use `PAN_MESA_DEBUG=gl3` to use higher profile if the game starts then quits before showing anything.
+Running Unity games is a hit or miss for now. Unity uses Mono (which uses signals that are not well emulated enough), and a runtime embedded in the main binary. A solution would be to use a native version of the libmono library used by Unity (it can be found here: https://github.com/Unity-Technologies/mono and needs to be built from source). But the wrapping of this lib is tricky, and not done for now, so the only solution is to emulate everything. The tricky part is to emulate the "JIT" code emitted by Mono, however with the new "protected memory" mechanism implemented it should be running with correct performance now.
+You should also note that some Unity3D games require OpenGL 3+ which can be tricky to provide on ARM SBC (single-board computers) for now.
+
+TL;DR: Not all Unity games work and can require a high OpenGL profile, but the speed, for the ones running, should be correct now.
 
 ----
 
 Notes about Steam
 ----
 
-Linux Steam's can run now with box86. but you also need box64 for it to completly usable.
-It is advised to run steam in the Small mode, as it use the less memory, but steamwebhelper (a 64bits process) will still be loaded even if not used.
-The login screen cannot run without steamwebhelper, and will just show a blank windows without box64 properly setup in the system.
-File note, Steam will use a lot of memory, and barely fit on system with 4GB of RAM. It will not work anymore on system with less memory (as a workaround, create a swap file, login and check "remember me", the use box64rc to disable steamwebhelper and run only in small mode without swap after the 1st login)
-Final note: the Steam BigPicture will work, but also need steamwebhelper (and so box64), and lots of memory. It will not start on system with only 4GB of RAM without swap.
+Linux Steam's can run now with box86. But it's still a bit unstable, and not everything works:
+- First problem is Steam crashing after the sign-in window, if you encounter this issue, you may need to add libappindicator. To install it on Debian, run `sudo apt install libappindicator1`.
+- If you select to "Remember password", Steam is crashing on subsequent starts, unless you have libnm installed. To install it on Debian, run `sudo apt install libnm0`.
 - If you have trouble installing Steam, you can find `install_steam.sh` in the root folder of the box86 repo. This simple script will download and install steam in your home folder, and then create a shortcut to steam in `/usr/local/bin` (and for this it will ask for sudo permission). Simply use `steam` to launch once it's installed. Note that the installation, being in the Home folder, will only work for a single user. Don't use this script if you need a multi-user installation.
+- Once open, Steam will only work on "Small Mode" and in "Big Picture", not in the regular "Large Mode". This is because some Steam components used in the browser view are only 64-bit now. So go in the "View" menu and switch to "Small view", else the list will stay empty. Alternatively, Steam can be started in small mode directly by using `+open steam://open/minigameslist` command line arguments.
 - To avoid the "libc.so.6 is absent" message, you can use `STEAMOS=1` and `STEAM_RUNTIME=1` as environment variables (it's automatically there if you used the `install_steam.sh` script)
+- Some Steam games (most Source engine games, like "Portal" or "Half-Life 2") use libtcmalloc. Box86 will detect it and will try to LD_PRELOAD it, for better compatibility. While it should work without the aforementioned feature, it is safer to add it to your system if you intend to play those games. To install it on Debian, run `sudo apt install libtcmalloc-minimal4`.
 
-to disable `steamwebhelper` when box64 installed and running, create (or edit) `~/.box64rc` and add:
-```
-[steamwebhelper]
-BOX64_EXIT=1
-```
-in it and it will be disable. Comment with a `#` those 2 lines to enable it again
+Steam for Windows installs fine but doesn't work yet.
 
 ----
 
@@ -124,7 +112,7 @@ Note: if you plan to use box86 with Wine on Raspberry Pi 3 or earlier, those mod
 Notes about Vulkan
 ----
 
-Box86 already wrap Vulkan. If your system has a 32bits Vulkan driver, box86 will use it when needed. Profile 1.0, 1.1, 1.2 and 1.3, with some extensions, should be OK. DXVK, including the 2.0, works. I know some demos work on Pi4 (Sascha Willems demos build for x86 work the same as if build on armhf directly). Note that the Vulkan driver of the Pi4 DOES NOT support dxvk for now (wine DirectX->Vulkan wrapper). It's not a box86 issue, it's missing extensions (hardware support) and a few other things that make dxvk not working on pi4. On Panfrost side, PanVK is a bit young and I haven't tested dxvk with it yet.
+Box86 already wrap Vulkan. If your system has a 32bits Vulkan driver, box86 will use it when needed. Note that Vulkan wrapping has not been tested much, due to the limited Vulkan support on the hardware I currently own. Profile 1.0 and 1.1, with some extension, should be OK. 1.2 is not really wrapped. I know some demos work on Pi4 (Sascha Willems demos build for x86 work the same as if build on armhf directly). Note that the Vulkan driver of the Pi4 DOES NOT support dxvk for now (wine DirectX->Vulkan wrapper). It's not a box86 issue, it's missing extensions (hardware support) and a few other things that make dxvk not working on pi4. On Panfrost side, PanVK is a bit young and I haven't tested dxvk with it yet.
 
 ----
 Final word

docs/README_CN.md

@@ -2,7 +2,7 @@
 
 Linux用户空间的x86应用模拟器 
 
-[更新历史](https://github.com/ptitSeb/box86/blob/master/docs/CHANGELOG.md) | [English](https://github.com/ptitSeb/box86/blob/master/docs/README.md) | [Українська](https://github.com/ptitSeb/box86/blob/master/docs/README_UK.md) | [报告错误](https://github.com/ptitSeb/box86/issues/new)
+[更新历史](https://github.com/ptitSeb/box86/blob/master/docs/CHANGELOG.md) | [English](https://github.com/ptitSeb/box86/blob/master/docs/README.md) | [报告错误](https://github.com/ptitSeb/box86/issues/new)
 
 ![build](https://app.travis-ci.com/ptitSeb/box86.svg?branch=master) ![stars](https://img.shields.io/github/stars/ptitSeb/box86) ![forks](https://img.shields.io/github/forks/ptitSeb/box86) ![contributors](https://img.shields.io/github/contributors/ptitSeb/box86) ![prs](https://img.shields.io/github/issues-pr/ptitSeb/box86) ![issues](https://img.shields.io/github/issues/ptitSeb/box86)
 

docs/README_UK.md

@@ -1,143 +0,0 @@
-![Official logo](img/Box86Logo.png "Official Logo")
-
-Емулятор простіра користувача x86_64 із родзинкою
-
-[Дивитись журнал змін](https://github.com/ptitSeb/box86/blob/master/docs/CHANGELOG.md) | [中文](https://github.com/ptitSeb/box86/blob/master/docs/README_CN.md) | [Українська](https://github.com/ptitSeb/box86/blob/master/docs/README_UK.md) | [Повідомити про помилку](https://github.com/ptitSeb/box86/issues/new)
-
-![build](https://app.travis-ci.com/ptitSeb/box86.svg?branch=main) ![stars](https://img.shields.io/github/stars/ptitSeb/box86) ![forks](https://img.shields.io/github/forks/ptitSeb/box86) ![contributors](https://img.shields.io/github/contributors/ptitSeb/box86) ![prs](https://img.shields.io/github/issues-pr/ptitSeb/box86) ![issues](https://img.shields.io/github/issues/ptitSeb/box86)
-
-----
-
-Box86 дозволяє запускати x86 Linux програми (наприклад, ігри) на системах Linux відмінних від x86, наприклад ARM (хост-система має мати 32-розрядний порядок редагування).
-
-Вам *ПОТРІБНА* 32-розрядна підсистема для запуску та створення Box86. Box86 марний лише на 64-розрядних системах. Крім того, вам *ПОТРІБЕН* 32-розрядний інструментарій для створення Box86. Ланцюжок інструментів, який підтримує лише 64-розрядні версії, не компілює Box86, і ви отримаєте помилки (зазвичай на aarch64 ви отримуєте що «-marm» не розпізнається, і вам знадобиться середовище з мультиархітектурою або chroot).
-
-Оскільки Box86 використовує рідні версії деяких «системних» бібліотек, таких як libc, libm, SDL і OpenGL, його легко інтегрувати та використовувати з більшістю програм, а продуктивність у багатьох випадках може бути напрочуд високою. Подивіться на цей стендовий аналіз для прикладу [тут](https://box86.org/index.php/2021/06/game-performances/). Це також означає, що вам знадобиться 32-бітний простір користувача на 64-бітній ОС, наприклад `armhf` поверх `aarch64` 64-бітної ОС.
-
-Більшість x86-ігор потребують OpenGL, тому на платформах ARM може знадобитися таке рішення, як [gl4es](https://github.com/ptitSeb/gl4es). (Деякі платформи ARM підтримують лише OpenGL ES і/або їх реалізація OpenGL хитра. (див. OpenGL на Android))
-
-Box86 інтегрується з DynaRec (динамічний рекомпілятор) для платформ ARM64 і RV64 забезпечуючи підвищення швидкості в 5-10 разів, ніж використання лише інтерпретатора. Деякі високорівневі відомості про те, як працює DynaRec, можна знайти [тут](https://box86.org/2021/07/inner-workings-a-high%e2%80%91level-view-of-box86-and-a-low%e2%80%91level-view-of-the-dynarec/).
-
-Багато ігор просто працюють без особливих налаштувань, наприклад: WorldOfGoo, Airline Tycoon Deluxe і FTL. Багато ігор GameMaker Linux також працюють нормально. (є довгий список, серед них UNDERTALE, A Risk of Rain і Cook Serve Delicious). Ігри Unity3D також працюють добре, але вимога OpenGL може бути проблемою на деяких платформах ARM.
-
-Якщо ви серйозно ставитеся до розробки Box86, вам слід встановити ccache та створити Box86 з ним. (Використовуйте, наприклад, ccmake.)
-Щоб увімкнути TRACE (тобто скидання в stdout усіх окремих виконаних інструкцій x86 із дампом регістрів), вам також знадобиться [бібліотека Zydis](https://github.com/zyantific/zydis), доступна у вашій системі.
-
-Деякі внутрішні коди операцій x86 використовують частини «Бібліотеки емулятора Realmode X86», дивіться [x86primop.c](../src/emu/x86primop.c) для детальної інформації про авторські права.
-
-----
-Компіляція/Встановлення
-----
-> Інструкцію зі складання Box86 можна знайти [тут](COMPILE.md).\
-> Інструкцію з встановлення Wine для Box86 можна знайти [тут](X86WINE.md).
-
-----
-
-Ось 6 відео, перші 2 відео – це відео "Airline Tycoon Deluxe" і "Heretic 2", які працюють на GigaHertz OpenPandora (друге використовує Dynarec), а наступні 2 відео – це відео "Bit.Trip.Runner" і "Neverwinter Night", які працюють на ODroid XU4 (без dynarec), а останні 2 відео на Pi4: Shovel Knight (відео від @ITotalJustice) і Freedom Planet (відео від @djazz), також без Dynarec.
-
-
-[![Play on Youtube](https://img.youtube.com/vi/bLt0hMoFDLk/3.jpg)](https://www.youtube.com/watch?v=bLt0hMoFDLk) [![Play on Youtube](https://img.youtube.com/vi/MM7kWYts7IA/3.jpg)](https://www.youtube.com/watch?v=MM7kWYts7IA) [![Play on Youtube](https://img.youtube.com/vi/8hr71S029Hg/1.jpg)](https://www.youtube.com/watch?v=8hr71S029Hg) [![Play on Youtube](https://img.youtube.com/vi/B4YN37z3-ws/1.jpg)](https://www.youtube.com/watch?v=B4YN37z3-ws) [![Play on Youtube](https://img.youtube.com/vi/xk8Q30mxqPg/1.jpg)](https://www.youtube.com/watch?v=xk8Q30mxqPg) [![Play on Youtube](https://img.youtube.com/vi/_QMRMVvYrqU/1.jpg)](https://www.youtube.com/watch?v=_QMRMVvYrqU)
-
-Ви можете знайти багато інших відео про Box86 у YouTube каналах [MicroLinux](https://www.youtube.com/channel/UCwFQAEj1lp3out4n7BeBatQ), [Pi Labs](https://www.youtube.com/channel/UCgfQjdc5RceRlTGfuthBs7g) або [The Byteman](https://www.youtube.com/channel/UCEr8lpIJ3B5Ctc5BvcOHSnA).
-
-Список сумісності доступний тут: https://github.com/ptitSeb/box86-compatibility-list/issues
-
-<img src="img/Box86Icon.png" width="96" height="96">
-
-Логотип і піктограма зроблені @grayduck, дякую!
-
-Зауважте, що цей проект не слід плутати з [86box](https://github.com/86Box/86Box), гарним емулятором "повної системи", що спеціалізується на ранньому (до відносно недавньому) апаратному забезпеченні ПК.
-
-----
-
-Використання
-----
-
-Є кілька змінних середовища для керування поведінкою Box86.
-
-Дивіться [тут](USAGE.md) для перегляду всіх змінних середовища та того, що вони роблять.
-
-Примітка: Dynarec від Box86 використовує механізм із захистом пам’яті та обробником сигналу помилки сегментів для обробки JIT коду. Простіше кажучи, якщо ви хочете використовувати GDB для налагодження запущеної програми, яка використовує JIT-код (наприклад, mono/Unity3D), ви все одно матимете багато «звичайних» помилок сегментів. Пропонується використовувати щось на зразок `handle SIGSEGV nostop` в GDB, щоб не зупинятися на кожній помилці сегмента, і, можливо, поставити точку зупину всередині `my_memprotectionhandler` в `signals.c`, якщо ви хочете перехопити помилки сегментів.
-
-----
-
-Історія версій/Журнал змін
-----
-
-Історія версій доступна [тут](docs/CHANGELOG.md).
-
-----
-
-Примітки щодо 64-розрядних платформ
-----
-
-Оскільки Box86 працює шляхом прямого перекладу викликів функцій із x86 на хост-систему, хост-система (на якій працює Box86) повинна мати 32-розрядні бібліотеки. Box86 не містить 32-біт <-> 64-біт перекладу. Отже, щоб запустити Box86, наприклад, на платформі ARM64, вам потрібно буде зібрати Box86 для 32-бітної ARM, а також потрібно мати chroot з 32-бітними бібліотеками.
-
-Якщо ви дивитесь на 64-розрядну версію box86, подивіться на [Box64](https://github.com/ptitSeb/box64): він може запускати двійкові файли x86_64 на 64-розрядних платформах. Але зауважте, що вам все одно потрібен Box86 (і 32-розрядний chroot) для запуску бінарних файлів x86 (як це також трапляється в реальному Linux x86_64, для запуску якого потрібні бібліотеки x86 і двійковий файл в multiarch).
-
-----
-
-Примітки щодо конфігурації Box86
-----
-
-Box86 тепер має конфігураційні файли. Завантажуються 2 файли: `/etc/box4.box86rc` і `~/.box86rc`. Обидва файли мають однаковий синтаксис і в основному є файлами ini. Розділ у квадратних дужках визначає назву процесу, а решта — встановлють змінну середовища. Подивіться на [використання](docs/USAGE.md), щоб дізнатися, які параметри можна використовувати. Box86 поставляється з файлом за замовчуванням, який слід інсталювати для кращої стабільності. Файл знаходиться в `system/box86.box86rc` і має бути встановлено в `/etc/box86.box86rc`. Якщо з певних причин ви не хочете встановлювати цей файл у `/etc`, принаймні скопіюйте його в `~/.box86rc` або гра може не працювати належним чином. Зауважте, що пріоритетом є: `~/.bashrc` > `/etc/box86.box86rc` > командний рядок
-Таким чином, ваші налаштування в `~/.bashrc` можуть замінити налаштування з вашого командного рядка...
-
-----
-
-Примітки щодо емуляції ігор Unity
-----
-
-Запуск ігор Unity має працювати, але ви також повинні зауважити, що для багатьох ігор Unity3D потрібен OpenGL 3+, який може бути складно забезпечити на ARM SBC (одноплатних комп’ютерах). Крім того, багато нових ігор Unity3D (наприклад, KSP) використовують стиснуті текстури BC7, які не підтримуються багатьма інтегрованими GPU ARM.
-Підказка: в Pi4 використовуйте `MESA_GL_VERSION_OVERRIDE=3.2`, а в Panfrost — `PAN_MESA_DEBUG=gl3`, щоб використовувати вищий профіль, якщо гра запускається, а потім завершується, перш ніж щось показує.
-
-----
-
-Примітки щодо Steam
-----
-
-Linux версія Steam тепер може працювати з Box86, але вам також потрібен Box64, щоб його можна було повністю використовувати.
-Рекомендується запускати Steam у small режимі, оскільки він використовує менше пам’яті, але steamwebhelper (64-бітний процес) усе одно завантажуватиметься, навіть якщо він не використовується.
-Екран входу не може працювати без steamwebhelper, і буде показувати лише порожні вікна без належного налаштування box64 у системі.
-Зауважте, що Steam використовуватиме багато пам’яті та ледве поміститься в систему з 4 ГБ оперативної пам’яті. Він більше не працюватиме в системі з меншим об’ємом пам’яті (як обхідний шлях, створіть файл підкачки, увійдіть і поставте прапорець «запам’ятати мене», використовуйте box64rc, щоб вимкнути steamwebhelper і запускати лише в малому режимі без підкачки після першого входу в систему)
-Останнє зауваження: Steam BigPicture працюватиме, але також потрібен steamwebhelper (і box64) і багато пам’яті. Він не запуститься в системі лише з 4 ГБ оперативної пам’яті без файлу підкачки.
-- Якщо у вас виникли проблеми зі встановленням Steam, ви можете знайти `install_steam.sh` у кореневій папці сховища box86. Цей простий скрипт завантажить і встановить Steam у вашу домашню папку, а потім створить ярлик steam у `/usr/local/bin` (для цього він запитає дозвіл sudo). Просто використовуйте `steam` для запуску після встановлення. Зауважте, що інсталяція, яка знаходиться в папці Home, працюватиме лише для одного користувача. Не використовуйте цей скрипт, якщо вам потрібна багатокористувацька інсталяція.
-- Щоб уникнути повідомлення «libc.so.6 відсутній», ви можете використовувати `STEAMOS=1` і `STEAM_RUNTIME=1` як змінні середовища (воно автоматично з’являється, якщо ви використовували сценарій `install_steam.sh`)
-
-Щоб вимкнути `steamwebhelper`, коли Box64 встановлений і працює, створіть (або відредагуйте) `~/.box64rc` і додайте у ньому:
-```
-[steamwebhelper]
-BOX64_EXIT=1
-```
-І тоді `steamwebhelper` буде вимкнено. Прокоментуйте `#` ці 2 рядки, щоб увімкнути його знову.
-
-----
-
-Примітки щодо Wine
-----
-
-Wine тепер підтримується. Інтегровани програми Wine працює як і багато програм та ігор для Windows. Не забувайте, що більшість ігор для Windows використовують Direct3D, для цього може знадобитися повний драйвер OpenGL і якомога більш високий профіль (і gl4es з бекендом ES2 наразі мають проблеми з Wine).
-Примітка: якщо ви плануєте використовувати box86 з Wine на Raspberry Pi 3 або ранішої версії, ці моделі використовують ОС за замовчуванням, яка має ядро ​​з розділенням 2/2 (тобто 2G місця для програми користувача та 2 Г місця для ядра). Це несумісно з програмами Wine, яким потрібен доступ до пам’яті > 2 Гб адреси. Тож вам потрібно буде переналаштувати ядро ​​для розділення 3G/1G.
-
-----
-
-Примітки щодо Vulkan
-----
-
-Box86 вже використовує Vulkan. Якщо у вашій системі є 32-розрядний драйвер Vulkan, Box86 використовуватиме його за потреби. Профіль 1.0, 1.1, 1.2 і 1.3, з деякими розширеннями, має бути в порядку. DXVK, включаючи 2.0, працює. Я знаю, що деякі демонстраційні версії працюють на Pi4 (демонстраційні версії Sascha Willems для x86 працюють так само, як якщо б створювати безпосередньо на armhf). Зауважте, що драйвер Vulkan для Pi4 наразі НЕ підтримує DXVK (обгортка Wine DirectX->Vulkan). Це не проблема Box86, у драйвері відсутні розширення (підтримка апаратного забезпечення) та кілька інших речей, через які DXVK не працює на pi4. З боку Panfrost, PanVK трохи молодий, і я ще не тестував DXVK з ним.
-
-----
-Останнє слово
-----
-
-Я хочу подякувати всім, хто зробив внесок у розвиток box86.
-Є багато способів зробити свій внесок: код, фінанси, апаратне забезпечення та реклама!
-Отже, без особливого порядку, я хочу подякувати:
- * За основний внесок у код: rajdakin, icecream95, M-HT
- * За великий фінансовий внесок: FlyingFathead, stormchaser3000, dennis1248, sll00, [libre-computer-project](https://libre.computer/)
- * За внесок у апаратне забезпечення: [Radxa](https://rockpi.org/), [Pine64](https://www.pine64.org/), [DragonBox](https://pyra-handheld.com/), [Novaspirit](https://www.youtube.com/channel/UCrjKdwxaQMSV_NDywgKXVmw), [HardKernel](https://www.hardkernel.com/), [Команда TwisterOS](https://twisteros.com/)
- * За постійну рекламу Box86: salva ([microLinux](https://www.youtube.com/channel/UCwFQAEj1lp3out4n7BeBatQ)), [PILab](https://www.youtube.com/channel/UCgfQjdc5RceRlTGfuthBs7g)/[Команда TwisterOS](https://twisteros.com/), [The Byteman](https://www.youtube.com/channel/UCEr8lpIJ3B5Ctc5BvcOHSnA), [NicoD](https://www.youtube.com/channel/UCpv7NFr0-9AB5xoklh3Snhg)
-
-І я також дякую багатьом іншим людям, які хоч раз брали участь у проекті.
-
-(Якщо ви використовуєте Box86 у своєму проекті, будь ласка, не забудьте згадати про це!)

docs/USAGE.md

@@ -3,258 +3,196 @@ Usage
 ----
 
 There are many environment variables to control Box86 behaviour. 
-Env. var with * can also be put inside box64rc files
 
-#### BOX86_LOG *
+#### BOX86_LOG
 Controls the Verbosity level of the logs
  * 0: NONE : No message (except some fatal error). (Default.)
  * 1: INFO : Show some minimum log (Example: librairies not found)
  * 2: DEBUG : Details a lot of stuff (Example: relocations or functions called).
  * 3: DUMP : All DEBUG plus DUMP of all ELF Info (so same as `BOX86_LOG=2 BOX86_DUMP=1`)
 
-#### BOX86_DUMP *
+#### BOX86_DUMP
 Controls the Dump of elf content
  * 0: No dump of elf information (Default)
  * 1: Dump elf sections and relocations and other information (also active if using `BOX86_LOG=3`)
 
-#### BOX86_ROLLING_LOG *
+#### BOX86_ROLLING_LOG
 Show last few wrapped function call when a Signal is caught
  * 0: No last function call printed (Default.)
- * 1: Last 16 wrapped functions calls printed when a signal is printed. Incompatible with BOX86_LOG>1 (may need BOX86_SHOWSEGV=1 also)
- * N: Last N wrapped functions calls printed when a signal is printed. Incompatible with BOX86_LOG>1 (may need BOX86_SHOWSEGV=1 also)
+ * 1: Last few wrapped function call printed when a signal is printed. Incompatible with BOX86_LOG>1 (may need BOX86_SHOWSEGV=1 also)
 
 #### BOX86_NOBANNER
 Disables Box86 printing its version and build
  * 0 : Enable printing its banner. (Default.)
  * 1 : Disable printing its banner. 
 
-#### BOX86_LD_LIBRARY_PATH *
+#### BOX86_LD_LIBRARY_PATH
 Path to look for x86 libraries. Default is current folder and `lib` in current folder.
 Also, `/usr/lib/i386-linux-gnu` and `/lib/i386-linux-gnu` are added if they exist.
 
-#### BOX86_PATH *
+#### BOX86_PATH
 Path to look for x86 executable. Default is current folder and `bin` in current folder.
 
-#### BOX86_DLSYM_ERROR *
+#### BOX86_DLSYM_ERROR
 Enables/Disables the logging of `dlsym` errors.
  * 0 : Don't log `dlsym` errors. (Default.)
  * 1 : Log dlsym errors.
 
-#### BOX86_TRACE_FILE *
+#### BOX86_TRACE_FILE
 Send all log and trace to a file instead of `stdout`
 Also, if name contains `%pid` then this is replaced by the actual PID of box86 instance
 Use `stderr` to use this instead of default `stdout` 
 
-#### BOX86_TRACE *
+#### BOX86_TRACE
 Only on build with trace enabled. Trace allow the logging of all instruction executed, along with register dump
  * 0 : No trace. (Default.) 
  * 1 : Trace enabled. Trace start after the initialisation of all depending libraries is done.
  * symbolname : Trace only `symbolname` (trace is disable if the symbol is not found).
  * 0xXXXXXXX-0xYYYYYYY : Trace only between the 2 addresses.
 
-#### BOX86_TRACE_INIT *
+#### BOX86_TRACE_INIT
 Use BOX86_TRACE_INIT instead of BOX_TRACE to start trace before the initialisation of libraries and the running program
  * 0 : No trace. (Default.)
  * 1 : Trace enabled. The trace start with the initialisation of all depending libraries is done.
 
-#### BOX86_TRACE_START *
+#### BOX86_TRACE_START
 Only on builds with trace enabled.
  * NNNNNNN : Start trace only after NNNNNNNN opcode execute (number is an `uint64_t`).
 
-#### BOX86_TRACE_XMM *
+#### BOX86_TRACE_XMM
 Only on builds with trace enabled.
  * 0 : The XMM (i.e. SSE/SSE2) register will not be logged with the general and x86 registers. (Default.)
  * 1 : Dump the XMM registers.
 
-#### BOX86_TRACE_EMM *
-Only on builds with trace enabled.
- * 0 : The EMM (i.e. MMX) register will not be logged with the general and x86 registers. (Default.)
- * 1 : Dump the EMM registers.
-
-#### BOX86_LOAD_ADDR *
+#### BOX86_LOAD_ADDR
 Try to load at 0xXXXXXX main binary (if binary is a PIE)
  * 0xXXXXXXXX : The load address . (Only active on PIE programs.)
 
-#### BOX86_NOSIGSEGV *
+#### BOX86_NOSIGSEGV
 Disable handling of SigSEGV. (Very useful for debugging.)
  * 0 : Let the x86 program set sighandler for SEGV (Default.)
  * 1 : Disable the handling of SigSEGV.
 
-#### BOX86_NOSIGILL *
+#### BOX86_NOSIGILL
 Disable handling of SigILL (to ease debugging mainly).
  * 0 : Let x86 program set sighandler for Illegal Instruction
  * 1 : Disables the handling of SigILL 
 
-#### BOX86_X11COLOR16 *
+#### BOX86_X11COLOR16
 PANDORA only: Try converting X11 color from 32 bits to 16 bits (to avoid light green on light cyan windows).
  * 0 : Don't touch X11 colors. (Default.)
  * 1 : Change colors arguments in XSetForeground, XSetBackground and XCreateGC.
 
-#### BOX86_X11THREADS *
+#### BOX86_X11THREADS
 Call XInitThreads when loading X11. (This is mostly for old Loki games with the Loki_Compat library.)
  * 0 : Don't force call XInitThreads. (Default.)
  * 1 : Call XInitThreads as soon as libX11 is loaded.
 
-#### BOX86_X11GLX *
+#### BOX86_X11GLX
 Force libX11's GLX extension to be present.
 * 0 : Do not force libX11's GLX extension to be present. 
 * 1 : GLX will always be present when using XQueryExtension. (Default.)
 
-#### BOX86_DYNAREC_DUMP *
+#### BOX86_DYNAREC_DUMP
 Enables/disables Box86's Dynarec's dump.
  * 0 : Disable Dynarec's blocks dump. (Default.)
  * 1 : Enable Dynarec's blocks dump.
  * 2 : Enable Dynarec's blocks dump with some colors.
 
-#### BOX86_DYNAREC_LOG *
+#### BOX86_DYNAREC_LOG
 Set the level of DynaRec's logs.
  * 0 : NONE : No Logs for DynaRec. (Default.)
  * 1 :INFO : Minimum Dynarec Logs (only unimplemented OpCode).
  * 2 : DEBUG : Debug Logs for Dynarec (with details on block created / executed).
  * 3 : VERBOSE : All of the above plus more.
 
-#### BOX86_DYNAREC *
+#### BOX86_DYNAREC
 Enables/Disables Box86's Dynarec.
  * 0 : Disables Dynarec.
  * 1 : Enable Dynarec. (Default.)
 
-#### BOX86_DYNAREC_TRACE *
+#### BOX86_DYNAREC_TRACE
 Enables/Disables trace for generated code.
  * 0 : Disable trace for generated code. (Default.)
  * 1 : Enable trace for generated code (like regular Trace, this will slow down the program a lot and generate huge logs).
 
-#### BOX86_NODYNAREC *
+#### BOX86_NODYNAREC 
 Forbid dynablock creation in the interval specified (helpfull for debugging behaviour difference between Dynarec and Interpretor)
  * 0xXXXXXXXX-0xYYYYYYYY : define the interval where dynablock cannot start (inclusive-exclusive)
 
-#### BOX86_DYNAREC_TEST *
-Dynarec will compare it's execution with the interpreter (super slow, only for testing)
- * 0 : No comparison
- * 1 : Each opcode runs on interepter and on Dynarec, and regs and memory are compared and print if different
-
-#### BOX86_DYNAREC_BIGBLOCK *
+#### BOX86_DYNAREC_BIGBLOCK
 Enables/Disables Box86's Dynarec building BigBlock.
  * 0 : Don't try to build block as big as possible (can help program using lots of thread and a JIT, like C#/Unity) (Default when libmonobdwgc-2.0.so is loaded)
  * 1 : Build Dynarec block as big as possible (Default.)
  * 2 : Build Dynarec block bigger (don't stop when block overlaps)
 
-#### BOX86_DYNAREC_FORWARD *
-Define Box86's Dynarec max allowed forward value when building Block.
- * 0 : No forward value. When current block end, don't try to go further even if there are previous forward jumps
- * XXX : Allow up to XXXX bytes of gap when building a Block after the block end to next forward jump (Default: 128)
- 
-#### BOX86_DYNAREC_STRONGMEM *
+#### BOX86_DYNAREC_STRONGMEM
 Enable/Disable simulation of Strong Memory model
 * 0 : Don't try anything special (Default.)
 * 1 : Enable some Memory Barrier when reading from memory (on some MOV opcode) to simulate Strong Memory Model while trying to limit performance impact (Default when libmonobdwgc-2.0.so is loaded)
 * 2 : Enable some Memory Barrier when reading from memory (on some MOV opcode) to simulate Strong Memory Model
 
-#### BOX86_DYNAREC_X87DOUBLE *
+#### BOX86_DYNAREC_X87DOUBLE
 Force the use of Double for x87 emulation
 * 0 : Try to use float when possible for x87 emulation (faster, Default)
 * 1 : Only use Double for x87 emulation (slower, may be needed for some specific games, like Crysis were it's enable automatically)
 
-#### BOX86_DYNAREC_FASTNAN *
+#### BOX86_DYNAREC_FASTNAN
 Enable/Disable generation of -NAN
 * 0 : Generate -NAN like on x86 (slower, more x86 accurate)
 * 1 : Don't do anything special with NAN, to go as fast as possible (Default)
 
-#### BOX86_DYNAREC_FASTROUND *
-Enable/Disable generation of precise x86 rounding
-* 0 : Generate float/double -> int rounding like on x86
-* 1 : Don't do anything special with edge case Rounding, to go as fast as possible (no INF/NAN/Overflow -> MIN_INT conversion) (faster, Default)
-
-#### BOX86_DYNAREC_SAFEFLAGS *
+#### BOX86_DYNAREC_SAFEFLAGS
 Handling of flags on CALL/RET opcodes
 * 0 : Treat CALL/RET as if it never needs any flags (faster but may have side-effects)
 * 1 : most of RET will need flags, most of CALLS will not (Default)
 * 2 : All CALL/RET will need flags (slower, but might be needed. Automatically enabled for Vara.exe)
 
-#### BOX86_DYNAREC_HOTPAGE *
-Handling of HotPage (Page beeing both executed and writen)
-* 0 : Don't track hotpage
-* 1-255 : Trak HotPage, and disable execution of a page beeing writen for N attempts (default is 16)
-
-#### BOX86_DYNAREC_FASTPAGE *
-Will use a faster handling of HotPage (Page being both executed and written)
-* 0 : use regular hotpage (Default)
-* 1 : Use faster hotpage, taking the risk of running obsolete JIT code (might be faster, but more prone to crash)
-
-#### BOX86_DYNAREC_BLEEDING_EDGE *
-Detect MonoBleedingEdge and apply conservative settings
-* 0 : Don't detect MonoBleedingEdge
-* 1 : Detect MonoBleedingEdge, and apply BIGBLOCK=0 STRONGMEM=1 if detected (Default)
-
-#### BOX86_DYNAREC_JVM *
-Detect libjvm and apply conservative settings
-* 0 : Don't detect libjvm
-* 1 : Detect libjvm, and apply BIGBLOCK=0 STRONGMEM=1 if detected (Default)
-
-#### BOX86_DYNAREC_WAIT *
-Behavior with FillBlock is not availble (FillBlock build Dynarec blocks and is not multithreaded)
-* 0 : Dynarec will not wait for FillBlock to ready and use Interpreter instead (might speedup a bit massive multithread or JIT programs)
-* 1 : Dynarec will wait for FillBlock to be ready (Default)
-
-#### BOX86_SSE_FLUSHTO0 *
-Handling of SSE Flush to 0 flags
-* 0 : Just track the flag (Default)
-* 1 : Direct apply of SSE Flush to 0 flag
-
-#### BOX86_X87_NO80BITS *
-Handling of x87 80bits long double
-* 0 : Try to handle 80bits long double as precise as possible (Default)
-* 1 : Handle them as double
-
-#### BOX86_LIBCEF *
-Detect libcef and apply malloc_hack settings
-* 0 : Don't detect libcef
-* 1 : Detect libcef, and apply MALLOC_HACK=2 if detected (Default)
-
-#### BOX86_LIBGL *
+#### BOX86_LIBGL
  * libXXXX set the name for libGL (defaults to libGL.so.1).
  * /PATH/TO/libGLXXX : Sets the name and path for libGL
  You can also use SDL_VIDEO_GL_DRIVER
 
-#### BOX86_LD_PRELOAD *
+#### BOX86_LD_PRELOAD
  * XXXX[:YYYYY] force loading XXXX (and YYYY...) libraries with the binary
- PreLoaded libs can be emulated or native, and are treated the same way as if they were comming from the binary (not that using this inside a rcfile might not work if the process needs to be renamed, for example for Wine process)
+ PreLoaded libs can be emulated or native, and are treated the same way as if they were comming from the binary
  
-#### BOX86_EMULATED_LIBS *
+#### BOX86_EMULATED_LIBS
  * XXXX[:YYYYY] force lib XXXX (and YYYY...) to be emulated (and not wrapped)
 Some games uses an old version of some libraries, with an ABI incompatible with native version.
 Note that LittleInferno for example is auto detected, and libvorbis.so.0 is automatical added to emulated libs, and same for Don't Starve (and Together / Server variant) that use an old SDL2 too
 
-#### BOX86_ALLOWMISSING_LIBS *
+#### BOX86_ALLOWMISSING_LIBS
 Allow Box86 to continue even if a library is missing (renamed from BOX86_ALLOWMISSINGLIBS). 
  * 0 : Box86 will stop if a library cannot be loaded. (Default.)
  * 1 : Continue even if a needed library cannot be loaded. Unadvised, this will, in most cases, crash later on.
 
-#### BOX86_ALLOWMISSING_SYMBOLS *
+#### BOX86_ALLOWMISSING_SYMBOLS
 Allow dlopen with RTLD_NOW flag to not resolve all symbols. 
  * 0 : Box86 will stop if a library have unresolved symbols. (Default.)
  * 1 : Continue even if a needed library have unresolved symbols (like symbols not yet wrapped).
 
-#### BOX86_PREFER_WRAPPED *
+#### BOX86_PREFER_WRAPPED
 Box86 will use wrapped libs even if the lib is specified with absolute path
  * 0 : Try to use emulated libs when they are defined with absolute path  (Default.)
  * 1 : Use Wrapped native libs even if path is absolute
 
-#### BOX86_PREFER_EMULATED *
+#### BOX86_PREFER_EMULATED
 Box86 will prefer emulated libs first (execpt for glibc, alsa, pulse, GL, vulkan and X11
  * 0 : Native libs are prefered (Default.)
  * 1 : Emulated libs are prefered (Default for program running inside pressure-vessel)
 
-#### BOX86_NOPULSE *
+#### BOX86_NOPULSE
 Disables the load of pulseaudio libraries.
  * 0 : Load pulseaudio libraries if found. (Default.)
  * 1 : Disables the load of pulse audio libraries (libpulse and libpulse-simple), both the native library and the x86 library
 
-#### BOX86_NOGTK *
+#### BOX86_NOGTK
 Disables the loading of wrapped GTK libraries.
  * 0 : Load wrapped GTK libraries if found. (Default.)
  * 1 : Disables loading wrapped GTK libraries.
 
-#### BOX86_NOVULKAN *
+#### BOX86_NOVULKAN
 Disables the load of vulkan libraries.
  * 0 : Load vulkan libraries if found.
  * 1 : Disables the load of vulkan libraries, both the native and the i386 version (can be useful on Pi4, where the vulkan driver is not quite there yet.)
@@ -267,22 +205,22 @@ Disables the load of vulkan libraries.
  * XXX=yyyy
  will add XXX=yyyy env. var. and continue with BOX86_ENV2 ... until var doesn't exist
 
-#### BOX86_FIX_64BIT_INODES *
+#### BOX86_FIX_64BIT_INODES
 Fix/Don't fix 64bit inodes
  * 0 : Don't fix 64bit inodes. (Default.)
  * 1 : Fix 64bit inodes. Helps when running on Filesystems with 64bit inodes. Is useful when a program uses API functions which doesn't support it and the program doesn't use inodes information.
 
-#### BOX86_SHOWSEGV *
+#### BOX86_SHOWSEGV
 Show Segfault signal even if a signal handler is present
  * 0 : Don't force segfault details when a signal handler is install (Default, to limit message spamming)
  * 1 : Show segfault details
 
-#### BOX86_SHOWBT *
+#### BOX86_BACKTRACE
 Show a backtrace (native and emulated) on Signal
  * 0 : Don't show any backtrace (Default.)
  * 1 : Show native backtrace when a signal is dumped (not available on Andoid build)
 
-#### BOX86_BASH *
+#### BOX86_BASH
 Define x86 bash to launch script
  * yyyy
 Will use yyyy as x86 bash to launch script. yyyy needs to be a full path to a valid x86 version of bash. Note that is Box64 is available, an x86_64 version of bash can also be used. Also, BOX64_BASH env. var. will also be read if BOX86_BASH is not defined.
@@ -291,8 +229,7 @@ Will use yyyy as x86 bash to launch script. yyyy needs to be a full path to a va
 Define where to find box64 binary
  * yyyy
 Will use yyyy as x86_64 interpretor, to launch x64_64 binaries
-
-#### BOX86_JITGDB *
+#### BOX86_JITGDB
 
  * 0 : Just print the Segfault message on segfault (default)
  * 1 : Launch `gdb` when a segfault, bus error or illegal instruction signal is trapped, attached to the offending process and go in an endless loop, waiting.
@@ -303,11 +240,3 @@ Will use yyyy as x86_64 interpretor, to launch x64_64 binaries
  * 2 : Launch `gdbserver` when a segfault, bus error or illegal instruction signal is trapped, attached to the offending process, and go in an endless loop, waiting.
  Use `gdb /PATH/TO/box86` and then `target remote 127.0.0.1:1234` to connect to the gdbserver (or use actual IP if not on the machine). After that, the procedure is the same as with ` BOX86_JITGDB=1`.
  This mode can be usefullwhen programs redirect all console output to a file (like Unity3D Games)
-
-#### BOX86_NORCFILES
-If the env var exist, no rc files (like /etc/box86.box86rc and ~/.box86rc) will be loaded
-
-#### BOX86_NOSANDBOX
- * 0 : Nothing special
- * 1 : Added "--no-sandbox" to command line arguments (usefull for chrome based programs)
-

docs/X86WINE.md

@@ -42,7 +42,7 @@ rm ~/wine.tgz # clean up
 
 # Install shortcuts (make launcher & symlinks. Credits: grayduck, Botspot)
 echo -e '#!/bin/bash\nsetarch linux32 -L '"$HOME/wine/bin/wine "'"$@"' | sudo tee -a /usr/local/bin/wine >/dev/null # Create a script to launch wine programs as 32bit only
-#sudo ln -s ~/wine/bin/wine /usr/local/bin/wine # You could also just make a symlink, but box86 only works for 32bit apps at the moment
+#sudo ln -s ~/wine/bin/wine /usr/local/bin/wine # You could aslo just make a symlink, but box86 only works for 32bit apps at the moment
 sudo ln -s ~/wine/bin/wineboot /usr/local/bin/wineboot
 sudo ln -s ~/wine/bin/winecfg /usr/local/bin/winecfg
 sudo ln -s ~/wine/bin/wineserver /usr/local/bin/wineserver

install_steam.sh

@@ -21,28 +21,19 @@ cd ../ && rm -rf ./tmp/
 echo "#!/bin/bash
 export STEAMOS=1
 export STEAM_RUNTIME=1
-export DBUS_FATAL_WARNINGS=0
-~/steam/bin/steam steam://open/minigameslist $@" > steam
+~/steam/bin/steam -noreactlogin steam://open/minigameslist $@" > steam
 
 # make script executable and move
 chmod +x steam
 sudo mv steam /usr/local/bin/
 
-# detect if we're running on 64 bit Debian (maybe this can be moved in another script then mentioned in documentation for the people that don't use steam but don't want a headache)
+# detect if we're running on 64 bit Debian 
 MACHINE_TYPE=`uname -m`
 if [ ${MACHINE_TYPE} == 'aarch64' ] && [ -f '/etc/debian_version' ]; then
  echo "Detected 64 bit ARM Debian. Installing 32 bit libraries"
  sudo dpkg --add-architecture armhf # enable installation of armhf libraries
  sudo apt update # update package lists with the newly added arch
- # install the libraries that Steam requires
- sudo apt install libc6:armhf libncurses5:armhf libsdl2-2.0-0:armhf libsdl2-image-2.0-0:armhf libsdl2-mixer-2.0-0:armhf libsdl2-ttf-2.0-0:armhf libopenal1:armhf libpng16-16:armhf libfontconfig1:armhf libxcomposite1:armhf libbz2-1.0:armhf libxtst6:armhf libsm6:armhf libice6:armhf libgl1:armhf libxinerama1:armhf libxdamage1:armhf
-
- # install mesa for armhf if already installed
- if dpkg-query -W libgl1-mesa-dri 2>/dev/null; then
-  echo "Detected mesa driver for 64 bit ARM. Installing complementary 32 bit one"
-  sudo apt install libgl1-mesa-dri:armhf
- fi
-
+ sudo apt install libc6:armhf libncurses5:armhf libsdl2*:armhf libopenal*:armhf libpng*:armhf libfontconfig*:armhf libXcomposite*:armhf libbz2-dev:armhf libXtst*:armhf # install the libraries that Steam requires
  echo "Don't forget to compile/install Box64!"
 fi
 

pkgbuilds/PKGBUILD-arm

@@ -1,7 +1,7 @@
 # Maintainer: Jai-JAP <[email protected]>, SpacingBat3 <[email protected]>
 # Author: Sebastien Chevalier <[email protected]>
 pkgname=box86-arm-git
-pkgver=r4581.d698861
+pkgver=r3858.5368285
 pkgrel=1
 pkgdesc="Linux Userspace x86 Emulator with a twist, targeted at ARM Linux devices."
 arch=('armv7h')
@@ -15,22 +15,15 @@ source=('git+https://github.com/ptitSeb/box86')
 md5sums=('SKIP')
 
 pkgver() {
-	cd "${srcdir}/${pkgname%-arm-git}"
+	cd "$srcdir/${pkgname%-arm-git}"
 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-prepare() {
-	cd "${srcdir}/${pkgname%-arm-git}"
-	[[ ! -d ./build ]] && mkdir build
-	cmake -B build -DARM_DYNAREC=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
-}
-
 build() {
-	cd "${srcdir}/${pkgname%-arm-git}/build"
-	make -j$(nproc)
+	cmake -B build -S "${pkgname%-arm-git}" -DARM_DYNAREC=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
+	make -C build
 }
 
 package() {
-	cd "${srcdir}/${pkgname%-arm-git}/build"
-	make DESTDIR="${pkgdir}/" install
-}
+	make -C build DESTDIR="${pkgdir}/" install
+}

pkgbuilds/PKGBUILD-arm64

@@ -1,36 +0,0 @@
-# Maintainer: Jai-JAP <[email protected]>, SpacingBat3 <[email protected]>
-# Author: Sebastien Chevalier <[email protected]>
-pkgname=box86-arm64-git
-pkgver=r4581.d698861
-pkgrel=1
-pkgdesc="Linux Userspace x86 Emulator with a twist, targeted at ARM Linux devices."
-arch=('aarch64')
-url="https://github.com/ptitSeb/box86"
-license=('MIT')
-optdepends=('gl4es: OpenGL 2 for GLES 2 devices')
-makedepends=('git' 'cmake' 'make')
-provides=("${pkgname%-git}" "${pkgname%-arm64-git}-git" "${pkgname%-arm64-git}")
-conflicts=("${pkgname%-git}" "${pkgname%-arm64-git}-git" "${pkgname%-arm64-git}")
-source=('git+https://github.com/ptitSeb/box86')
-md5sums=('SKIP')
-
-pkgver() {
-	cd "${srcdir}/${pkgname%-arm64-git}"
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-prepare() {
-	cd "${srcdir}/${pkgname%-arm64-git}"
-	[[ ! -d ./build ]] && mkdir build
-	cmake -B build -DARM64=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
-}
-
-build() {
-	cd "${srcdir}/${pkgname%-arm64-git}/build"
-	make -j$(nproc)
-}
-
-package() {
-	cd "${srcdir}/${pkgname%-arm64-git}/build"
-	make DESTDIR="${pkgdir}/" install
-}

pkgbuilds/PKGBUILD-gameshell

@@ -1,7 +1,7 @@
 # Maintainer: Jai-JAP <[email protected]>, SpacingBat3 <[email protected]>
 # Author: Sebastien Chevalier <[email protected]>
 pkgname=box86-gameshell-git
-pkgver=r4581.d698861
+pkgver=r3858.5368285
 pkgrel=1
 pkgdesc="Linux Userspace x86 Emulator with a twist, targeted at ARM Linux devices."
 arch=('armv7h')
@@ -15,22 +15,15 @@ source=('git+https://github.com/ptitSeb/box86')
 md5sums=('SKIP')
 
 pkgver() {
-	cd "${srcdir}/${pkgname%-gameshell-git}"
+	cd "$srcdir/${pkgname%-gameshell-git}"
 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-prepare() {
-	cd "${srcdir}/${pkgname%-gameshell-git}"
-	[[ ! -d ./build ]] && mkdir build
-	cmake -B build -DGAMESHELL=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
-}
-
 build() {
-	cd "${srcdir}/${pkgname%-gameshell-git}/build"
-	make -j$(nproc)
+	cmake -B build -S "${pkgname%-gameshell-git}" -DGAMESHELL=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
+	make -C build
 }
 
 package() {
-	cd "${srcdir}/${pkgname%-gameshell-git}/build"
-	make DESTDIR="${pkgdir}/" install
-}
+	make -C build DESTDIR="${pkgdir}/" install
+}

pkgbuilds/PKGBUILD-goaclone

@@ -1,36 +0,0 @@
-# Maintainer: Jai-JAP <[email protected]>, SpacingBat3 <[email protected]>
-# Author: Sebastien Chevalier <[email protected]>
-pkgname=box86-goaclone-git
-pkgver=r4581.d698861
-pkgrel=1
-pkgdesc="Linux Userspace x86 Emulator with a twist, targeted at ARM Linux devices."
-arch=('armv7h')
-url="https://github.com/ptitSeb/box86"
-license=('MIT')
-optdepends=('gl4es: OpenGL 2 for GLES 2 devices')
-makedepends=('git' 'cmake' 'make')
-provides=("${pkgname%-git}" "${pkgname%-goaclone-git}-git" "${pkgname%-goaclone-git}")
-conflicts=("${pkgname%-git}" "${pkgname%-goaclone-git}-git" "${pkgname%-goaclone-git}")
-source=('git+https://github.com/ptitSeb/box86')
-md5sums=('SKIP')
-
-pkgver() {
-	cd "${srcdir}/${pkgname%-goaclone-git}"
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-prepare() {
-	cd "${srcdir}/${pkgname%-goaclone-git}"
-	[[ ! -d ./build ]] && mkdir build
-	cmake -B build -DGOA_CLONE=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
-}
-
-build() {
-	cd "${srcdir}/${pkgname%-goaclone-git}/build"
-	make -j$(nproc)
-}
-
-package() {
-	cd "${srcdir}/${pkgname%-goaclone-git}/build"
-	make DESTDIR="${pkgdir}/" install
-}

pkgbuilds/PKGBUILD-lx2610a

@@ -1,36 +0,0 @@
-# Maintainer: Jai-JAP <[email protected]>, SpacingBat3 <[email protected]>
-# Author: Sebastien Chevalier <[email protected]>
-pkgname=box86-lx2610a-git
-pkgver=r4581.d698861
-pkgrel=1
-pkgdesc="Linux Userspace x86 Emulator with a twist, targeted at ARM Linux devices."
-arch=('armv7h')
-url="https://github.com/ptitSeb/box86"
-license=('MIT')
-optdepends=('gl4es: OpenGL 2 for GLES 2 devices')
-makedepends=('git' 'cmake' 'make')
-provides=("${pkgname%-git}" "${pkgname%-lx2610a-git}-git" "${pkgname%-lx2610a-git}")
-conflicts=("${pkgname%-git}" "${pkgname%-lx2610a-git}-git" "${pkgname%-lx2610a-git}")
-source=('git+https://github.com/ptitSeb/box86')
-md5sums=('SKIP')
-
-pkgver() {
-	cd "${srcdir}/${pkgname%-lx2610a-git}"
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-prepare() {
-	cd "${srcdir}/${pkgname%-lx2610a-git}"
-	[[ ! -d ./build ]] && mkdir build
-	cmake -B build -DLX2610A=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
-}
-
-build() {
-	cd "${srcdir}/${pkgname%-lx2610a-git}/build"
-	make -j$(nproc)
-}
-
-package() {
-	cd "${srcdir}/${pkgname%-lx2610a-git}/build"
-	make DESTDIR="${pkgdir}/" install
-}

pkgbuilds/PKGBUILD-odroid

@@ -1,7 +1,7 @@
 # Maintainer: Jai-JAP <[email protected]>, SpacingBat3 <[email protected]>
 # Author: Sebastien Chevalier <[email protected]>
 pkgname=box86-odroid-git
-pkgver=r4581.d698861
+pkgver=r3858.5368285
 pkgrel=1
 pkgdesc="Linux Userspace x86 Emulator with a twist, targeted at ARM Linux devices."
 arch=('armv7h')
@@ -15,22 +15,15 @@ source=('git+https://github.com/ptitSeb/box86')
 md5sums=('SKIP')
 
 pkgver() {
-	cd "${srcdir}/${pkgname%-odroid-git}"
+	cd "$srcdir/${pkgname%-odroid-git}"
 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-prepare() {
-	cd "${srcdir}/${pkgname%-odroid-git}"
-	[[ ! -d ./build ]] && mkdir build
-	cmake -B build -DODROID=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
-}
-
 build() {
-	cd "${srcdir}/${pkgname%-odroid-git}/build"
-	make -j$(nproc)
+	cmake -B build -S "${pkgname%-odroid-git}" -DODROID=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
+	make -C build
 }
 
 package() {
-	cd "${srcdir}/${pkgname%-odroid-git}/build"
-	make DESTDIR="${pkgdir}/" install
-}
+	make -C build DESTDIR="${pkgdir}/" install
+}

pkgbuilds/PKGBUILD-odroidn2

@@ -1,36 +0,0 @@
-# Maintainer: Jai-JAP <[email protected]>, SpacingBat3 <[email protected]>
-# Author: Sebastien Chevalier <[email protected]>
-pkgname=box86-odroidn2-git
-pkgver=r4581.d698861
-pkgrel=1
-pkgdesc="Linux Userspace x86 Emulator with a twist, targeted at ARM Linux devices."
-arch=('armv7h')
-url="https://github.com/ptitSeb/box86"
-license=('MIT')
-optdepends=('gl4es: OpenGL 2 for GLES 2 devices')
-makedepends=('git' 'cmake' 'make')
-provides=("${pkgname%-git}" "${pkgname%-odroidn2-git}-git" "${pkgname%-odroidn2-git}")
-conflicts=("${pkgname%-git}" "${pkgname%-odroidn2-git}-git" "${pkgname%-odroidn2-git}")
-source=('git+https://github.com/ptitSeb/box86')
-md5sums=('SKIP')
-
-pkgver() {
-	cd "${srcdir}/${pkgname%-odroidn2-git}"
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-prepare() {
-	cd "${srcdir}/${pkgname%-odroidn2-git}"
-	[[ ! -d ./build ]] && mkdir build
-	cmake -B build -DODROID=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
-}
-
-build() {
-	cd "${srcdir}/${pkgname%-odroidn2-git}/build"
-	make -j$(nproc)
-}
-
-package() {
-	cd "${srcdir}/${pkgname%-odroidn2-git}/build"
-	make DESTDIR="${pkgdir}/" install
-}

pkgbuilds/PKGBUILD-pandora

@@ -1,7 +1,7 @@
 # Maintainer: Jai-JAP <[email protected]>, SpacingBat3 <[email protected]>
 # Author: Sebastien Chevalier <[email protected]>
 pkgname=box86-pandora-git
-pkgver=r4581.d698861
+pkgver=r3858.5368285
 pkgrel=1
 pkgdesc="Linux Userspace x86 Emulator with a twist, targeted at ARM Linux devices."
 arch=('armv7h')
@@ -15,22 +15,15 @@ source=('git+https://github.com/ptitSeb/box86')
 md5sums=('SKIP')
 
 pkgver() {
-	cd "${srcdir}/${pkgname%-pandora-git}"
+	cd "$srcdir/${pkgname%-pandora-git}"
 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-prepare() {
-	cd "${srcdir}/${pkgname%-pandora-git}"
-	[[ ! -d ./build ]] && mkdir build
-	cmake -B build -DPANDORA=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
-}
-
 build() {
-	cd "${srcdir}/${pkgname%-pandora-git}/build"
-	make -j$(nproc)
+	cmake -B build -S "${pkgname%-pandora-git}" -DPANDORA=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
+	make -C build
 }
 
 package() {
-	cd "${srcdir}/${pkgname%-pandora-git}/build"
-	make DESTDIR="${pkgdir}/" install
-}
+	make -C build DESTDIR="${pkgdir}/" install
+}

pkgbuilds/PKGBUILD-phytium

@@ -1,36 +0,0 @@
-# Maintainer: Jai-JAP <[email protected]>, SpacingBat3 <[email protected]>
-# Author: Sebastien Chevalier <[email protected]>
-pkgname=box86-phytium-git
-pkgver=r4581.d698861
-pkgrel=1
-pkgdesc="Linux Userspace x86 Emulator with a twist, targeted at ARM Linux devices."
-arch=('armv7h')
-url="https://github.com/ptitSeb/box86"
-license=('MIT')
-optdepends=('gl4es: OpenGL 2 for GLES 2 devices')
-makedepends=('git' 'cmake' 'make')
-provides=("${pkgname%-git}" "${pkgname%-phytium-git}"-git "${pkgname%-phytium-git}")
-conflicts=("${pkgname%-git}" "${pkgname%-phytium-git}"-git "${pkgname%-phytium-git}")
-source=('git+https://github.com/ptitSeb/box86')
-md5sums=('SKIP')
-
-pkgver() {
-	cd "${srcdir}/${pkgname%-phytium-git}"
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-prepare() {
-	cd "${srcdir}/${pkgname%-phytium-git}"
-	[[ ! -d ./build ]] && mkdir build
-	cmake -B build -DPHYTIUM=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
-}
-
-build() {
-	cd "${srcdir}/${pkgname%-phytium-git}/build"
-	make -j$(nproc)
-}
-
-package() {
-	cd "${srcdir}/${pkgname%-phytium-git}/build"
-	make DESTDIR="${pkgdir}/" install
-}

pkgbuilds/PKGBUILD-pyra

@@ -1,7 +1,7 @@
 # Maintainer: Jai-JAP <[email protected]>, SpacingBat3 <[email protected]>
 # Author: Sebastien Chevalier <[email protected]>
 pkgname=box86-pyra-git
-pkgver=r4581.d698861
+pkgver=r3858.5368285
 pkgrel=1
 pkgdesc="Linux Userspace x86 Emulator with a twist, targeted at ARM Linux devices."
 arch=('armv7h')
@@ -15,22 +15,15 @@ source=('git+https://github.com/ptitSeb/box86')
 md5sums=('SKIP')
 
 pkgver() {
-	cd "${srcdir}/${pkgname%-pyra-git}"
+	cd "$srcdir/${pkgname%-pyra-git}"
 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-prepare() {
-	cd "${srcdir}/${pkgname%-pyra-git}"
-	[[ ! -d ./build ]] && mkdir build
-	cmake -B build -DPYRA=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
-}
-
 build() {
-	cd "${srcdir}/${pkgname%-pyra-git}/build"
-	make -j$(nproc)
+	cmake -B build -S "${pkgname%-pyra-git}" -DPYRA=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
+	make -C build
 }
 
 package() {
-	cd "${srcdir}/${pkgname%-pyra-git}/build"
-	make DESTDIR="${pkgdir}/" install
-}
+	make -C build DESTDIR="${pkgdir}/" install
+}

pkgbuilds/PKGBUILD-raspberrypi

@@ -1,7 +1,7 @@
 # Maintainer: Jai-JAP <[email protected]>, SpacingBat3 <[email protected]>
 # Author: Sebastien Chevalier <[email protected]>
 pkgname=box86-rpi-git
-pkgver=r4581.d698861
+pkgver=r3858.5368285
 pkgrel=1
 pkgdesc="Linux Userspace x86 Emulator with a twist, targeted at ARM Linux devices."
 arch=('armv7h')
@@ -16,12 +16,11 @@ md5sums=('SKIP')
 _pimodel=`tr -d '\0' < /sys/firmware/devicetree/base/model`
 
 pkgver() {
-	cd "${srcdir}/${pkgname%-rpi-git}"
+	cd "$srcdir/${pkgname%-rpi-git}"
 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-prepare() {
-	cd "${srcdir}/${pkgname%-rpi-git}"
+build() {
 	# Check for Pi version number
 	if [[ ${_pimodel} =~ "Raspberry Pi 4" ]]; then
 		_piversion=4
@@ -32,20 +31,15 @@ prepare() {
 	else
 		# This RPI is not supported or this device is not a pi.
 		# We should cancel then the build.
-		echo -e "\033[01m\033[01;31m==> ERROR:\033[00;01m Your device is not supported! This script is for RPi model 4/3/2 (1/0 isn't supported).\033[00m"
+		echo -e "\033[01m\033[01;31m==> ERROR:\033[00;01m Your device is not supported! This script is for RPi model 4/3/2 (1/0 isn't supported yet).\033[00m"
 		exit 1
 	fi
 	echo -e "\033[01m\033[01;34m==> INFO:\033[00;01m Your detected Pi verion number is: \033[01;31m${_piversion}\033[01m.\033[00m"
-	[[ ! -d ./build ]] && mkdir build
-	cmake -B build -DRPI${_piversion}=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
-}
 
-build() {
-	cd "${srcdir}/${pkgname%-rpi-git}/build"
-	make -j$(nproc)
+	cmake -B build -S "${pkgname%-rpi-git}" -DRPI${_piversion}=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
+	make -C build
 }
 
 package() {
-	cd "${srcdir}/${pkgname%-rpi-git}/build"
-	make DESTDIR="${pkgdir}/" install
+	make -C build DESTDIR="${pkgdir}/" install
 }

pkgbuilds/PKGBUILD-rk3399

@@ -1,7 +1,7 @@
 # Maintainer: Jai-JAP <[email protected]>, SpacingBat3 <[email protected]>
 # Author: Sebastien Chevalier <[email protected]>
-pkgname=box86-a64-git
-pkgver=r4581.d698861
+pkgname=box86-rk3399-git
+pkgver=r3858.5368285
 pkgrel=1
 pkgdesc="Linux Userspace x86 Emulator with a twist, targeted at ARM Linux devices."
 arch=('armv7h')
@@ -9,28 +9,21 @@ url="https://github.com/ptitSeb/box86"
 license=('MIT')
 optdepends=('gl4es: OpenGL 2 for GLES 2 devices')
 makedepends=('git' 'cmake' 'make')
-provides=("${pkgname%-git}" "${pkgname%-a64-git}-git" "${pkgname%-a64-git}")
-conflicts=("${pkgname%-git}" "${pkgname%-a64-git}-git" "${pkgname%-a64-git}")
+provides=("${pkgname%-git}" "${pkgname%-rk3399-git}-git" "${pkgname%-rk3399-git}")
+conflicts=("${pkgname%-git}" "${pkgname%-rk3399-git}-git" "${pkgname%-rk3399-git}")
 source=('git+https://github.com/ptitSeb/box86')
 md5sums=('SKIP')
 
 pkgver() {
-	cd "${srcdir}/${pkgname%-a64-git}"
+	cd "$srcdir/${pkgname%-rk3399-git}"
 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-prepare() {
-	cd "${srcdir}/${pkgname%-a64-git}"
-	[[ ! -d ./build ]] && mkdir build
-	cmake -B build -DA64=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
-}
-
 build() {
-	cd "${srcdir}/${pkgname%-a64-git}/build"
-	make -j$(nproc)
+	cmake -B build -S "${pkgname%-rk3399-git}" -DRK3399=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
+	make -C build
 }
 
 package() {
-	cd "${srcdir}/${pkgname%-a64-git}/build"
-	make DESTDIR="${pkgdir}/" install
-}
+	make -C build DESTDIR="${pkgdir}/" install
+}

pkgbuilds/PKGBUILD-rk3xxx

@@ -1,50 +0,0 @@
-# Maintainer: Jai-JAP <[email protected]>, SpacingBat3 <[email protected]>
-# Author: Sebastien Chevalier <[email protected]>
-pkgname=box86-rk3xxx-git
-pkgver=r4581.d698861
-pkgrel=1
-pkgdesc="Linux Userspace x86 Emulator with a twist, targeted at ARM Linux devices."
-arch=('armv7h')
-url="https://github.com/ptitSeb/box86"
-license=('MIT')
-optdepends=('gl4es: OpenGL 2 for GLES 2 devices')
-makedepends=('git' 'cmake' 'make')
-provides=("${pkgname%-git}" "${pkgname%-rk3xxx-git}-git" "${pkgname%-rk3xxx-git}")
-conflicts=("${pkgname%-git}" "${pkgname%-rk3xxx-git}-git" "${pkgname%-rk3xxx-git}")
-source=('git+https://github.com/ptitSeb/box86')
-md5sums=('SKIP')
-
-pkgver() {
-	cd "$srcdir/${pkgname%-rk3xxx-git}"
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-prepare() {
-	cd "${srcdir}/${pkgname%-rk3xxx-git}"
-	# Check for RockChip version number
-	if [[ ${_rkmodel} =~ "rk3288"]]; then
-		_rksuffix=3288
-	elif [[ ${_rkmodel} =~ "rk3399" ]]; then
-		_rksuffix=3399	
-	elif [[ ${_rkmodel} =~ "rk3588" ]]; then
-		_rksuffix=3588	
-	else
-		# This RKxxxx is not supported or this device is not RockChip based.
-		# We should cancel then the build.
-		echo -e "\033[01m\033[01;31m==> ERROR:\033[00;01m Your device is not supported! This script is for RockChip model 3399/3588.\033[00m"
-		exit 1
-	fi
-	echo -e "\033[01m\033[01;34m==> INFO:\033[00;01m Your detected RockChip verion number is: \033[01;31m${_rksuffix}\033[01m.\033[00m"
-	[[ ! -d ./build ]] && mkdir build
-    cmake -B build -DRK${_rksuffix}=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
-}
-
-build() {
-	cd "${srcdir}/${pkgname%-rk3xxx-git}/build"
-	make -j$(nproc)
-}
-
-package() {
-	cd "${srcdir}/${pkgname%-rk3xxx-git}/build"
-	make DESTDIR="${pkgdir}/" install
-}

pkgbuilds/PKGBUILD-sd845

@@ -1,36 +0,0 @@
-# Maintainer: Jai-JAP <[email protected]>, SpacingBat3 <[email protected]>
-# Author: Sebastien Chevalier <[email protected]>
-pkgname=box86-sd845-git
-pkgver=r4581.d698861
-pkgrel=1
-pkgdesc="Linux Userspace x86 Emulator with a twist, targeted at ARM Linux devices."
-arch=('armv7h')
-url="https://github.com/ptitSeb/box86"
-license=('MIT')
-optdepends=('gl4es: OpenGL 2 for GLES 2 devices')
-makedepends=('git' 'cmake' 'make')
-provides=("${pkgname%-git}" "${pkgname%-sd845-git}-git" "${pkgname%-sd845-git}")
-conflicts=("${pkgname%-git}" "${pkgname%-sd845-git}-git" "${pkgname%-sd845-git}")
-source=('git+https://github.com/ptitSeb/box86')
-md5sums=('SKIP')
-
-pkgver() {
-	cd "${srcdir}/${pkgname%-sd845-git}"
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-prepare() {
-	cd "${srcdir}/${pkgname%-sd845-git}"
-	[[ ! -d ./build ]] && mkdir build
-	cmake -B build -DSD845=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
-}
-
-build() {
-	cd "${srcdir}/${pkgname%-sd845-git}/build"
-	make -j$(nproc)
-}
-
-package() {
-	cd "${srcdir}/${pkgname%-sd845-git}/build"
-	make DESTDIR="${pkgdir}/" install
-}

pkgbuilds/PKGBUILD-tegra

@@ -1,36 +0,0 @@
-# Maintainer: Jai-JAP <[email protected]>, SpacingBat3 <[email protected]>
-# Author: Sebastien Chevalier <[email protected]>
-pkgname=box86-tegra-git
-pkgver=r4581.d698861
-pkgrel=1
-pkgdesc="Linux Userspace x86 Emulator with a twist, targeted at ARM Linux devices."
-arch=('armv7h')
-url="https://github.com/ptitSeb/box86"
-license=('MIT')
-optdepends=('gl4es: OpenGL 2 for GLES 2 devices')
-makedepends=('git' 'cmake' 'make')
-provides=("${pkgname%-git}" "${pkgname%-tegra-git}"-git "${pkgname%-tegra-git}")
-conflicts=("${pkgname%-git}" "${pkgname%-tegra-git}"-git "${pkgname%-tegra-git}")
-source=('git+https://github.com/ptitSeb/box86')
-md5sums=('SKIP')
-
-pkgver() {
-	cd "${srcdir}/${pkgname%-tegra-git}"
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-prepare() {
-	cd "${srcdir}/${pkgname%-tegra-git}"
-	[[ ! -d ./build ]] && mkdir build
-	cmake -B build -DTEGRAX1ARM32=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
-}
-
-build() {
-	cd "${srcdir}/${pkgname%-tegra-git}/build"
-	make -j$(nproc)
-}
-
-package() {
-	cd "${srcdir}/${pkgname%-tegra-git}/build"
-	make DESTDIR="${pkgdir}/" install
-}

pkgbuilds/PKGBUILD-x86

@@ -1,7 +1,7 @@
 # Maintainer: Jai-JAP <[email protected]>, SpacingBat3 <[email protected]>
 # Author: Sebastien Chevalier <[email protected]>
 pkgname=box86-x86-git
-pkgver=r4581.d698861
+pkgver=r3858.5368285
 pkgrel=1
 pkgdesc="Linux Userspace x86 Emulator with a twist, targeted at ARM Linux devices."
 arch=('i386')
@@ -14,22 +14,15 @@ source=('git+https://github.com/ptitSeb/box86')
 md5sums=('SKIP')
 
 pkgver() {
-	cd "${srcdir}/${pkgname%-x86-git}"
+	cd "$srcdir/${pkgname%-x86-git}"
 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-prepare() {
-	cd "${srcdir}/${pkgname%-x86-git}"
-	[[ ! -d ./build ]] && mkdir build
-	cmake -B build -DLD80BITS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
-}
-
 build() {
-	cd "${srcdir}/${pkgname%-x86-git}/build"
-	make -j$(nproc)
+	cmake -B build -S "${pkgname%-x86-git}" -DLD80BITS=1 -DNOALIGN=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
+	make -C build
 }
 
 package() {
-	cd "${srcdir}/${pkgname%-x86-git}/build"
-	make DESTDIR="${pkgdir}/" install
-}
+	make -C build DESTDIR="${pkgdir}/" install
+}

pkgbuilds/README.md

@@ -12,7 +12,7 @@ This will copy the PKGBUILD for your platform (where you type your platform name
 In the future, I might try to do an unified PKGBUILD for all platforms that will recognize your platform automatically.
 
 ### 2. What platforms are currently supported.
-Most specified in [COMPILE.md](../docs/COMPILE.md). Except PowerPC based.
+All specified in [COMPILE.md](../docs/COMPILE.md).
 
 ### 3. Any advantages with that sollution?
 This might give you some advantages like those:

rebuild_printer.py

@@ -1834,7 +1834,7 @@ def main(root, ver, __debug_forceAllDebugging=False):
 			start = (start >> 4) + ((start & 0xF) << 1);
 		}
 		
-		char tmp[7];
+		char tmp[6];
 		for (int cur = start; cur < start + size - 1; ++cur) {
 			sprintf(tmp, "%c%d, ", regChr, cur);
 			strcat(ret, tmp);

rebuild_wrappers.py

@@ -679,12 +679,12 @@ class Clauses:
 		return isinstance(o, Clauses) and (self.clauses == o.clauses)
 
 JumbledFunctions     = CustOrderedDictList[Clause, Function]
-FileSpecifics        = Dict[Filename, FileSpec]
+FilesSpecific        = Dict[Filename, FileSpec]
 
 SortedGlobals        = CustOrderedDictList[Clauses, FunctionType]
 SortedRedirects      = CustOrderedDictList[Clauses, FunctionType]
 
-def readFiles(files: Iterable[str]) -> Tuple[JumbledFunctions, JumbledFunctions, FileSpecifics]:
+def readFiles(files: Iterable[str]) -> Tuple[JumbledFunctions, JumbledFunctions, FilesSpecific]:
 	"""
 	readFiles
 	
@@ -693,7 +693,7 @@ def readFiles(files: Iterable[str]) -> Tuple[JumbledFunctions, JumbledFunctions,
 	
 	gbls:      JumbledFunctions = CustOrderedDictList()
 	redirects: JumbledFunctions = CustOrderedDictList()
-	filespecs: FileSpecifics    = {}
+	filespecs: FilesSpecific    = {}
 	
 	symbols: Dict[str, Filename] = {}
 	need_halt: bool = False
@@ -880,7 +880,7 @@ def readFiles(files: Iterable[str]) -> Tuple[JumbledFunctions, JumbledFunctions,
 	
 	return gbls, redirects, filespecs
 
-def sortArrays(gbl_funcs: JumbledFunctions, red_funcs: JumbledFunctions, filespecs: FileSpecifics) \
+def sortArrays(gbl_funcs: JumbledFunctions, red_funcs: JumbledFunctions, filespecs: FilesSpecific) \
  -> Tuple[SortedGlobals, SortedRedirects]:
 	# First sort file specific stuff
 	for fn in filespecs:
@@ -944,13 +944,13 @@ def sortArrays(gbl_funcs: JumbledFunctions, red_funcs: JumbledFunctions, filespe
 		redirects[red_vals[funtype]].append(funtype)
 	redirects.sort(key=Clauses.splitdef)
 	
-	def fail(): assert False
+	def fail(): assert(False)
 	for clauses in redirects:
 		redirects[clauses].sort(key=lambda v: fail() if v.redirected is None else v.splitchar() + v.redirected.splitchar())
 	
 	return gbls, redirects
 
-def checkRun(root: str, gbls: SortedGlobals, redirects: SortedRedirects, filespecs: FileSpecifics) -> Optional[str]:
+def checkRun(root: str, gbls: SortedGlobals, redirects: SortedRedirects, filesspec: FilesSpecific) -> Optional[str]:
 	# Check if there was any new functions compared to last run
 	functions_list: str = ""
 	for clauses in gbls:
@@ -960,18 +960,18 @@ def checkRun(root: str, gbls: SortedGlobals, redirects: SortedRedirects, filespe
 		for v in redirects[clauses]:
 			assert(v.redirected is not None)
 			functions_list = functions_list + "#" + str(clauses) + " " + v.orig + " -> " + v.redirected.orig + "\n"
-	for filename in sorted(filespecs.keys()):
+	for filename in sorted(filesspec.keys()):
 		functions_list = functions_list + filename + ":\n"
-		for st in filespecs[filename].structs:
-			struct = filespecs[filename].structs[st]
+		for st in filesspec[filename].structs:
+			struct = filesspec[filename].structs[st]
 			functions_list = functions_list + \
 				"% " + st + " " + struct.name + " " + struct.repl + "\n"
-		for _bare in filespecs[filename].typedefs:
+		for _bare in filesspec[filename].typedefs:
 			functions_list = functions_list + "- " + _bare.orig + ":\n"
-			for fn in filespecs[filename].typedefs[_bare]:
+			for fn in filesspec[filename].typedefs[_bare]:
 				if fn.no_dlsym: continue
 				functions_list = functions_list + "  - " + fn.name + "\n"
-		for funtype in filespecs[filename].structsuses:
+		for funtype in filesspec[filename].structsuses:
 			assert(funtype.redirected is not None)
 			functions_list = functions_list + "% " + funtype.orig + " -> " + funtype.redirected.orig + "\n"
 	
@@ -992,7 +992,7 @@ def checkRun(root: str, gbls: SortedGlobals, redirects: SortedRedirects, filespe
 	return functions_list
 
 def generate_files(root: str, files: Iterable[str], ver: str, gbls: SortedGlobals, redirects: SortedRedirects, \
- filespecs: FileSpecifics) -> None:
+ filespecs: FilesSpecific) -> None:
 	# Files header and guard
 	files_header = {
 		"wrapper.c": """
@@ -1148,13 +1148,6 @@ def generate_files(root: str, files: Iterable[str], ver: str, gbls: SortedGlobal
 	for fhdr in files_header:
 		files_guard[fhdr] = trim(files_guard[fhdr])
 	
-	# TODO: put the informations below in a structure (like in box64, where
-	# typedefs & co. are stored in an ABI-specific structure)
-	
-	return_x87: str = "DKdf"
-	if any(c not in FileSpec.values for c in return_x87):
-		raise NotImplementedError("Invalid character")
-	
 	# Typedefs
 	#           E            v       c         w          i          I          C          W           u           U           f        d         D              K         l           L            p        V        O          S        2                  P        G        N      M      s
 	tdtypes = ["x86emu_t*", "void", "int8_t", "int16_t", "int32_t", "int64_t", "uint8_t", "uint16_t", "uint32_t", "uint64_t", "float", "double", "long double", "double", "intptr_t", "uintptr_t", "void*", "void*", "int32_t", "void*", "_2uint_struct_t", "void*", "void*", "...", "...", "void*"]
@@ -1256,7 +1249,7 @@ def generate_files(root: str, files: Iterable[str], ver: str, gbls: SortedGlobal
 		f.write("void {0}(x86emu_t *emu, uintptr_t fcn) {2} {1} fn = ({1})fcn; ".format(N.orig, W, "{"))
 		
 		if N.orig == 'vFv':
-			f.write("(void)emu; ")
+			f.write("(void)fcn; ")
 		
 		args = N.orig[2:]
 		if args == 'Ev': args = 'E'
@@ -1316,22 +1309,6 @@ def generate_files(root: str, files: Iterable[str], ver: str, gbls: SortedGlobal
 			if not clauses.empty():
 				file.write("#endif\n")
 		
-		# Finally, write predicate functions
-		
-		# isRetX87Wrapper
-		file.write("\nint isRetX87Wrapper(wrapper_t fun) {\n")
-		for clauses in gbls:
-			empty = True
-			for funtype in gbls[clauses]:
-				if funtype.orig[0] in return_x87: # TODO: put this in a function (functions would request the ABI for more info)
-					if empty and (not clauses.empty()):
-						file.write("#if " + str(clauses) + "\n")
-						empty = False
-					file.write("\tif (fun == &" + funtype.orig + ") return 1;\n")
-			if not empty:
-				file.write("#endif\n")
-		file.write("\treturn 0;\n}\n")
-		
 		file.write(files_guard["wrapper.c"].format(lbr="{", rbr="}", version=ver))
 	
 	# Rewrite the wrapper.h file:
@@ -1421,6 +1398,6 @@ if __name__ == '__main__':
 		if v == "--":
 			limit.append(i)
 	Define.defines = list(map(DefineType, sys.argv[2:limit[0]]))
-	if main(sys.argv[1], sys.argv[limit[0]+1:], "2.0.0.11") != 0:
+	if main(sys.argv[1], sys.argv[limit[0]+1:], "2.0.0.10") != 0:
 		exit(2)
 	exit(0)

src/box86context.c

@@ -22,8 +22,6 @@
 #include <sys/mman.h>
 #include "custommem.h"
 #include "dictionnary.h"
-#include "rcfile.h"
-#include "gltools.h"
 #ifdef DYNAREC
 #include "dynablock.h"
 #include "dynarec/arm_lock_helper.h"
@@ -50,7 +48,6 @@ void finiAllHelpers(box86context_t* context)
     static int finied = 0;
     if(finied)
         return;
-    DeleteParams();
     fini_pthread_helper(context);
     fini_signal_helper();
     fini_bridge_helper();
@@ -85,20 +82,11 @@ int unlockMutex()
 {
     int ret = unlockCustommemMutex();
     int i;
-    #ifdef DYNAREC
-    void* tid = (void*)GetTID();
-    #define GO(A, B)                    \
-        i = (arm_lock_storeifref2(&A, NULL, tid)==tid);  \
-        if(i) {                         \
-            ret|=(1<<B);                \
-        }
-    #else
     #define GO(A, B)                    \
         i = checkUnlockMutex(&A);       \
         if(i) {                         \
             ret|=(1<<B);                \
         }
-    #endif
 
     GO(my_context->mutex_once, 5)
     GO(my_context->mutex_once2, 6)
@@ -112,6 +100,7 @@ int unlockMutex()
     GO(my_context->mutex_thread, 10)
     GO(my_context->mutex_bridge, 11)
     #undef GO
+
     return ret;
 }
 
@@ -119,7 +108,7 @@ void relockMutex(int locks)
 {
     #define GO(A, B)                    \
         if(locks&(1<<B))                \
-            mutex_lock(&A);             \
+            pthread_mutex_lock(&A);     \
 
     GO(my_context->mutex_once, 5)
     GO(my_context->mutex_once2, 6)
@@ -138,30 +127,22 @@ void relockMutex(int locks)
 
 static void init_mutexes(box86context_t* context)
 {
-
-#ifdef DYNAREC
-    arm_lock_stored(&context->mutex_dyndump, 0);
-    arm_lock_stored(&context->mutex_once, 0);
-    arm_lock_stored(&context->mutex_once2, 0);
-    arm_lock_stored(&context->mutex_trace, 0);
-    arm_lock_stored(&context->mutex_tls, 0);
-    arm_lock_stored(&context->mutex_thread, 0);
-    arm_lock_stored(&context->mutex_bridge, 0);
-    pthread_mutex_init(&context->mutex_lock, NULL);
-#else
     pthread_mutexattr_t attr;
     pthread_mutexattr_init(&attr);
     pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
     pthread_mutex_init(&context->mutex_once, &attr);
     pthread_mutex_init(&context->mutex_once2, &attr);
     pthread_mutex_init(&context->mutex_trace, &attr);
+#ifdef DYNAREC
+    pthread_mutex_init(&context->mutex_dyndump, &attr);
+#else
+    pthread_mutex_init(&context->mutex_lock, &attr);
+#endif
     pthread_mutex_init(&context->mutex_tls, &attr);
     pthread_mutex_init(&context->mutex_thread, &attr);
     pthread_mutex_init(&context->mutex_bridge, &attr);
-    pthread_mutex_init(&context->mutex_lock, &attr);
 
     pthread_mutexattr_destroy(&attr);
-#endif
 }
 
 static void atfork_child_box64context(void)
@@ -170,31 +151,6 @@ static void atfork_child_box64context(void)
     init_mutexes(my_context);
 }
 
-void freeCycleLog(box86context_t* ctx)
-{
-    if(cycle_log) {
-        for(int i=0; i<cycle_log; ++i) {
-            box_free(ctx->log_call[i]);
-            box_free(ctx->log_ret[i]);
-        }
-        box_free(ctx->log_call);
-        box_free(ctx->log_ret);
-        ctx->log_call = NULL;
-        ctx->log_ret = NULL;
-    }
-}
-void initCycleLog(box86context_t* context)
-{
-    if(cycle_log) {
-        context->log_call = (char**)box_calloc(cycle_log, sizeof(char*));
-        context->log_ret = (char**)box_calloc(cycle_log, sizeof(char*));
-        for(int i=0; i<cycle_log; ++i) {
-            context->log_call[i] = (char*)box_calloc(256, 1);
-            context->log_ret[i] = (char*)box_calloc(128, 1);
-        }
-    }
-}
-
 EXPORTDYN
 box86context_t *NewBox86Context(int argc)
 {
@@ -207,12 +163,15 @@ box86context_t *NewBox86Context(int argc)
     // init and put default values
     box86context_t *context = my_context = (box86context_t*)box_calloc(1, sizeof(box86context_t));
 
-    initCycleLog(context);
-
+    if(cycle_log)
+        for(int i=0; i<CYCLE_LOG; ++i) {
+            context->log_call[i] = (char*)box_calloc(256, 1);
+            context->log_ret[i] = (char*)box_calloc(128, 1);
+        }
 #ifdef BUILD_LIB
     context->deferedInit = 0;
 #else
-    context->deferredInit = 1;
+    context->deferedInit = 1;
 #endif
     context->sel_serial = 1;
 
@@ -222,12 +181,11 @@ box86context_t *NewBox86Context(int argc)
     context->local_maplib = NewLibrarian(context, 1);
     context->versym = NewDictionnary();
     context->system = NewBridge();
-    // Cannot use Bridge name as the map is not initialized yet
+    context->globaldefver = NewDefaultVersion();
+    context->weakdefver = NewDefaultVersion();
     // create vsyscall
     context->vsyscall = AddBridge(context->system, iFEv, x86Syscall, 0, NULL);
     addAlternate((void*)0xffffe400, (void*)context->vsyscall);
-    // create exit bridge
-    context->exit_bridge = AddBridge(context->system, NULL, NULL, 0, NULL);
 #ifdef BUILD_LIB
     context->box86lib = RTLD_DEFAULT;   // not ideal
 #else
@@ -249,13 +207,11 @@ box86context_t *NewBox86Context(int argc)
     context->canary[/*getrand(4)*/0] = 0;
     printf_log(LOG_DEBUG, "Setting up canary (for Stack protector) at GS:0x14, value:%08X\n", *(uint32_t*)context->canary);
 
-    context->globdata = NewMapSymbols();
-
     initAllHelpers(context);
 
     return context;
 }
-void freeALProcWrapper(box86context_t* context);
+
 EXPORTDYN
 void FreeBox86Context(box86context_t** context)
 {
@@ -293,8 +249,8 @@ void FreeBox86Context(box86context_t** context)
     if(ctx->zydis)
         DeleteX86Trace(ctx);
 
-    if(ctx->deferredInitList)
-        box_free(ctx->deferredInitList);
+    if(ctx->deferedInitList)
+        box_free(ctx->deferedInitList);
 
     /*box_free(ctx->argv);*/
     
@@ -355,73 +311,51 @@ void FreeBox86Context(box86context_t** context)
         }
     }
 
-    free_neededlib(ctx->neededlibs);
-    ctx->neededlibs = NULL;
+    free_neededlib(&ctx->neededlibs);
 
     if(ctx->emu_sig)
         FreeX86Emu(&ctx->emu_sig);
-
-    FreeMapSymbols(&ctx->globdata);
+    FreeDefaultVersion(&ctx->globaldefver);
+    FreeDefaultVersion(&ctx->weakdefver);
 
     finiAllHelpers(ctx);
 
-#ifdef DYNAREC
-    pthread_mutex_destroy(&ctx->mutex_lock);
-#else
     pthread_mutex_destroy(&ctx->mutex_once);
     pthread_mutex_destroy(&ctx->mutex_once2);
     pthread_mutex_destroy(&ctx->mutex_trace);
+#ifdef DYNAREC
+    pthread_mutex_destroy(&ctx->mutex_dyndump);
+#else
+    pthread_mutex_destroy(&ctx->mutex_lock);
+#endif
     pthread_mutex_destroy(&ctx->mutex_tls);
     pthread_mutex_destroy(&ctx->mutex_thread);
     pthread_mutex_destroy(&ctx->mutex_bridge);
-    pthread_mutex_destroy(&ctx->mutex_lock);
-#endif
 
-    freeCycleLog(ctx);
+    if(cycle_log)
+        for(int i=0; i<CYCLE_LOG; ++i) {
+            box_free(ctx->log_call[i]);
+            box_free(ctx->log_ret[i]);
+        }
 
     box_free(ctx);
 }
 
 int AddElfHeader(box86context_t* ctx, elfheader_t* head) {
-    int idx = 0;
-    while(idx<ctx->elfsize && ctx->elfs[idx]) idx++;
-    if(idx == ctx->elfsize) {
-        if(idx==ctx->elfcap) {
-            // resize...
-            ctx->elfcap += 16;
-            ctx->elfs = (elfheader_t**)box_realloc(ctx->elfs, sizeof(elfheader_t*) * ctx->elfcap);
-        }
-        ctx->elfs[idx] = head;
-        ctx->elfsize++;
-    } else {
-        ctx->elfs[idx] = head;
+    int idx = ctx->elfsize;
+    if(idx==ctx->elfcap) {
+        // resize...
+        ctx->elfcap += 16;
+        ctx->elfs = (elfheader_t**)box_realloc(ctx->elfs, sizeof(elfheader_t*) * ctx->elfcap);
     }
+    ctx->elfs[idx] = head;
+    ctx->elfsize++;
     printf_log(LOG_DEBUG, "Adding \"%s\" as #%d in elf collection\n", ElfName(head), idx);
     return idx;
 }
 
-void RemoveElfHeader(box86context_t* ctx, elfheader_t* head) {
-    if(GetTLSBase(head)) {
-        // should remove the tls info
-        int tlsbase = GetTLSBase(head);
-        /*if(tlsbase == -ctx->tlssize) {
-            // not really correct, but will do for now
-            ctx->tlssize -= GetTLSSize(head);
-            if(!(++ctx->sel_serial))
-                ++ctx->sel_serial;
-        }*/
-    }
-    for(int i=0; i<ctx->elfsize; ++i)
-        if(ctx->elfs[i] == head) {
-            ctx->elfs[i] = NULL;
-            return;
-        }
-}
-
-
 int AddTLSPartition(box86context_t* context, int tlssize) {
     int oldsize = context->tlssize;
-    // should in fact first try to map a hole, but rewinding all elfs and checking filled space, like with the mapmem utilities
     context->tlssize += tlssize;
     context->tlsdata = box_realloc(context->tlsdata, context->tlssize);
     memmove(context->tlsdata+tlssize, context->tlsdata, oldsize);   // move to the top, using memmove as regions will probably overlap

src/box86version.h

@@ -2,7 +2,7 @@
 #define __BOX86_VERSION_H_
 
 #define BOX86_MAJOR 0
-#define BOX86_MINOR 3
-#define BOX86_REVISION 2
+#define BOX86_MINOR 2
+#define BOX86_REVISION 7
 
 #endif //__BOX86_VERSION_H_

src/dynarec/arm_emitter.h

@@ -390,8 +390,8 @@ Op is 20-27
 #define LDRD_IMM8(reg, addr, imm8) EMIT(c__ | 0b000<<25 | 1<<24  | (((imm8)<0)?0:1)<<23 | 1<<22 | 0<<21 | 0<<20 | ((reg) << 12) | ((addr) << 16) | ((abs(imm8))&0xf0)<<(8-4) | (0b1101<<4) | ((abs(imm8))&0x0f) )
 // ldrd reg, reg+1, [addr, +rm], reg must be even, reg+1 is implicit
 #define LDRD_REG(reg, addr, rm) EMIT(c__ | 0b000<<25 | 1<<24  | 1<<23 | 0<<22 | 0<<21 | 0<<20 | ((reg) << 12) | ((addr) << 16) | 0b1101<<4 | (rm) )
-// ldr reg, [pc+imm]
-#define LDR_literal(reg, imm12) EMIT(c__ | 0b010<<25 | 1<<24 | (((imm12)>=0)?1:0)<<23 | 0<<21 | 1<<20 | 0b1111<<16 | (reg)<<12 | (abs(imm12)))
+
+#define LDR_litteral(reg, imm12)    EMIT(c__ | 0b010<<25 | 0<<24 | ((imm12<0)?0:1)<<23 | 0<<22 | 0<<21 | 1<<20 | 0b1111<<16 | (reg)<<12 | (abs(imm12)))
 
 // str reg, [addr, #+/-imm9]
 #define STR_IMM9(reg, addr, imm9) EMIT(0xe5000000 | (((imm9)<0)?0:1)<<23 | ((reg) << 12) | ((addr) << 16) | brIMM(imm9) )
@@ -822,8 +822,6 @@ Op is 20-27
 #define VLD1_32(Dd, Rn) EMIT(Vxx1gen(1, ((Dd)>>4)&1, Rn, ((Dd)&0x0f), 0b0111, 2, 0, 15))
 // Load [Rn]! => Dd. Align is 4
 #define VLD1_32_W(Dd, Rn) EMIT(Vxx1gen(1, ((Dd)>>4)&1, Rn, ((Dd)&0x0f), 0b0111, 2, 0, 13))
-// Load [Rn]! => Dd. Align is 8
-#define VLD1_64_W(Dd, Rn) EMIT(Vxx1gen(1, ((Dd)>>4)&1, Rn, ((Dd)&0x0f), 0b0111, 3, 0, 13))
 // Load [Rn]! => Dd/Dd+1. Align is 4
 #define VLD1Q_32_W(Dd, Rn) EMIT(Vxx1gen(1, ((Dd)>>4)&1, Rn, ((Dd)&0x0f), 0b1010, 2, 0, 13))
 // Load [Rn, Rm]! => Dd/Dd+1. If Rm==15, no writeback, Rm ignored, else writeback Rn <- Rn+Rm. Align is 4
@@ -845,8 +843,6 @@ Op is 20-27
 
 // Store [Rn]! => Dd. Align is 4
 #define VST1_32_W(Dd, Rn) EMIT(Vxx1gen(0, ((Dd)>>4)&1, Rn, ((Dd)&0x0f), 0b0111, 2, 0, 13))
-// Store [Rn]! => Dd. Align is 8
-#define VST1_64_W(Dd, Rn) EMIT(Vxx1gen(0, ((Dd)>>4)&1, Rn, ((Dd)&0x0f), 0b0111, 3, 0, 13))
 // Store [Rn] => Dd/Dd+1. Align is 4
 #define VST1Q_32(Dd, Rn) EMIT(Vxx1gen(0, ((Dd)>>4)&1, Rn, ((Dd)&0x0f), 0b1010, 2, 0, 15))
 // Store [Rn]! => Dd/Dd+1. Align is 4

src/dynarec/arm_instructions.txt

@@ -335,9 +335,9 @@ NEON 1 1 1 1 0 1 0 0 1 D 1 0 Rn Vd 1 1 0 0 size 1 @<1> Rm @ param=1 char align[4
 NEON 1 1 1 1 0 1 0 0 1 D 1 0 Rn Vd size 0 0 @<4> 1 1 0 1 @ set uint8_t temp = (2 << size) - 1@ set uint8_t temp2 = param & temp@ temp2=0=param>>1 char align[5] !@ %@ align[0] = '\0'@ sprintf(align, ":%d", 8 << size)@ sprintf(align, "???")@ set uint8_t x = param >> (size + 1)@ @ VLD1<c>.\%d8 &l&l size\ {\vecname[0x20 + d]\[\%dx\]}, [<Rn>\align\]!
 NEON 1 1 1 1 0 1 0 0 1 D 1 0 Rn Vd size 0 0 @<4> 1 1 1 1 @ set uint8_t temp = (2 << size) - 1@ set uint8_t temp2 = param & temp@ temp2=0=param>>1 char align[5] !@ %@ align[0] = '\0'@ sprintf(align, ":%d", 8 << size)@ sprintf(align, "???")@ set uint8_t x = param >> (size + 1)@ @ VLD1<c>.\%d8 &l&l size\ {\vecname[0x20 + d]\[\%dx\]}, [<Rn>\align\]
 NEON 1 1 1 1 0 1 0 0 1 D 1 0 Rn Vd size 0 0 @<4> Rm @ set uint8_t temp = (2 << size) - 1@ set uint8_t temp2 = param & temp@ temp2=0=param>>1 char align[5] !@ %@ align[0] = '\0'@ sprintf(align, ":%d", 8 << size)@ sprintf(align, "???")@ set uint8_t x = param >> (size + 1)@ @ VLD1<c>.\%d8 &l&l size\ {\vecname[0x20 + d]\[\%dx\]}, [<Rn>\align\], <Rm>
-NEON 1 1 1 1 0 1 0 0 1 D 1 0 Rn Vd 1 1 0 1 size @<1> @<1> 1 1 0 1 @ param2_1=1 char align[5] !@ %@ sprintf(align, ":%d", 16 << size)@ align[0] = '\0'@ @ VLD2<c>.\%d8 &l&l size\ {\vecname[0x20 + d]\[], \vecname[0x21 + param1_1 + d]\[]}, [<Rn>\align\]!
-NEON 1 1 1 1 0 1 0 0 1 D 1 0 Rn Vd 1 1 0 1 size @<1> @<1> 1 1 1 1 @ param2_1=1 char align[5] !@ %@ sprintf(align, ":%d", 16 << size)@ align[0] = '\0'@ @ VLD2<c>.\%d8 &l&l size\ {\vecname[0x20 + d]\[], \vecname[0x21 + param1_1 + d]\[]}, [<Rn>\align\]
-NEON 1 1 1 1 0 1 0 0 1 D 1 0 Rn Vd 1 1 0 1 size @<1> @<1> Rm @ param2_1=1 char align[5] !@ %@ sprintf(align, ":%d", 16 << size)@ align[0] = '\0'@ @ VLD2<c>.\%d8 &l&l size\ {\vecname[0x20 + d]\[], \vecname[0x21 + param1_1 + d]\[]}, [<Rn>\align\], <Rm>
+NEON 1 1 1 1 0 1 0 0 1 D 1 0 Rn Vd 1 1 0 1 size @<1> @<1> 1 1 0 1 @ param2_1=1 char align[4] !@ %@ sprintf(align, ":%d", 16 << size)@ align[0] = '\0'@ @ VLD2<c>.\%d8 &l&l size\ {\vecname[0x20 + d]\[], \vecname[0x21 + param1_1 + d]\[]}, [<Rn>\align\]!
+NEON 1 1 1 1 0 1 0 0 1 D 1 0 Rn Vd 1 1 0 1 size @<1> @<1> 1 1 1 1 @ param2_1=1 char align[4] !@ %@ sprintf(align, ":%d", 16 << size)@ align[0] = '\0'@ @ VLD2<c>.\%d8 &l&l size\ {\vecname[0x20 + d]\[], \vecname[0x21 + param1_1 + d]\[]}, [<Rn>\align\]
+NEON 1 1 1 1 0 1 0 0 1 D 1 0 Rn Vd 1 1 0 1 size @<1> @<1> Rm @ param2_1=1 char align[4] !@ %@ sprintf(align, ":%d", 16 << size)@ align[0] = '\0'@ @ VLD2<c>.\%d8 &l&l size\ {\vecname[0x20 + d]\[], \vecname[0x21 + param1_1 + d]\[]}, [<Rn>\align\], <Rm>
 NEON 1 1 1 1 0 1 0 0 1 D 1 0 Rn Vd size 0 1 @<4> 1 1 0 1 @ size=0b00=0b01 uint8_t temp temp,1,1,3@ set uint8_t temp2 = param & temp@ temp2=0=1 char align[5] !@ %@ align[0] = '\0'@ sprintf(align, ":%d", 16 << size)@ sprintf(align, "???")@ set uint8_t x = param >> (size + 1)@ set int spacing = size ? ((param >> size) & 1) : 0@ @ VLD2<c>.\%d8 &l&l size\ {\vecname[0x20 + d]\[\%dx\], \vecname[0x21 + d + spacing]\[\%dx\]}, [<Rn>\align\]!
 NEON 1 1 1 1 0 1 0 0 1 D 1 0 Rn Vd size 0 1 @<4> 1 1 1 1 @ size=0b00=0b01 uint8_t temp temp,1,1,3@ set uint8_t temp2 = param & temp@ temp2=0=1 char align[5] !@ %@ align[0] = '\0'@ sprintf(align, ":%d", 16 << size)@ sprintf(align, "???")@ set uint8_t x = param >> (size + 1)@ set int spacing = size ? ((param >> size) & 1) : 0@ @ VLD2<c>.\%d8 &l&l size\ {\vecname[0x20 + d]\[\%dx\], \vecname[0x21 + d + spacing]\[\%dx\]}, [<Rn>\align\]
 NEON 1 1 1 1 0 1 0 0 1 D 1 0 Rn Vd size 0 1 @<4> Rm @ size=0b00=0b01 uint8_t temp temp,1,1,3@ set uint8_t temp2 = param & temp@ temp2=0=1 char align[5] !@ %@ align[0] = '\0'@ sprintf(align, ":%d", 16 << size)@ sprintf(align, "???")@ set uint8_t x = param >> (size + 1)@ set int spacing = size ? ((param >> size) & 1) : 0@ @ VLD2<c>.\%d8 &l&l size\ {\vecname[0x20 + d]\[\%dx\], \vecname[0x21 + d + spacing]\[\%dx\]}, [<Rn>\align\], <Rm>

src/dynarec/arm_jmpnext.c

@@ -4,9 +4,9 @@
 #include "arm_emitter.h"
 
 #define EMIT(A) *block = (A); ++block
-void CreateJmpNext(void* addr, void* next)
+void CreateJmpNextTo(void* addr, void* tonext)
 {
     uint32_t* block = (uint32_t*)addr;
-    LDR_literal(x2, ((intptr_t)next - (intptr_t)addr)-8);
-    BX(x2);
+    MOV32(x3, (uintptr_t)tonext);
+    BX(x3);
 }

src/dynarec/arm_lock_helper.S

@@ -16,14 +16,12 @@
 .global arm_lock_xchg
 .global arm_lock_storeifnull
 .global arm_lock_storeifref
-.global arm_lock_storeifref2
-.global arm_lock_decifnot0b
-.global arm_lock_incb
-.global arm_lock_incif0b
-.global arm_lock_stored
-.global arm_lock_storeb
-.global arm_lock_storeif0b
-.global arm_lock_readb
+.global arm_lock_store_xchg
+.global arm_lock_dec
+.global arm_lock_dec_b
+.global arm_lock_store
+.global arm_lock_store_b
+
 
 arm_lock_read_b:
     // address is r0, return is r0
@@ -90,117 +88,76 @@ arm_lock_xchg:
     bx      lr
 
 arm_lock_storeifnull:
-    // address is r0, value is r1, r1 store to r0 only if [r0] is 0. return old [r0] value
+    // address is r0, value is r1, r1 store to r0 only if [r0] is 0. return new [r0] value (so r1 or old value)
     // r0 needs to be aligned
     dmb     ish
     ldrex   r2, [r0]
     cmp     r2, #0
     bne     arm_lock_storeifnull_exit
-    strex   r3, r1, [r0]
+    mov     r2, r1
+    strex   r3, r2, [r0]
     cmp     r3, #1
     beq     arm_lock_storeifnull
 arm_lock_storeifnull_exit:
     mov     r0, r2
     bx      lr
 
-arm_lock_storeifref2:
-    dmb     ish
-arm_lock_storeifref2_loop:
-    // address is r0, value is r1, r1 store to r0 only if [r0] is r2. return old [r0] value (so r2 or old value)
-    ldrex   r3, [r0]
-    cmp     r3, r2
-    movne   r0, r3
-    bne     arm_lock_storeifref2_exit
-    strex   r3, r1, [r0]
-    cmp     r3, #1
-    beq     arm_lock_storeifref_loop
-    mov     r0, r2
-arm_lock_storeifref2_exit:
-    bx      lr
-
 arm_lock_storeifref:
+    push    {r4}
     dmb     ish
 arm_lock_storeifref_loop:
     // address is r0, value is r1, r1 store to r0 only if [r0] is r2. return new [r0] value (so r1 or old value)
     ldrex   r3, [r0]
     cmp     r3, r2
-    movne   r0, r3
     bne     arm_lock_storeifref_exit
-    strex   r3, r1, [r0]
-    cmp     r3, #1
+    mov     r3, r1
+    strex   r4, r3, [r0]
+    cmp     r4, #1
     beq     arm_lock_storeifref_loop
-    mov     r0, r1
 arm_lock_storeifref_exit:
+    mov     r0, r3
+    pop     {r4}
     bx      lr
 
-arm_lock_decifnot0b:
+arm_lock_store_xchg:
+    // address is r0, value is r1, r1 store to r0 only if [r0] is 0. return new [r0] value (so r1 or old value)
+    // r0 needs to be aligned
+    ldrex   r2, [r0]
+    cmp     r2, #0
+    bne     arm_lock_store_xchg_exit
+    mov     r2, r1
+    strex   r3, r2, [r0]
+    cmp     r3, #1
+    beq     arm_lock_store_xchg
+    mov     r2, #0
+arm_lock_store_xchg_exit:
+    mov     r0, r2
+    bx      lr
+
+arm_lock_dec:
     dmb     ish
-arm_lock_decifnot0b_0:
-    ldrexb  r1, [r0]
-    cmp     r1, #0
-    subne   r3, r1, #1
-    moveq   r3, r1
-    strexb  r2, r3, [r0]
+    ldrex   r1, [r0]
+    sub     r1, r1, #1
+    strex   r2, r1, [r0]
     cmp     r2, #1
-    beq     arm_lock_decifnot0b_0
-    dmb     ish
-    mov     r0, r1
+    beq     arm_lock_dec
     bx      lr
 
-arm_lock_incb:
+arm_lock_dec_b:
     dmb     ish
-arm_lock_incb_0:
     ldrexb  r1, [r0]
-    add     r1, r1, #1
+    sub     r1, r1, #1
     strexb  r2, r1, [r0]
     cmp     r2, #1
-    beq     arm_lock_incb_0
-arm_lock_incb_exit:
-    dmb     ish
+    beq     arm_lock_dec_b
     bx      lr
 
-arm_lock_incif0b:
-    dmb     ish
-arm_lock_incif0b_0:
-    ldrexb  r1, [r0]
-    cmp     r1, #0
-    addeq   r3, r1, #1
-    movne   r3, r1
-    strexb  r2, r3, [r0]
-    cmp     r2, #1
-    beq     arm_lock_incif0b_0
-    dmb     ish
-    mov     r0, r1
-    bx      lr
-
-arm_lock_stored:
-    dmb     ish
+arm_lock_store:
     str     r1, [r0]
     dmb     ish
     bx      lr
 
-arm_lock_storeb:
-    dmb     ish
+arm_lock_store_b:
     strb    r1, [r0]
     dmb     ish
     bx      lr
-
-arm_lock_storeif0b:
-    dmb     ish
-arm_lock_storeif0b_0:
-    ldrexb  r2, [r0]
-    cmp     r2, #0
-    bne     arm_lock_storeif0b_exit
-    strexb  r3, r1, [r0]
-    cmp     r3, #1
-    beq     arm_lock_storeif0b_0
-    mov     r2, #0
-    dmb     ish
-arm_lock_storeif0b_exit:
-    mov     r0, r2
-    bx      lr
-
-arm_lock_readb:
-    dmb     ish
-    ldrb    r0, [r0]
-    bx      lr

src/dynarec/arm_lock_helper.h

@@ -25,34 +25,25 @@ extern int arm_lock_write_dd(uint32_t a, uint32_t b, void* addr);
 // Atomically exchange value at [p] with val, return old p
 extern uintptr_t arm_lock_xchg(void* p, uintptr_t val);
 
-// Atomically store value to [p] only if [p] is NULL. Return old [p] value
+// Atomically store value to [p] only if [p] is NULL. Return new [p] value (so val or old)
 extern void* arm_lock_storeifnull(void* p, void* val);
 
 // Atomically store value to [p] only if [p] is ref. Return new [p] value (so val or old)
 extern void* arm_lock_storeifref(void* p, void* val, void* ref);
 
-// Atomically store value to [p] only if [p] is ref. Return old [p] value
-extern void* arm_lock_storeifref2(void* p, void* val, void* ref);
+// Atomically store value to [p] only if [p] is NULL. Return old [p] value
+extern void* arm_lock_store_xchg(void* p, void* val);
 
-// decrement atomicaly the byte at [p] (but only if p not 0). Return old [p] value
-extern int arm_lock_decifnot0b(void*p);
+// will decrease *p atomicaly
+extern void arm_lock_dec_b(uint8_t* p);
 
-// increment atomicaly the byte at [p]
-extern void arm_lock_incb(void*p);
+// will decrease *p atomicaly
+extern void arm_lock_dec(int* p);
 
-// increment atomicaly the byte at [p] only if it was 0. Return the old value of [p]
-extern int arm_lock_incif0b(void*p);
+// store value, with data memory barrier
+extern void arm_lock_store_b(uint8_t* p, uint8_t val);
 
-// atomic store (with memory barrier)
-extern void arm_lock_stored(void*p, uint32_t d);
-
-// atomic store (with memory barrier)
-extern void arm_lock_storeb(void*p, uint8_t b);
-
-// atomic store (with memory barrier) only if it was 0. Return the old value of [p]
-extern int arm_lock_storeif0b(void*p, uint8_t b);
-
-// atomic load (with memory barrier)
-extern int arm_lock_readb(void*p);
+// store value, with data memory barrier
+extern void arm_lock_store(int* p, int val);
 
 #endif  //__ARM_LOCK_HELPER__H__

src/dynarec/arm_next.S

@@ -9,7 +9,6 @@
 .extern LinkNext
 
 .global arm_next
-    .4byte  0   // NULL pointer before arm64_next, for getDB
 arm_next:
     // emu is r0
     //stm     r0, {r4-r12,r14}   // don't put put back reg value in emu, faster but more tricky to debug

src/dynarec/arm_printer.c

@@ -159,7 +159,7 @@ const char* print_register_list_fpu(uint8_t start, uint8_t size, uint8_t double_
 		start = (start >> 4) + ((start & 0xF) << 1);
 	}
 	
-	char tmp[7];
+	char tmp[6];
 	for (int cur = start; cur < start + size - 1; ++cur) {
 		sprintf(tmp, "%c%d, ", regChr, cur);
 		strcat(ret, tmp);
@@ -3049,7 +3049,7 @@ const char* arm_print(uint32_t opcode) {
 		int param1_1 = (opcode >> 5) & 0x1;
 		int param2_1 = (opcode >> 4) & 0x1;
 		
-		char align[5];
+		char align[4];
 		if (param2_1 == 1) {
 			sprintf(align, ":%d", 16 << size);
 		} else {
@@ -3064,7 +3064,7 @@ const char* arm_print(uint32_t opcode) {
 		int param1_1 = (opcode >> 5) & 0x1;
 		int param2_1 = (opcode >> 4) & 0x1;
 		
-		char align[5];
+		char align[4];
 		if (param2_1 == 1) {
 			sprintf(align, ":%d", 16 << size);
 		} else {
@@ -3080,7 +3080,7 @@ const char* arm_print(uint32_t opcode) {
 		int param1_1 = (opcode >> 5) & 0x1;
 		int param2_1 = (opcode >> 4) & 0x1;
 		
-		char align[5];
+		char align[4];
 		if (param2_1 == 1) {
 			sprintf(align, ":%d", 16 << size);
 		} else {

src/dynarec/dynablock.c

@@ -4,6 +4,7 @@
 #include <errno.h>
 #include <sys/mman.h>
 #include <setjmp.h>
+#include <sys/mman.h>
 
 #include "debug.h"
 #include "box86context.h"
@@ -41,108 +42,51 @@ uint32_t X31_hash_code(void* addr, int len)
 	return (uint32_t)h;
 }
 
-dynablock_t* InvalidDynablock(dynablock_t* db, int need_lock)
-{
-    if(db) {
-        if(db->gone)
-            return NULL; // already in the process of deletion!
-        dynarec_log(LOG_DEBUG, "InvalidDynablock(%p), db->block=%p x86=%p:%p already gone=%d\n", db, db->block, db->x86_addr, db->x86_addr+db->x86_size-1, db->gone);
-        if(need_lock)
-            mutex_lock(&my_context->mutex_dyndump);
-        // remove jumptable
-        setJumpTableDefault(db->x86_addr);
-        db->done = 0;
-        db->gone = 1;
-        if(need_lock)
-            mutex_unlock(&my_context->mutex_dyndump);
-    }
-    return db;
-}
-
-void FreeInvalidDynablock(dynablock_t* db, int need_lock)
-{
-    if(db) {
-        if(!db->gone)
-            return; // already in the process of deletion!
-        dynarec_log(LOG_DEBUG, "FreeInvalidDynablock(%p), db->block=%p x86=%p:%p already gone=%d\n", db, db->block, db->x86_addr, db->x86_addr+db->x86_size-1, db->gone);
-        if(need_lock)
-            mutex_lock(&my_context->mutex_dyndump);
-        FreeDynarecMap((uintptr_t)db->actual_block);
-        customFree(db);
-        if(need_lock)
-            mutex_unlock(&my_context->mutex_dyndump);
-    }
-}
-
 void FreeDynablock(dynablock_t* db, int need_lock)
 {
     if(db) {
         if(db->gone)
             return; // already in the process of deletion!
-        dynarec_log(LOG_DEBUG, "FreeDynablock(%p), db->block=%p x86=%p:%p already gone=%d\n", db, db->block, db->x86_addr, db->x86_addr+db->x86_size-1, db->gone);
+        dynarec_log(LOG_DEBUG, "FreeDynablock(%p), db->block=%p x86=%p:%p already gone=%d\n", db, db->block, db->x86_addr, db->x86_addr+db->x86_size, db->gone);
         if(need_lock)
-            mutex_lock(&my_context->mutex_dyndump);
+            pthread_mutex_lock(&my_context->mutex_dyndump);
         // remove jumptable
         setJumpTableDefault(db->x86_addr);
         dynarec_log(LOG_DEBUG, " -- FreeDyrecMap(%p, %d)\n", db->actual_block, db->size);
         db->done = 0;
         db->gone = 1;
-        if(db->previous)
-            FreeInvalidDynablock(db->previous, 0);
-        FreeDynarecMap((uintptr_t)db->actual_block);
-        customFree(db);
+        FreeDynarecMap(db, (uintptr_t)db->actual_block, db->size);
+        box_free(db);
         if(need_lock)
-            mutex_unlock(&my_context->mutex_dyndump);
+            pthread_mutex_unlock(&my_context->mutex_dyndump);
     }
 }
 
-
-
 void MarkDynablock(dynablock_t* db)
 {
     if(db) {
-        dynarec_log(LOG_DEBUG, "MarkDynablock %p %p-%p\n", db, db->x86_addr, db->x86_addr+db->x86_size-1);
-        if(!setJumpTableIfRef(db->x86_addr, db->jmpnext, db->block)) {
-            dynablock_t* old = db;
-            db = getDB((uintptr_t)old->x86_addr);
-            if(!old->gone && db!=old) {
-                printf_log(LOG_INFO, "Warning, couldn't mark block as dirty for %p, block=%p, current_block=%p\n", old->x86_addr, old, db);
-                // the block is lost, need to invalidate it...
-                old->gone = 1;
-                old->done = 0;
-                if(!db || db->previous)
-                    FreeInvalidDynablock(old, 1);
-                else
-                    db->previous = old;
-            }
-        }
+        if(db->need_test)
+            return; // already done
+        db->need_test = 1;
+        setJumpTableDefault(db->x86_addr);
     }
 }
 
-static int IntervalIntersects(uintptr_t start1, uintptr_t end1, uintptr_t start2, uintptr_t end2)
+int IntervalIntersects(uintptr_t start1, uintptr_t end1, uintptr_t start2, uintptr_t end2)
 {
     if(start1 > end2 || start2 > end1)
         return 0;
     return 1;
 }
 
-static int MarkedDynablock(dynablock_t* db)
-{
-    if(db) {
-        if(getNeedTest((uintptr_t)db->x86_addr))
-            return 1; // already done
-    }
-    return 0;
-}
-
 void MarkRangeDynablock(dynablock_t* db, uintptr_t addr, uintptr_t size)
 {
-    // Mark will try to find *any* blocks that intersect the range to mark
     if(!db)
         return;
     dynarec_log(LOG_DEBUG, "MarkRangeDynablock %p-%p .. startdb=%p, sizedb=%p\n", (void*)addr, (void*)addr+size-1, (void*)db->x86_addr, (void*)db->x86_size);
-    if(IntervalIntersects((uintptr_t)db->x86_addr, (uintptr_t)db->x86_addr+db->x86_size-1, addr, addr+size+1))
-        MarkDynablock(db);
+    if(!db->need_test)
+        if(IntervalIntersects((uintptr_t)db->x86_addr, (uintptr_t)db->x86_addr+db->x86_size-1, addr, addr+size+1))
+            MarkDynablock(db);
 }
 
 int FreeRangeDynablock(dynablock_t* db, uintptr_t addr, uintptr_t size)
@@ -158,6 +102,20 @@ int FreeRangeDynablock(dynablock_t* db, uintptr_t addr, uintptr_t size)
     return 1;
 }
 
+dynablock_t* FindDynablockDynablocklist(void* addr, kh_dynablocks_t* dynablocks)
+{
+    if(!dynablocks)
+        return NULL;
+    dynablock_t* db;
+    kh_foreach_value(dynablocks, db, 
+        const uintptr_t s = (uintptr_t)db->block;
+        const uintptr_t e = (uintptr_t)db->block+db->size;
+        if((uintptr_t)addr>=s && (uintptr_t)addr<e)
+            return db;
+    )
+    return NULL;
+}
+
 dynablock_t *AddNewDynablock(uintptr_t addr)
 {
     dynablock_t* block;
@@ -168,11 +126,12 @@ dynablock_t *AddNewDynablock(uintptr_t addr)
         dynarec_log(LOG_VERBOSE, "Block asked on a memory with no execution flags 0x%02X\n", prot);
         return NULL;
     }
-    
     #endif
+    pthread_mutex_lock(&my_context->mutex_dyndump);
     // create and add new block
     dynarec_log(LOG_VERBOSE, "Ask for DynaRec Block creation @%p\n", (void*)addr);
-    block = (dynablock_t*)customCalloc(1, sizeof(dynablock_t));
+    block = (dynablock_t*)box_calloc(1, sizeof(dynablock_t));
+    pthread_mutex_unlock(&my_context->mutex_dyndump);
     return block;
 }
 
@@ -196,56 +155,52 @@ static dynablock_t* internalDBGetBlock(x86emu_t* emu, uintptr_t addr, uintptr_t
     if(block || !create)
         return block;
 
-    if(need_lock) {
-        if(box86_dynarec_wait) {
-            mutex_lock(&my_context->mutex_dyndump);
-        } else {
-            if(mutex_trylock(&my_context->mutex_dyndump))   // FillBlock not available for now
-                return NULL;
-        }
-        block = getDB(addr);    // just in case
-        if(block) {
-            mutex_unlock(&my_context->mutex_dyndump);
-            return block;
-        }
+    if(need_lock)
+        pthread_mutex_lock(&my_context->mutex_dyndump);
+
+    block = getDB(addr);    // just in case
+    if(block) {
+        if(need_lock)
+            pthread_mutex_unlock(&my_context->mutex_dyndump);
+        return block;
     }
-    
+
     block = AddNewDynablock(addr);
 
     // fill the block
     block->x86_addr = (void*)addr;
     if(sigsetjmp(&dynarec_jmpbuf, 1)) {
         printf_log(LOG_INFO, "FillBlock at %p triggered a segfault, cancelling\n", (void*)addr);
-        FreeDynablock(block, 0);
         if(need_lock)
-            mutex_unlock(&my_context->mutex_dyndump);
+            pthread_mutex_unlock(&my_context->mutex_dyndump);
         return NULL;
     }
     void* ret = FillBlock(block, filladdr);
+    if(need_lock)
+        pthread_mutex_unlock(&my_context->mutex_dyndump);
     if(!ret) {
         dynarec_log(LOG_DEBUG, "Fillblock of block %p for %p returned an error\n", block, (void*)addr);
-        customFree(block);
+        box_free(block);
         block = NULL;
     }
     // check size
-    if(block) {
+    if(block && (block->x86_size || (!block->x86_size && !block->done))) {
         int blocksz = block->x86_size;
         if(blocksz>my_context->max_db_size)
             my_context->max_db_size = blocksz;
         // fill-in jumptable
-        if(!addJumpTableIfDefault(block->x86_addr, block->dirty?block->jmpnext:block->block)) {
-            FreeDynablock(block, 0);
+        if(!addJumpTableIfDefault(block->x86_addr, block->block)) {
+            FreeDynablock(block, 1);
             block = getDB(addr);
-            MarkDynablock(block);   // just in case...
         } else {
             if(block->x86_size)
                 block->done = 1;    // don't validate the block if the size is null, but keep the block
         }
     }
     if(need_lock)
-        mutex_unlock(&my_context->mutex_dyndump);
+        pthread_mutex_unlock(&my_context->mutex_dyndump);
 
-    dynarec_log(LOG_DEBUG, "%04d| --- DynaRec Block created @%p:%p (%p, 0x%x bytes)\n", GetTID(), (void*)addr, (void*)(addr+((block)?block->x86_size:1)-1), (block)?block->block:0, (block)?block->size:0);
+    dynarec_log(LOG_DEBUG, " --- DynaRec Block created @%p:%p (%p, 0x%x bytes)\n", (void*)addr, (void*)(addr+((block)?block->x86_size:0)), (block)?block->block:0, (block)?block->size:0);
 
     return block;
 }
@@ -253,55 +208,32 @@ static dynablock_t* internalDBGetBlock(x86emu_t* emu, uintptr_t addr, uintptr_t
 dynablock_t* DBGetBlock(x86emu_t* emu, uintptr_t addr, int create)
 {
     dynablock_t *db = internalDBGetBlock(emu, addr, addr, create, 1);
-    if(db && db->done && db->block && getNeedTest(addr)) {
-        if(db->always_test)
-            sched_yield();  // just calm down...
+    if(db && db->done && db->block && db->need_test) {
         if(AreaInHotPage((uintptr_t)db->x86_addr, (uintptr_t)db->x86_addr + db->x86_size - 1)) {
-            emu->test.test = 0;
-            if(box86_dynarec_fastpage) {
-                uint32_t hash = X31_hash_code(db->x86_addr, db->x86_size);
-                if(hash==db->hash) { // seems ok, run it without reprotecting it
-                    setJumpTableIfRef(db->x86_addr, db->block, db->jmpnext);
-                    return db;
-                }
-                db->done = 0;   // invalidating the block, it's already not good
-                dynarec_log(LOG_DEBUG, "Invalidating block %p from %p:%p (hash:%X/%X) for %p\n", db, db->x86_addr, db->x86_addr+db->x86_size-1, hash, db->hash, (void*)addr);
-                // Free db, it's now invalid!
-                FreeDynablock(db, 1);
-                return NULL;    // not building a new one, it's still a hotpage
-            } else {
-                dynarec_log(LOG_INFO, "Not running block %p from %p:%p with for %p because it's in a hotpage\n", db, db->x86_addr, db->x86_addr+db->x86_size-1, (void*)addr);
-                return NULL;
-            }
+            dynarec_log(LOG_DEBUG, "Not running block %p from %p:%p with for %p because it's in a hotpage\n", db, db->x86_addr, db->x86_addr+db->x86_size-1, (void*)addr);
+            return NULL;
         }
         uint32_t hash = X31_hash_code(db->x86_addr, db->x86_size);
-        int need_lock = mutex_trylock(&my_context->mutex_dyndump);
+        if(pthread_mutex_trylock(&my_context->mutex_dyndump)) {
+            dynarec_log(LOG_DEBUG, "mutex_dyndump not available when trying to validate block %p from %p:%p (hash:%X) for %p\n", db, db->x86_addr, db->x86_addr+db->x86_size-1, db->hash, (void*)addr);
+            return NULL;
+        }
         if(hash!=db->hash) {
             db->done = 0;   // invalidating the block
             dynarec_log(LOG_DEBUG, "Invalidating block %p from %p:%p (hash:%X/%X) for %p\n", db, db->x86_addr, db->x86_addr+db->x86_size-1, hash, db->hash, (void*)addr);
             // Free db, it's now invalid!
-            dynablock_t* old = InvalidDynablock(db, need_lock);
+            FreeDynablock(db, 0);
             // start again... (will create a new block)
-            db = internalDBGetBlock(emu, addr, addr, create, need_lock);
-            if(db) {
-                if(db->previous)
-                    FreeInvalidDynablock(db->previous, need_lock);
-                db->previous = old;
-            } else
-                FreeInvalidDynablock(old, need_lock);
+            db = internalDBGetBlock(emu, addr, addr, create, 0);
         } else {
+            db->need_test = 0;
             dynarec_log(LOG_DEBUG, "Validating block %p from %p:%p (hash:%X) for %p\n", db, db->x86_addr, db->x86_addr+db->x86_size-1, db->hash, (void*)addr);
             protectDB((uintptr_t)db->x86_addr, db->x86_size);
-            // fill back jumptable
-            if(isprotectedDB((uintptr_t)db->x86_addr, db->x86_size) && !db->always_test) {
-                setJumpTableIfRef(db->x86_addr, db->block, db->jmpnext);
-            }
+            // fill back jumptable        
+            setJumpTableIfRef(db->x86_addr, db->block, db->jmpnext);
         }
-        if(!need_lock)
-            mutex_unlock(&my_context->mutex_dyndump);
-    } 
-    if(!db || !db->block || !db->done)
-        emu->test.test = 0;
+        pthread_mutex_unlock(&my_context->mutex_dyndump);
+    }
     return db;
 }
 
@@ -310,35 +242,24 @@ dynablock_t* DBAlternateBlock(x86emu_t* emu, uintptr_t addr, uintptr_t filladdr)
     dynarec_log(LOG_DEBUG, "Creating AlternateBlock at %p for %p\n", (void*)addr, (void*)filladdr);
     int create = 1;
     dynablock_t *db = internalDBGetBlock(emu, addr, filladdr, create, 1);
-    if(db && db->done && db->block && getNeedTest(filladdr)) {
-        if(db->always_test)
-            sched_yield();  // just calm down...
-        int need_lock = mutex_trylock(&my_context->mutex_dyndump);
+    if(db && db->done && db->block && db->need_test) {
+        if(pthread_mutex_trylock(&my_context->mutex_dyndump))
+            return NULL;
         uint32_t hash = X31_hash_code(db->x86_addr, db->x86_size);
         if(hash!=db->hash) {
             db->done = 0;   // invalidating the block
             dynarec_log(LOG_DEBUG, "Invalidating alt block %p from %p:%p (hash:%X/%X) for %p\n", db, db->x86_addr, db->x86_addr+db->x86_size, hash, db->hash, (void*)addr);
             // Free db, it's now invalid!
-            dynablock_t* old = InvalidDynablock(db, need_lock);
+            FreeDynablock(db, 0);
             // start again... (will create a new block)
-            db = internalDBGetBlock(emu, addr, filladdr, create, need_lock);
-            if(db) {
-                if(db->previous)
-                    FreeInvalidDynablock(db->previous, need_lock);
-                db->previous = old;
-            } else
-                FreeInvalidDynablock(old, need_lock);
+            db = internalDBGetBlock(emu, addr, filladdr, create, 0);
         } else {
+            db->need_test = 0;
             protectDB((uintptr_t)db->x86_addr, db->x86_size);
             // fill back jumptable
-            if(isprotectedDB((uintptr_t)db->x86_addr, db->x86_size) && !db->always_test) {
-                setJumpTableIfRef(db->x86_addr, db->block, db->jmpnext);
-            }
+            addJumpTableIfDefault(db->x86_addr, db->block);
         }
-        if(!need_lock)
-            mutex_unlock(&my_context->mutex_dyndump);
+        pthread_mutex_unlock(&my_context->mutex_dyndump);
     } 
-    if(!db || !db->block || !db->done)
-        emu->test.test = 0;
     return db;
-}
+}

src/dynarec/dynablock_private.h

@@ -1,6 +1,7 @@
 #ifndef __DYNABLOCK_PRIVATE_H_
 #define __DYNABLOCK_PRIVATE_H_
 
+
 typedef struct instsize_s {
     unsigned char x86:4;
     unsigned char nat:4;
@@ -9,15 +10,14 @@ typedef struct instsize_s {
 typedef struct dynablock_s {
     void*           block;  // block-sizeof(void*) == self
     void*           actual_block;   // the actual start of the block (so block-sizeof(void*))
-    struct dynablock_s*    previous;   // a previous block that might need to be freed
     int             size;
     void*           x86_addr;
     uintptr_t       x86_size;
     uint32_t        hash;
+    uint8_t         need_test;
     uint8_t         done;
     uint8_t         gone;
-    uint8_t         always_test;
-    uint8_t         dirty;      // if need to be tested as soon as it's created
+    uint8_t         dummy;
     int             isize;
     instsize_t*     instsize;
     void*           jmpnext;    // a branch jmpnext code when block is marked

src/dynarec/dynarec.c

@@ -20,13 +20,7 @@
 #include "dynablock.h"
 #include "dynablock_private.h"
 #include "bridge.h"
-void x86test_check(x86emu_t* ref, uintptr_t ip);
-#endif
-
-#ifdef ARM
-void arm_prolog(x86emu_t* emu, void* addr) EXPORTDYN;
-void arm_epilog() EXPORTDYN;
-void arm_epilog_fast() EXPORTDYN;
+#include "dynarec_next.h"
 #endif
 
 #ifdef DYNAREC
@@ -46,26 +40,24 @@ void* LinkNext(x86emu_t* emu, uintptr_t addr, void* x2)
     }
     #endif
     void * jblock;
-    dynablock_t* block = NULL;
-    if(hasAlternate((void*)addr)) {
-        printf_log(LOG_INFO, "Jmp address has alternate: %p", (void*)addr);
-        addr = (uintptr_t)getAlternate((void*)addr);
-        R_EIP = addr;
-        printf_log(LOG_INFO, " -> %p\n", (void*)addr);
-        block = DBGetBlock(emu, addr, 1);
-    } else
-        block = DBGetBlock(emu, addr, 1);
+    dynablock_t* block = DBGetBlock(emu, addr, 1);
     if(!block) {
         // no block, let link table as is...
-        #ifdef HAVE_TRACE
-        if(LOG_INFO<=box86_dynarec_log) {
+        if(hasAlternate((void*)addr)) {
+            printf_log(LOG_INFO, "Jmp address has alternate: %p", (void*)addr);
+            addr = (uintptr_t)getAlternate((void*)addr);
+            R_EIP = addr;
+            printf_log(LOG_INFO, " -> %p\n", (void*)addr);
+            block = DBGetBlock(emu, addr, 1);
+        }
+        if(!block) {
+            #ifdef HAVE_TRACE
             dynablock_t* db = FindDynablockFromNativeAddress(x2);
-            elfheader_t* h = FindElfAddress(my_context, (uintptr_t)x2);
-            dynarec_log(LOG_INFO, "Warning, jumping to a no-block address %p from %p (db=%p, x64addr=%p(elf=%s))\n", (void*)addr, x2, db, db?(void*)getX86Address(db, (uintptr_t)x2-4):NULL, h?ElfName(h):"(none)");
+            dynarec_log(LOG_INFO, "Warning, jumping to a no-block address %p from %p (db=%p, x86addr=%p)\n", (void*)addr, x2, db, db?(void*)getX86Address(db, (uintptr_t)x2):NULL);
+            #endif
+            //tableupdate(arm_epilog, addr, table);
+            return arm_epilog;
         }
-        #endif
-        //tableupdate(arm_epilog, addr, table);
-        return arm_epilog;
     }
     if(!block->done) {
         // not finished yet... leave linker
@@ -86,25 +78,18 @@ void DynaCall(x86emu_t* emu, uintptr_t addr)
     // prepare setjump for signal handling
     emu_jmpbuf_t *ejb = NULL;
     int jmpbuf_reset = 0;
-    int skip = 0;
     if(emu->type == EMUTYPE_MAIN) {
         ejb = GetJmpBuf();
         if(!ejb->jmpbuf_ok) {
             ejb->emu = emu;
             ejb->jmpbuf_ok = 1;
             jmpbuf_reset = 1;
-            if((skip=sigsetjmp((struct __jmp_buf_tag*)ejb->jmpbuf, 1))) {
-                printf_log(LOG_DEBUG, "Setjmp DynaCall %d, fs=0x%x\n", skip, ejb->emu->segs[_FS]);
+            int a;
+            if((a=sigsetjmp((struct __jmp_buf_tag*)ejb->jmpbuf, 1))) {
+                printf_log(LOG_DEBUG, "Setjmp DynaCall %d, fs=0x%x\n", a, ejb->emu->segs[_FS]);
                 addr = R_EIP;   // not sure if it should still be inside DynaCall!
-                #ifdef DYNAREC
-                if(box86_dynarec_test) {
-                    if(emu->test.clean)
-                        x86test_check(emu, R_EIP);
-                    emu->test.clean = 0;
-                }
-                #endif
-                if(skip!=2)
-                    skip = 0;
+                if(a==2)
+                    Run(emu, 1);    // "single step" next instruction that is doing auto-smc
             }
         }
     }
@@ -123,18 +108,12 @@ void DynaCall(x86emu_t* emu, uintptr_t addr)
         PushExit(emu);
         R_EIP = addr;
         emu->df = d_none;
-        dynablock_t* block = NULL;
-        dynablock_t* current = NULL;
         while(!emu->quit) {
-            block = (skip==2)?NULL:DBGetBlock(emu, R_EIP, 1);
-            current = block;
+            dynablock_t* block = DBGetBlock(emu, R_EIP, 1);
             if(!block || !block->block || !block->done) {
-                skip = 0;
                 // no block, of block doesn't have DynaRec content (yet, temp is not null)
                 // Use interpreter (should use single instruction step...)
                 dynarec_log(LOG_DEBUG, "%04d|Calling Interpretor @%p, emu=%p\n", GetTID(), (void*)R_EIP, emu);
-                if(box86_dynarec_test)
-                    emu->test.clean = 0;
                 Run(emu, 1);
             } else {
                 dynarec_log(LOG_DEBUG, "%04d|Calling DynaRec Block @%p (%p) of %d x86 instructions emu=%p\n", GetTID(), (void*)R_EIP, block->block, block->isize ,emu);
@@ -185,7 +164,6 @@ int DynaRun(x86emu_t* emu)
 {
     // prepare setjump for signal handling
     emu_jmpbuf_t *ejb = NULL;
-    int skip = 0;
 #ifdef DYNAREC
     int jmpbuf_reset = 1;
 #endif
@@ -198,17 +176,11 @@ int DynaRun(x86emu_t* emu)
 #ifdef DYNAREC
             jmpbuf_reset = 1;
 #endif
-            if((skip=sigsetjmp((struct __jmp_buf_tag*)ejb->jmpbuf, 1))) {
-                printf_log(LOG_DEBUG, "Setjmp DynaRun %d, fs=0x%x\n", skip, ejb->emu->segs[_FS]);
-                #ifdef DYNAREC
-                if(box86_dynarec_test) {
-                    if(emu->test.clean)
-                        x86test_check(emu, R_EIP);
-                    emu->test.clean = 0;
-                }
-                #endif
-                if(skip!=2)
-                    skip = 0;
+            if((a=sigsetjmp((struct __jmp_buf_tag*)ejb->jmpbuf, 1))) {
+                printf_log(LOG_DEBUG, "Setjmp DynaRun %d, fs=0x%x\n", a, ejb->emu->segs[_FS]);
+                if(a==2)
+                    Run(emu, 1);    // "single step" next instruction that is doing auto-smc
+
             }
         }
     }
@@ -219,17 +191,12 @@ int DynaRun(x86emu_t* emu)
 #ifdef DYNAREC
     else {
         dynablock_t* block = NULL;
-        dynablock_t* current = NULL;
         while(!emu->quit) {
-            block = (skip==2)?NULL:DBGetBlock(emu, R_EIP, 1);
-            current = block;
+            block = DBGetBlock(emu, R_EIP, 1);
             if(!block || !block->block || !block->done) {
-                skip = 0;
                 // no block, of block doesn't have DynaRec content (yet, temp is not null)
                 // Use interpreter (should use single instruction step...)
                 dynarec_log(LOG_DEBUG, "%04d|Running Interpretor @%p, emu=%p\n", GetTID(), (void*)R_EIP, emu);
-                if(box86_dynarec_test)
-                    emu->test.clean = 0;
                 Run(emu, 1);
             } else {
                 dynarec_log(LOG_DEBUG, "%04d|Running DynaRec Block @%p (%p) of %d x86 insts emu=%p\n", GetTID(), (void*)R_EIP, block->block, block->isize, emu);

src/dynarec/dynarec_arm.c

@@ -23,6 +23,7 @@
 #include "dynarec_arm_private.h"
 #include "dynarec_arm_functions.h"
 #include "elfloader.h"
+#include "dynarec_next.h"
 
 void printf_x86_instruction(zydis_dec_t* dec, instruction_x86_t* inst, const char* name) {
     uint8_t *ip = (uint8_t*)inst->addr;
@@ -73,8 +74,8 @@ void add_next(dynarec_arm_t *dyn, uintptr_t addr) {
         }
     // add slots
     if(dyn->next_sz == dyn->next_cap) {
-        dyn->next_cap += 64;
-        dyn->next = (uintptr_t*)dynaRealloc(dyn->next, dyn->next_cap*sizeof(uintptr_t));
+        dyn->next_cap += 16;
+        dyn->next = (uintptr_t*)box_realloc(dyn->next, dyn->next_cap*sizeof(uintptr_t));
     }
     dyn->next[dyn->next_sz++] = addr;
 }
@@ -83,13 +84,11 @@ uintptr_t get_closest_next(dynarec_arm_t *dyn, uintptr_t addr) {
     uintptr_t best = 0;
     int i = 0;
     while((i<dyn->next_sz) && (best!=addr)) {
-        if(dyn->next[i]) {
-            if(dyn->next[i]<addr) { // remove the address, it's before current address
-                dyn->next[i] = 0;
-            } else {
-                if((dyn->next[i]<best) || !best)
-                    best = dyn->next[i];
-            }
+        if(dyn->next[i]<addr) { // remove the address, it's before current address
+            dyn->next[i] = 0;
+        } else {
+            if((dyn->next[i]<best) || !best)
+                best = dyn->next[i];
         }
         ++i;
     }
@@ -243,31 +242,35 @@ int is_instructions(dynarec_arm_t *dyn, uintptr_t addr, int n)
     return (i==n)?1:0;
 }
 
-void addInst(instsize_t* insts, size_t* size, int x86_size, int native_size)
+static instsize_t* addInst(instsize_t* insts, size_t* size, size_t* cap, int x86_size, int arm_size)
 {
     // x86 instruction is <16 bytes
     int toadd;
-    if(x86_size>native_size)
+    if(x86_size>arm_size)
         toadd = 1 + x86_size/15;
     else
-        toadd = 1 + native_size/15;
+        toadd = 1 + arm_size/15;
+    if((*size)+toadd>(*cap)) {
+        *cap = (*size)+toadd;
+        insts = (instsize_t*)box_realloc(insts, (*cap)*sizeof(instsize_t));
+    }
     while(toadd) {
         if(x86_size>15)
             insts[*size].x86 = 15;    
         else
             insts[*size].x86 = x86_size;
         x86_size -= insts[*size].x86;
-        if(native_size>15)
+        if(arm_size>15)
             insts[*size].nat = 15;
         else
-            insts[*size].nat = native_size;
-        native_size -= insts[*size].nat;
+            insts[*size].nat = arm_size;
+        arm_size -= insts[*size].nat;
         ++(*size);
         --toadd;
     }
+    return insts;
 }
 
-
 static void fillPredecessors(dynarec_arm_t* dyn)
 {
     int pred_sz = 1;    // to be safe
@@ -279,13 +282,6 @@ static void fillPredecessors(dynarec_arm_t* dyn)
             ++dyn->insts[dyn->insts[i].x86.jmp_insts].pred_sz;
         }
     }
-    // remove "has_next" from orphean branch
-    for(int i=0; i<dyn->size-1; ++i) {
-        if(!dyn->insts[i].x86.has_next) {
-            if(dyn->insts[i+1].x86.has_next && !dyn->insts[i+1].pred_sz)
-                dyn->insts[i+1].x86.has_next = 0;
-        }
-    }
     // second the "has_next"
     for(int i=0; i<dyn->size-1; ++i) {
         if(dyn->insts[i].x86.has_next) {
@@ -293,7 +289,7 @@ static void fillPredecessors(dynarec_arm_t* dyn)
             ++dyn->insts[i+1].pred_sz;
         }
     }
-    dyn->predecessor = (int*)dynaMalloc(pred_sz*sizeof(int));
+    dyn->predecessor = (int*)box_malloc(pred_sz*sizeof(int));
     // fill pred pointer
     int* p = dyn->predecessor;
     for(int i=0; i<dyn->size; ++i) {
@@ -303,13 +299,12 @@ static void fillPredecessors(dynarec_arm_t* dyn)
     }
     // fill pred
     for(int i=0; i<dyn->size; ++i) {
-        if((i!=dyn->size-1) && dyn->insts[i].x86.has_next)
+        if(i!=dyn->size-1 && dyn->insts[i].x86.has_next && (!i || dyn->insts[i].pred_sz))
             dyn->insts[i+1].pred[dyn->insts[i+1].pred_sz++] = i;
-        if(dyn->insts[i].x86.jmp && (dyn->insts[i].x86.jmp_insts!=-1)) {
-            int j = dyn->insts[i].x86.jmp_insts;
-            dyn->insts[j].pred[dyn->insts[j].pred_sz++] = i;
-        }
+        if(dyn->insts[i].x86.jmp && dyn->insts[i].x86.jmp_insts!=-1)
+            dyn->insts[dyn->insts[i].x86.jmp_insts].pred[dyn->insts[dyn->insts[i].x86.jmp_insts].pred_sz++] = i;
     }
+
 }
 
 // updateNeed goes backward, from last intruction to top
@@ -352,50 +347,45 @@ static int updateNeed(dynarec_arm_t* dyn, int ninst, uint8_t need) {
             else
                 updateNeed(dyn, dyn->insts[ninst].pred[i], need);
         }
-        --ninst;
         if(!ok)
-            return ninst;
+            return ninst - 1;
+        --ninst;
     }
     return ninst;
 }
 
-void* current_helper = NULL;
-
-void CancelBlock(int need_lock)
-{
-    if(need_lock)
-        mutex_lock(&my_context->mutex_dyndump);
-    dynarec_arm_t* helper = (dynarec_arm_t*)current_helper;
-    current_helper = NULL;
-    if(helper) {
-        dynaFree(helper->next);
-        dynaFree(helper->insts);
-        dynaFree(helper->predecessor);
-        if(helper->dynablock && helper->dynablock->actual_block) {
-            FreeDynarecMap((uintptr_t)helper->dynablock->actual_block);
-            helper->dynablock->actual_block = NULL;
-        }
-    }
-    if(need_lock)
-        mutex_unlock(&my_context->mutex_dyndump);
-}
-
 uintptr_t arm_pass0(dynarec_arm_t* dyn, uintptr_t addr);
 uintptr_t arm_pass1(dynarec_arm_t* dyn, uintptr_t addr);
 uintptr_t arm_pass2(dynarec_arm_t* dyn, uintptr_t addr);
 uintptr_t arm_pass3(dynarec_arm_t* dyn, uintptr_t addr);
-void arm_epilog();
-void arm_next();
+
+__thread void* current_helper = NULL;
+
+void CancelBlock()
+{
+    dynarec_arm_t* helper = (dynarec_arm_t*)current_helper;
+    current_helper = NULL;
+    if(!helper)
+        return;
+    box_free(helper->next);
+    box_free(helper->insts);
+    box_free(helper->instsize);
+    box_free(helper->predecessor);
+    if(helper->dynablock && helper->dynablock->actual_block)
+        FreeDynarecMap(helper->dynablock, (uintptr_t)helper->dynablock->actual_block, helper->dynablock->size);
+    else if(helper->dynablock && helper->block)
+        FreeDynarecMap(helper->dynablock, (uintptr_t)helper->block-sizeof(void*), helper->dynablock->size);
+}
 
 void* CreateEmptyBlock(dynablock_t* block, uintptr_t addr) {
     block->isize = 0;
     block->done = 0;
-    size_t sz = 8*sizeof(void*);
-    void* actual_p = (void*)AllocDynarecMap(sz);
+    size_t sz = 4*sizeof(void*);
+    void* actual_p = (void*)AllocDynarecMap(block, sz);
     void* p = actual_p + sizeof(void*);
     if(actual_p==NULL) {
         dynarec_log(LOG_INFO, "AllocDynarecMap(%p, %zu) failed, cancelling block\n", block, sz);
-        CancelBlock(0);
+        CancelBlock();
         return NULL;
     }
     block->size = sz;
@@ -403,41 +393,27 @@ void* CreateEmptyBlock(dynablock_t* block, uintptr_t addr) {
     block->block = p;
     block->jmpnext = p;
     *(dynablock_t**)actual_p = block;
-    *(void**)(p+4*sizeof(void*)) = arm_epilog;
-    CreateJmpNext(block->jmpnext, p+4*sizeof(void*));
+    CreateJmpNextTo(block->jmpnext, arm_epilog);
+    block->need_test = 0;
     // all done...
     __clear_cache(actual_p, actual_p+sz);   // need to clear the cache before execution...
     return block;
 }
 
 void* FillBlock(dynablock_t* block, uintptr_t addr) {
-    /*
-        A Block must have this layout:
-
-        0x0000..0x0003  : dynablock_t* : self
-        0x0004..4+4*n   : actual Native instructions, (n is the total number)
-        B ..    B+3     : dynablock_t* : self (as part of JmpNext, that simulate another block)
-        B+4 ..  B+15    : 3 Native code for jmpnext (or jmp epilog in case of empty block)
-        B+16 .. B+19    : jmpnext (or jmp_epilog) address
-        B+20 .. B+31    : empty (in case an architecture needs more than 3 opcodes)
-        B+32 .. B+32+sz : instsize (compressed array with each instruction lenght on x86 and native side)
-
-    */
 dynarec_log(LOG_DEBUG, "Asked to Fill block %p with %p\n", block, (void*)addr);
     if(IsInHotPage(addr)) {
         dynarec_log(LOG_DEBUG, "Cancelling dynarec FillBlock on hotpage for %p\n", (void*)addr);
         return NULL;
     }
     if(addr>=box86_nodynarec_start && addr<box86_nodynarec_end) {
-        dynarec_log(LOG_DEBUG, "Asked to fill a block in fobidden zone\n");
+        dynarec_log(LOG_INFO, "Create empty block in no-dynarec zone\n");
         return CreateEmptyBlock(block, addr);
     }
-    if(current_helper) {
-        dynarec_log(LOG_DEBUG, "Cancelling dynarec FillBlock at %p as anothor one is going on\n", (void*)addr);
+    if(!isJumpTableDefault((void*)addr)) {
+        dynarec_log(LOG_DEBUG, "Asked to fill a block at %p, but JumpTable is not default\n", (void*)addr);
         return NULL;
     }
-    // protect the 1st page
-    protectDB(addr, 1);
     // init the helper
     dynarec_arm_t helper = {0};
     current_helper = &helper;
@@ -445,37 +421,27 @@ dynarec_log(LOG_DEBUG, "Asked to Fill block %p with %p\n", block, (void*)addr);
     helper.start = addr;
     uintptr_t start = addr;
     helper.cap = 64; // needs epilog handling
-    helper.insts = (instruction_arm_t*)dynaCalloc(helper.cap, sizeof(instruction_arm_t));
+    helper.insts = (instruction_arm_t*)box_calloc(helper.cap, sizeof(instruction_arm_t));
     // pass 0, addresses, x86 jump addresses, overall size of the block
     uintptr_t end = arm_pass0(&helper, addr);
     // no need for next anymore
-    dynaFree(helper.next);
+    box_free(helper.next);
     helper.next_sz = helper.next_cap = 0;
     helper.next = NULL;
     // basic checks
     if(!helper.size) {
         dynarec_log(LOG_DEBUG, "Warning, null-sized dynarec block (%p)\n", (void*)addr);
-        CancelBlock(0);
+        CancelBlock();
         return CreateEmptyBlock(block, addr);
     }
-    if(!isprotectedDB(addr, 1)) {
-        dynarec_log(LOG_INFO, "Warning, write on current page on pass0, aborting dynablock creation (%p)\n", (void*)addr);
-        AddHotPage(addr);
-        CancelBlock(0);
-        return NULL;
-    }
     // already protect the block and compute hash signature
-    // protect the block of it goes over the 1st page
-    if((addr&~box86_pagesize)!=(end&~box86_pagesize)) // need to protect some other pages too
-        protectDB(addr, end-addr);  //end is 1byte after actual end
+    protectDB(addr, end-addr);  //end is 1byte after actual end
     uint32_t hash = X31_hash_code((void*)addr, end-addr);
     // calculate barriers
     for(int i=0; i<helper.size; ++i)
         if(helper.insts[i].x86.jmp) {
             uintptr_t j = helper.insts[i].x86.jmp;
-            if(j<start || j>=end || j==helper.insts[i].x86.addr) {
-                if(j==helper.insts[i].x86.addr) // if there is a loop on some opcode, make the block "always to tested"
-                    helper.always_test = 1;
+            if(j<start || j>=end) {
                 helper.insts[i].x86.jmp_insts = -1;
                 helper.insts[i].x86.need_after |= X_PEND;
             } else {
@@ -502,70 +468,45 @@ dynarec_log(LOG_DEBUG, "Asked to Fill block %p with %p\n", block, (void*)addr);
 
     // pass 2, instruction size
     arm_pass2(&helper, addr);
-    // ok, now allocate mapped memory, with executable flag on
-    size_t insts_rsize = (helper.insts_size+2)*sizeof(instsize_t);
-    insts_rsize = (insts_rsize+7)&~7;   // round the size...
-    size_t arm_size = (helper.arm_size+7)&~7;   // round the size...
-    // ok, now allocate mapped memory, with executable flag on
-    size_t sz = sizeof(void*) + arm_size + 8*sizeof(void*) + insts_rsize;
-    //           dynablock_t* block (arm insts) jmpnext code    instsize
-    void* actual_p = (void*)AllocDynarecMap(sz);
-    void* p = (void*)(((uintptr_t)actual_p) + sizeof(void*));
-    void* next = p + arm_size;
-    void* instsize = next + 8*sizeof(void*);
+    // keep size of instructions for signal handling
+    size_t insts_ursize = 0;
+    {
+        size_t insts_size = 0;
+        size_t cap = 1;
+        for(int i=0; i<helper.size; ++i)
+            cap += 1 + ((helper.insts[i].x86.size>helper.insts[i].size)?helper.insts[i].x86.size:helper.insts[i].size)/15;
+        helper.instsize = (instsize_t*)box_calloc(cap, sizeof(instsize_t));
+        for(int i=0; i<helper.size; ++i)
+            helper.instsize = addInst(helper.instsize, &insts_size, &cap, helper.insts[i].x86.size, helper.insts[i].size/4);
+        helper.instsize = addInst(helper.instsize, &insts_size, &cap, 0, 0);    // add a "end of block" mark, just in case
+        insts_ursize = insts_size*sizeof(instsize_t);
+    }
+    size_t insts_rsize = (insts_ursize+7)&~7;   // round the size...
+    size_t sz = sizeof(void*) + helper.arm_size + 4*sizeof(void*) + insts_rsize;
+    //           dynablock_t*     block (arm insts)    jmpnext code       instsize
+    void* actual_p = (void*)AllocDynarecMap(block, sz);
+    void* p = actual_p + sizeof(void*);
+    void* next = p + helper.arm_size;
+    void* instsize = next + 4*sizeof(void*);
     if(actual_p==NULL) {
-        dynarec_log(LOG_INFO, "AllocDynarecMap(%p, %zu) failed, cancelling block\n", block, sz);
-        CancelBlock(0);
+        dynarec_log(LOG_DEBUG, "AllocDynarecMap(%p, %d) failed, cancelling block\n", block, sz);
+        CancelBlock();
         return NULL;
     }
     helper.block = p;
-    block->actual_block = actual_p;
     helper.arm_start = (uintptr_t)p;
-    helper.jmp_next = (uintptr_t)next+sizeof(void*);
-    helper.instsize = (instsize_t*)instsize;
     *(dynablock_t**)actual_p = block;
-    // pass 3, emit (log emit native opcode)
+    // pass 3, emit (log emit arm opcode)
     if(box86_dynarec_dump) {
         dynarec_log(LOG_NONE, "%s%04d|Emitting %d bytes for %d x86 bytes", (box86_dynarec_dump>1)?"\e[01;36m":"", GetTID(), helper.arm_size, helper.isize); 
         printFunctionAddr(helper.start, " => ");
         dynarec_log(LOG_NONE, "%s\n", (box86_dynarec_dump>1)?"\e[m":"");
     }
     size_t oldarmsize = helper.arm_size;
-    size_t oldinstsize = helper.insts_size;
     helper.arm_size = 0;
-    helper.insts_size = 0;  // reset
     arm_pass3(&helper, addr);
-    // keep size of instructions for signal handling
-    block->instsize = instsize;
-    // ok, free the helper now
-    dynaFree(helper.insts);
-    helper.insts = NULL;
-    helper.instsize = NULL;
-    dynaFree(helper.predecessor);
-    helper.predecessor = NULL;
-    block->size = sz;
-    block->isize = helper.size;
-    block->block = p;
-    block->jmpnext = next+sizeof(void*);
-    block->always_test = helper.always_test;
-    block->dirty = block->always_test;
-    *(dynablock_t**)next = block;
-    *(void**)(next+5*sizeof(void*)) = arm_next;
-    CreateJmpNext(block->jmpnext, next+5*sizeof(void*));
-    //block->x86_addr = (void*)start;
-    block->x86_size = end-start;
-    // all done...
-    __clear_cache(actual_p, actual_p+sz);   // need to clear the cache before execution...
-    block->hash = X31_hash_code(block->x86_addr, block->x86_size);
-    // Check if something changed, to abbort if it as
-    if((block->hash != hash)) {
-        dynarec_log(LOG_DEBUG, "Warning, a block changed while being processed hash(%p:%zu)=%x/%x\n", block->x86_addr, block->x86_size, block->hash, hash);
-        AddHotPage(addr);
-        CancelBlock(0);
-        return NULL;
-    }
-    if((oldarmsize!=helper.arm_size)) {
-        printf_log(LOG_NONE, "BOx86: Warning, size difference in block between pass2 (%zu) & pass3 (%zu)!\n", sz, helper.arm_size);
+    if(oldarmsize!=helper.arm_size) {
+        printf_log(LOG_NONE, "BOX86: Warning, size difference in block between pass2 (%d) & pass3 (%d)!\n", sz, helper.arm_size);
         uint8_t *dump = (uint8_t*)helper.start;
         printf_log(LOG_NONE, "Dump of %d x86 opcodes:\n", helper.size);
         for(int i=0; i<helper.size; ++i) {
@@ -575,19 +516,41 @@ dynarec_log(LOG_DEBUG, "Asked to Fill block %p with %p\n", block, (void*)addr);
             printf_log(LOG_NONE, "\t%d -> %d\n", helper.insts[i].size2, helper.insts[i].size);
         }
         printf_log(LOG_NONE, " ------------\n");
-        CancelBlock(0);
+    }
+    // keep size of instructions for signal handling
+    memcpy(instsize, helper.instsize, insts_ursize);
+    block->instsize = instsize;
+    // ok, free the helper now
+    box_free(helper.insts);
+    helper.insts = NULL;
+    box_free(helper.next);
+    helper.next = NULL;
+    box_free(helper.instsize);
+    helper.instsize = NULL;
+    box_free(helper.predecessor);
+    helper.predecessor = NULL;
+    block->size = sz;
+    block->isize = helper.size;
+    block->actual_block = actual_p;
+    block->block = p;
+    block->jmpnext = next+sizeof(void*);
+    *(dynablock_t**)next = block;
+    CreateJmpNextTo(block->jmpnext, arm_next);
+    block->need_test = 0;
+    //block->x86_addr = (void*)start;
+    block->x86_size = end-start;
+    if(box86_dynarec_largest<block->x86_size)
+        box86_dynarec_largest = block->x86_size;
+    // all done...
+    __clear_cache(actual_p, actual_p+sz);   // need to clear the cache before execution...
+    block->hash = X31_hash_code(block->x86_addr, block->x86_size);
+    // Check if something changed, to abbort if it as
+    if(block->hash != hash) {
+        dynarec_log(LOG_INFO, "Warning, a block changed while beeing processed hash(%p:%d)=%x/%x\n", block->x86_addr, block->x86_size, block->hash, hash);
+        CancelBlock();
         return NULL;
     }
-    if(insts_rsize/sizeof(instsize_t)<helper.insts_size) {
-        printf_log(LOG_NONE, "BOX86: Warning, ists_size difference in block between pass2 (%zu) and pass3 (%zu), allocated: %zu\n", oldinstsize, helper.insts_size, insts_rsize/sizeof(instsize_t));
-    }
-    if(!isprotectedDB(addr, end-addr)) {
-        dynarec_log(LOG_DEBUG, "Warning, block unprotected while being processed %p:%zu, marking as need_test\n", block->x86_addr, block->x86_size);
-        AddHotPage(addr);
-        block->dirty = 1;
-        //protectDB(addr, end-addr);
-    }
     current_helper = NULL;
-    //block->done = 1;
+    block->done = 1;
     return (void*)block;
 }

src/dynarec/dynarec_arm_00.c

@@ -27,8 +27,6 @@
 #include "dynarec_arm_functions.h"
 #include "dynarec_arm_helper.h"
 
-int isRetX87Wrapper(wrapper_t fun);
-
 uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst, int* ok, int* need_epilog)
 {
     uint8_t nextop, opcode;
@@ -583,12 +581,16 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
         case 0x57:
             INST_NAME("PUSH reg");
             gd = xEAX+(opcode&0x07);
+            #ifdef RPI2
             if(gd==xESP) {
                 MOV_REG(x1, gd);
                 PUSH1(x1);
             } else {
                 PUSH1(gd);    
             }
+            #else
+            PUSH1(gd);
+            #endif
             break;
         case 0x58:
         case 0x59:
@@ -663,7 +665,7 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             i32 = F32S;
             if(PK(0)==0xC3) {
                 MESSAGE(LOG_DUMP, "PUSH then RET, using indirect\n");
-                MOV32(x3, addr-4);
+                MOV32(x3, ip+1);
                 LDR_IMM9(x1, x3, 0);
                 PUSH1(x1);
             } else {
@@ -1013,7 +1015,7 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 BFI(eb1, x14, eb2*8, 8);
             } else {
                 GETGB(x14);
-                SMDMB();
+                DMB_ISH();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0, LOCK_LOCK);
                 MARKLOCK;
                 // do the swap with exclusive locking
@@ -1023,7 +1025,7 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 CMPS_IMM8(x3, 0);
                 B_MARKLOCK(cNE);
                 BFI(gb1, x1, gb2*8, 8);
-                SMDMB();
+                DMB_ISH();
             }
             break;
         case 0x87:
@@ -1039,7 +1041,7 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 }
             } else {
                 GETGD;
-                SMDMB();
+                DMB_ISH();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 1, LOCK_LOCK);
                 if(!fixedaddress) {
                     TSTS_IMM8(ed, 3);
@@ -1063,7 +1065,7 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 if(!fixedaddress) {
                     MARK2;
                 }
-                SMDMB();
+                DMB_ISH();
                 MOV_REG(gd, x1);
             }
             break;
@@ -1087,7 +1089,7 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             } else {
                 addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 4095, 0, 0, &lock);
                 STRB_IMM9(gd, ed, fixedaddress);
-                SMWRITELOCK(lock);
+                if(lock) {DMB_ISH();}
             }
             break;
         case 0x89:
@@ -1099,7 +1101,7 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             } else {                    // mem <= reg
                 addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 4095, 0, 0, &lock);
                 STR_IMM9(gd, ed, fixedaddress);
-                SMWRITELOCK(lock);
+                if(lock) {DMB_ISH();}
             }
             break;
         case 0x8A:
@@ -1121,10 +1123,10 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 } else {
                     if(box86_dynarec_strongmem && 
                      (dyn->insts[ninst].x86.barrier || !ninst || (box86_dynarec_strongmem>1) || (ninst && dyn->insts[ninst-1].x86.barrier))) {
-                        SMDMB();
+                        DMB_ISH();
                     }
                     addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 4095, 0, 0, &lock);
-                    SMREADLOCK(lock);
+                    if(lock) {DMB_ISH();}
                     LDRB_IMM9(x14, wback, fixedaddress);
                     ed = x14;
                 }
@@ -1138,7 +1140,10 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 MOV_REG(gd, xEAX+(nextop&7));
             } else {                    // mem <= reg
                 addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 4095, 0, 0, &lock);
-                SMREADLOCK(lock);
+                if(lock || (box86_dynarec_strongmem && 
+                    (dyn->insts[ninst].x86.barrier || !ninst || (box86_dynarec_strongmem>1) || (ninst && dyn->insts[ninst-1].x86.barrier)))) {
+                    DMB_ISH();
+                }
                 LDR_IMM9(gd, ed, fixedaddress);
             }
             break;
@@ -1152,7 +1157,6 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0, NULL);
                 LDRH_REG(x3, xEmu, x3);
                 STRH_IMM8(x3, ed, fixedaddress);
-                SMWRITE2();
             }
             break;
         case 0x8D:
@@ -1247,15 +1251,6 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             AND_REG_LSL_IMM5(xFlags, xFlags, x1, 0);
             ORR_IMM8(xFlags, xFlags, 2, 0);
             SET_DFNONE(x1);
-            if(box86_wine) {    // should this be done all the time?
-                TSTS_IMM8_ROR(xFlags, 0x1, 12); // 0x100 == F_TF
-                B_NEXT(cEQ);
-                MOV32(x1, addr);
-                STM(xEmu, (1<<xEAX)|(1<<xEBX)|(1<<xECX)|(1<<xEDX)|(1<<xESI)|(1<<xEDI)|(1<<xESP)|(1<<xEBP));
-                STR_IMM9(x1, xEmu, offsetof(x86emu_t, ip));
-                CALL(arm_singlestep, -1, 0);
-                BFC(xFlags, F_TF, 1);   // should not be needed
-            }
             break;
         case 0x9E:
             INST_NAME("SAHF");
@@ -1289,14 +1284,12 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             u32 = F32;
             MOV32(x2, u32);
             STRB_IMM9(xEAX, x2, 0);
-            SMWRITE();
             break;
         case 0xA3:
             INST_NAME("MOV Od, EAX");
             u32 = F32;
             MOV32(x2, u32);
             STR_IMM9(xEAX, x2, 0);
-            SMWRITE();
             break;
         case 0xA4:
             INST_NAME("MOVSB");
@@ -1529,7 +1522,7 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     u8 = F8;
                     MOVW(x2, u8);
                     CALL_(rcl32, ed, (1<<x14));
-                    WBACK;
+                    WBACK;  // no SBACK here because ret value is ed directly
                     break;
                 case 3:
                     INST_NAME("RCR Ed, Ib");
@@ -1560,13 +1553,13 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                             BFC_COND(cCC, xFlags, F_CF, 1);
 
                         }
-                        WBACK;
+                        WBACK;  // no SBACK here because ed has been used all along and not x1
                     } else if(u8>1) {
                         MESSAGE(LOG_DUMP, "Need Optimization RCR\n");
                         SETFLAGS(X_OF|X_CF, SF_SET);
                         MOVW(x2, u8);
                         CALL_(rcr32, ed, (1<<x14));
-                        WBACK;
+                        WBACK;  // no SBACK here because ret value is ed directly
                     }
                     break;
                 case 4:
@@ -1640,7 +1633,7 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 u8 = F8;
                 MOVW(x3, u8);
                 STRB_IMM9(x3, ed, fixedaddress);
-                SMWRITELOCK(lock);
+                if(lock) {DMB_ISH();}
             }
             break;
         case 0xC7:
@@ -1655,7 +1648,7 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 i32 = F32S;
                 MOV32(x3, i32);
                 STR_IMM9(x3, ed, fixedaddress);
-                SMWRITELOCK(lock);
+                if(lock) {DMB_ISH();}
             }
             break;
 
@@ -1674,7 +1667,6 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 if((PK(0)==0) && (PK(1)==0) && (PK(2)==0) && (PK(3)==0))
                 {
                     addr+=4;
-                    SKIPTEST(x14);
                     MESSAGE(LOG_DEBUG, "Exit x86 Emu\n");
                     MOV32(x14, ip+1+2);
                     STM(xEmu, (1<<xEAX)|(1<<xEBX)|(1<<xECX)|(1<<xEDX)|(1<<xESI)|(1<<xEDI)|(1<<xESP)|(1<<xEBP)|(1<<xEIP)|(1<<xFlags));
@@ -1684,7 +1676,6 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     *need_epilog = 1;
                 } else {
                     MESSAGE(LOG_DUMP, "Native Call to %s\n", GetNativeName(GetNativeFnc(ip)));
-                    SKIPTEST(x14);
                     x87_forget(dyn, ninst, x3, x14, 0);
                     if((box86_log<2) && !cycle_log) {   // call the wrapper directly
                         uintptr_t ncall[2]; // to avoid BUSERROR!!!
@@ -1728,11 +1719,9 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             break;
         case 0xCD:
             SETFLAGS(X_ALL, SF_SET);    // Hack, set all flags (to an unknown state...)
-            SKIPTEST(x14);
-            SMEND();
-            u8 = F8;
-            if(u8==0x80) {
+            if(PK(0)==0x80) {
                 INST_NAME("Syscall");
+                u8 = F8;
                 BARRIER(BARRIER_FLOAT);
                 MOV32(xEIP, ip+2);
                 STM(xEmu, (1<<xEAX)|(1<<xEBX)|(1<<xECX)|(1<<xEDX)|(1<<xESI)|(1<<xEDI)|(1<<xESP)|(1<<xEBP)|(1<<xEIP)|(1<<xFlags));
@@ -1748,11 +1737,7 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 jump_to_epilog(dyn, 0, xEIP, ninst);
             } else {
                 INST_NAME("INT Ib");
-                if(box86_wine && u8==0x2D) {
-                    MESSAGE(LOG_DEBUG, "Hack for wine/int 2d\n");
-                } else {
-                    DEFAULT;
-                }
+                DEFAULT;
             }
             break;
 
@@ -1899,7 +1884,7 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     MOVW(x2, 1);
                     GETEDW(x14, x1);
                     CALL_(rcl32, ed, (1<<x14));
-                    WBACK;
+                    WBACK;  // no SBACK here because ret value is ed directly
                     break;
                 case 3:
                     INST_NAME("RCR Ed, 1");
@@ -2009,7 +1994,7 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     AND_IMM8(x2, xECX, 0x1f);
                     GETEDW(x14, x1);
                     CALL_(rcl32, ed, (1<<x14));
-                    WBACK;
+                    WBACK;  // no SBACK here because ret value is ed directly
                     break;
                 case 3:
                     INST_NAME("RCR Ed, CL");
@@ -2019,7 +2004,7 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     AND_IMM8(x2, xECX, 0x1f);
                     GETEDW(x14, x1);
                     CALL_(rcr32, ed, (1<<x14));
-                    WBACK;
+                    WBACK;  // no SBACK here because ret value is ed directly
                     break;
                 case 4:
                 case 6:
@@ -2080,7 +2065,6 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
         case 0xD7:
             INST_NAME("XLAT");
             UBFX(x1, xEAX, 0, 8);    // x1 = AL
-            SMREAD();
             LDRB_REG_LSL_IMM5(x1, xEBX, x1, 0); //x1 = byte ptr[EBX+AL]
             BFI(xEAX, x1, 0, 8);
             break;
@@ -2176,8 +2160,8 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 tmp = dyn->insts[ninst].pass2choice = 1;
             else if ((getProtection(u32)&PROT_READ) && (PKa(u32+0)==0x8B) && (((PKa(u32+1))&0xC7)==0x04) && (PKa(u32+2)==0x24) && (PKa(u32+3)==0xC3))
                 tmp = dyn->insts[ninst].pass2choice = 2;
-            else if(isNativeCall(dyn, u32, &dyn->insts[ninst].natcall, &dyn->insts[ninst].retn))
-                tmp = dyn->insts[ninst].pass2choice = 3;
+            /*else if(isNativeCall(dyn, u32, &dyn->insts[ninst].natcall, &dyn->insts[ninst].retn))
+                tmp = dyn->insts[ninst].pass2choice = 3;*/
             else 
                 tmp = dyn->insts[ninst].pass2choice = 0;
             #else
@@ -2187,19 +2171,18 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 case 1:
                     //SETFLAGS(X_ALL, SF_SET);    // Hack to set flags to "dont'care" state
                     MESSAGE(LOG_DUMP, "Hack for Call 0\n");
-                    SKIPTEST(x14);
                     MOV32(xEIP, addr);
                     PUSH1(xEIP);
                     break;
                 case 2:
                     //SETFLAGS(X_ALL, SF_SET);    // Hack to set flags to "dont'care" state
                     MESSAGE(LOG_DUMP, "Hack for Call x86.get_pc_thunk.reg\n");
-                    SKIPTEST(x14);
                     u8 = PK(i32+1);
                     gd = xEAX+((u8&0x38)>>3);
                     MOV32(gd, addr);
                     break;
-                case 3:
+                // disabling this to avoid fetching data outside current block (in case this part changed, this block will not been marck as dirty)
+                /*case 3:
                     SETFLAGS(X_ALL, SF_SET);    // Hack to set flags to "dont'care" state
                     BARRIER(BARRIER_FULL);
                     BARRIER_NEXT(BARRIER_FULL);
@@ -2207,10 +2190,7 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     PUSH1(x2);
                     MESSAGE(LOG_DUMP, "Native Call to %s (retn=%d)\n", GetNativeName(GetNativeFnc(dyn->insts[ninst].natcall-1)), dyn->insts[ninst].retn);
                     // calling a native function
-                    if(isRetX87Wrapper(*(wrapper_t*)(dyn->insts[ninst].natcall+2))) {
-                        // return value will be on the stack, so the stack depth needs to be updated
-                        x87_purgecache(dyn, ninst, 0, x3, x14, x1);
-                    }
+                    x87_forget(dyn, ninst, x3, x14, 0);
                     if((box86_log<2) && !cycle_log && dyn->insts[ninst].natcall) {   // call the wrapper directly
                         uintptr_t ncall[2];
                         memcpy(ncall,  (void*)(dyn->insts[ninst].natcall+2), 2*sizeof(void*));   // the wrapper + function
@@ -2241,22 +2221,16 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     B_NEXT(cNE);    // not quitting, so lets continue
                     MARK;
                     jump_to_epilog(dyn, 0, xEIP, ninst);
-                    break;
+                    break;*/
                 default:
                     if((box86_dynarec_safeflags>1) || (ninst && dyn->insts[ninst-1].x86.set_flags)) {
                         READFLAGS(X_PEND);  // that's suspicious
                     } else {
-                        SETFLAGS(X_ALL, SF_SET);    // Hack to set flags to "dont'care" state
+                        //SETFLAGS(X_ALL, SF_SET);    // Hack to set flags to "dont'care" state
                     }
                     // regular call
+                    BARRIER(BARRIER_FLOAT);
                     //BARRIER_NEXT(BARRIER_FULL);
-                    if(/*box86_dynarec_callret &&*/ box86_dynarec_bigblock>1) {
-                        BARRIER(BARRIER_FULL);
-                    } else {
-                        BARRIER(BARRIER_FLOAT);
-                        *need_epilog = 0;
-                        *ok = 0;
-                    }
                     *need_epilog = 0;
                     *ok = 0;
                     MOV32(x2, addr);
@@ -2280,11 +2254,11 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 INST_NAME("JMP Ib");
                 i32 = F8S;
             }
-            JUMP((uintptr_t)getAlternate((void*)(addr+i32)), 0);
+            JUMP(addr+i32, 0);
             if(dyn->insts[ninst].x86.jmp_insts==-1) {
                 // out of the block
                 fpu_purgecache(dyn, ninst, 1, x1, x2, x3);
-                jump_to_next(dyn, (uintptr_t)getAlternate((void*)(addr+i32)), 0, ninst);
+                jump_to_next(dyn, addr+i32, 0, ninst);
             } else {
                 // inside the block
                 CacheTransform(dyn, ninst, CHECK_CACHE(), x1, x2, x3);
@@ -2299,19 +2273,9 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             *ok = 0;
             break;
         
-        case 0xEC:                      /* IN AL, DX */
-        case 0xED:                      /* IN EAX, DX */
-        case 0xEE:                      /* OUT DX, AL */
-        case 0xEF:                      /* OUT DX, EAX */
-            INST_NAME(opcode==0xEC?"IN AL, DX":(opcode==0xED?"IN EAX, DX":(opcode==0xEE?"OUT DX? AL":"OUT DX, EAX")));
-            SETFLAGS(X_ALL, SF_SET);    // Hack to set flags in "don't care" state
-            STM(xEmu, (1<<xEAX)|(1<<xECX)|(1<<xEDX)|(1<<xEBX)|(1<<xESP)|(1<<xEBP)|(1<<xESI)|(1<<xEDI)|(1<<xFlags));
-            STR_IMM9(xEIP, xEmu, offsetof(x86emu_t, ip));
-            CALL(arm_priv, -1, 0);
-            LDR_IMM9(xEIP, xEmu, offsetof(x86emu_t, ip));
-            jump_to_epilog(dyn, 0, xEIP, ninst);
-            *need_epilog = 0;
-            *ok = 0;
+        case 0xEE:
+            INST_NAME("OUT dx, al");
+            //ignored!
             break;
 
         case 0xF0:
@@ -2802,16 +2766,13 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             ORRS_IMM8(xFlags, xFlags, 1, 0);
             break;
         case 0xFA:
+            INST_NAME("CLI");
+            BFC(xFlags, F_IF, 1);
+            break;
         case 0xFB:
-            INST_NAME(opcode==0xFA?"STI":"CLI");
-            SETFLAGS(X_ALL, SF_SET);    // Hack to set flags in "don't care" state
-            STM(xEmu, (1<<xEAX)|(1<<xECX)|(1<<xEDX)|(1<<xEBX)|(1<<xESP)|(1<<xEBP)|(1<<xESI)|(1<<xEDI)|(1<<xFlags));
-            STR_IMM9(xEIP, xEmu, offsetof(x86emu_t, ip));
-            CALL(arm_priv, -1, 0);
-            LDR_IMM9(xEIP, xEmu, offsetof(x86emu_t, ip));
-            jump_to_epilog(dyn, 0, xEIP, ninst);
-            *need_epilog = 0;
-            *ok = 0;
+            INST_NAME("STI");
+            MOVW(x1, 1);
+            BFI(xFlags, x1, F_IF, 1);
             break;
         case 0xFC:
             INST_NAME("CLD");
@@ -2864,13 +2825,10 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     break;
                 case 2: // CALL Ed
                     INST_NAME("CALL Ed");
-                    PASS2IF((box86_dynarec_safeflags>1) ||
-                        ((ninst && dyn->insts[ninst-1].x86.set_flags)
-                        || ((ninst>1) && dyn->insts[ninst-2].x86.set_flags)), 1)
-                    {
+                    PASS2IF((box86_dynarec_safeflags>1) || (ninst && dyn->insts[ninst-1].x86.set_flags), 1) {
                         READFLAGS(X_PEND);          // that's suspicious
                     } else {
-                        SETFLAGS(X_ALL, SF_SET);    //Hack to put flag in "don't care" state
+                        //SETFLAGS(X_ALL, SF_SET);    //Hack to put flag in "don't care" state
                     }
                     GETEDH(xEIP);
                     BARRIER(BARRIER_FLOAT);
@@ -2883,8 +2841,7 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     break;
                 case 4: // JMP Ed
                     INST_NAME("JMP Ed");
-                    READFLAGS(X_PEND);
-                    BARRIER(BARRIER_FLOAT);
+                    BARRIER(BARRIER_FULL);
                     GETEDH(xEIP);
                     jump_to_next(dyn, 0, ed, ninst);
                     *need_epilog = 0;

src/dynarec/dynarec_arm_0f.c

@@ -31,7 +31,6 @@
     if((nextop&0xC0)==0xC0) { \
         a = sse_get_reg(dyn, ninst, x1, nextop&7, w); \
     } else {    \
-        SMREAD(); \
         addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL); \
         a = fpu_get_scratch_quad(dyn); \
         VLD1Q_64(a, ed);    \
@@ -43,7 +42,6 @@
     if((nextop&0xC0)==0xC0) { \
         a = mmx_get_reg(dyn, ninst, x1, x2, x3, nextop&7); \
     } else {    \
-        SMREAD(); \
         addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL); \
         a = fpu_get_scratch_double(dyn); \
         VLD1_64(a, ed);    \
@@ -51,7 +49,6 @@
 #define PUTEM(a)    \
     if((nextop&0xC0)!=0xC0) { \
         VST1_64(a, ed);    \
-        SMWRITE2(); \
     }
 
 uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst, int* ok, int* need_epilog)
@@ -90,7 +87,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             INST_NAME("UD2");
             SETFLAGS(X_ALL, SF_SET);    // Hack to set flags in "don't care" state
             //CALL(arm_ud, -1, 0);
-            SKIPTEST(x14);
             UDF(0);
             break;
 
@@ -116,7 +112,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 v0 = sse_get_reg_empty(dyn, ninst, x1, gd);
                 VMOVQ(v0, v1);
             } else {
-                SMREAD();
                 v0 = sse_get_reg_empty(dyn, ninst, x1, gd);
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-12, 0, 0, NULL);
                 //LDRD also have alignment requirements
@@ -145,7 +140,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 VMOVfrV_D(x2, x3, v0+1);
                 STR_IMM9(x2, ed, fixedaddress+8);
                 STR_IMM9(x3, ed, fixedaddress+12);
-                SMWRITE2();
             }
             break;
         case 0x12:
@@ -158,7 +152,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             } else {
                 INST_NAME("MOVLPS Gx,Ex");
                 GETGX(v0, 1);
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-4, 0, 0, NULL);
                 LDR_IMM9(x2, ed, fixedaddress);
                 LDR_IMM9(x3, ed, fixedaddress+4);
@@ -177,13 +170,12 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 if(parity) {
                     addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                     VST1_32(v0, ed);  // better to use VST1 than VSTR_64, to avoid NEON->VFPU transfert I assume
-                    SMWRITE2();
+
                 } else {
                     VMOVfrV_D(x2, x3, v0);
                     addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-4, 0, 0, NULL);
                     STR_IMM9(x2, ed, fixedaddress);
                     STR_IMM9(x3, ed, fixedaddress+4);
-                    SMWRITE2();
                 }
             }
             break;
@@ -220,7 +212,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             } else {
                 INST_NAME("MOVHPS Gx,Ex");
                 GETGX(v0, 1);
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                 VLD1_64(v0+1, ed);
             }
@@ -237,13 +228,12 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 if(parity) {
                     addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                     VST1_64(v0+1, ed);  // better to use VST1 than VSTR_64, to avoid NEON->VFPU transfert I assume
-                    SMWRITE2();
+
                 } else {
                     VMOVfrV_D(x2, x3, v0+1);
                     addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-4, 0, 0, NULL);
                     STR_IMM9(x2, ed, fixedaddress);
                     STR_IMM9(x3, ed, fixedaddress+4);
-                    SMWRITE2();
                 }
             }
             break;
@@ -288,7 +278,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 VMOVQ(v0, v1);
             } else {
                 v0 = sse_get_reg_empty(dyn, ninst, x1, gd);
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                 VLD1Q_32(v0, ed);
             }
@@ -304,7 +293,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             } else {
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                 VST1Q_32(v0, ed);
-                SMWRITE2();
             }
             break;
         case 0x2A:
@@ -315,7 +303,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             if((nextop&0xC0)==0xC0) {
                 v1 = mmx_get_reg(dyn, ninst, x1, x2, x3, nextop&7);
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                 v1 = fpu_get_scratch_double(dyn);
                 VLD1_32(v1, ed);
@@ -343,7 +330,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             if((nextop&0xC0)==0xC0) {
                 v1 = sse_get_reg(dyn, ninst, x1, nextop&7, 0);
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                 v1 = fpu_get_scratch_double(dyn);
                 VLD1_32(v1, ed);
@@ -358,7 +344,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             if((nextop&0xC0)==0xC0) {
                 v1 = sse_get_reg(dyn, ninst, x1, nextop&7, 0);
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                 v1 = fpu_get_scratch_double(dyn);
                 VLD1_32(v1, ed);
@@ -398,7 +383,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 }
                 s0 = d0*2;
             } else {
-                SMREAD();
                 parity = getedparity(dyn, ninst, addr, nextop, 2);
                 s0 = fpu_get_scratch_single(dyn);
                 if(parity) {
@@ -422,7 +406,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
         case 0x31:
             INST_NAME("RDTSC");
             MESSAGE(LOG_DUMP, "Need Optimization\n");
-            SKIPTEST(x14);
             CALL(ReadTSC, xEAX, 0);   // will return the u64 in x1:xEAX
             MOV_REG(xEDX, x1);
             break;
@@ -469,7 +452,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     if((nextop&0xC0)==0xC0) {   // reg <= reg
                         REV(gd, xEAX+(nextop&7));
                     } else {                    // mem <= reg
-                        SMREAD();
                         addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 4095, 0, 0, NULL);
                         LDR_IMM9(gd, ed, fixedaddress);
                         REV(gd, gd);
@@ -485,7 +467,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                         addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 4095, 0, 0, NULL);
                         REV(x1, gd);
                         STR_IMM9(gd, ed, fixedaddress);
-                        SMWRITE();
                     }
                     break;
 
@@ -527,7 +508,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 ed = xEAX+(nextop&7);   \
                 MOV_REG_COND(YES, gd, ed); \
             } else { \
-                SMREAD(); \
                 addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 4095, 0, 0, NULL);    \
                 LDR_IMM9_COND(YES, gd, ed, fixedaddress); \
             }
@@ -640,7 +620,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 BFI(gd, x3, 3, 1);
             } else {
                 // EX is memory
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4096-16, 0, 0, NULL);
                 LDR_IMM9(x2, ed, fixedaddress+0);
                 UBFX(x3, x2, 31, 1);
@@ -658,7 +637,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             break;
         case 0x51:
             INST_NAME("SQRTPS Gx, Ex");
-            SKIPTEST(x1);
             nextop = F8;
             GETEX(q0, 0);
             gd = (nextop&0x38)>>3;
@@ -698,42 +676,19 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             break;
         case 0x52:
             INST_NAME("RSQRTPS Gx, Ex");
-            SKIPTEST(x1);
             nextop = F8;
             GETEX(q0, 0);
             gd = (nextop&0x38)>>3;
-            q1 = sse_get_reg_empty(dyn, ninst, x1, gd);
-            v0 = fpu_get_scratch_quad(dyn);
-            if(q1==q0 || !box86_dynarec_fastnan)
-                v1 = fpu_get_scratch_quad(dyn);
-            else
-                v1 = q1;
+            v0 = sse_get_reg_empty(dyn, ninst, x1, gd);
             VRSQRTEQ_F32(v0, q0);
-            VMULQ_F32(v1, v0, q0);
-            VRSQRTSQ_F32(v1, v1, v0);
-            VMULQ_F32(q1, v1, v0);
-            if(!box86_dynarec_fastnan) {
-                VCEQQ_F32(v1, q1, q1);  // 00 is nan
-                VANDQ(q1, q1, v1);  // if nan, remove
-                VBICQ(v0, v0, v1);  // if nan, keep
-                VORRQ(q1, q1, v0);
-            }
             break;
         case 0x53:
             INST_NAME("RCPPS Gx, Ex");
-            SKIPTEST(x1);
             nextop = F8;
             GETEX(q0, 0);
             gd = (nextop&0x38)>>3;
-            q1 = sse_get_reg_empty(dyn, ninst, x1, gd);
-            if(q0 == q1)
-                v1 = fpu_get_scratch_quad(dyn);
-            else
-                v1 = q1;
-            v0 = fpu_get_scratch_quad(dyn);
+            v0 = sse_get_reg_empty(dyn, ninst, x1, gd);
             VRECPEQ_F32(v0, q0);
-            VRECPSQ_F32(v1, v0, q0);
-            VMULQ_F32(q1, v0, v1);
             break;
         case 0x54:
             INST_NAME("ANDPS Gx, Ex");
@@ -817,23 +772,7 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             nextop = F8;
             GETGX(v0, 1);
             GETEX(v1, 0);
-            // VMIN/VMAX wll put default NaN if any input is NaN
-            // but x86 will copy if either v0[x] or v1[x] is NaN, so lets force a copy if source is NaN
-            if(!box86_dynarec_fastnan) {
-                if(v0==v1) {
-                    q1 = fpu_get_scratch_quad(dyn);
-                    VMOVQ(q1, v1);
-                } else
-                    q1 = v1;
-            }
             VMINQ_F32(v0, v0, v1);
-            if(!box86_dynarec_fastnan) {
-                q0 = fpu_get_scratch_quad(dyn);
-                VCEQQ_F32(q0, v0, v0);   // 0 is NaN, -1 is not NaN
-                VANDQ(v0, v0, q0);
-                VBICQ(q0, q1, q0);
-                VORRQ(v0, v0, q0);
-            }
             break;
         case 0x5E:
             INST_NAME("DIVPS Gx, Ex");
@@ -857,23 +796,7 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             nextop = F8;
             GETGX(v0, 1);
             GETEX(v1, 0);
-            // VMIN/VMAX wll put default NaN if any input is NaN
-            // but x86 will copy if either v0[x] or v1[x] is NaN, so lets force a copy if source is NaN
-            if(!box86_dynarec_fastnan) {
-                if(v0==v1) {
-                    q1 = fpu_get_scratch_quad(dyn);
-                    VMOVQ(q1, v1);
-                } else
-                    q1 = v1;
-            }
             VMAXQ_F32(v0, v0, v1);
-            if(!box86_dynarec_fastnan) {
-                q0 = fpu_get_scratch_quad(dyn);
-                VCEQQ_F32(q0, v0, v0);   // 0 is NaN, -1 is not NaN
-                VANDQ(v0, v0, q0);
-                VBICQ(q0, q1, q0);
-                VORRQ(v0, v0, q0);
-            }
             break;
         case 0x60:
             INST_NAME("PUNPCKLBW Gm,Em");
@@ -1082,7 +1005,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     if((nextop&0xC0)==0xC0) {
                         d0 = mmx_get_reg(dyn, ninst, x1, x2, x3, nextop&7);
                     } else {
-                        SMREAD();
                         addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                         d0 = fpu_get_scratch_quad(dyn);
                         VLD1_16(d0, ed);
@@ -1096,7 +1018,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                         }
                         if((nextop&0xC0)!=0xC0) {
                             VST1_16(d0, ed);
-                            SMWRITE2();
                         }
                     }
                     break;
@@ -1105,7 +1026,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     if((nextop&0xC0)==0xC0) {
                         d0 = mmx_get_reg(dyn, ninst, x1, x2, x3, nextop&7);
                     } else {
-                        SMREAD();
                         addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                         d0 = fpu_get_scratch_quad(dyn);
                         VLD1_16(d0, ed);
@@ -1116,7 +1036,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     }
                     if((nextop&0xC0)!=0xC0) {
                         VST1_16(d0, ed);
-                        SMWRITE2();
                     }
                     break;
                 case 6:
@@ -1124,7 +1043,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     if((nextop&0xC0)==0xC0) {
                         d0 = mmx_get_reg(dyn, ninst, x1, x2, x3, nextop&7);
                     } else {
-                        SMREAD();
                         addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                         d0 = fpu_get_scratch_quad(dyn);
                         VLD1_16(d0, ed);
@@ -1138,7 +1056,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                         }
                         if((nextop&0xC0)!=0xC0) {
                             VST1_16(d0, ed);
-                            SMWRITE2();
                         }
                     }
                     break;
@@ -1148,7 +1065,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             break;
         case 0x72:
             nextop = F8;
-            SMREAD();
             GETEM(v0);
             switch((nextop>>3)&7) {
                 case 2:
@@ -1190,7 +1106,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
         case 0x73:
             nextop = F8;
             GETEM(v0);
-            SMREAD();
             switch((nextop>>3)&7) {
                 case 2:
                     INST_NAME("PSRLQ Em, Ib");
@@ -1256,7 +1171,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 VMOVfrDx_32(x2, v0, 0); // there can be some bus error is storing the VFPU reg directly
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095, 0, 0, NULL);
                 STR_IMM9(x2, ed, fixedaddress);
-                SMWRITE2();
             }
             break;
         case 0x7F:
@@ -1271,13 +1185,11 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 if(parity) {
                     addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0, NULL);
                     VSTR_64(v0, ed, fixedaddress);
-                    SMWRITE2();
                 } else {
                     VMOVfrV_D(x2, x3, v0);
                     addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-4, 0, 0, NULL);
                     STR_IMM9(x2, ed, fixedaddress);
                     STR_IMM9(x3, ed, fixedaddress+4);
-                    SMWRITE2();
                 }
             }
             break;
@@ -1395,7 +1307,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 , cNE, cEQ, X_SF|X_OF|X_ZF)
             break;
         #undef GO
-
         #define GO(GETFLAGS, NO, YES, F)    \
             READFLAGS(F);                   \
             GETFLAGS;   \
@@ -1410,8 +1321,8 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             } else {                \
                 addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 4095, 0, 0, NULL);\
                 STRB_IMM9(x3, ed, fixedaddress);   \
-                SMWRITE();          \
             }
+
         case 0x90:
             INST_NAME("SETO Eb");
             GO( TSTS_IMM8_ROR(xFlags, 0b10, 0x0b)
@@ -1532,7 +1443,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             if((nextop&0xC0)==0xC0) {
                 ed = xEAX+(nextop&7);
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x3, &fixedaddress, 4095, 0, 0, NULL);
                 MOV_REG_ASR_IMM5(x1, gd, 5);    // r1 = (gd>>5);
                 ADD_REG_LSL_IMM5(x1, ed, x1, 2); //(&ed)+=r1*4;
@@ -1589,7 +1499,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 ed = xEAX+(nextop&7);
                 wback = 0;
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 4095, 0, 0, NULL);
                 MOV_REG_ASR_IMM5(x1, gd, 5);    // r1 = (gd>>5);
                 ADD_REG_LSL_IMM5(x3, wback, x1, 2); //(&ed)+=r1*4;
@@ -1608,7 +1517,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             ORR_REG_LSL_REG(ed, ed, x14, x2);
             if(wback) {
                 STR_IMM9(ed, wback, fixedaddress);
-                SMWRITE();
             }
             break;
         case 0xAC:
@@ -1636,15 +1544,15 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             // xFENCE -> DMB is approximative, but should be good enough
             if((nextop&0xF8)==0xE8) {
                 INST_NAME("LFENCE");
-                SMDMB();
+                DMB_ISH();
             } else
             if((nextop&0xF8)==0xF0) {
                 INST_NAME("MFENCE");
-                SMDMB();
+                DMB_ISH();
             } else
             if((nextop&0xF8)==0xF8) {
                 INST_NAME("SFENCE");
-                SMDMB();
+                DMB_ISH();
             } else {
                 switch((nextop>>3)&7) {
                     case 0:
@@ -1676,12 +1584,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                         INST_NAME("LDMXCSR Md");
                         GETED;
                         STR_IMM9(ed, xEmu, offsetof(x86emu_t, mxcsr));
-                        if(box86_sse_flushto0) {
-                            VMRS(x14);                      // get fpscr
-                            MOV_REG_LSR_IMM5(x3, ed, 15);   // get FZ bit
-                            BFI(x14, x3, 24, 1);            // inject FZ bit
-                            VMSR(x14);                      // put new fpscr
-                        }
                         break;
                     case 3:
                         INST_NAME("STMXCSR Md");
@@ -1698,20 +1600,7 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                         INST_NAME("XRSTOR Ed (not implemented");
                         FAKEED;
                         SETFLAGS(X_ALL, SF_SET);    // Hack to set flags in "don't care" state
-                        STM(xEmu, (1<<xEAX)|(1<<xECX)|(1<<xEDX)|(1<<xEBX)|(1<<xESP)|(1<<xEBP)|(1<<xESI)|(1<<xEDI)|(1<<xFlags));
-                        STR_IMM9(xEIP, xEmu, offsetof(x86emu_t, ip));
                         CALL(arm_ud, -1, 0);
-                        LDR_IMM9(xEIP, xEmu, offsetof(x86emu_t, ip));
-                        jump_to_epilog(dyn, 0, xEIP, ninst);
-                        *need_epilog = 0;
-                        *ok = 0;
-                        break;
-                    case 7:
-                        INST_NAME("CLFLUSH Ed");
-                        MESSAGE(LOG_DUMP, "Need Optimization?\n");
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
-                        if(ed!=x1) {MOV_REG(x1, ed);}
-                        CALL_(arm_clflush, -1, 0);
                         break;
                     default:
                         DEFAULT;
@@ -1785,7 +1674,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 ed = xEAX+(nextop&7);
                 wback = 0;
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 4095, 0, 0, NULL);
                 MOV_REG_ASR_IMM5(x1, gd, 5);    // r1 = (gd>>5);
                 ADD_REG_LSL_IMM5(x3, wback, x1, 2); //(&ed)+=r1*4;
@@ -1804,7 +1692,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             XOR_REG_LSL_REG(ed, ed, x14, x2);
             if(wback) {
                 STR_IMM9(ed, wback, fixedaddress);
-                SMWRITE();
             }
             MARK3;
             break;
@@ -1819,7 +1706,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 eb2 = (ed&4)>>2;    // L or H
                 UXTB(gd, eb1, eb2);
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 4095, 0, 0, NULL);
                 LDRB_IMM9(gd, ed, fixedaddress);
             }
@@ -1832,7 +1718,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 ed = xEAX+(nextop&7);
                 UXTH(gd, ed, 0);
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0, NULL);
                 LDRH_IMM8(gd, ed, fixedaddress);
             }
@@ -1849,7 +1734,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     if((nextop&0xC0)==0xC0) {
                         ed = xEAX+(nextop&7);
                     } else {
-                        SMREAD();
                         addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 4095, 0, 0, NULL);
                         LDR_IMM9(x1, wback, fixedaddress);
                         ed = x1;
@@ -1870,7 +1754,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                         ed = xEAX+(nextop&7);
                         wback = 0;
                     } else {
-                        SMREAD();
                         addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 4095, 0, 0, NULL);
                         LDR_IMM9(x1, wback, fixedaddress);
                         ed = x1;
@@ -1891,7 +1774,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     XOR_REG_LSL_IMM5(ed, ed, x14, u8);
                     if(wback) {
                         STR_IMM9(ed, wback, fixedaddress);
-                        SMWRITE();
                     }
                     break;
                 case 6:
@@ -1902,7 +1784,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                         ed = xEAX+(nextop&7);
                         wback = 0;
                     } else {
-                        SMREAD();
                         addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 4095, 0, 0, NULL);
                         LDR_IMM9(x1, wback, fixedaddress);
                         ed = x1;
@@ -1923,7 +1804,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     XOR_REG_LSL_IMM5(ed, ed, x14, u8);
                     if(wback) {
                         STR_IMM9(ed, wback, fixedaddress);
-                        SMWRITE();
                     }
                     break;
                 case 7:
@@ -1934,7 +1814,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                         ed = xEAX+(nextop&7);
                         wback = 0;
                     } else {
-                        SMREAD();
                         addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 4095, 0, 0, NULL);
                         LDR_IMM9(x1, wback, fixedaddress);
                         ed = x1;
@@ -1956,7 +1835,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     XOR_REG_LSL_IMM5(ed, ed, x14, u8);
                     if(wback) {
                         STR_IMM9(ed, wback, fixedaddress);
-                        SMWRITE();
                     }
                     MARK3;
                     break;
@@ -1974,7 +1852,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 ed = xEAX+(nextop&7);
                 wback = 0;
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 4095, 0, 0, NULL);
                 MOV_REG_ASR_IMM5(x1, gd, 5);    // r1 = (gd>>5);
                 ADD_REG_LSL_IMM5(x3, wback, x1, 2); //(&ed)+=r1*4;
@@ -1991,7 +1868,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             XOR_REG_LSL_REG(ed, ed, x14, x2);
             if(wback) {
                 STR_IMM9(ed, wback, fixedaddress);
-                SMWRITE();
             }
             break;
         case 0xBC:
@@ -2048,7 +1924,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 eb2 = (ed&4)>>2;    // L or H
                 SXTB(gd, eb1, eb2);
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0, NULL);
                 LDRSB_IMM8(gd, ed, fixedaddress);
             }
@@ -2061,7 +1936,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 ed = xEAX+(nextop&7);
                 SXTH(gd, ed, 0);
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0, NULL);
                 LDRSH_IMM8(gd, ed, fixedaddress);
             }
@@ -2082,11 +1956,12 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             nextop = F8;
             GETGD;
             GETED;
-            MOV_REG(x1, gd);
             if(gd!=ed) {
-                MOV_REG(gd, ed);
+                XOR_REG_LSL_IMM5(gd, gd, ed, 0);    // swap gd, ed
+                XOR_REG_LSL_IMM5(ed, gd, ed, 0);
+                XOR_REG_LSL_IMM5(gd, gd, ed, 0);
             }
-            emit_add32(dyn, ninst, ed, x1, x3, x14);
+            emit_add32(dyn, ninst, ed, gd, x3, x14);
             WBACK;
             break;
         case 0xC2:
@@ -2141,7 +2016,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 ed = xEAX+(nextop&7);
                 VMOVtoDx_16(d0, u8, ed);
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0, NULL);
                 u8 = (F8)&3;
                 VLD1LANE_16(d0, wback, u8);
@@ -2156,7 +2030,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 u8 = (F8)&3;
                 VMOVfrDx_U16(gd, d0, u8);
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255-8, 0, 0, NULL);
                 u8 = (F8)&3;
                 LDRH_IMM8(gd, wback, fixedaddress+u8*2);
@@ -2170,7 +2043,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             GETGX(v0, 1);
             v2 = fpu_get_scratch_double(dyn);
             if((nextop&0xC0)!=0xC0) {
-                SMREAD();
                 // from memory
                 addr = geted(dyn, addr, ninst, nextop, &wback, x1, &fixedaddress, 0, 0, 0, NULL);
                 u8 = F8;
@@ -2322,7 +2194,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 case 1:
                     INST_NAME("CMPXCHG8B Gq, Eq");
                     SETFLAGS(X_ZF, SF_SUBSET);
-                    SMREAD();
                     addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 4095-4, 0, 0, NULL);
                     LDR_IMM9(x1, wback, fixedaddress+0);
                     LDR_IMM9(x2, wback, fixedaddress+4);
@@ -2340,7 +2211,6 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     MOVW(x1, 0);
                     MARK3;
                     BFI(xFlags, x1, F_ZF, 1);
-                    SMWRITE();
                     break;
                 default:
                     DEFAULT;

src/dynarec/dynarec_arm_64.c

@@ -103,7 +103,6 @@ uintptr_t dynarecFS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     } else {
                         addr = geted16(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0);
                         STRH_REG(gd, x14, ed);
-                        SMWRITE2();
                     }
                     break;
 
@@ -115,7 +114,6 @@ uintptr_t dynarecFS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     if((nextop&0xC0)==0xC0) {   // reg <= reg
                         MOV_REG(gd, xEAX+(nextop&7));
                     } else {                    // mem <= reg
-                        SMREAD();
                         addr = geted16(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0);
                         LDR_REG_LSL_IMM5(gd, ed, x14, 0);
                     }
@@ -131,7 +129,6 @@ uintptr_t dynarecFS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                         addr = geted16(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0);
                         POP1(x2);
                         STR_REG_LSL_IMM5(x2, x1, x14, 0);
-                        SMWRITE2();
                     }
                     break;
 
@@ -143,7 +140,6 @@ uintptr_t dynarecFS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                         MOV32(x2, u32);
                         ADD_REG_LSL_IMM5(x1, x1, x2, 0);
                     }
-                    SMREAD();
                     LDR_IMM9(xEAX, x1, 0);
                     break;
 
@@ -156,7 +152,6 @@ uintptr_t dynarecFS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                         ADD_REG_LSL_IMM5(x1, x1, x2, 0);
                     }
                     STR_IMM9(xEAX, x1, 0);
-                    SMWRITE2();
                     break;
 
                 case 0xFF:
@@ -168,7 +163,6 @@ uintptr_t dynarecFS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                             if((nextop&0xC0)==0xC0) {   // reg
                                 DEFAULT;
                             } else {                    // mem <= i32
-                                SMREAD();
                                 addr = geted16(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0);
                                 LDR_REG_LSL_IMM5(x3, ed, x14, 0);
                                 PUSH1(x3);
@@ -193,7 +187,6 @@ uintptr_t dynarecFS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             } else {                    // mem <= reg
                 addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0, NULL);
                 STR_REG_LSL_IMM5(gd, ed, x14, 0);
-                SMWRITE2();
             }
             break;
 
@@ -205,7 +198,6 @@ uintptr_t dynarecFS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             if((nextop&0xC0)==0xC0) {   // reg <= reg
                 MOV_REG(gd, xEAX+(nextop&7));
             } else {                    // mem <= reg
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0, NULL);
                 LDR_REG_LSL_IMM5(gd, ed, x14, 0);
             }
@@ -221,7 +213,6 @@ uintptr_t dynarecFS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                 POP1(x2);
                 STR_REG_LSL_IMM5(x2, ed, x14, 0);
-                SMWRITE2();
             }
             break;
 
@@ -233,7 +224,6 @@ uintptr_t dynarecFS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 LDRB_IMM9(xEAX, x1, i32);
             } else {
                 MOV32(x2, i32);
-                SMREAD();
                 LDRB_REG_LSL_IMM5(xEAX, x1, x2, 0);
             }
             break;
@@ -245,7 +235,6 @@ uintptr_t dynarecFS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 LDR_IMM9(xEAX, x1, i32);
             } else {
                 MOV32(x2, i32);
-                SMREAD();
                 LDR_REG_LSL_IMM5(xEAX, x1, x2, 0);
             }
             break;
@@ -258,7 +247,6 @@ uintptr_t dynarecFS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             } else {
                 MOV32(x2, i32);
                 STRB_REG_LSL_IMM5(xEAX, x1, x2, 0);
-                SMWRITE2();
             }
             break;
         case 0xA3:
@@ -267,11 +255,9 @@ uintptr_t dynarecFS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             i32 = F32S;
             if(i32>-4096 && i32<4096) {
                 STR_IMM9(xEAX, x1, i32);
-                SMWRITE2();
             } else {
                 MOV32(x2, i32);
                 STR_REG_LSL_IMM5(xEAX, x2, x1, 0);
-                SMWRITE2();
             }
             break;
 
@@ -297,7 +283,6 @@ uintptr_t dynarecFS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 i32 = F32S;
                 MOV32(x3, i32);
                 STR_REG_LSL_IMM5(x3, ed, x14, 0);
-                SMWRITE2();
             }
             break;
             
@@ -313,10 +298,7 @@ uintptr_t dynarecFS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             switch((nextop>>3)&7) {
                 case 2: // CALL Ed
                     INST_NAME("CALL FS:Ed");
-                    PASS2IF((box86_dynarec_safeflags>1) ||
-                        ((ninst && dyn->insts[ninst-1].x86.set_flags)
-                        || ((ninst>1) && dyn->insts[ninst-2].x86.set_flags)), 1)
-                    {
+                    PASS2IF(ninst && dyn->insts[ninst-1].x86.set_flags, 1) {
                         READFLAGS(X_PEND);          // that's suspicious
                     } else {
                         SETFLAGS(X_ALL, SF_SET);    //Hack to put flag in "don't care" state
@@ -339,7 +321,6 @@ uintptr_t dynarecFS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     if((nextop&0xC0)==0xC0) {   // reg
                         DEFAULT;
                     } else {                    // mem <= i32
-                        SMREAD();
                         addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0, NULL);
                         LDR_REG_LSL_IMM5(x3, ed, x14, 0);
                         PUSH1(x3);

src/dynarec/dynarec_arm_65.c

@@ -50,7 +50,7 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             GETGD;
             GETEDO2(x14);
             emit_add32(dyn, ninst, ed, gd, x3, x14);
-            WBACK2;
+            WBACK;
             break;
 
         case 0x03:
@@ -97,7 +97,7 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             GETGD;
             GETEDO2(x14);
             emit_and32(dyn, ninst, ed, gd, x3, x14);
-            WBACK2;
+            WBACK;
             break;
 
         case 0x23:
@@ -118,7 +118,7 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             GETGD;
             GETEDO2(x14);
             emit_sub32(dyn, ninst, ed, gd, x3, x14);
-            WBACK2;
+            WBACK;
             break;
 
         case 0x2B:
@@ -139,7 +139,7 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             GETGD;
             GETEDO2(x14);
             emit_xor32(dyn, ninst, gd, ed, x3, x14);
-            WBACK2;
+            WBACK;
             break;
 
         case 0x33:
@@ -202,7 +202,7 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     GETEBO(x1);
                     u8 = F8;
                     emit_add8c(dyn, ninst, x1, u8, x2, x14);
-                    EBBACK2;
+                    EBBACK;
                     break;
                 case 1: //OR
                     INST_NAME("OR GS:Eb, Ib");
@@ -211,7 +211,7 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     GETEBO(x1);
                     u8 = F8;
                     emit_or8c(dyn, ninst, x1, u8, x2, x14);
-                    EBBACK2;
+                    EBBACK;
                     break;
                 case 2: //ADC
                     INST_NAME("ADC GS:Eb, Ib");
@@ -221,7 +221,7 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     GETEBO(x1);
                     u8 = F8;
                     emit_adc8c(dyn, ninst, x1, u8, x2, x14);
-                    EBBACK2;
+                    EBBACK;
                     break;
                 case 3: //SBB
                     INST_NAME("SBB GS:Eb, Ib");
@@ -231,7 +231,7 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     GETEBO(x1);
                     u8 = F8;
                     emit_sbb8c(dyn, ninst, x1, u8, x2, x14);
-                    EBBACK2;
+                    EBBACK;
                     break;
                 case 4: //AND
                     INST_NAME("AND GS:Eb, Ib");
@@ -240,7 +240,7 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     GETEBO(x1);
                     u8 = F8;
                     emit_and8c(dyn, ninst, x1, u8, x2, x14);
-                    EBBACK2;
+                    EBBACK;
                     break;
                 case 5: //SUB
                     INST_NAME("SUB GS:Eb, Ib");
@@ -249,7 +249,7 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     GETEBO(x1);
                     u8 = F8;
                     emit_sub8c(dyn, ninst, x1, u8, x2, x14);
-                    EBBACK2;
+                    EBBACK;
                     break;
                 case 6: //XOR
                     INST_NAME("XOR GS:Eb, Ib");
@@ -258,7 +258,7 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     GETEBO(x1);
                     u8 = F8;
                     emit_xor8c(dyn, ninst, x1, u8, x2, x14);
-                    EBBACK2;
+                    EBBACK;
                     break;
                 case 7: //CMP
                     INST_NAME("CMP GS:Eb, Ib");
@@ -290,7 +290,7 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     GETEDO2(x14);
                     if(opcode==0x81) i32 = F32S; else i32 = F8S;
                     emit_add32c(dyn, ninst, ed, i32, x3, x14);
-                    WBACK2;
+                    WBACK;
                     break;
                 case 1: //OR
                     if(opcode==0x81) {INST_NAME("OR Ed, Id");} else {INST_NAME("OR Ed, Ib");}
@@ -299,7 +299,7 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     GETEDO2(x14);
                     if(opcode==0x81) i32 = F32S; else i32 = F8S;
                     emit_or32c(dyn, ninst, ed, i32, x3, x14);
-                    WBACK2;
+                    WBACK;
                     break;
                 case 2: //ADC
                     if(opcode==0x81) {INST_NAME("ADC Ed, Id");} else {INST_NAME("ADC Ed, Ib");}
@@ -309,7 +309,7 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     GETEDO2(x14);
                     if(opcode==0x81) i32 = F32S; else i32 = F8S;
                     emit_adc32c(dyn, ninst, ed, i32, x3, x14);
-                    WBACK2;
+                    WBACK;
                     break;
                 case 3: //SBB
                     if(opcode==0x81) {INST_NAME("SBB Ed, Id");} else {INST_NAME("SBB Ed, Ib");}
@@ -319,7 +319,7 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     GETEDO2(x14);
                     if(opcode==0x81) i32 = F32S; else i32 = F8S;
                     emit_sbb32c(dyn, ninst, ed, i32, x3, x14);
-                    WBACK2;
+                    WBACK;
                     break;
                 case 4: //AND
                     if(opcode==0x81) {INST_NAME("AND Ed, Id");} else {INST_NAME("AND Ed, Ib");}
@@ -328,7 +328,7 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     GETEDO2(x14);
                     if(opcode==0x81) i32 = F32S; else i32 = F8S;
                     emit_and32c(dyn, ninst, ed, i32, x3, x14);
-                    WBACK2;
+                    WBACK;
                     break;
                 case 5: //SUB
                     if(opcode==0x81) {INST_NAME("SUB Ed, Id");} else {INST_NAME("SUB Ed, Ib");}
@@ -337,7 +337,7 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     GETEDO2(x14);
                     if(opcode==0x81) i32 = F32S; else i32 = F8S;
                     emit_sub32c(dyn, ninst, ed, i32, x3, x14);
-                    WBACK2;
+                    WBACK;
                     break;
                 case 6: //XOR
                     if(opcode==0x81) {INST_NAME("XOR Ed, Id");} else {INST_NAME("XOR Ed, Ib");}
@@ -346,7 +346,7 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     GETEDO2(x14);
                     if(opcode==0x81) i32 = F32S; else i32 = F8S;
                     emit_xor32c(dyn, ninst, ed, i32, x3, x14);
-                    WBACK2;
+                    WBACK;
                     break;
                 case 7: //CMP
                     if(opcode==0x81) {INST_NAME("CMP Ed, Id");} else {INST_NAME("CMP Ed, Ib");}
@@ -374,7 +374,6 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             } else {                    // mem <= reg
                 addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0, NULL);
                 STR_REG_LSL_IMM5(gd, ed, x14, 0);
-                SMWRITE2();
             }
             break;
 
@@ -386,7 +385,6 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             if((nextop&0xC0)==0xC0) {   // reg <= reg
                 MOV_REG(gd, xEAX+(nextop&7));
             } else {                    // mem <= reg
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0, NULL);
                 LDR_REG_LSL_IMM5(gd, ed, x14, 0);
             }
@@ -402,7 +400,6 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                 POP1(x2);
                 STR_REG_LSL_IMM5(x2, ed, x14, 0);
-                SMWRITE2();
             }
             break;
 
@@ -410,7 +407,6 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             INST_NAME("MOV EAX, GS:Id");
             grab_tlsdata(dyn, addr, ninst, x1);
             i32 = F32S;
-            SMREAD();
             if(i32>-4096 && i32<4096) {
                 LDR_IMM9(xEAX, x1, i32);
             } else {
@@ -420,16 +416,6 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             }
             break;
 
-        case 0xA2:
-            INST_NAME("MOV GS:Od, AL");
-            grab_tlsdata(dyn, addr, ninst, x1);
-            u32 = F32;
-            MOV32(x2, u32);
-            ADD_REG_LSL_IMM5(x2, x1, x2, 0);
-            STRB_IMM9(xEAX, x2, 0);
-            SMWRITE2();
-            break;
-
         case 0xA3:
             INST_NAME("MOV GS:Od, EAX");
             grab_tlsdata(dyn, addr, ninst, x1);
@@ -437,7 +423,6 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             MOV32(x2, u32);
             ADD_REG_LSL_IMM5(x2, x1, x2, 0);
             STR_IMM9(xEAX, x2, 0);
-            SMWRITE2();
             break;
 
         case 0xC6:
@@ -456,7 +441,6 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 u8 = F8;
                 MOVW(x3, u8);
                 STRB_REG_LSL_IMM5(x3, ed, x14, 0);
-                SMWRITE2();
             }
             break;
         case 0xC7:
@@ -472,7 +456,6 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 i32 = F32S;
                 MOV32(x3, i32);
                 STR_REG_LSL_IMM5(x3, ed, x14, 0);
-                SMWRITE2();
             }
             break;
 
@@ -485,14 +468,14 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     SETFLAGS(X_OF|X_CF, SF_SUBSET_PENDING);
                     GETEDO2(x14);
                     emit_rol32c(dyn, ninst, ed, 1, x3, x14);
-                    WBACK2;
+                    WBACK;
                     break;
                 case 1:
                     INST_NAME("ROR Ed, 1");
                     SETFLAGS(X_OF|X_CF, SF_SUBSET_PENDING);
                     GETEDO2(x14);
                     emit_ror32c(dyn, ninst, ed, 1, x3, x14);
-                    WBACK2;
+                    WBACK;
                     break;
                 case 2:
                     INST_NAME("RCL Ed, 1");
@@ -501,9 +484,10 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     SETFLAGS(X_OF|X_CF, SF_SET);
                     MOVW(x2, 1);
                     GETEDO2(x14);
+                    wb = ed;
                     if(ed!=x1) {MOV_REG(x1, ed); wb = x1;}
-                    CALL_(rcl32, ed, (1<<x2));
-                    WBACK2;
+                    CALL_(rcl32, ed, (1<<x14));
+                    SBACK(wb);
                     break;
                 case 3:
                     INST_NAME("RCR Ed, 1");
@@ -511,9 +495,10 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     READFLAGS(X_CF);
                     SETFLAGS(X_OF|X_CF, SF_SET);
                     MOVW(x2, 1);
+                    wb = ed;
                     if(ed!=x1) {MOV_REG(x1, ed); wb = x1;}
-                    CALL_(rcr32, ed, (1<<x2));
-                    WBACK2;
+                    CALL_(rcr32, ed, (1<<x14));
+                    SBACK(wb);
                     break;
                 case 4:
                 case 6:
@@ -521,21 +506,21 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     SETFLAGS(X_ALL, SF_SET_PENDING);    // some flags are left undefined
                     GETEDO2(x14);
                     emit_shl32c(dyn, ninst, ed, 1, x3, x14);
-                    WBACK2;
+                    WBACK;
                     break;
                 case 5:
                     INST_NAME("SHR Ed, 1");
                     SETFLAGS(X_ALL, SF_SET_PENDING);    // some flags are left undefined
                     GETEDO2(x14);
                     emit_shr32c(dyn, ninst, ed, 1, x3, x14);
-                    WBACK2;
+                    WBACK;
                     break;
                 case 7:
                     INST_NAME("SAR Ed, 1");
                     SETFLAGS(X_ALL, SF_SET_PENDING);    // some flags are left undefined
                     GETEDO2(x14);
                     emit_sar32c(dyn, ninst, ed, 1, x3, x14);
-                    WBACK2;
+                    WBACK;
                     break;
             }
             break;
@@ -552,7 +537,7 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     RSB_IMM8(x3, x3, 0x20);
                     GETEDO2(x14);
                     MOV_REG_ROR_REG(ed, ed, x3);
-                    WBACK2;
+                    WBACK;
                     UFLAG_IF {  // calculate flags directly
                         CMPS_IMM8(x3, 31);
                         B_MARK(cNE);
@@ -573,7 +558,7 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     B_MARK2(cEQ);
                     GETEDO2(x14);
                     MOV_REG_ROR_REG(ed, ed, x3);
-                    WBACK2;
+                    WBACK;
                     UFLAG_IF {  // calculate flags directly
                         CMPS_IMM8(x3, 1);
                         B_MARK(cNE);
@@ -593,9 +578,10 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     READFLAGS(X_CF);
                     SETFLAGS(X_OF|X_CF, SF_SET);
                     AND_IMM8(x2, xECX, 0x1f);
+                    wb = ed;
                     if(ed!=x1) {MOV_REG(x1, ed); wb = x1;}
-                    CALL_(rcl32, ed, (1<<x2));
-                    WBACK2;
+                    CALL_(rcl32, ed, (1<<x14));
+                    SBACK(wb);
                     break;
                 case 3:
                     INST_NAME("RCR Ed, CL");
@@ -603,9 +589,10 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     READFLAGS(X_CF);
                     SETFLAGS(X_OF|X_CF, SF_SET);
                     AND_IMM8(x2, xECX, 0x1f);
+                    wb = ed;
                     if(ed!=x1) {MOV_REG(x1, ed); wb = x1;}
                     CALL_(rcr32, ed, (1<<x14));
-                    WBACK2;
+                    SBACK(wb);
                     break;
                 case 4:
                 case 6:
@@ -614,7 +601,7 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     AND_IMM8(x3, xECX, 0x1f);
                     GETEDO2(x14);
                     emit_shl32(dyn, ninst, ed, x3, x3, x14);
-                    WBACK2;
+                    WBACK;
                     break;
                 case 5:
                     INST_NAME("SHR Ed, CL");
@@ -622,7 +609,7 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     AND_IMM8(x3, xECX, 0x1f);
                     GETEDO2(x14);
                     emit_shr32(dyn, ninst, ed, x3, x3, x14);
-                    WBACK2;
+                    WBACK;
                     break;
                 case 7:
                     INST_NAME("SAR Ed, CL");
@@ -631,7 +618,7 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     GETEDO2(x14);
                     UFLAG_OP12(ed, x3);
                     MOV_REG_ASR_REG(ed, ed, x3);
-                    WBACK2;
+                    WBACK;
                     UFLAG_RES(ed);
                     UFLAG_DF(x3, d_sar32);
                     break;
@@ -653,7 +640,6 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     if((nextop&0xC0)==0xC0) {   // reg
                         DEFAULT;
                     } else {                    // mem <= i32
-                        SMREAD();
                         addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0, NULL);
                         LDR_REG_LSL_IMM5(x3, ed, x14, 0);
                         PUSH1(x3);

src/dynarec/dynarec_arm_66.c

@@ -505,7 +505,7 @@ uintptr_t dynarec66(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             break;
 
         case 0x87:
-            INST_NAME("(LOCK) XCHG Ew, Gw");
+            INST_NAME("XCHG Ew, Gw");
             nextop = F8;
             if((nextop&0xC0)==0xC0) {
                 GETGD;
@@ -518,7 +518,6 @@ uintptr_t dynarec66(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             } else {
                 GETGD;
                 UXTH(x14, gd, 0);
-                SMDMB();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0, LOCK_LOCK);
                 #if 0
                 MARKLOCK;
@@ -532,7 +531,6 @@ uintptr_t dynarec66(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 LDRH_IMM8(x1, ed, fixedaddress);
                 STRH_IMM8(x14, ed, fixedaddress);
                 #endif
-                SMDMB();
                 BFI(gd, x1, 0, 16);
             }
             break;
@@ -549,7 +547,7 @@ uintptr_t dynarec66(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             } else {
                 addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0, &lock);
                 STRH_IMM8(gd, ed, fixedaddress);
-                SMWRITELOCK(lock);
+                if(lock) {DMB_ISH();}
             }
             break;
         case 0x8B:
@@ -563,7 +561,7 @@ uintptr_t dynarec66(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 }
             } else {
                 addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0, &lock);
-                SMREADLOCK(lock);
+                if(lock) {DMB_ISH();}
                 LDRH_IMM8(x1, ed, fixedaddress);
                 BFI(gd, x1, 0, 16);
             }
@@ -579,7 +577,6 @@ uintptr_t dynarec66(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             } else {
                 addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0, NULL);
                 STRH_IMM8(x1, ed, fixedaddress);
-                SMWRITE2();
             }
             break;
 
@@ -591,7 +588,6 @@ uintptr_t dynarec66(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 MOV32(x2, offsetof(x86emu_t, segs[(nextop&0x38)>>3]));
                 STRH_REG(ed, xEmu, x2);
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0, NULL);
                 LDRH_IMM8(x1, ed, fixedaddress);
                 MOV32(x2, offsetof(x86emu_t, segs[(nextop&0x38)>>3]));
@@ -649,7 +645,6 @@ uintptr_t dynarec66(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             INST_NAME("MOV, AX, Od");
             u32 = F32;
             MOV32(x2, u32);
-            SMREAD();
             LDRH_IMM8(x2, x2, 0);
             BFI(xEAX, x2, 0, 16);
             break;
@@ -658,7 +653,6 @@ uintptr_t dynarec66(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             u32 = F32;
             MOV32(x2, u32);
             STRH_IMM8(xEAX, x2, 0);
-            SMWRITE();
             break;
         case 0xA5:
             INST_NAME("MOVSW");

src/dynarec/dynarec_arm_660f.c

@@ -27,10 +27,9 @@
     if((nextop&0xC0)==0xC0) {   \
         a = sse_get_reg(dyn, ninst, x1, nextop&7, w);  \
     } else {                    \
-        SMREAD();               \
         addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL); \
         a = fpu_get_scratch_quad(dyn); \
-        VLD1Q_8(a, ed);         \
+        VLD1Q_8(a, ed);       \
     }
 #define GETGX(a, w)         \
     gd = (nextop&0x38)>>3;  \
@@ -71,7 +70,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                 v0 = sse_get_reg_empty(dyn, ninst, x1, gd);
                 VMOVQ(v0, v1);
             } else {
-                SMREAD();
                 v0 = sse_get_reg_empty(dyn, ninst, x1, gd);
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-12, 0, 0, NULL);
                 LDR_IMM9(x2, ed, fixedaddress+0);
@@ -98,7 +96,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                 VMOVfrV_D(x2, x3, v0+1);
                 STR_IMM9(x2, ed, fixedaddress+8);
                 STR_IMM9(x3, ed, fixedaddress+12);
-                SMWRITE2();
             }
             break;
         case 0x12:
@@ -111,7 +108,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                 return addr;
             }
             parity = getedparity(dyn, ninst, addr, nextop, 3);
-            SMREAD();
             if(parity) {
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0, NULL);
                 VLDR_64(v0, ed, fixedaddress);
@@ -141,7 +137,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                 STR_IMM9(x2, ed, fixedaddress);
                 STR_IMM9(x3, ed, fixedaddress+4);
             }
-            SMWRITE2();
             break;
         case 0x14:
             INST_NAME("UNPCKLPD Gx, Ex");
@@ -151,7 +146,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                 v1 = sse_get_reg(dyn, ninst, x1, nextop&7, 0);
                 VMOVD(v0+1, v1);
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0, NULL);
                 VLDR_64(v0+1, ed, fixedaddress);
             }
@@ -165,7 +159,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                 v1 = sse_get_reg(dyn, ninst, x1, nextop&7, 0);
                 VMOVD(v0+1, v1+1);
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023-4, 3, 0, NULL);
                 VLDR_64(v0+1, ed, fixedaddress+4);
             }
@@ -180,7 +173,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                 return addr;
             }
             parity = getedparity(dyn, ninst, addr, nextop, 3);
-            SMREAD();
             if(parity) {
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0, NULL);
                 VLDR_64(v0+1, ed, fixedaddress);    // vfpu opcode here
@@ -210,7 +202,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                 STR_IMM9(x2, ed, fixedaddress);
                 STR_IMM9(x3, ed, fixedaddress+4);
             }
-            SMWRITE2();
             break;
 
         case 0x1F:
@@ -230,8 +221,7 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
             } else {
                 v0 = sse_get_reg_empty(dyn, ninst, x1, gd);
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
-                VLD1Q_64(v0, ed);
-                SMWRITE2();
+                VLD1Q_32(v0, ed);
             }
             break;
         case 0x29:
@@ -244,24 +234,7 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                 VMOVQ(v1, v0);
             } else {
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
-                VST1Q_64(v0, ed);
-                SMWRITE2();
-            }
-            break;
-
-
-        case 0x2B:
-            INST_NAME("MOVNTPD Ex, Gx");
-            nextop = F8;
-            gd = (nextop&0x38)>>3;
-            v0 = sse_get_reg(dyn, ninst, x1, gd, 0);
-            if((nextop&0xC0)==0xC0) {
-                v1 = sse_get_reg_empty(dyn, ninst, x1, nextop&7);
-                VMOVQ(v1, v0);
-            } else {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
-                VST1Q_64(v0, ed);
-                SMWRITE2();
+                VST1Q_32(v0, ed);
             }
             break;
 
@@ -289,7 +262,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                     if((nextop&0xC0)==0xC0) {
                         v0 = sse_get_reg(dyn, ninst, x1, nextop&7, 0);
                     } else {
-                        SMREAD();
                         addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                         VLD1Q_64(q1, ed);
                         v0 = q1;
@@ -497,7 +469,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
             if((nextop&0xC0)==0xC0) {   \
                 ed = xEAX+(nextop&7);   \
             } else { \
-                SMREAD(); \
                 addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0, NULL);\
                 LDRH_IMM8_COND(YES, x1, ed, fixedaddress); \
                 ed = x1;                        \
@@ -716,26 +687,8 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
             nextop = F8;
             GETGX(v0, 1);
             GETEX(v1, 0);
-            if(v0>15)
-                q0 = fpu_get_scratch_quad(dyn);
-            else
-                q0 = v0;
-            if(v1>15) {
-                q1 = fpu_get_scratch_quad(dyn);
-                VMOVQ(q1, v1);
-            } else
-                q1 = v1;
-            // need rounding!
-            //VCVTQ_S32_F32(v0, v1);
-            u8 = sse_setround(dyn, ninst, x1, x2, x14);
-            VCVTR_S32_F32(q0*2+0, q1*2+0);
-            VCVTR_S32_F32(q0*2+1, q1*2+1);
-            VCVTR_S32_F32(q0*2+2, q1*2+2);
-            VCVTR_S32_F32(q0*2+3, q1*2+3);
-            if(q0!=v0) {
-                VMOVQ(v0, q0);
-            }
-            x87_restoreround(dyn, ninst, u8);
+            // need rounding?
+            VCVTQ_S32_F32(v0, v1);
             break;
         case 0x5C:
             INST_NAME("SUBPD Gx, Ex");
@@ -940,7 +893,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                 v1 = sse_get_reg(dyn, ninst, x1, nextop&7, 0);
                 VMOVD(v0+1, v1);
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0, NULL);
                 VLDR_64(v0+1, ed, fixedaddress);
             }
@@ -954,7 +906,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                 q1 = sse_get_reg(dyn, ninst, x1, nextop&7, 0);
                 VMOVD(q0+1, q1+1);
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023-8, 3, 0, NULL);
                 VLDR_64(q0+1, ed, fixedaddress+8);
             }
@@ -977,7 +928,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                 v0 = sse_get_reg_empty(dyn, ninst, x1, gd);
                 VMOVQ(v0, v1);
             } else {
-                SMREAD();
                 v0 = sse_get_reg_empty(dyn, ninst, x1, gd);
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                 VLD1Q_64(v0, ed);
@@ -1093,7 +1043,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                     VMOVQ(v0, q0);
                 }
             } else {
-                SMREAD();
                 v0 = sse_get_reg_empty(dyn, ninst, x1, gd);
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                 u8 = F8;
@@ -1122,7 +1071,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                     if((nextop&0xC0)==0xC0) {
                         q0 = sse_get_reg(dyn, ninst, x1, nextop&7, 1);
                     } else {
-                        SMREAD();
                         addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                         q0 = fpu_get_scratch_quad(dyn);
                         VLD1Q_16(q0, ed);
@@ -1136,7 +1084,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                         }
                         if((nextop&0xC0)!=0xC0) {
                             VST1Q_16(q0, ed);
-                            SMWRITE2();
                         }
                     }
                     break;
@@ -1145,7 +1092,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                     if((nextop&0xC0)==0xC0) {
                         q0 = sse_get_reg(dyn, ninst, x1, nextop&7, 1);
                     } else {
-                        SMREAD();
                         addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                         q0 = fpu_get_scratch_quad(dyn);
                         VLD1Q_16(q0, ed);
@@ -1156,7 +1102,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                     }
                     if((nextop&0xC0)!=0xC0) {
                         VST1Q_16(q0, ed);
-                        SMWRITE2();
                     }
                     break;
                 case 6:
@@ -1164,7 +1109,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                     if((nextop&0xC0)==0xC0) {
                         q0 = sse_get_reg(dyn, ninst, x1, nextop&7, 1);
                     } else {
-                        SMREAD();
                         addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                         q0 = fpu_get_scratch_quad(dyn);
                         VLD1Q_16(q0, ed);
@@ -1178,7 +1122,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                         }
                         if((nextop&0xC0)!=0xC0) {
                             VST1Q_16(q0, ed);
-                            SMWRITE2();
                         }
                     }
                     break;
@@ -1195,7 +1138,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                     if((nextop&0xC0)==0xC0) {
                         q0 = sse_get_reg(dyn, ninst, x1, nextop&7, 1);
                     } else {
-                        SMREAD();
                         addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                         q0 = fpu_get_scratch_quad(dyn);
                         VLD1Q_32(q0, ed);
@@ -1209,7 +1151,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                         }
                         if((nextop&0xC0)!=0xC0) {
                             VST1Q_32(q0, ed);
-                            SMWRITE2();
                         }
                     }
                     break;
@@ -1218,7 +1159,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                     if((nextop&0xC0)==0xC0) {
                         q0 = sse_get_reg(dyn, ninst, x1, nextop&7, 1);
                     } else {
-                        SMREAD();
                         addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                         q0 = fpu_get_scratch_quad(dyn);
                         VLD1Q_32(q0, ed);
@@ -1229,7 +1169,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                     }
                     if((nextop&0xC0)!=0xC0) {
                         VST1Q_32(q0, ed);
-                        SMWRITE2();
                     }
                     break;
                 case 6:
@@ -1237,7 +1176,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                     if((nextop&0xC0)==0xC0) {
                         q0 = sse_get_reg(dyn, ninst, x1, nextop&7, 1);
                     } else {
-                        SMREAD();
                         addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                         q0 = fpu_get_scratch_quad(dyn);
                         VLD1Q_32(q0, ed);
@@ -1251,7 +1189,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                         }
                         if((nextop&0xC0)!=0xC0) {
                             VST1Q_32(q0, ed);
-                            SMWRITE2();
                         }
                     }
                     break;
@@ -1267,7 +1204,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                     if((nextop&0xC0)==0xC0) {
                         q0 = sse_get_reg(dyn, ninst, x1, nextop&7, 1);
                     } else {
-                        SMREAD();
                         addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                         q0 = fpu_get_scratch_quad(dyn);
                         VLD1Q_64(q0, ed);
@@ -1281,7 +1217,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                         }
                         if((nextop&0xC0)!=0xC0) {
                             VST1Q_64(q0, ed);
-                            SMWRITE2();
                         }
                     }
                     break;
@@ -1290,7 +1225,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                     if((nextop&0xC0)==0xC0) {
                         q0 = sse_get_reg(dyn, ninst, x1, nextop&7, 1);
                     } else {
-                        SMREAD();
                         addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                         q0 = fpu_get_scratch_quad(dyn);
                         VLD1Q_64(q0, ed);
@@ -1306,7 +1240,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                         }
                         if((nextop&0xC0)!=0xC0) {
                             VST1Q_64(q0, ed);
-                            SMWRITE2();
                         }
                     }
                     break;
@@ -1315,7 +1248,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                     if((nextop&0xC0)==0xC0) {
                         q0 = sse_get_reg(dyn, ninst, x1, nextop&7, 1);
                     } else {
-                        SMREAD();
                         addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                         q0 = fpu_get_scratch_quad(dyn);
                         VLD1Q_64(q0, ed);
@@ -1329,7 +1261,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                         }
                         if((nextop&0xC0)!=0xC0) {
                             VST1Q_64(q0, ed);
-                            SMWRITE2();
                         }
                     }
                     break;
@@ -1338,7 +1269,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                     if((nextop&0xC0)==0xC0) {
                         q0 = sse_get_reg(dyn, ninst, x1, nextop&7, 1);
                     } else {
-                        SMREAD();
                         addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                         q0 = fpu_get_scratch_quad(dyn);
                         VLD1Q_64(q0, ed);
@@ -1354,7 +1284,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                         }
                         if((nextop&0xC0)!=0xC0) {
                             VST1Q_64(q0, ed);
-                            SMWRITE2();
                         }
                     }
                     break;
@@ -1396,7 +1325,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                 VMOVfrDx_32(x2, v0, 0); // to avoid Bus Error, using regular store
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095, 0, 0, NULL);
                 STR_IMM9(x2, ed, fixedaddress);
-                SMWRITE2();
             }
             break;
         case 0x7F:
@@ -1409,7 +1337,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
             } else {
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                 VST1Q_32(v0, ed);
-                SMWRITE2();
             }
             break;
 
@@ -1422,7 +1349,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
             if((nextop&0xC0)==0xC0) {
                 ed = xEAX+(nextop&7);   // no need for extract
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x3, &fixedaddress, 255, 0, 0, NULL);
                 SBFX(x1, gd, 4, 12);    // r1 = (gw>>4);
                 ADD_REG_LSL_IMM5(x1, ed, x1, 1); //(&ed)+=r1*2;
@@ -1465,7 +1391,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                 ed = xEAX+(nextop&7);
                 wback = 0;   // no need for extract
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255, 0, 0, NULL);
                 SBFX(x14, gd, 4, 12);    // r14 = (gw>>4);
                 ADD_REG_LSL_IMM5(x3, wback, x14, 1); //(&ew)+=r14*2;
@@ -1482,7 +1407,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
             ORR_REG_LSL_REG(ed, ed, x1, x2);
             if(wback) {
                 STRH_IMM8(ed, wback, fixedaddress);
-                SMWRITE();
             }
             break;
         case 0xAC:
@@ -1535,7 +1459,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                 ed = xEAX+(nextop&7);
                 wback = 0;   // no need for extract
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255, 0, 0, NULL);
                 SBFX(x14, gd, 4, 12);    // r14 = (gw>>4);
                 ADD_REG_LSL_IMM5(x3, wback, x14, 1); //(&ew)+=r14*2;
@@ -1552,7 +1475,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
             XOR_REG_LSL_REG(ed, ed, x1, x2);
             if(wback) {
                 STRH_IMM8(ed, wback, fixedaddress);
-                SMWRITE();
             }
             break;
 
@@ -1566,7 +1488,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                 eb2 = (ed&4)>>2;    // L or H
                 UXTB(x1, eb1, eb2);
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 4095, 0, 0, NULL);
                 LDRB_IMM9(x1, ed, fixedaddress);
             }
@@ -1580,7 +1501,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                 ed = xEAX + (nextop&7);
                 UXTH(x1, ed, 0);
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0, NULL);
                 LDRH_IMM8(x1, ed, fixedaddress);
             }
@@ -1597,7 +1517,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                     if((nextop&0xC0)==0xC0) {
                         ed = xEAX+(nextop&7);
                     } else {
-                        SMREAD();
                         addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255, 0, 0, NULL);
                         LDRH_IMM8(x1, wback, fixedaddress);
                         ed = x1;
@@ -1618,7 +1537,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                         ed = xEAX+(nextop&7);
                         wback = 0;
                     } else {
-                        SMREAD();
                         addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255, 0, 0, NULL);
                         LDRH_IMM8(x1, wback, fixedaddress);
                         ed = x1;
@@ -1637,7 +1555,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                     XOR_REG_LSL_IMM5(ed, ed, x14, u8);
                     if(wback) {
                         STRH_IMM8(ed, wback, fixedaddress);
-                        SMWRITE();
                     }
                     MARK3;
                     break;
@@ -1649,7 +1566,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                         ed = xEAX+(nextop&7);
                         wback = 0;
                     } else {
-                        SMREAD();
                         addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255, 0, 0, NULL);
                         LDRH_IMM8(x1, wback, fixedaddress);
                         ed = x1;
@@ -1668,7 +1584,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                     XOR_REG_LSL_IMM5(ed, ed, x14, u8);
                     if(wback) {
                         STRH_IMM8(ed, wback, fixedaddress);
-                        SMWRITE();
                     }
                     MARK3;
                     break;
@@ -1680,7 +1595,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                         ed = xEAX+(nextop&7);
                         wback = 0;
                     } else {
-                        SMREAD();
                         addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255, 0, 0, NULL);
                         LDRH_IMM8(x1, wback, fixedaddress);
                         ed = x1;
@@ -1698,7 +1612,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                     XOR_REG_LSL_IMM5(ed, ed, x14, u8);
                     if(wback) {
                         STRH_IMM8(ed, wback, fixedaddress);
-                        SMWRITE();
                     }
                     MARK3;
                     break;
@@ -1716,7 +1629,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                 ed = xEAX+(nextop&7);
                 wback = 0;   // no need for extract
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255, 0, 0, NULL);
                 SBFX(x14, gd, 4, 12);    // r14 = (gw>>4);
                 ADD_REG_LSL_IMM5(x3, wback, x14, 1); //(&ew)+=r14*2;
@@ -1731,7 +1643,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
             XOR_REG_LSL_REG(ed, ed, x1, x2);
             if(wback) {
                 STRH_IMM8(ed, wback, fixedaddress);
-                SMWRITE();
             }
             break;
         case 0xBC:
@@ -1777,7 +1688,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                 eb2 = (ed&4)>>2;    // L or H
                 SXTB(x1, eb1, eb2);
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0, NULL);
                 LDRSB_IMM8(x1, ed, fixedaddress);
             }
@@ -1849,7 +1759,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                 ed = xEAX+(nextop&7);
                 VMOVtoDx_16(v0+(u8/4), u8&3, ed);
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0, NULL);
                 u8 = (F8)&7;
                 VLD1LANE_16(v0+(u8/4), wback, u8&3);
@@ -1864,7 +1773,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                 u8 = (F8)&7;
                 VMOVfrDx_U16(gd, v0+(u8/4), (u8&3));
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255-14, 0, 0, NULL);
                 u8 = (F8)&7;
                 LDRH_IMM8(gd, wback, fixedaddress+u8*2);
@@ -1922,11 +1830,8 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
             GETGX(q0, 1);
             GETEX(q1, 0);
             v0 = fpu_get_scratch_quad(dyn);
-            VQMOVN_S64(v0, q1);
-            VQMOVN_S32(v0, v0);
-            VQMOVN_S16(v0, v0);
-            VDUPQ_8(v0, v0, 0); // only 8 bits are taken
-            VNEGNQ_8(v0, v0);   // because we want SHR and not SHL
+            VDUPQ_16(v0, q1, 0);
+            VNEGNQ_16(v0, v0);   // because we want SHR and not SHL
             VSHLQ_U16(q0, q0, v0);
             break;
         case 0xD2:
@@ -1935,11 +1840,11 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
             GETGX(q0, 1);
             GETEX(q1, 0);
             v0 = fpu_get_scratch_quad(dyn);
-            VQMOVN_S64(v0, q1);
-            VQMOVN_S32(v0, v0);
-            VQMOVN_S16(v0, v0);
-            VDUPQ_8(v0, v0, 0); // only 8 bits are taken
-            VNEGNQ_8(v0, v0);   // because we want SHR and not SHL
+            VMOVD(v0, q1);
+            VMOVD(v0+1, q1);
+            VQMOVN_S64(v0, v0); // 2*q1 in 32bits now
+            VNEGN_32(v0, v0);   // because we want SHR and not SHL
+            VMOVD(v0+1, v0);
             VSHLQ_U32(q0, q0, v0);
             break;
         case 0xD3:
@@ -1948,11 +1853,11 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
             GETGX(q0, 1);
             GETEX(q1, 0);
             v0 = fpu_get_scratch_quad(dyn);
-            VQMOVN_S64(v0, q1);
-            VQMOVN_S32(v0, v0);
-            VQMOVN_S16(v0, v0);
-            VDUPQ_8(v0, v0, 0); // only 8 bits are taken
-            VNEGNQ_8(v0, v0);   // because we want SHR and not SHL
+            VMOVD(v0, q1);
+            VMOVD(v0+1, q1);
+            VQMOVN_S64(v0, v0); // 2*q1 in 32bits now
+            VNEGN_32(v0, v0);   // because we want SHR and not SHL
+            VMOVL_S32(v0, v0);  // 2*q1 in 64 bits now
             VSHLQ_U64(q0, q0, v0);
             break;
         case 0xD4:
@@ -1989,7 +1894,6 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                     STR_IMM9(x2, ed, fixedaddress+0);
                     STR_IMM9(x3, ed, fixedaddress+4);
                 }
-                SMWRITE2();
             }
             break;
         case 0xD7:
@@ -2095,11 +1999,13 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
             GETGX(q0, 1);
             GETEX(q1, 0);
             v0 = fpu_get_scratch_quad(dyn);
-            VQMOVN_S64(v0, q1);
-            VQMOVN_S32(v0, v0);
-            VQMOVN_S16(v0, v0);
-            VDUPQ_8(v0, v0, 0); // only 8 bits are taken
-            VNEGNQ_8(v0, v0);   // because we want SHR and not SHL
+            VMOVD(v0, q1);
+            VMOVD(v0+1, q1);
+            VQMOVN_S64(v0, v0); // 2*q1 in 32bits now
+            VMOVD(v0+1, v0);
+            VQMOVN_S32(v0, v0); // 4*q1 in 16bits now
+            VNEGN_16(v0, v0);   // because we want SHR and not SHL
+            VMOVD(v0+1, v0);
             VSHLQ_S16(q0, q0, v0);
             break;
         case 0xE2:
@@ -2108,11 +2014,11 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
             GETGX(q0, 1);
             GETEX(q1, 0);
             v0 = fpu_get_scratch_quad(dyn);
-            VQMOVN_S64(v0, q1);
-            VQMOVN_S32(v0, v0);
-            VQMOVN_S16(v0, v0);
-            VDUPQ_8(v0, v0, 0); // only 8 bits are taken
-            VNEGNQ_8(v0, v0);   // because we want SHR and not SHL
+            VMOVD(v0, q1);
+            VMOVD(v0+1, q1);
+            VQMOVN_S64(v0, v0); // 2*q1 in 32bits now
+            VNEGN_32(v0, v0);   // because we want SHR and not SHL
+            VMOVD(v0+1, v0);
             VSHLQ_S32(q0, q0, v0);
             break;
         case 0xE3:
@@ -2242,10 +2148,12 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
             GETGX(q0, 1);
             GETEX(q1, 0);
             v0 = fpu_get_scratch_quad(dyn);
-            VQMOVN_S64(v0, q1);
-            VQMOVN_S32(v0, v0);
-            VQMOVN_S16(v0, v0);
-            VDUPQ_8(v0, v0, 0); // only 8 bits are taken
+            VMOVD(v0, q1);
+            VMOVD(v0+1, q1);
+            VQMOVN_S64(v0, v0); // 2*q1 in 32bits now
+            VMOVD(v0+1, v0);
+            VQMOVN_S32(v0, v0); // 4*q1 in 16bits now
+            VMOVD(v0+1, v0);
             VSHLQ_U16(q0, q0, v0);
             break;
         case 0xF2:
@@ -2254,10 +2162,10 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
             GETGX(q0, 1);
             GETEX(q1, 0);
             v0 = fpu_get_scratch_quad(dyn);
-            VQMOVN_S64(v0, q1);
-            VQMOVN_S32(v0, v0);
-            VQMOVN_S16(v0, v0);
-            VDUPQ_8(v0, v0, 0); // only 8 bits are taken
+            VMOVD(v0, q1);
+            VMOVD(v0+1, q1);
+            VQMOVN_S64(v0, v0); // 2*q1 in 32bits now
+            VMOVD(v0+1, v0);
             VSHLQ_U32(q0, q0, v0);
             break;
         case 0xF3:
@@ -2266,10 +2174,8 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
             GETGX(q0, 1);
             GETEX(q1, 0);
             v0 = fpu_get_scratch_quad(dyn);
-            VQMOVN_S64(v0, q1);
-            VQMOVN_S32(v0, v0);
-            VQMOVN_S16(v0, v0);
-            VDUPQ_8(v0, v0, 0); // only 8 bits are taken
+            VMOVD(v0, q1);
+            VMOVD(v0+1, q1);
             VSHLQ_U64(q0, q0, v0);
             break;
         case 0xF4:
@@ -2311,7 +2217,7 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
             VPADDLQ_U32(q0, q0);
             break;
         case 0xF7:
-            INST_NAME("MASKMOVDQU Gx, Ex");
+            INST_NAME("MASKMOVDQU Gx, Ex")
             nextop = F8;
             GETGX(q0, 1);
             GETEX(q1, 0);

src/dynarec/dynarec_arm_66f0.c

@@ -41,7 +41,7 @@ uintptr_t dynarec66F0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
         case 0x81:
         case 0x83:
             nextop = F8;
-            SMDMB();
+            DMB_ISH();
             switch((nextop>>3)&7) {
                 case 0: //ADD
                     if(opcode==0x81) {
@@ -50,7 +50,7 @@ uintptr_t dynarec66F0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                         INST_NAME("LOCK ADD Ew, Ib");
                     }
                     SETFLAGS(X_ALL, SF_SET_PENDING);
-                    SMDMB();
+                    DMB_ISH();
                     if((nextop&0xC0)==0xC0) {
                         if(opcode==0x81) i16 = F16S; else i16 = F8S;
                         ed = xEAX+(nextop&7);
@@ -71,7 +71,7 @@ uintptr_t dynarec66F0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                             B_MARKLOCK(cNE);
                         }
                         if(!fixedaddress) {
-                            SMDMB();
+                            DMB_ISH();
                             B_NEXT(c__);
                         }
                         if(!fixedaddress || (fixedaddress && (fixedaddress&1))) {
@@ -85,17 +85,17 @@ uintptr_t dynarec66F0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                             B_MARK(cNE);
                             STRH_IMM8(x1, wback, 0); // put the whole value
                         }
-                        SMDMB();
+                        DMB_ISH();
                     }
                     break;
                 default:
                   DEFAULT;
             }
-            SMDMB();
+            DMB_ISH();
             break;
         case 0xFF:
             nextop = F8;
-            SMDMB();
+            DMB_ISH();
             switch((nextop>>3)&7)
             {
                 case 0: // INC Ew
@@ -120,7 +120,7 @@ uintptr_t dynarec66F0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                             B_MARKLOCK(cNE);
                         }
                         if(!fixedaddress) {
-                            SMDMB();
+                            DMB_ISH();
                             B_NEXT(c__);
                         }
                         if(!fixedaddress || (fixedaddress && (fixedaddress&1))) {
@@ -158,7 +158,7 @@ uintptr_t dynarec66F0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                             B_MARKLOCK(cNE);
                         }
                         if(!fixedaddress) {
-                            SMDMB();
+                            DMB_ISH();
                             B_NEXT(c__);
                         }
                         if(!fixedaddress || (fixedaddress && (fixedaddress&3))) {
@@ -178,7 +178,7 @@ uintptr_t dynarec66F0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                     // default to NO LOCK
                     addr-=2;
             }
-            SMDMB();
+            DMB_ISH();
             break;
         default:
             DEFAULT;

src/dynarec/dynarec_arm_67.c

@@ -58,7 +58,6 @@ uintptr_t dynarec67(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     } else {
                         addr = geted16(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0);
                         STRH_REG(gd, x14, ed);
-                        SMWRITE2();
                     }
                     break;
 
@@ -73,7 +72,6 @@ uintptr_t dynarec67(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                             BFI(gd, ed, 0, 16);
                         }
                     } else {                    // mem <= reg
-                        SMREAD();
                         addr = geted16(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0);
                         LDR_REG_LSL_IMM5(gd, x14, ed, 0);
                     }
@@ -89,7 +87,6 @@ uintptr_t dynarec67(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                         addr = geted16(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0);
                         POP1(x2);
                         STR_REG_LSL_IMM5(x2, x14, ed, 0);
-                        SMWRITE2();
                     }
                     break;
 
@@ -101,7 +98,6 @@ uintptr_t dynarec67(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                         MOV32(x2, u32);
                         ADD_REG_LSL_IMM5(x1, x1, x2, 0);
                     }
-                    SMREAD();
                     LDR_IMM9(xEAX, x1, 0);
                     break;
 
@@ -114,7 +110,6 @@ uintptr_t dynarec67(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                         ADD_REG_LSL_IMM5(x1, x1, x2, 0);
                     }
                     STR_IMM9(xEAX, x1, 0);
-                    SMWRITE2();
                     break;
 
                 case 0xFF:
@@ -126,7 +121,6 @@ uintptr_t dynarec67(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                             if((nextop&0xC0)==0xC0) {   // reg
                                 DEFAULT;
                             } else {                    // mem <= i32
-                                SMREAD();
                                 addr = geted16(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0);
                                 LDR_REG_LSL_IMM5(x3, ed, x14, 0);
                                 PUSH1(x3);

src/dynarec/dynarec_arm_d9.c

@@ -194,7 +194,7 @@ uintptr_t dynarecD9(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
 
         case 0xE8:
             INST_NAME("FLD1");
-            v1 = x87_do_push(dyn, ninst, x1, box86_dynarec_x87double?NEON_CACHE_ST_D:NEON_CACHE_ST_F);
+            v1 = x87_do_push(dyn, ninst, x1, NEON_CACHE_ST_F);
             if(ST_IS_F(0)) {
                 VMOV_i_32(v1, 0b01110000);
             } else {
@@ -204,7 +204,7 @@ uintptr_t dynarecD9(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             break;
         case 0xE9:
             INST_NAME("FLDL2T");
-            v1 = x87_do_push(dyn, ninst, x1, box86_dynarec_x87double?NEON_CACHE_ST_D:NEON_CACHE_ST_F);
+            v1 = x87_do_push(dyn, ninst, x1, NEON_CACHE_ST_F);
             if(ST_IS_F(0)) {
                 MOV32(x2, (&f_l2t));
                 VLDR_32(v1, x2, 0);
@@ -216,7 +216,7 @@ uintptr_t dynarecD9(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             break;
         case 0xEA:     
             INST_NAME("FLDL2E");
-            v1 = x87_do_push(dyn, ninst, x1, box86_dynarec_x87double?NEON_CACHE_ST_D:NEON_CACHE_ST_F);
+            v1 = x87_do_push(dyn, ninst, x1, NEON_CACHE_ST_F);
             if(ST_IS_F(0)) {
                 MOV32(x2, (&f_l2e));
                 VLDR_32(v1, x2, 0);
@@ -228,7 +228,7 @@ uintptr_t dynarecD9(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             break;
         case 0xEB:
             INST_NAME("FLDPI");
-            v1 = x87_do_push(dyn, ninst, x1, box86_dynarec_x87double?NEON_CACHE_ST_D:NEON_CACHE_ST_F);
+            v1 = x87_do_push(dyn, ninst, x1, NEON_CACHE_ST_F);
             if(ST_IS_F(0)) {
                 MOV32(x2, (&f_pi));
                 VLDR_32(v1, x2, 0);
@@ -240,7 +240,7 @@ uintptr_t dynarecD9(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             break;
         case 0xEC:
             INST_NAME("FLDLG2");
-            v1 = x87_do_push(dyn, ninst, x1, box86_dynarec_x87double?NEON_CACHE_ST_D:NEON_CACHE_ST_F);
+            v1 = x87_do_push(dyn, ninst, x1, NEON_CACHE_ST_F);
             if(ST_IS_F(0)) {
                 MOV32(x2, (&f_lg2));
                 VLDR_32(v1, x2, 0);
@@ -252,7 +252,7 @@ uintptr_t dynarecD9(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             break;
         case 0xED:
             INST_NAME("FLDLN2");
-            v1 = x87_do_push(dyn, ninst, x1, box86_dynarec_x87double?NEON_CACHE_ST_D:NEON_CACHE_ST_F);
+            v1 = x87_do_push(dyn, ninst, x1, NEON_CACHE_ST_F);
             if(ST_IS_F(0)) {
                 MOV32(x2, (&f_ln2));
                 VLDR_32(v1, x2, 0);
@@ -264,7 +264,7 @@ uintptr_t dynarecD9(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             break;
         case 0xEE:
             INST_NAME("FLDZ");
-            v1 = x87_do_push(dyn, ninst, x1, box86_dynarec_x87double?NEON_CACHE_ST_D:NEON_CACHE_ST_F);
+            v1 = x87_do_push(dyn, ninst, x1, NEON_CACHE_ST_F);
             if(ST_IS_F(0)) {
                 VMOV_8(v1/2, 0);  // float is *2...
             } else {
@@ -309,7 +309,7 @@ uintptr_t dynarecD9(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             break;
         case 0xF2:
             INST_NAME("FPTAN");
-            v2 = x87_do_push(dyn, ninst, x1, box86_dynarec_x87double?NEON_CACHE_ST_D:NEON_CACHE_ST_F);
+            v2 = x87_do_push(dyn, ninst, x1, NEON_CACHE_ST_F);
             v1 = x87_get_st(dyn, ninst, x1, x2, 1, NEON_CACHE_ST_D);
             VMOV_64(0, v1);    // prepare call to tan
             CALL_1D(tan, 0);
@@ -589,7 +589,7 @@ uintptr_t dynarecD9(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     break;
                 case 2:
                     INST_NAME("FST float[ED], ST0");
-                    v1 = x87_get_st(dyn, ninst, x1, x2, 0, box86_dynarec_x87double?NEON_CACHE_ST_D:NEON_CACHE_ST_F);
+                    v1 = x87_get_st(dyn, ninst, x1, x2, 0, NEON_CACHE_ST_F);
                     if(ST_IS_F(0))
                         s0 = v1;
                     else {
@@ -608,7 +608,7 @@ uintptr_t dynarecD9(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     break;
                 case 3:
                     INST_NAME("FSTP float[ED], ST0");
-                    v1 = x87_get_st(dyn, ninst, x1, x2, 0, box86_dynarec_x87double?NEON_CACHE_ST_D:NEON_CACHE_ST_F);
+                    v1 = x87_get_st(dyn, ninst, x1, x2, 0, NEON_CACHE_ST_F);
                     if(ST_IS_F(0))
                         s0 = v1;
                     else {

src/dynarec/dynarec_arm_db.c

@@ -223,7 +223,7 @@ uintptr_t dynarecDB(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 case 2:
                     INST_NAME("FIST Ed, ST0");
                     v1 = x87_get_st(dyn, ninst, x1, x2, 0, NEON_CACHE_ST_D);
-                    u8 = x87_setround_reset(dyn, ninst, x1, x2, x14); // x1 have the modified RPSCR reg
+                    u8 = x87_setround(dyn, ninst, x1, x2, x14); // x1 have the modified RPSCR reg
                     if((nextop&0xC0)==0xC0) {
                         ed = xEAX+(nextop&7);
                         wback = 0;
@@ -233,6 +233,10 @@ uintptr_t dynarecDB(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     }
                     s0 = fpu_get_scratch_single(dyn);
                     MSR_nzcvq_0();
+                    // x1 already have FPCSR reg to clear exceptions flags
+                    ORR_IMM8(x3, x1, 0b010, 9); // enable exceptions
+                    BIC_IMM8(x3, x3, 0b10011111, 0);
+                    VMSR(x3);
                     VCVTR_S32_F64(s0, v1);
                     VMRS(x3);   // get the FPCSR reg and test FPU execption (invalid operation only)
                     VMOVfrV(ed, s0);
@@ -244,7 +248,7 @@ uintptr_t dynarecDB(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 case 3:
                     INST_NAME("FISTP Ed, ST0");
                     v1 = x87_get_st(dyn, ninst, x1, x2, 0, NEON_CACHE_ST_D);
-                    u8 = x87_setround_reset(dyn, ninst, x1, x2, x14); // x1 have the modified RPSCR reg
+                    u8 = x87_setround(dyn, ninst, x1, x2, x14); // x1 have the modified RPSCR reg
                     if((nextop&0xC0)==0xC0) {
                         ed = xEAX+(nextop&7);
                         wback = 0;
@@ -254,6 +258,10 @@ uintptr_t dynarecDB(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     }
                     s0 = fpu_get_scratch_single(dyn);
                     MSR_nzcvq_0();
+                    // The FPCSR reg to clear exceptions flags
+                    ORR_IMM8(x3, x1, 0b010, 9); // enable exceptions
+                    BIC_IMM8(x3, x3, 0b10011111, 0);
+                    VMSR(x3);
                     VCVTR_S32_F64(s0, v1);
                     VMRS(x3);   // get the FPCSR reg and test FPU execption (denormal and overflow only)
                     VMOVfrV(ed, s0);
@@ -279,89 +287,17 @@ uintptr_t dynarecDB(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                         STR_IMM9(x2, ed, 0);
                         STR_IMM9(x3, ed, 4);
                         STRH_IMM8(x14, ed, 8);
-                    } else {
-                        if(box86_x87_no80bits) {
-                            v1 = x87_do_push(dyn, ninst, x1, NEON_CACHE_ST_D);
-                            parity = getedparity(dyn, ninst, addr, nextop, 3);
-                            if (parity) {
-                                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0, NULL);
-                                VLDR_64(v1, ed, fixedaddress);
-                            } else {
-                                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-4, 0, 0, NULL);
-                                LDR_IMM9(x2, ed, fixedaddress);
-                                LDR_IMM9(x3, ed, fixedaddress + 4);
-                                VMOVtoV_D(v1, x2, x3);
-                            }
-                        } else {
-                            #if 0
-                            MESSAGE(LOG_DUMP, "Need Optimization\n");
-                            if(ed!=x1) {
-                                MOV_REG(x1, ed);
-                            }
-                            x87_do_push_empty(dyn, ninst, x3);
-                            CALL(arm_fld, -1, 0);
-                            #else
-                            v1 = x87_do_push(dyn, ninst, x2, NEON_CACHE_ST_D);
-                            // copy 10bytes of *ED to STld(0)
-                            LDR_IMM9(x3, xEmu, offsetof(x86emu_t, top));
-                            int a = -dyn->n.x87stack;
-                            if(a) {
-                                if(a<0) {
-                                    SUB_IMM8(x3, x3, -a);
-                                } else {
-                                    ADD_IMM8(x3, x3, a);
-                                }
-                                AND_IMM8(x3, x3, 7);
-                            }
-                            ADD_IMM8(x2, xEmu, offsetof(x86emu_t, fpu_ld)+offsetof(fpu_ld_t, ld));
-                            MOVW(x14, sizeof(fpu_ld_t));
-                            MLA(x2, x3, x14, x2);
-                            LDR_IMM9(x14, ed, 0);
-                            STR_IMM9(x14, x2, 0);
-                            LDR_IMM9(x14, ed, 4);
-                            STR_IMM9(x14, x2, 4);
-                            LDRH_IMM8(x14, ed, 8);
-                            STRH_IMM8(x14, x2, 8);
-                            // convert 10bytes -> double
-                            CALL_1RD(FromLD, ed, x2, (1<<x3)|(1<<xFlags)|(1<<x2));
-                            // store ref to STld(0).uref, but can be unaligned...
-                            VMOVfrV_D(x3, x14, 0);
-                            // also, store result to ST0
-                            VMOVD(v1, 0);
-                            STR_IMM9(x3, x2, offsetof(fpu_ld_t, uref)-offsetof(fpu_ld_t, ld));
-                            STR_IMM9(x14, x2, offsetof(fpu_ld_t, uref)-offsetof(fpu_ld_t, ld)+4);
-                            #endif
-                        }
-                    }
-                    break;
-                case 7:
-                    INST_NAME("FSTP tbyte");
-                        if(box86_x87_no80bits) {
-                        v1 = x87_get_st(dyn, ninst, x1, x2, 0, NEON_CACHE_ST_D);
-                        parity = getedparity(dyn, ninst, addr, nextop, 3);
-                        if(parity) {
-                            addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0, NULL);
-                            VSTR_64(v1, ed, fixedaddress);
-                        } else {
-                            addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-4, 0, 0, NULL);
-                            VMOVfrV_D(x2, x3, v1);
-                            STR_IMM9(x2, ed, fixedaddress);
-                            STR_IMM9(x3, ed, fixedaddress+4);
-                        }
                     } else {
                         #if 0
                         MESSAGE(LOG_DUMP, "Need Optimization\n");
-                        x87_forget(dyn, ninst, x1, x3, 0);
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                         if(ed!=x1) {
                             MOV_REG(x1, ed);
                         }
-                        CALL(arm_fstp, -1, 0);
+                        x87_do_push_empty(dyn, ninst, x3);
+                        CALL(arm_fld, -1, 0);
                         #else
-                        v1 = x87_get_st(dyn, ninst, x1, x2, 0, NEON_CACHE_ST_D);
-                        v2 = fpu_get_scratch_double(dyn);
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
-                        // get top in x3
+                        v1 = x87_do_push(dyn, ninst, x2, NEON_CACHE_ST_D);
+                        // copy 10bytes of *ED to STld(0)
                         LDR_IMM9(x3, xEmu, offsetof(x86emu_t, top));
                         int a = -dyn->n.x87stack;
                         if(a) {
@@ -372,41 +308,85 @@ uintptr_t dynarecDB(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                             }
                             AND_IMM8(x3, x3, 7);
                         }
-                        // get STld(0)
                         ADD_IMM8(x2, xEmu, offsetof(x86emu_t, fpu_ld)+offsetof(fpu_ld_t, ld));
                         MOVW(x14, sizeof(fpu_ld_t));
                         MLA(x2, x3, x14, x2);
-                        // compare uref with actual value, top is not used anymore, so x3 is free
-                        LDR_IMM9(x14, x2, offsetof(fpu_ld_t, uref)-offsetof(fpu_ld_t, ld));
-                        LDR_IMM9(x3, x2, offsetof(fpu_ld_t, uref)-offsetof(fpu_ld_t, ld)+4);
-                        VMOVtoV_D(v2, x14, x3);
-                        VCEQ_32(v2, v2, v1);    // same?
-                        VMOVfrV_D(x14, x3, v2);
-                        TSTS_REG_LSL_IMM5(x14, x3, 0);
-                        B_MARK(cEQ);    // different, do the conversion
-                        // same... copy STld(0).ld
-                        LDR_IMM9(x14, x2, 0);
-                        LDR_IMM9(x3, x2, 4);
-                        STR_IMM9(x14, ed, 0);
-                        STR_IMM9(x3, ed, 4);
-                        LDRH_IMM8(x14, x2, 8);
-                        STRH_IMM8(x14, ed, 8);
-                        B_MARK2(c__);
-                        MARK;
-                        // different, call D2LD
-                        SUB_IMM8(xSP, xSP, 8);
-                        VSTR_64(v1, xSP, 0);
-                        PUSH(xSP, (1<<xEmu)|(1<<xFlags));
-                        ADD_IMM8(0, xSP, 8);    //1st arg is &d
-                        if(ed!=x1) {
-                            MOV_REG_LSL_IMM5(x1, ed, 0);    //2nd arg is ed
-                        }
-                        CALL_S(D2LD, -2, 0);
-                        POP(xSP, (1<<xEmu)|(1<<xFlags));
-                        ADD_IMM8(xSP, xSP, 8);
-                        MARK2;
+                        LDR_IMM9(x14, ed, 0);
+                        STR_IMM9(x14, x2, 0);
+                        LDR_IMM9(x14, ed, 4);
+                        STR_IMM9(x14, x2, 4);
+                        LDRH_IMM8(x14, ed, 8);
+                        STRH_IMM8(x14, x2, 8);
+                        // convert 10bytes -> double
+                        CALL_1RD(FromLD, ed, x2, (1<<x3)|(1<<xFlags)|(1<<x2));
+                        // store ref to STld(0).uref, but can be unaligned...
+                        VMOVfrV_D(x3, x14, 0);
+                        // also, store result to ST0
+                        VMOVD(v1, 0);
+                        STR_IMM9(x3, x2, offsetof(fpu_ld_t, uref)-offsetof(fpu_ld_t, ld));
+                        STR_IMM9(x14, x2, offsetof(fpu_ld_t, uref)-offsetof(fpu_ld_t, ld)+4);
                         #endif
                     }
+                    break;
+                case 7:
+                    INST_NAME("FSTP tbyte");
+                    #if 0
+                    MESSAGE(LOG_DUMP, "Need Optimization\n");
+                    x87_forget(dyn, ninst, x1, x3, 0);
+                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
+                    if(ed!=x1) {
+                        MOV_REG(x1, ed);
+                    }
+                    CALL(arm_fstp, -1, 0);
+                    #else
+                    v1 = x87_get_st(dyn, ninst, x1, x2, 0, NEON_CACHE_ST_D);
+                    v2 = fpu_get_scratch_double(dyn);
+                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
+                    // get top in x3
+                    LDR_IMM9(x3, xEmu, offsetof(x86emu_t, top));
+                    int a = -dyn->n.x87stack;
+                    if(a) {
+                        if(a<0) {
+                            SUB_IMM8(x3, x3, -a);
+                        } else {
+                            ADD_IMM8(x3, x3, a);
+                        }
+                        AND_IMM8(x3, x3, 7);
+                    }
+                    // get STld(0)
+                    ADD_IMM8(x2, xEmu, offsetof(x86emu_t, fpu_ld)+offsetof(fpu_ld_t, ld));
+                    MOVW(x14, sizeof(fpu_ld_t));
+                    MLA(x2, x3, x14, x2);
+                    // compare uref with actual value, top is not used anymore, so x3 is free
+                    LDR_IMM9(x14, x2, offsetof(fpu_ld_t, uref)-offsetof(fpu_ld_t, ld));
+                    LDR_IMM9(x3, x2, offsetof(fpu_ld_t, uref)-offsetof(fpu_ld_t, ld)+4);
+                    VMOVtoV_D(v2, x14, x3);
+                    VCEQ_32(v2, v2, v1);    // same?
+                    VMOVfrV_D(x14, x3, v2);
+                    TSTS_REG_LSL_IMM5(x14, x3, 0);
+                    B_MARK(cEQ);    // different, do the conversion
+                    // same... copy STld(0).ld
+                    LDR_IMM9(x14, x2, 0);
+                    LDR_IMM9(x3, x2, 4);
+                    STR_IMM9(x14, ed, 0);
+                    STR_IMM9(x3, ed, 4);
+                    LDRH_IMM8(x14, x2, 8);
+                    STRH_IMM8(x14, ed, 8);
+                    B_MARK2(c__);
+                    MARK;
+                    // different, call D2LD
+                    SUB_IMM8(xSP, xSP, 8);
+                    VSTR_64(v1, xSP, 0);
+                    PUSH(xSP, (1<<xEmu)|(1<<xFlags));
+                    ADD_IMM8(0, xSP, 8);    //1st arg is &d
+                    if(ed!=x1) {
+                        MOV_REG_LSL_IMM5(x1, ed, 0);    //2nd arg is ed
+                    }
+                    CALL_S(D2LD, -2, 0);
+                    POP(xSP, (1<<xEmu)|(1<<xFlags));
+                    ADD_IMM8(xSP, xSP, 8);
+                    MARK2;
+                    #endif
                     x87_do_pop(dyn, ninst, x3);
                     break;
                 default:

src/dynarec/dynarec_arm_df.c

@@ -161,7 +161,7 @@ uintptr_t dynarecDF(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             switch((nextop>>3)&7) {
                 case 0:
                     INST_NAME("FILD ST0, Ew");
-                    v1 = x87_do_push(dyn, ninst, x1, box86_dynarec_x87double?NEON_CACHE_ST_D:NEON_CACHE_ST_F);
+                    v1 = x87_do_push(dyn, ninst, x1, NEON_CACHE_ST_F);
                     addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255, 0, 0, NULL);
                     LDRSH_IMM8(x1, wback, fixedaddress);
                     if(ST_IS_F(0)) {
@@ -175,7 +175,7 @@ uintptr_t dynarecDF(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     break;
                 case 1:
                     INST_NAME("FISTTP Ew, ST0");
-                    v1 = x87_get_st(dyn, ninst, x1, x2, 0, box86_dynarec_x87double?NEON_CACHE_ST_D:NEON_CACHE_ST_F);
+                    v1 = x87_get_st(dyn, ninst, x1, x2, 0, NEON_CACHE_ST_F);
                     addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 255, 0, 0, NULL);
                     ed = x1;
                     s0 = fpu_get_scratch_single(dyn);
@@ -202,12 +202,16 @@ uintptr_t dynarecDF(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     break;
                 case 2:
                     INST_NAME("FIST Ew, ST0");
-                    v1 = x87_get_st(dyn, ninst, x1, x2, 0, box86_dynarec_x87double?NEON_CACHE_ST_D:NEON_CACHE_ST_F);
-                    u8 = x87_setround_reset(dyn, ninst, x1, x2, x14);
+                    v1 = x87_get_st(dyn, ninst, x1, x2, 0, NEON_CACHE_ST_F);
+                    u8 = x87_setround(dyn, ninst, x1, x2, x14);
                     addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 255, 0, 0, NULL);
                     ed = x1;
                     s0 = fpu_get_scratch_single(dyn);
                     MSR_nzcvq_0();
+                    // x1 already have FPCSR reg to clear exceptions flags
+                    ORR_IMM8(x3, x1, 0b010, 9); // enable exceptions
+                    BIC_IMM8(x3, x3, 0b10011111, 0);
+                    VMSR(x3);
                     if(ST_IS_F(0)) {
                         VCVTR_S32_F32(s0, v1);
                     } else {
@@ -224,12 +228,16 @@ uintptr_t dynarecDF(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     break;
                 case 3:
                     INST_NAME("FISTP Ew, ST0");
-                    v1 = x87_get_st(dyn, ninst, x1, x2, 0, box86_dynarec_x87double?NEON_CACHE_ST_D:NEON_CACHE_ST_F);
-                    u8 = x87_setround_reset(dyn, ninst, x1, x2, x14);
+                    v1 = x87_get_st(dyn, ninst, x1, x2, 0, NEON_CACHE_ST_F);
+                    u8 = x87_setround(dyn, ninst, x1, x2, x14);
                     addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 255, 0, 0, NULL);
                     ed = x1;
                     s0 = fpu_get_scratch_single(dyn);
                     MSR_nzcvq_0();
+                    // x1 already have FPCSR reg to clear exceptions flags
+                    ORR_IMM8(x3, x1, 0b010, 9); // enable exceptions
+                    BIC_IMM8(x3, x3, 0b10011111, 0);
+                    VMSR(x3);
                     if(ST_IS_F(0)) {
                         VCVTR_S32_F32(s0, v1);
                     } else {

src/dynarec/dynarec_arm_f0.c

@@ -42,7 +42,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             SETFLAGS(X_ALL, SF_SET_PENDING);
             nextop = F8;
             GETGB(x2);
-            SMDMB();
+            DMB_ISH();
             if((nextop&0xC0)==0xC0) {
                 wback = (nextop&7);    
                 wb2 = (wback>>2);      
@@ -59,14 +59,14 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 CMPS_IMM8(x14, 0);
                 B_MARKLOCK(cNE);    // write failed, try again
             }
-            SMDMB();
+            DMB_ISH();
             break;
         case 0x01:
             INST_NAME("LOCK ADD Ed, Gd");
             SETFLAGS(X_ALL, SF_SET_PENDING);
             nextop = F8;
             GETGD;
-            SMDMB();
+            DMB_ISH();
             if((nextop&0xC0)==0xC0) {
                 ed = xEAX+(nextop&7);
                 emit_add32(dyn, ninst, ed, gd, x3, x14);
@@ -79,13 +79,13 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 CMPS_IMM8(x3, 0);
                 B_MARKLOCK(cNE);
             }
-            SMDMB();
+            DMB_ISH();
             break;
         case 0x08:
             INST_NAME("LOCK OR Eb, Gb");
             SETFLAGS(X_ALL, SF_SET_PENDING);
             nextop = F8;
-            SMDMB();
+            DMB_ISH();
             if((nextop&0xC0)==0xC0) {
                 GETGB(x2);
                 wback = (nextop&7);    
@@ -104,14 +104,14 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 CMPS_IMM8(x14, 0);
                 B_MARKLOCK(cNE);    // write failed, try again
             }
-            SMDMB();
+            DMB_ISH();
             break;
         case 0x09:
             INST_NAME("LOCK OR Ed, Gd");
             SETFLAGS(X_ALL, SF_SET_PENDING);
             nextop = F8;
             GETGD;
-            SMDMB();
+            DMB_ISH();
             if((nextop&0xC0)==0xC0) {
                 ed = xEAX+(nextop&7);
                 emit_or32(dyn, ninst, ed, gd, x3, x14);
@@ -124,7 +124,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 CMPS_IMM8(x3, 0);
                 B_MARKLOCK(cNE);
             }
-            SMDMB();
+            DMB_ISH();
             break;
         case 0x10:
             INST_NAME("LOCK ADC Eb, Gb");
@@ -132,7 +132,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             SETFLAGS(X_ALL, SF_SET_PENDING);
             nextop = F8;
             GETGB(x2);
-            SMDMB();
+            DMB_ISH();
             if((nextop&0xC0)==0xC0) {
                 wback = (nextop&7);    
                 wb2 = (wback>>2);      
@@ -149,7 +149,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 CMPS_IMM8(x14, 0);
                 B_MARKLOCK(cNE);    // write failed, try again
             }
-            SMDMB();
+            DMB_ISH();
             break;
         case 0x11:
             INST_NAME("LOCK ADC Ed, Gd");
@@ -157,7 +157,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             SETFLAGS(X_ALL, SF_SET_PENDING);
             nextop = F8;
             GETGD;
-            SMDMB();
+            DMB_ISH();
             if((nextop&0xC0)==0xC0) {
                 ed = xEAX+(nextop&7);
                 emit_adc32(dyn, ninst, ed, gd, x3, x14);
@@ -170,7 +170,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 CMPS_IMM8(x3, 0);
                 B_MARKLOCK(cNE);
             }
-            SMDMB();
+            DMB_ISH();
             break;
         case 0x18:
             INST_NAME("LOCK SBB Eb, Gb");
@@ -178,7 +178,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             SETFLAGS(X_ALL, SF_SET_PENDING);
             nextop = F8;
             GETGB(x2);
-            SMDMB();
+            DMB_ISH();
             if((nextop&0xC0)==0xC0) {
                 wback = (nextop&7);    
                 wb2 = (wback>>2);      
@@ -195,7 +195,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 CMPS_IMM8(x14, 0);
                 B_MARKLOCK(cNE);    // write failed, try again
             }
-            SMDMB();
+            DMB_ISH();
             break;
         case 0x19:
             INST_NAME("LOCK SBB Ed, Gd");
@@ -203,7 +203,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
             SETFLAGS(X_ALL, SF_SET_PENDING);
             nextop = F8;
             GETGD;
-            SMDMB();
+            DMB_ISH();
             if((nextop&0xC0)==0xC0) {
                 ed = xEAX+(nextop&7);
                 emit_sbb32(dyn, ninst, ed, gd, x3, x14);
@@ -216,13 +216,13 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 CMPS_IMM8(x3, 0);
                 B_MARKLOCK(cNE);
             }
-            SMDMB();
+            DMB_ISH();
             break;
         case 0x20:
             INST_NAME("LOCK AND Eb, Gb");
             SETFLAGS(X_ALL, SF_SET_PENDING);
             nextop = F8;
-            SMDMB();
+            DMB_ISH();
             if((nextop&0xC0)==0xC0) {
                 GETGB(x2);
                 wback = (nextop&7);    
@@ -241,14 +241,14 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 CMPS_IMM8(x14, 0);
                 B_MARKLOCK(cNE);    // write failed, try again
             }
-            SMDMB();
+            DMB_ISH();
             break;
         case 0x21:
             INST_NAME("LOCK AND Ed, Gd");
             SETFLAGS(X_ALL, SF_SET_PENDING);
             nextop = F8;
             GETGD;
-            SMDMB();
+            DMB_ISH();
             if((nextop&0xC0)==0xC0) {
                 ed = xEAX+(nextop&7);
                 emit_and32(dyn, ninst, ed, gd, x3, x14);
@@ -261,14 +261,14 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 CMPS_IMM8(x3, 0);
                 B_MARKLOCK(cNE);
             }
-            SMDMB();
+            DMB_ISH();
             break;
         case 0x28:
             INST_NAME("LOCK SUB Eb, Gb");
             SETFLAGS(X_ALL, SF_SET_PENDING);
             nextop = F8;
             GETGB(x2);
-            SMDMB();
+            DMB_ISH();
             if((nextop&0xC0)==0xC0) {
                 wback = (nextop&7);    
                 wb2 = (wback>>2);      
@@ -285,14 +285,14 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 CMPS_IMM8(x14, 0);
                 B_MARKLOCK(cNE);    // write failed, try again
             }
-            SMDMB();
+            DMB_ISH();
             break;
         case 0x29:
             INST_NAME("LOCK SUB Ed, Gd");
             SETFLAGS(X_ALL, SF_SET_PENDING);
             nextop = F8;
             GETGD;
-            SMDMB();
+            DMB_ISH();
             if((nextop&0xC0)==0xC0) {
                 ed = xEAX+(nextop&7);
                 emit_sub32(dyn, ninst, ed, gd, x3, x14);
@@ -305,13 +305,13 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 CMPS_IMM8(x3, 0);
                 B_MARKLOCK(cNE);
             }
-            SMDMB();
+            DMB_ISH();
             break;
         case 0x38:
             INST_NAME("LOCK XOR Eb, Gb");
             SETFLAGS(X_ALL, SF_SET_PENDING);
             nextop = F8;
-            SMDMB();
+            DMB_ISH();
             if((nextop&0xC0)==0xC0) {
                 GETGB(x2);
                 wback = (nextop&7);    
@@ -330,14 +330,14 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 CMPS_IMM8(x14, 0);
                 B_MARKLOCK(cNE);    // write failed, try again
             }
-            SMDMB();
+            DMB_ISH();
             break;
         case 0x39:
             INST_NAME("LOCK XOR Ed, Gd");
             SETFLAGS(X_ALL, SF_SET_PENDING);
             nextop = F8;
             GETGD;
-            SMDMB();
+            DMB_ISH();
             if((nextop&0xC0)==0xC0) {
                 ed = xEAX+(nextop&7);
                 emit_xor32(dyn, ninst, ed, gd, x3, x14);
@@ -350,7 +350,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 CMPS_IMM8(x3, 0);
                 B_MARKLOCK(cNE);
             }
-            SMDMB();
+            DMB_ISH();
             break;
         
         case 0x66:
@@ -368,7 +368,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                         INST_NAME("LOCK ADD Ed, Ib");
                     }
                     SETFLAGS(X_ALL, SF_SET_PENDING);
-                    SMDMB();
+                    DMB_ISH();
                     if((nextop&0xC0)==0xC0) {
                         if(opcode==0x81) i32 = F32S; else i32 = F8S;
                         ed = xEAX+(nextop&7);
@@ -389,7 +389,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                             B_MARKLOCK(cNE);
                         }
                         if(!fixedaddress) {
-                            SMDMB();
+                            DMB_ISH();
                             B_NEXT(c__);
                         }
                         if(!fixedaddress || (fixedaddress && (fixedaddress&3))) {
@@ -403,13 +403,13 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                             B_MARK(cNE);
                             STR_IMM9(x1, wback, 0);    // put the whole value
                         }
-                        SMDMB();
+                        DMB_ISH();
                     }
                     break;
                 case 1: //OR
                     if(opcode==0x81) {INST_NAME("LOCK OR Ed, Id");} else {INST_NAME("LOCK OR Ed, Ib");}
                     SETFLAGS(X_ALL, SF_SET_PENDING);
-                    SMDMB();
+                    DMB_ISH();
                     if((nextop&0xC0)==0xC0) {
                         if(opcode==0x81) i32 = F32S; else i32 = F8S;
                         ed = xEAX+(nextop&7);
@@ -424,13 +424,13 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                         CMPS_IMM8(x3, 0);
                         B_MARKLOCK(cNE);
                     }
-                    SMDMB();
+                    DMB_ISH();
                     break;
                 case 2: //ADC
                     if(opcode==0x81) {INST_NAME("LOCK ADC Ed, Id");} else {INST_NAME("LOCK ADC Ed, Ib");}
                     READFLAGS(X_CF);
                     SETFLAGS(X_ALL, SF_SET_PENDING);
-                    SMDMB();
+                    DMB_ISH();
                     if((nextop&0xC0)==0xC0) {
                         if(opcode==0x81) i32 = F32S; else i32 = F8S;
                         ed = xEAX+(nextop&7);
@@ -445,13 +445,13 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                         CMPS_IMM8(x3, 0);
                         B_MARKLOCK(cNE);
                     }
-                    SMDMB();
+                    DMB_ISH();
                     break;
                 case 3: //SBB
                     if(opcode==0x81) {INST_NAME("LOCK SBB Ed, Id");} else {INST_NAME("LOCK SBB Ed, Ib");}
                     READFLAGS(X_CF);
                     SETFLAGS(X_ALL, SF_SET_PENDING);
-                    SMDMB();
+                    DMB_ISH();
                     if((nextop&0xC0)==0xC0) {
                         if(opcode==0x81) i32 = F32S; else i32 = F8S;
                         ed = xEAX+(nextop&7);
@@ -466,12 +466,12 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                         CMPS_IMM8(x3, 0);
                         B_MARKLOCK(cNE);
                     }
-                    SMDMB();
+                    DMB_ISH();
                     break;
                 case 4: //AND
                     if(opcode==0x81) {INST_NAME("LOCK AND Ed, Id");} else {INST_NAME("LOCK AND Ed, Ib");}
                     SETFLAGS(X_ALL, SF_SET_PENDING);
-                    SMDMB();
+                    DMB_ISH();
                     if((nextop&0xC0)==0xC0) {
                         if(opcode==0x81) i32 = F32S; else i32 = F8S;
                         ed = xEAX+(nextop&7);
@@ -486,7 +486,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                         CMPS_IMM8(x3, 0);
                         B_MARKLOCK(cNE);
                     }
-                    SMDMB();
+                    DMB_ISH();
                     break;
                 case 5: //SUB
                     if(opcode==0x81) {INST_NAME("LOCK SUB Ed, Id");} else {INST_NAME("LOCK SUB Ed, Ib");}
@@ -496,7 +496,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                         ed = xEAX+(nextop&7);
                         emit_sub32c(dyn, ninst, ed, i32, x3, x14);
                     } else {
-                        SMDMB();
+                        DMB_ISH();
                         addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 1, LOCK_LOCK);
                         if(opcode==0x81) i32 = F32S; else i32 = F8S;
                         if(!fixedaddress) {
@@ -512,7 +512,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                             B_MARKLOCK(cNE);
                         }
                         if(!fixedaddress) {
-                            SMDMB();
+                            DMB_ISH();
                             B_NEXT(c__);
                         }
                         if(!fixedaddress || (fixedaddress && (fixedaddress&3))) {
@@ -526,7 +526,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                             B_MARK(cNE);
                             STR_IMM9(x1, wback, 0);    // put the whole value
                         }
-                        SMDMB();
+                        DMB_ISH();
                     }
                     break;
                 case 6: //XOR
@@ -537,7 +537,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                         ed = xEAX+(nextop&7);
                         emit_xor32c(dyn, ninst, ed, i32, x3, x14);
                     } else {
-                        SMDMB();
+                        DMB_ISH();
                         addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 0, LOCK_LOCK);
                         if(opcode==0x81) i32 = F32S; else i32 = F8S;
                         MARKLOCK;
@@ -546,13 +546,13 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                         STREX(x3, x1, wback);
                         CMPS_IMM8(x3, 0);
                         B_MARKLOCK(cNE);
-                        SMDMB();
+                        DMB_ISH();
                     }
                     break;
                 case 7: //CMP
                     if(opcode==0x81) {INST_NAME("(LOCK) CMP Ed, Id");} else {INST_NAME("(LOCK) CMP Ed, Ib");}
                     SETFLAGS(X_ALL, SF_SET_PENDING);
-                    SMDMB();
+                    DMB_ISH();
                     GETEDH(x1);
                     // No need to LOCK, this is readonly
                     if(opcode==0x81) i32 = F32S; else i32 = F8S;
@@ -582,7 +582,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
         #undef GO
         case 0x86:  // for this two, the lock is already done by the opcode, so just ignoring it
         case 0x87:
-            SMDMB();
+            DMB_ISH();
             --addr;
             break;
         case 0x90:  // This is xchg reg, reg, so let's ignore the LOCK prefix...
@@ -593,7 +593,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
         case 0x95:
         case 0x96:
         case 0x97:
-            SMDMB();
+            DMB_ISH();
             --addr;
             break;
     
@@ -603,7 +603,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                 case 0xB0:
                     INST_NAME("LOCK CMPXCHG Eb, Gb");
                     SETFLAGS(X_ALL, SF_SET_PENDING);
-                    SMDMB();
+                    DMB_ISH();
                     nextop = F8;
                     if((nextop&0xC0)==0xC0) {
                         wback = (nextop&7);    
@@ -640,7 +640,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     // AL != Eb
                     BFI(xEAX, ed, 0, 8);
                     MARK3;
-                    SMDMB();
+                    DMB_ISH();
                     // done, do the cmp now
                     UFLAG_IF {emit_cmp8(dyn, ninst, x1, x2, x3, x14);}
                     break;
@@ -649,7 +649,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     SETFLAGS(X_ALL, SF_SET_PENDING);
                     nextop = F8;
                     GETGD;
-                    SMDMB();
+                    DMB_ISH();
                     if((nextop&0xC0)==0xC0) {
                         ed = xEAX+(nextop&7);
                         // same as no lock, all in regs...
@@ -679,7 +679,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                                 B_MARK(cNE);
                                 // EAX == Ed
                                 STREX(x14, gd, wback);
-                                SMDMB();
+                                DMB_ISH();
                                 CMPS_IMM8(x14, 0);
                                 B_MARKLOCK(cNE);
                                 B_MARK(c__);
@@ -695,7 +695,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                             CMPS_IMM8(x14, 0);
                             B_MARK2(cNE);
                             STR_IMM9(gd, wback, 0);
-                            SMDMB();
+                            DMB_ISH();
                         } else {
                             MARKLOCK;
                             // alignment is good
@@ -706,7 +706,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                             STREX(x14, gd, wback);
                             CMPS_IMM8(x14, 0);
                             B_MARKLOCK(cNE);
-                            SMDMB();
+                            DMB_ISH();
                         }
                         // end of EAX == Ed or EAX != Ed
                         MARK;
@@ -721,7 +721,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     SET_DFNONE(x1);
                     nextop = F8;
                     GETGD;
-                    SMDMB();
+                    DMB_ISH();
                     if((nextop&0xC0)==0xC0) {
                         ed = xEAX+(nextop&7);
                         wback = 0;
@@ -747,12 +747,12 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                         B_MARKLOCK(cNE);
                     }
                     MARK3;
-                    SMDMB();
+                    DMB_ISH();
                     break;
 
                 case 0xBA:
                     nextop = F8;
-                    SMDMB();
+                    DMB_ISH();
                     switch((nextop>>3)&7) {
                         case 4:
                             INST_NAME("(LOCK) BT Ed, Ib");
@@ -839,7 +839,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                         default:
                             DEFAULT;
                     }
-                    SMDMB();
+                    DMB_ISH();
                     break;
                 case 0xBB:
                     INST_NAME("LOCK BTC Ed, Gd");
@@ -847,7 +847,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     SET_DFNONE(x1);
                     nextop = F8;
                     GETGD;
-                    SMDMB();
+                    DMB_ISH();
                     if((nextop&0xC0)==0xC0) {
                         ed = xEAX+(nextop&7);
                         wback = 0;
@@ -870,14 +870,14 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                         CMPS_IMM8(x14, 0);
                         B_MARKLOCK(cNE);
                     }
-                    SMDMB();
+                    DMB_ISH();
                     break;
             
                 case 0xC0:
                     INST_NAME("LOCK XADD Gb, Eb");
                     SETFLAGS(X_ALL, SF_SET_PENDING);
                     nextop = F8;
-                    SMDMB();
+                    DMB_ISH();
                     GETGB(x1);
                     if((nextop&0xC0)==0xC0) {
                         wback = (nextop&7); 
@@ -902,14 +902,14 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     } else {
                         BFI(wback, ed, wb2*8, 8);
                     }
-                    SMDMB();
+                    DMB_ISH();
                     break;
                 case 0xC1:
                     INST_NAME("LOCK XADD Gd, Ed");
                     SETFLAGS(X_ALL, SF_SET_PENDING);
                     nextop = F8;
                     GETGD;
-                    SMDMB();
+                    DMB_ISH();
                     if((nextop&0xC0)==0xC0) {
                         ed = xEAX+(nextop&7);
                         if(gd!=ed) {
@@ -955,7 +955,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                         }
                         MOV_REG(gd, x1);
                     }
-                    SMDMB();
+                    DMB_ISH();
                     break;
 
                 case 0xC7:
@@ -964,7 +964,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                         case 1:
                             INST_NAME("LOCK CMPXCHG8B Gq, Eq");
                             SETFLAGS(X_ZF, SF_SUBSET);
-                            SMDMB();
+                            DMB_ISH();
                             addr = geted(dyn, addr, ninst, nextop, &wback, x1, &fixedaddress, 0, 0, 1, LOCK_LOCK);
                             MARKLOCK;
                             if(!fixedaddress || (fixedaddress && (fixedaddress&7))) {
@@ -1001,7 +1001,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                             MOV_REG(xEDX, x3);
                             MOVW(x1, 0);
                             MARK3;
-                            SMDMB();
+                            DMB_ISH();
                             BFI(xFlags, x1, F_ZF, 1);
                             break;
                         default:
@@ -1017,7 +1017,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
 
         case 0xFF:
             nextop = F8;
-            SMDMB();
+            DMB_ISH();
             switch((nextop>>3)&7)
             {
                 case 0: // INC Ed
@@ -1041,7 +1041,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                             B_MARKLOCK(cNE);
                         }
                         if(!fixedaddress) {
-                            SMDMB();
+                            DMB_ISH();
                             B_NEXT(c__);
                         }
                         if(!fixedaddress || (fixedaddress && (fixedaddress&3))) {
@@ -1078,7 +1078,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                             B_MARKLOCK(cNE);
                         }
                         if(!fixedaddress) {
-                            SMDMB();
+                            DMB_ISH();
                             B_NEXT(c__);
                         }
                         if(!fixedaddress || (fixedaddress && (fixedaddress&3))) {
@@ -1098,7 +1098,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                     // default to NO LOCK
                     addr-=2;
             }
-            SMDMB();
+            DMB_ISH();
             break;
        
         default:

src/dynarec/dynarec_arm_f20f.c

@@ -29,7 +29,6 @@
     } else {    \
         parity = getedparity(dyn, ninst, addr, nextop, 3);  \
         a = fpu_get_scratch_double(dyn);            \
-        SMREAD();                                   \
         if(parity) {                                \
             addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0, NULL); \
             VLDR_64(a, ed, fixedaddress);           \
@@ -73,7 +72,6 @@ uintptr_t dynarecF20F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                 d0 = sse_get_reg(dyn, ninst, x1, nextop&7, 0);
                 VMOVD(v0, d0);
             } else {
-                SMREAD();
                 v0 = sse_get_reg_empty(dyn, ninst, x1, gd);
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-4, 0, 0, NULL);
                 LDR_IMM9(x2, ed, fixedaddress+0);
@@ -95,7 +93,6 @@ uintptr_t dynarecF20F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-4, 0, 0, NULL);
                 STR_IMM9(x2, ed, fixedaddress+0);
                 STR_IMM9(x3, ed, fixedaddress+4);
-                SMWRITE2();
             }
             break;
         case 0x12:
@@ -107,7 +104,6 @@ uintptr_t dynarecF20F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                 v0 = sse_get_reg_empty(dyn, ninst, x1, gd);
                 VMOVD(v0, d0);
             } else {
-                SMREAD();
                 v0 = sse_get_reg_empty(dyn, ninst, x1, gd);
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-4, 0, 0, NULL);
                 LDR_IMM9(x2, ed, fixedaddress+0);
@@ -136,50 +132,28 @@ uintptr_t dynarecF20F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
             if((nextop&0xC0)==0xC0) {
                 d0 = sse_get_reg(dyn, ninst, x1, nextop&7, 0);
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0, NULL);
                 d0 = fpu_get_scratch_double(dyn);
                 VLDR_64(d0, ed, fixedaddress);
             }
-            if(!box86_dynarec_fastround) {
-                VMRS(x14);   // Get FPCSR reg to clear exceptions flags
-                ORR_IMM8(x3, x14, 0b010, 9); // enable exceptions
-                BIC_IMM8(x3, x3, 0b10011111, 0);
-                VMSR(x3);
-            }
             VCVT_S32_F64(s0, d0);
             VMOVfrV(gd, s0);
-            if(!box86_dynarec_fastround) {
-                VMRS(x3);   // get the FPCSR reg and test FPU exception (IO only)
-                TSTS_IMM8_ROR(x3, 0b00000001, 0);
-                MOV_IMM_COND(cNE, gd, 0b10, 1);   // 0x80000000
-                VMSR(x14);  // put back values
-            }
             break;
         case 0x2D:
             INST_NAME("CVTSD2SI Gd, Ex");
-            if(!box86_dynarec_fastround)
-                u8 = sse_setround_reset(dyn, ninst, x1, x2, x14);
-            else
-                u8 = sse_setround(dyn, ninst, x1, x2, x14);
+            u8 = sse_setround(dyn, ninst, x1, x2, x14);
             nextop = F8;
             GETGD;
             s0 = fpu_get_scratch_single(dyn);
             if((nextop&0xC0)==0xC0) {
                 d0 = sse_get_reg(dyn, ninst, x1, nextop&7, 0);
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0, NULL);
                 d0 = fpu_get_scratch_double(dyn);
                 VLDR_64(d0, ed, fixedaddress);
             }
             VCVTR_S32_F64(s0, d0);
             VMOVfrV(gd, s0);
-            if(!box86_dynarec_fastround) {
-                VMRS(x3);   // get the FPCSR reg and test FPU exception (IO only)
-                TSTS_IMM8_ROR(x3, 0b00000001, 0);
-                MOV_IMM_COND(cNE, gd, 0b10, 1);   // 0x80000000
-            }
             x87_restoreround(dyn, ninst, u8);
             break;
 
@@ -331,7 +305,6 @@ uintptr_t dynarecF20F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
             if((nextop&0xC0)==0xC0) {
                 v1 = sse_get_reg(dyn, ninst, x1, nextop&7, 0);
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                 v1 = fpu_get_scratch_quad(dyn);
                 VLD1Q_64(v1, ed);
@@ -367,7 +340,6 @@ uintptr_t dynarecF20F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
             if((nextop&0xC0)==0xC0) {
                 v1 = sse_get_reg(dyn, ninst, x1, nextop&7, 0);
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                 v1 = fpu_get_scratch_quad(dyn);
                 VLD1Q_64(v1, ed);
@@ -429,33 +401,6 @@ uintptr_t dynarecF20F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
             VMOV_64(v0, v1);
             break;
 
-        case 0xE6:
-            INST_NAME("CVTPD2DQ Gx, Ex");
-            nextop = F8;
-            gd = (nextop&0x38)>>3;
-            v0 = sse_get_reg(dyn, ninst, x1, gd, 1);
-            if((nextop&0xC0)==0xC0) {
-                v1 = sse_get_reg(dyn, ninst, x1, nextop&7, 0);
-            } else {
-                SMREAD();
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
-                v1 = fpu_get_scratch_quad(dyn);
-                VLD1Q_8(v1, ed);
-            }
-            u8 = sse_setround(dyn, ninst, x1, x2, x14);
-            if(v0<16) {
-                VCVTR_S32_F64(v0*2, v1);
-                VCVTR_S32_F64(v0*2+1, v1+1);
-            } else {
-                d0 = fpu_get_scratch_double(dyn);
-                VCVTR_S32_F64(d0*2, v1);
-                VCVTR_S32_F64(d0*2+1, v1+1);
-                VMOVD(v0, d0);
-            }
-            x87_restoreround(dyn, ninst, u8);
-            VEOR(v0+1, v0+1, v0+1);
-            break;
-
         case 0xF0:
             INST_NAME("LDDQ Gx,Ex");
             nextop = F8;
@@ -465,7 +410,6 @@ uintptr_t dynarecF20F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                 v0 = sse_get_reg_empty(dyn, ninst, x1, gd);
                 VMOVQ(v0, v1);
             } else {
-                SMREAD();
                 v0 = sse_get_reg_empty(dyn, ninst, x1, gd);
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-12, 0, 0, NULL);
                 LDR_IMM9(x2, ed, fixedaddress+0);

src/dynarec/dynarec_arm_f30f.c

@@ -37,7 +37,6 @@
         b = fpu_get_scratch_double(dyn);            \
         a = b*2;                                    \
         parity = getedparity(dyn, ninst, addr, nextop, 2);  \
-        SMREAD();                                   \
         if(parity) {                                \
             addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 0, 0, NULL); \
             VLDR_32(a, ed, fixedaddress);           \
@@ -103,7 +102,6 @@ uintptr_t dynarecF30F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
             } else {
                 v0 = sse_get_reg_empty(dyn, ninst, x1, gd);
                 parity = getedparity(dyn, ninst, addr, nextop, 2);
-                SMREAD();
                 if(parity && (v0<16)) {
                     VEORQ(v0, v0, v0);
                     addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 0, 0, NULL);
@@ -149,7 +147,6 @@ uintptr_t dynarecF30F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                     addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095, 0, 0, NULL);
                     STR_IMM9(x2, ed, fixedaddress);
                 }
-                SMWRITE2();
             }
             break;
         case 0x12:
@@ -159,7 +156,6 @@ uintptr_t dynarecF30F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
             if((nextop&0xC0)==0xC0) {
                 q1 = sse_get_reg(dyn, ninst, x1, nextop&7, 0);
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                 q1 = fpu_get_scratch_quad(dyn);
                 VLD1Q_64(q1, ed);
@@ -176,7 +172,6 @@ uintptr_t dynarecF30F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
             if((nextop&0xC0)==0xC0) {
                 q1 = sse_get_reg(dyn, ninst, x1, nextop&7, 0);
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                 q1 = fpu_get_scratch_quad(dyn);
                 VLD1Q_64(q1, ed);
@@ -234,7 +229,6 @@ uintptr_t dynarecF30F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                 VMOV_32(s0, d0*2);
             } else {
                 parity = getedparity(dyn, ninst, addr, nextop, 3);
-                SMREAD();
                 if(parity) {
                     addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0, NULL);
                     VLDR_32(s0, ed, fixedaddress);
@@ -244,27 +238,12 @@ uintptr_t dynarecF30F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                     VMOVtoV(s0, x2);
                 }
             }
-            if(!box86_dynarec_fastround) {
-                VMRS(x14);   // Get FPCSR reg to clear exceptions flags
-                ORR_IMM8(x3, x14, 0b010, 9); // enable exceptions
-                BIC_IMM8(x3, x3, 0b10011111, 0);
-                VMSR(x3);
-            }
             VCVT_S32_F32(s0, s0);
             VMOVfrV(gd, s0);
-            if(!box86_dynarec_fastround) {
-                VMRS(x3);   // get the FPCSR reg and test FPU exception (IO only)
-                TSTS_IMM8_ROR(x3, 0b00000001, 0);
-                MOV_IMM_COND(cNE, gd, 0b10, 1);   // 0x80000000
-                VMSR(x14);  // put back values
-            }
             break;
         case 0x2D:
             INST_NAME("CVTSS2SI Gd, Ex");
-            if(!box86_dynarec_fastround)
-                u8 = sse_setround_reset(dyn, ninst, x1, x2, x14);
-            else
-                u8 = sse_setround(dyn, ninst, x1, x2, x14);
+            u8 = sse_setround(dyn, ninst, x1, x2, x14);
             nextop = F8;
             GETGD;
             s0 = fpu_get_scratch_single(dyn);
@@ -279,7 +258,6 @@ uintptr_t dynarecF30F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                 VMOV_32(s0, d0*2);
             } else {
                 parity = getedparity(dyn, ninst, addr, nextop, 3);
-                SMREAD();
                 if(parity) {
                     addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0, NULL);
                     VLDR_32(s0, ed, fixedaddress);
@@ -291,11 +269,6 @@ uintptr_t dynarecF30F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
             }
             VCVTR_S32_F32(s0, s0);
             VMOVfrV(gd, s0);
-            if(!box86_dynarec_fastround) {
-                VMRS(x3);   // get the FPCSR reg and test FPU exception (IO only)
-                TSTS_IMM8_ROR(x3, 0b00000001, 0);
-                MOV_IMM_COND(cNE, gd, 0b10, 1);   // 0x80000000
-            }
             x87_restoreround(dyn, ninst, u8);
             break;
 
@@ -423,7 +396,6 @@ uintptr_t dynarecF30F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
             if((nextop&0xC0)==0xC0) {
                 v1 = sse_get_reg(dyn, ninst, x1, nextop&7, 0);
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                 v1 = fpu_get_scratch_quad(dyn);
                 VLD1Q_64(v1, ed);
@@ -528,7 +500,6 @@ uintptr_t dynarecF30F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                 v0 = sse_get_reg_empty(dyn, ninst, x1, gd);
                 VMOVQ(v0, v1);
             } else {
-                SMREAD();
                 v0 = sse_get_reg_empty(dyn, ninst, x1, gd);
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-12, 0, 0, NULL);
                 LDR_IMM9(x2, ed, fixedaddress+0);
@@ -543,15 +514,14 @@ uintptr_t dynarecF30F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
             INST_NAME("PSHUFHW Gx, Ex, Ib");
             nextop = F8;
             gd = (nextop&0x38)>>3;
+            v0 = sse_get_reg(dyn, ninst, x1, gd, 1);
             if((nextop&0xC0)==0xC0) {
                 v1 = sse_get_reg(dyn, ninst, x1, nextop&7, 0);
             } else {
-                SMREAD();
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                 v1 = fpu_get_scratch_quad(dyn);
                 VLD1Q_64(v1, ed);
             }
-            v0 = sse_get_reg_empty(dyn, ninst, x1, gd);
             u8 = F8;
             // only high part need to be shuffled. VTBL only handle 8bits value, so the 16bits shuffles need to be changed in 8bits
             u32 = 0;
@@ -584,7 +554,6 @@ uintptr_t dynarecF30F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                 v0 = sse_get_reg_empty(dyn, ninst, x1, gd);
                 VMOVD(v0, v1);
             } else {
-                SMREAD();
                 v0 = sse_get_reg_empty(dyn, ninst, x1, gd);
                 addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                 VLD1_64(v0, ed);
@@ -607,7 +576,6 @@ uintptr_t dynarecF30F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                 VMOVfrV_D(x2, x3, v0+1);
                 STR_IMM9(x2, ed, fixedaddress+8);
                 STR_IMM9(x3, ed, fixedaddress+12);
-                SMWRITE2();
             }
             break;
 
@@ -672,7 +640,6 @@ uintptr_t dynarecF30F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                 VMOV_64(v0, v1);
             } else {
                 parity = getedparity(dyn, ninst, addr, nextop, 3);
-                SMREAD();
                 if(parity) {
                     addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0, NULL);
                     VLDR_64(v0, ed, fixedaddress);    // vfpu opcode here
@@ -699,7 +666,6 @@ uintptr_t dynarecF30F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
             } else {
                 v0 = fpu_get_scratch_double(dyn);
                 parity = getedparity(dyn, ninst, addr, nextop, 3);
-                SMREAD();
                 if(parity) {
                     addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0, NULL);
                     VLDR_64(v0, ed, fixedaddress);    // vfpu opcode here

src/dynarec/dynarec_arm_functions.c

@@ -27,8 +27,6 @@
 #include "dynarec_arm_private.h"
 #include "dynarec_arm_functions.h"
 #include "bridge.h"
-#include "arm_printer.h"
-#include "custommem.h"
 
 void arm_fstp(x86emu_t* emu, void* p)
 {
@@ -111,7 +109,7 @@ void arm_fistp64(x86emu_t* emu, int64_t* ed)
         memcpy(ed, &STll(0).sq, sizeof(int64_t));
     } else {
         int64_t tmp;
-        if(isgreater(ST0.d, (double)(int64_t)0x7fffffffffffffffLL) || isless(ST0.d, -(double)(uint64_t)0x8000000000000000LL) || !isfinite(ST0.d))
+        if(isgreater(ST0.d, (double)(int64_t)0x7fffffffffffffffLL) || isless(ST0.d, (double)(int64_t)0x8000000000000000LL) || !isfinite(ST0.d))
             tmp = 0x8000000000000000LL;
         else
             tmp = fpu_round(emu, ST0.d);
@@ -122,7 +120,7 @@ void arm_fistp64(x86emu_t* emu, int64_t* ed)
 int64_t arm_fist64_0(double d)
 {
     int64_t tmp;
-    if(isgreater(d, (double)(int64_t)0x7fffffffffffffffLL) || isless(d, -(double)(uint64_t)0x8000000000000000LL) || !isfinite(d))
+    if(isgreater(d, (double)(int64_t)0x7fffffffffffffffLL) || isless(d, (double)(int64_t)0x8000000000000000LL) || !isfinite(d))
         tmp = 0x8000000000000000LL;
     else
         tmp = nearbyint(d);
@@ -131,7 +129,7 @@ int64_t arm_fist64_0(double d)
 int64_t arm_fist64_1(double d)
 {
     int64_t tmp;
-    if(isgreater(d, (double)(int64_t)0x7fffffffffffffffLL) || isless(d, -(double)(uint64_t)0x8000000000000000LL) || !isfinite(d))
+    if(isgreater(d, (double)(int64_t)0x7fffffffffffffffLL) || isless(d, (double)(int64_t)0x8000000000000000LL) || !isfinite(d))
         tmp = 0x8000000000000000LL;
     else
         tmp = floor(d);
@@ -140,7 +138,7 @@ int64_t arm_fist64_1(double d)
 int64_t arm_fist64_2(double d)
 {
     int64_t tmp;
-    if(isgreater(d, (double)(int64_t)0x7fffffffffffffffLL) || isless(d, -(double)(uint64_t)0x8000000000000000LL) || !isfinite(d))
+    if(isgreater(d, (double)(int64_t)0x7fffffffffffffffLL) || isless(d, (double)(int64_t)0x8000000000000000LL) || !isfinite(d))
         tmp = 0x8000000000000000LL;
     else
         tmp = ceil(d);
@@ -149,7 +147,7 @@ int64_t arm_fist64_2(double d)
 int64_t arm_fist64_3(double d)
 {
     int64_t tmp;
-    if(isgreater(d, (double)(int64_t)0x7fffffffffffffffLL) || isless(d, -(double)(uint64_t)0x8000000000000000LL) || !isfinite(d))
+    if(isgreater(d, (double)(int64_t)0x7fffffffffffffffLL) || isless(d, (double)(int64_t)0x8000000000000000LL) || !isfinite(d))
         tmp = 0x8000000000000000LL;
     else
         tmp = trunc(d);
@@ -172,22 +170,9 @@ void arm_fld(x86emu_t* emu, uint8_t* ed)
 
 void arm_ud(x86emu_t* emu)
 {
-    emu->test.test = 0;
     emit_signal(emu, SIGILL, (void*)R_EIP, 0);
 }
 
-void arm_priv(x86emu_t* emu)
-{
-    emu->test.test = 0;
-    emit_signal(emu, SIGSEGV, (void*)R_EIP, 0);
-}
-
-void arm_singlestep(x86emu_t* emu)
-{
-    emu->test.test = 0;
-    emit_signal(emu, SIGTRAP, (void*)R_EIP, 1);
-}
-
 void arm_fsave(x86emu_t* emu, uint8_t* ed)
 {
     fpu_savenv(emu, (char*)ed, 0);
@@ -223,10 +208,6 @@ void arm_fprem1(x86emu_t* emu)
     emu->sw.f.F87_C0 = ((tmp64s>>2)&1);
 }
 
-void arm_clflush(x86emu_t* emu, void* p)
-{
-    cleanDBFromAddressRange((uintptr_t)p, 8, 0);
-}
 
 // Get a FPU single scratch reg
 int fpu_get_scratch_single(dynarec_arm_t* dyn)
@@ -627,7 +608,6 @@ void neoncacheUnwind(neoncache_t* cache)
                 case NEON_CACHE_XMMW:
                     cache->ssecache[cache->neoncache[i].n].reg = i+FPUFIRST;
                     cache->ssecache[cache->neoncache[i].n].write = (cache->neoncache[i].t==NEON_CACHE_XMMW)?1:0;
-                    cache->neoncache[i] = cache->neoncache[i+1];
                     ++cache->fpu_reg;
                     ++i;    // next next
                     break;
@@ -722,13 +702,13 @@ int isNativeCall(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t* calladdress, int
 #define PK(a)       *(uint8_t*)(addr+a)
 #define PK32(a)     *(uint32_t*)(addr+a)
 
-    if(!addr || !getProtection(addr))
+    if(!addr)
         return 0;
     if(PK(0)==0xff && PK(1)==0x25) {  // absolute jump, maybe the GOT
         uintptr_t a1 = (PK32(2));   // need to add a check to see if the address is from the GOT !
         addr = (uintptr_t)getAlternate(*(void**)a1); 
     }
-    if(addr<0x10000 || !getProtection(addr))    // too low, that is suspicious
+    if(addr<0x10000)    // too low, that is suspicious
         return 0;
     onebridge_t *b = (onebridge_t*)(addr);
     if(b->CC==0xCC && b->S=='S' && b->C=='C' && b->w!=(wrapper_t)0 && b->f!=(uintptr_t)PltResolver) {
@@ -757,6 +737,24 @@ const char* getCacheName(int t, int n)
     return buff;
 }
 
+// is inst clean for a son branch?
+int isInstClean(dynarec_arm_t* dyn, int ninst)
+{
+    // check flags cache
+    if(dyn->insts[ninst].f_entry.dfnone || dyn->insts[ninst].f_entry.pending)
+        return 0;
+    if(dyn->insts[ninst].x86.state_flags)
+        return 0;
+    // check neoncache
+    neoncache_t* n = &dyn->insts[ninst].n;
+    if(n->news || n->stack || n->stack_next)
+        return 0;
+    for(int i=0; i<24; ++i)
+        if(n->neoncache[i].v)
+            return 0;
+    return 1;
+}
+
 static int flagsCacheNeedsTransform(dynarec_arm_t* dyn, int ninst) {
     int jmp = dyn->insts[ninst].x86.jmp_insts;
     if(jmp<0)
@@ -797,58 +795,4 @@ int CacheNeedsTransform(dynarec_arm_t* dyn, int ninst) {
     if (fpuCacheNeedsTransform(dyn, ninst)) ret|=1;
     if (flagsCacheNeedsTransform(dyn, ninst)) ret|=2;
     return ret;
-}
-
-void inst_name_pass3(dynarec_arm_t* dyn, int ninst, const char* name)
-{
-    if(box86_dynarec_dump) {
-        printf_x86_instruction(my_context->dec, &dyn->insts[ninst].x86, name);
-        dynarec_log(LOG_NONE, "%s%p: %d emited opcodes, inst=%d, barrier=%d state=%d/%d(%d), %s=%X/%X, use=%X, need=%X/%X sm=%d/%d",
-            (box86_dynarec_dump>1)?"\e[32m":"",
-            (void*)(dyn->arm_start+dyn->insts[ninst].address),
-            dyn->insts[ninst].size/4,
-            ninst,
-            dyn->insts[ninst].x86.barrier,
-            dyn->insts[ninst].x86.state_flags,
-            dyn->f.pending,
-            dyn->f.dfnone,
-            dyn->insts[ninst].x86.may_set?"may":"set",
-            dyn->insts[ninst].x86.set_flags,
-            dyn->insts[ninst].x86.gen_flags,
-            dyn->insts[ninst].x86.use_flags,
-            dyn->insts[ninst].x86.need_before,
-            dyn->insts[ninst].x86.need_after,
-            dyn->smread, dyn->smwrite);
-        if(dyn->insts[ninst].pred_sz) {
-            dynarec_log(LOG_NONE, ", pred=");
-            for(int ii=0; ii<dyn->insts[ninst].pred_sz; ++ii)
-                dynarec_log(LOG_NONE, "%s%d", ii?"/":"", dyn->insts[ninst].pred[ii]);
-        }
-        if(dyn->insts[ninst].x86.jmp && dyn->insts[ninst].x86.jmp_insts>=0)
-            dynarec_log(LOG_NONE, ", jmp=%d", dyn->insts[ninst].x86.jmp_insts);
-        if(dyn->insts[ninst].x86.jmp && dyn->insts[ninst].x86.jmp_insts==-1)
-            dynarec_log(LOG_NONE, ", jmp=out");
-        for(int ii=0; ii<24; ++ii) {
-            switch(dyn->insts[ninst].n.neoncache[ii].t) {
-                case NEON_CACHE_ST_D: dynarec_log(LOG_NONE, " D%d:%s", ii+8, getCacheName(dyn->insts[ninst].n.neoncache[ii].t, dyn->insts[ninst].n.neoncache[ii].n)); break;
-                case NEON_CACHE_ST_F: dynarec_log(LOG_NONE, " S%d:%s", (ii+8)*2, getCacheName(dyn->insts[ninst].n.neoncache[ii].t, dyn->insts[ninst].n.neoncache[ii].n)); break;
-                case NEON_CACHE_MM: dynarec_log(LOG_NONE, " D%d:%s", ii+8, getCacheName(dyn->insts[ninst].n.neoncache[ii].t, dyn->insts[ninst].n.neoncache[ii].n)); break;
-                case NEON_CACHE_XMMW: dynarec_log(LOG_NONE, " Q%d:%s", (ii+8)/2, getCacheName(dyn->insts[ninst].n.neoncache[ii].t, dyn->insts[ninst].n.neoncache[ii].n)); ++ii; break;
-                case NEON_CACHE_XMMR: dynarec_log(LOG_NONE, " Q%d:%s", (ii+8)/2, getCacheName(dyn->insts[ninst].n.neoncache[ii].t, dyn->insts[ninst].n.neoncache[ii].n)); ++ii; break;
-                case NEON_CACHE_SCR: dynarec_log(LOG_NONE, " D%d:%s", ii+8, getCacheName(dyn->insts[ninst].n.neoncache[ii].t, dyn->insts[ninst].n.neoncache[ii].n)); break;
-                case NEON_CACHE_NONE:
-                default:    break;
-            }
-        }
-        if(dyn->n.stack || dyn->insts[ninst].n.stack_next || dyn->insts[ninst].n.x87stack)
-            dynarec_log(LOG_NONE, " X87:%d/%d(+%d/-%d)%d", dyn->n.stack, dyn->insts[ninst].n.stack_next, dyn->insts[ninst].n.stack_push, dyn->insts[ninst].n.stack_pop, dyn->insts[ninst].n.x87stack);
-        if(dyn->insts[ninst].n.combined1 || dyn->insts[ninst].n.combined2)
-            dynarec_log(LOG_NONE, " %s:%d/%d", dyn->insts[ninst].n.swapped?"SWP":"CMB", dyn->insts[ninst].n.combined1, dyn->insts[ninst].n.combined2);
-        dynarec_log(LOG_NONE, "%s\n", (box86_dynarec_dump>1)?"\e[m":"");
-    }
-}
-
-void print_opcode(dynarec_arm_t* dyn, int ninst, uint32_t opcode)
-{
-    dynarec_log(LOG_NONE, "\t%08x\t%s\n", opcode, arm_print(opcode));
-}
+}

src/dynarec/dynarec_arm_functions.h

@@ -23,16 +23,12 @@ void arm_fsave(x86emu_t* emu, uint8_t* ed);
 void arm_frstor(x86emu_t* emu, uint8_t* ed);
 void arm_fprem1(x86emu_t* emu);
 
-void arm_clflush(x86emu_t* emu, void* p);
-
 int64_t arm_fist64_0(double d);
 int64_t arm_fist64_1(double d);
 int64_t arm_fist64_2(double d);
 int64_t arm_fist64_3(double d);
 
 void arm_ud(x86emu_t* emu);
-void arm_priv(x86emu_t* emu);
-void arm_singlestep(x86emu_t* emu);
 
 #define FPUFIRST    8
 
@@ -75,6 +71,9 @@ int CacheNeedsTransform(dynarec_arm_t* dyn, int i1);
 // Undo the changes of a neoncache to get the status before the instruction
 void neoncacheUnwind(neoncache_t* cache);
 
+// is inst clean for a son branch?
+int isInstClean(dynarec_arm_t* dyn, int ninst);
+
 // predecessor access
 int isPred(dynarec_arm_t* dyn, int ninst, int pred);
 int getNominalPred(dynarec_arm_t* dyn, int ninst);
@@ -89,7 +88,4 @@ int isNativeCall(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t* calladdress, int
 
 const char* getCacheName(int t, int n);
 
-void inst_name_pass3(dynarec_arm_t* dyn, int ninst, const char* name);
-void print_opcode(dynarec_arm_t* dyn, int ninst, uint32_t opcode);
-
 #endif //__DYNAREC_ARM_FUNCTIONS_H__

src/dynarec/dynarec_arm_helper.c

@@ -4,7 +4,6 @@
 #include <pthread.h>
 #include <errno.h>
 #include <assert.h>
-#include <string.h>
 
 #include "debug.h"
 #include "box86context.h"
@@ -177,8 +176,8 @@ uintptr_t geted16(dynarec_arm_t* dyn, uintptr_t addr, int ninst, uint8_t nextop,
     uint32_t m = nextop&0xC7;
     uint32_t n = (m>>6)&3;
     int32_t offset = 0;
-    if(!n && (m&7)==6) {
-        offset = F16S;
+    if(!n && m==6) {
+        offset = F16;
         MOVW(ret, offset);
     } else {
         switch(n) {
@@ -186,7 +185,7 @@ uintptr_t geted16(dynarec_arm_t* dyn, uintptr_t addr, int ninst, uint8_t nextop,
             case 1: offset = F8S; break;
             case 2: offset = F16S; break;
         }
-        if(offset && (abs(offset)<=absmax && !(offset&mask))) {
+        if(offset && (abs(offset)>absmax || (offset&mask))) {
             *fixaddress = offset;
             offset = 0;
         }
@@ -252,7 +251,6 @@ void jump_to_epilog(dynarec_arm_t* dyn, uintptr_t ip, int reg, int ninst)
     }
     PASS3(void* epilog = arm_epilog);
     MOV32_(2, (uintptr_t)epilog);
-    SMEND();
     BX(2);
 }
 
@@ -279,7 +277,6 @@ void jump_to_next(dynarec_arm_t* dyn, uintptr_t ip, int reg, int ninst)
     #ifdef HAVE_TRACE
     MOV_REG(x2, 15);    // move current PC to x2, for tracing
     #endif
-    SMEND();
     BX(x3);
 }
 
@@ -296,7 +293,6 @@ void ret_to_epilog(dynarec_arm_t* dyn, int ninst)
         #ifdef HAVE_TRACE
         MOV_REG(x2, 15);    // move current PC to x2, for tracing
         #endif
-        SMEND();
         BX(x3);
 }
 
@@ -319,7 +315,6 @@ void retn_to_epilog(dynarec_arm_t* dyn, int ninst, int n)
         #ifdef HAVE_TRACE
         MOV_REG(x2, 15);    // move current PC to x2, for tracing
         #endif
-        SMEND();
         BX(x3);
 }
 
@@ -342,7 +337,6 @@ void iret_to_epilog(dynarec_arm_t* dyn, int ninst)
     SET_DFNONE(x1);
     // Ret....
     MOV32_(x2, (uintptr_t)arm_epilog);  // epilog on purpose, CS might have changed!
-    SMEND();
     BX(x2);
 }
 
@@ -484,7 +478,7 @@ void call_rd(dynarec_arm_t* dyn, int ninst, void* fnc, int reg, int s1, uint32_t
         if(s1!=xFlags) mask=1<<xFlags; else mask=1<<x3;
     }
     PUSH(xSP, (1<<xEmu) | mask);
-    fpu_pushcache(dyn, ninst, s1);
+    fpu_pushcache(dyn, ninst, reg);
     if(saveflags) {
         STR_IMM9(xFlags, xEmu, offsetof(x86emu_t, eflags));
     }
@@ -496,7 +490,7 @@ void call_rd(dynarec_arm_t* dyn, int ninst, void* fnc, int reg, int s1, uint32_t
     #ifdef ARM_SOFTFP
     VMOVtoV_64(0, 0, 1);    // load r0:r1 to D0 to simulate hardfo
     #endif
-    fpu_popcache(dyn, ninst, s1);
+    fpu_popcache(dyn, ninst, reg);
     POP(xSP, (1<<xEmu) | mask);
     if(saveflags) {
         LDR_IMM9(xFlags, xEmu, offsetof(x86emu_t, eflags));
@@ -862,29 +856,10 @@ void x87_purgecache(dynarec_arm_t* dyn, int ninst, int next, int s1, int s2, int
     MESSAGE(LOG_DUMP, "\t---Purge x87 Cache and Synch Stackcount\n");
 }
 
+#ifdef HAVE_TRACE
 static void x87_reflectcache(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3)
 {
-    // Synch top & stack counter
-    int a = dyn->n.x87stack;
-    if(a) {
-    // Add x87stack to emu fpu_stack
-        LDR_IMM9(s2, xEmu, offsetof(x86emu_t, fpu_stack));
-        if(a>0) {
-            ADD_IMM8(s2, s2, a);
-        } else {
-            SUB_IMM8(s2, s2, -a);
-        }
-        STR_IMM9(s2, xEmu, offsetof(x86emu_t, fpu_stack));
-        // Sub x87stack to top, with and 7
-        LDR_IMM9(s2, xEmu, offsetof(x86emu_t, top));
-        if(a>0) {
-            SUB_IMM8(s2, s2, a);
-        } else {
-            ADD_IMM8(s2, s2, -a);
-        }
-        AND_IMM8(s2, s2, 7);
-        STR_IMM9(s2, xEmu, offsetof(x86emu_t, top));
-    }
+    x87_stackcount(dyn, ninst, s1);
     int ret = 0;
     for (int i=0; (i<8) && (!ret); ++i)
         if(dyn->n.x87cache[i] != -1)
@@ -892,20 +867,13 @@ static void x87_reflectcache(dynarec_arm_t* dyn, int ninst, int s1, int s2, int
     if(!ret)    // nothing to do
         return;
     // Get top
-    if(!a) {
-        // already there
-        LDR_IMM9(s2, xEmu, offsetof(x86emu_t, top));
-    }
+    LDR_IMM9(s2, xEmu, offsetof(x86emu_t, top));
     // loop all cache entries
     for (int i=0; i<8; ++i)
         if(dyn->n.x87cache[i]!=-1) {
-            if(dyn->n.x87cache[i]) {
-                ADD_IMM8(s3, s2, dyn->n.x87cache[i]);
-                AND_IMM8(s3, s3, 7);    // (emu->top + i)&7
-                ADD_REG_LSL_IMM5(s3, xEmu, s3, 3);    // fpu[(emu->top+i)&7] lsl 3 because fpu are double, so 8 bytes
-            } else {
-                ADD_REG_LSL_IMM5(s3, xEmu, s2, 3);
-            }
+            ADD_IMM8(s3, s2, dyn->n.x87cache[i]);
+            AND_IMM8(s3, s3, 7);    // (emu->top + i)&7
+            ADD_REG_LSL_IMM5(s3, xEmu, s3, 3);    // fpu[(emu->top+i)&7] lsl 3 because fpu are double, so 8 bytes
             if(ST_IS_F(dyn->n.x87cache[i])) {
                 VCVT_F64_F32(0, dyn->n.x87reg[i]*2);    // use D0 as scratch...
                 VSTR_64(0, s3, offsetof(x86emu_t, x87));
@@ -914,31 +882,7 @@ static void x87_reflectcache(dynarec_arm_t* dyn, int ninst, int s1, int s2, int
             }
         }
 }
-
-static void x87_unreflectcache(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3)
-{
-    // go back with the top & stack counter
-    int a = dyn->n.x87stack;
-    if(a) {
-    // Add x87stack to emu fpu_stack
-        LDR_IMM9(s1, xEmu, offsetof(x86emu_t, fpu_stack));
-        if(a>0) {
-            SUB_IMM8(s1, s1, a);
-        } else {
-            ADD_IMM8(s1, s1, -a);
-        }
-        STR_IMM9(s1, xEmu, offsetof(x86emu_t, fpu_stack));
-        // Sub x87stack to top, with and 7
-        LDR_IMM9(s1, xEmu, offsetof(x86emu_t, top));
-        if(a>0) {
-            ADD_IMM8(s1, s1, a);
-        } else {
-            SUB_IMM8(s1, s1, -a);
-        }
-        AND_IMM8(s1, s1, 7);
-        STR_IMM9(s1, xEmu, offsetof(x86emu_t, top));
-    }
-}
+#endif
 
 int x87_get_current_cache(dynarec_arm_t* dyn, int ninst, int st, int t)
 {
@@ -1122,13 +1066,15 @@ void x87_reget_st(dynarec_arm_t* dyn, int ninst, int s1, int s2, int st)
     MESSAGE(LOG_DUMP, "\t-------x87 Cache for ST%d\n", st);
 }
 
+static int round_map[] = {0, 2, 1, 3};  // map x86 -> arm round flag
+
 // Set rounding according to cw flags, return reg to restore flags
 int x87_setround(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3)
 {
     LDRH_IMM8(s1, xEmu, offsetof(x86emu_t, cw));    // hopefully cw is not too far for an imm8
-    UBFX(s1, s1, 10, 2);    // extract round...
-    UBFX(s2, s1, 1, 1);     // swap bits 0 and 1
-    BFI(s2, s1, 1, 1);
+    UBFX(s2, s1, 10, 2);    // extract round...
+    MOV32(s1, round_map);
+    LDR_REG_LSL_IMM5(s2, s1, s2, 2);
     VMRS(s1);               // get fpscr
     MOV_REG(s3, s1);
     BFI(s1, s2, 22, 2);     // inject new round
@@ -1136,21 +1082,6 @@ int x87_setround(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3)
     return s3;
 }
 
-// Set rounding according to cw flags, also enable exception and reset counter, return reg to restore flags
-int x87_setround_reset(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3)
-{
-    LDRH_IMM8(s1, xEmu, offsetof(x86emu_t, cw));    // hopefully cw is not too far for an imm8
-    UBFX(s1, s1, 10, 2);    // extract round...
-    UBFX(s2, s1, 1, 1);     // swap bits 0 and 1
-    BFI(s2, s1, 1, 1);
-    VMRS(s3);               // get fpscr
-    ORR_IMM8(s1, s3, 0b010, 9); // enable exceptions
-    BIC_IMM8(s1, s1, 0b10011111, 0);    // reset counters
-    BFI(s1, s2, 22, 2);     // inject new round
-    VMSR(s1);               // put new fpscr
-    return s3;
-}
-
 void x87_swapreg(dynarec_arm_t* dyn, int ninst, int s1, int s2, int a, int b)
 {
     int i1, i2, i3;
@@ -1175,9 +1106,9 @@ void x87_swapreg(dynarec_arm_t* dyn, int ninst, int s1, int s2, int a, int b)
 int sse_setround(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3)
 {
     LDR_IMM9(s1, xEmu, offsetof(x86emu_t, mxcsr));
-    UBFX(s1, s1, 13, 2);    // extract round...
-    UBFX(s2, s1, 1, 1);     // swap bits 0 and 1
-    BFI(s2, s1, 1, 1);
+    UBFX(s2, s1, 13, 2);    // extract round...
+    MOV32(s1, round_map);
+    LDR_REG_LSL_IMM5(s2, s1, s2, 2);
     VMRS(s1);               // get fpscr
     MOV_REG(s3, s1);
     BFI(s1, s2, 22, 2);     // inject new round
@@ -1185,21 +1116,6 @@ int sse_setround(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3)
     return s3;
 }
 
-// Set rounding according to mxcsr flags, also enable exception and reset counter, return reg to restore flags
-int sse_setround_reset(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3)
-{
-    LDR_IMM9(s1, xEmu, offsetof(x86emu_t, mxcsr));
-    UBFX(s1, s1, 13, 2);    // extract round...
-    UBFX(s2, s1, 1, 1);     // swap bits 0 and 1
-    BFI(s2, s1, 1, 1);
-    VMRS(s3);               // get fpscr
-    ORR_IMM8(s1, s3, 0b010, 9); // enable exceptions
-    BIC_IMM8(s1, s1, 0b10011111, 0);    // reset counters
-    BFI(s1, s2, 22, 2);     // inject new round
-    VMSR(s1);               // put new fpscr
-    return s3;
-}
-
 // Restore round flag
 void x87_restoreround(dynarec_arm_t* dyn, int ninst, int s1)
 {
@@ -1274,6 +1190,7 @@ void mmx_purgecache(dynarec_arm_t* dyn, int ninst, int next, int s1)
         MESSAGE(LOG_DUMP, "\t------ Purge MMX Cache\n");
     }
 }
+#ifdef HAVE_TRACE
 static void mmx_reflectcache(dynarec_arm_t* dyn, int ninst, int s1)
 {
     int old = -1;
@@ -1291,6 +1208,7 @@ static void mmx_reflectcache(dynarec_arm_t* dyn, int ninst, int s1)
             VST1_32_W(dyn->n.mmxcache[i], s1);
         }
 }
+#endif
 
 
 // SSE / SSE2 helpers
@@ -1370,6 +1288,7 @@ static void sse_purgecache(dynarec_arm_t* dyn, int ninst, int next, int s1)
         MESSAGE(LOG_DUMP, "\t------ Purge SSE Cache\n");
     }
 }
+#ifdef HAVE_TRACE
 static void sse_reflectcache(dynarec_arm_t* dyn, int ninst, int s1)
 {
     int old = -1;
@@ -1393,6 +1312,7 @@ static void sse_reflectcache(dynarec_arm_t* dyn, int ninst, int s1)
             VST1Q_32_W(dyn->n.ssecache[i].reg, s1);
         }
 }
+#endif
 
 void fpu_pushcache(dynarec_arm_t* dyn, int ninst, int s1)
 {
@@ -1413,7 +1333,7 @@ void fpu_pushcache(dynarec_arm_t* dyn, int ninst, int s1)
     MOV_REG(s1, xSP);
     for (int i=16; i<32; ++i) {   // should use VSTM?
         if(dyn->n.fpuused[i-8]) {
-            VST1_64_W(i, s1);
+            VST1_32_W(i, s1);
         }
     }
     MESSAGE(LOG_DUMP, "\t------- Push FPU Cache (%d)\n", n);
@@ -1432,7 +1352,7 @@ void fpu_popcache(dynarec_arm_t* dyn, int ninst, int s1)
     MOV_REG(s1, xSP);
     for (int i=16; i<32; ++i) {
         if(dyn->n.fpuused[i-8]) {
-            VLD1_64_W(i, s1);
+            VLD1_32_W(i, s1);
         }
     }
     if(n>=8) {
@@ -1493,10 +1413,8 @@ static void swapCache(dynarec_arm_t* dyn, int ninst, int i, int j, neoncache_t *
         quad =1;
     if(cache->neoncache[j].t==NEON_CACHE_XMMR || cache->neoncache[j].t==NEON_CACHE_XMMW)
         quad =1;
-    if(quad) {    // if quad, we need to swap the whole quad!
+    if(quad)    // if quad, we need to swap the whole quad!
         i&=~1;
-        j&=~1;
-    }
     if(!cache->neoncache[i].v && ((quad && !cache->neoncache[i+1].v) || !quad)) {
         // a mov is enough, no need to swap
         MESSAGE(LOG_DUMP, "\t  - Moving %d <- %d\n", i, j);
@@ -1766,7 +1684,7 @@ static void fpuCacheTransform(dynarec_arm_t* dyn, int ninst, int s1, int s2, int
         stack_cnt = cache_i2.stack;
     }
     neoncache_t cache = dyn->n;
-    // sanitize XMM regs alocation, cache_i2 has been sanitized in neoncacheUnwind already
+    // sanitize XMM regs alocation
     for(int i=0; i<24; i+=2) {
         if(cache.neoncache[i].t == NEON_CACHE_XMMR || cache.neoncache[i].t == NEON_CACHE_XMMW)
             cache.neoncache[i+1] = cache.neoncache[i];
@@ -1874,11 +1792,11 @@ static void flagsCacheTransform(dynarec_arm_t* dyn, int ninst, int s1)
         if(dyn->f.pending!=SF_PENDING) {
             LDR_IMM9(s1, xEmu, offsetof(x86emu_t, df));
             TSTS_REG_LSL_IMM5(s1, s1, 0);
-            j32 = (GETMARKF2)-(dyn->arm_size+8);
+            j32 = (GETMARK3)-(dyn->arm_size+8);
             Bcond(cEQ, j32);
         }
         CALL_(UpdateFlags, -1, 0);
-        MARKF2;
+        MARK3;
     }
 #endif
 }
@@ -1890,17 +1808,16 @@ void CacheTransform(dynarec_arm_t* dyn, int ninst, int cacheupd, int s1, int s2,
         flagsCacheTransform(dyn, ninst, s1);
 }
 
+#ifdef HAVE_TRACE
 void fpu_reflectcache(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3)
 {
     x87_reflectcache(dyn, ninst, s1, s2, s3);
-    mmx_reflectcache(dyn, ninst, s1);
-    sse_reflectcache(dyn, ninst, s1);
-}
-
-void fpu_unreflectcache(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3)
-{
-    x87_unreflectcache(dyn, ninst, s1, s2, s3);
+    if(trace_emm)
+       mmx_reflectcache(dyn, ninst, s1);
+    if(trace_xmm)
+       sse_reflectcache(dyn, ninst, s1);
 }
+#endif
 
 void fpu_reset(dynarec_arm_t* dyn)
 {
@@ -1937,64 +1854,3 @@ void emit_pf(dynarec_arm_t* dyn, int ninst, int s1, int s3, int s4)
     MVN_REG_LSR_REG(s4, s4, s3);
     BFI(xFlags, s4, F_PF, 1);
 }
-
-void fpu_reset_cache(dynarec_arm_t* dyn, int ninst, int reset_n)
-{
-    MESSAGE(LOG_DEBUG, "Reset Caches with %d\n",reset_n);
-    #if STEP > 1
-    // for STEP 2 & 3, just need to refrest with current, and undo the changes (push & swap)
-    dyn->n = dyn->insts[ninst].n;
-    neoncacheUnwind(&dyn->n);
-    #ifdef HAVE_TRACE
-    if(box86_dynarec_dump)
-        if(memcmp(&dyn->n, &dyn->insts[reset_n].n, sizeof(neon_cache_t))) {
-            MESSAGE(LOG_DEBUG, "Warning, difference in neoncache: reset=");
-            for(int i=0; i<24; ++i)
-                if(dyn->insts[reset_n].n.neoncache[i].v)
-                    MESSAGE(LOG_DEBUG, " %02d:%s", i, getCacheName(dyn->insts[reset_n].n.neoncache[i].t, dyn->insts[reset_n].n.neoncache[i].n));
-            if(dyn->insts[reset_n].n.combined1 || dyn->insts[reset_n].n.combined2)
-                MESSAGE(LOG_DEBUG, " %s:%02d/%02d", dyn->insts[reset_n].n.swapped?"SWP":"CMB", dyn->insts[reset_n].n.combined1, dyn->insts[reset_n].n.combined2);
-            if(dyn->insts[reset_n].n.stack_push || dyn->insts[reset_n].n.stack_pop)
-                MESSAGE(LOG_DEBUG, " (%d:%d)", dyn->insts[reset_n].n.stack_push, -dyn->insts[reset_n].n.stack_pop);
-            MESSAGE(LOG_DEBUG, " ==> ");
-            for(int i=0; i<24; ++i)
-                if(dyn->insts[ninst].n.neoncache[i].v)
-                    MESSAGE(LOG_DEBUG, " %02d:%s", i, getCacheName(dyn->insts[ninst].n.neoncache[i].t, dyn->insts[ninst].n.neoncache[i].n));
-            if(dyn->insts[ninst].n.combined1 || dyn->insts[ninst].n.combined2)
-                MESSAGE(LOG_DEBUG, " %s:%02d/%02d", dyn->insts[ninst].n.swapped?"SWP":"CMB", dyn->insts[ninst].n.combined1, dyn->insts[ninst].n.combined2);
-            if(dyn->insts[ninst].n.stack_push || dyn->insts[ninst].n.stack_pop)
-                MESSAGE(LOG_DEBUG, " (%d:%d)", dyn->insts[ninst].n.stack_push, -dyn->insts[ninst].n.stack_pop);
-            MESSAGE(LOG_DEBUG, " -> ");
-            for(int i=0; i<24; ++i)
-                if(dyn->n.neoncache[i].v)
-                    MESSAGE(LOG_DEBUG, " %02d:%s", i, getCacheName(dyn->n.neoncache[i].t, dyn->n.neoncache[i].n));
-            if(dyn->n.combined1 || dyn->n.combined2)
-                MESSAGE(LOG_DEBUG, " %s:%02d/%02d", dyn->n.swapped?"SWP":"CMB", dyn->n.combined1, dyn->n.combined2);
-            if(dyn->n.stack_push || dyn->n.stack_pop)
-                MESSAGE(LOG_DEBUG, " (%d:%d)", dyn->n.stack_push, -dyn->n.stack_pop);
-            MESSAGE(LOG_DEBUG, "\n");
-        }
-    #endif //HAVE_TRACE
-    #else
-    dyn->n = dyn->insts[reset_n].n;
-    #endif
-}
-
-// propagate ST stack state, especial stack pop that are deferred
-void fpu_propagate_stack(dynarec_arm_t* dyn, int ninst)
-{
-    if(dyn->n.stack_pop) {
-        for(int j=0; j<24; ++j)
-            if((dyn->n.neoncache[j].t == NEON_CACHE_ST_D || dyn->n.neoncache[j].t == NEON_CACHE_ST_F)) {
-                if(dyn->n.neoncache[j].n<dyn->n.stack_pop)
-                    dyn->n.neoncache[j].v = 0;
-                else
-                    dyn->n.neoncache[j].n-=dyn->n.stack_pop;
-            }
-        dyn->n.stack_pop = 0;
-    }
-    dyn->n.stack = dyn->n.stack_next;
-    dyn->n.news = 0;
-    dyn->n.stack_push = 0;
-    dyn->n.swapped = 0;
-}

src/dynarec/dynarec_arm_helper.h

@@ -27,30 +27,6 @@
 #define PKip(a) *(uint8_t*)(ip+a)
 #define PKa(a)  *(uint8_t*)(a)
 
-// Strong mem emulation helpers
-// Sequence of Read will trigger a DMB on "first" read if strongmem is 2
-// Squence of Write will trigger a DMB on "last" write if strongmem is 1
-// Opcode will read
-#define SMREAD()    if(!dyn->smread && box86_dynarec_strongmem>1) {SMDMB();}
-// Opcode will read with option forced lock
-#define SMREADLOCK(lock)    if(lock || (!dyn->smread && box86_dynarec_strongmem>1)) {SMDMB();}
-// Opcode migh read (depend on nextop)
-#define SMMIGHTREAD()   if(!MODREG) {SMREAD();}
-// Opcode has wrote
-#define SMWRITE()   dyn->smwrite=1
-// Opcode has wrote (strongmem>1 only)
-#define SMWRITE2()   if(box86_dynarec_strongmem>1) dyn->smwrite=1
-// Opcode has wrote with option forced lock
-#define SMWRITELOCK(lock)   if(lock) {SMDMB();} else dyn->smwrite=1
-// Opcode migh have wrote (depend on nextop)
-#define SMMIGHTWRITE()   if(!MODREG) {SMWRITE();}
-// Start of sequence
-#define SMSTART()   SMEND()
-// End of sequence
-#define SMEND()     if(dyn->smwrite && box86_dynarec_strongmem) {DMB_ISH();} dyn->smwrite=0; dyn->smread=0;
-// Force a Data memory barrier (for LOCK: prefix)
-#define SMDMB()     DMB_ISH(); dyn->smwrite=0; dyn->smread=1
-
 //LOCK_* define
 #define LOCK_LOCK   (int*)1
 
@@ -61,7 +37,6 @@
                     ed = xEAX+(nextop&7);   \
                     wback = 0;              \
                 } else {                    \
-                    SMREAD();               \
                     addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 4095, 0, 0, NULL); \
                     LDR_IMM9(x1, wback, fixedaddress); \
                     ed = x1;                \
@@ -71,7 +46,6 @@
                     ed = xEAX+(nextop&7);   \
                     wback = 0;              \
                 } else {                    \
-                    SMREAD();               \
                     addr = geted(dyn, addr, ninst, nextop, &wback, (hint==x2)?x1:x2, &fixedaddress, 4095, 0, 0, NULL); \
                     LDR_IMM9(hint, wback, fixedaddress); \
                     ed = hint;              \
@@ -82,21 +56,19 @@
                     MOV_REG(ret, ed);       \
                     wback = 0;              \
                 } else {                    \
-                    SMREAD();               \
                     addr = geted(dyn, addr, ninst, nextop, &wback, hint, &fixedaddress, 4095, 0, 0, NULL); \
                     ed = ret;               \
                     LDR_IMM9(ed, wback, fixedaddress); \
                 }
 // Write back ed in wback (if wback not 0)
-#define WBACK       if(wback) {STR_IMM9(ed, wback, fixedaddress); SMWRITE();}
-// Write back ed in wback (if wback not 0) (SMWRITE2 version)
-#define WBACK2      if(wback) {STR_IMM9(ed, wback, fixedaddress); SMWRITE2();}
+#define WBACK       if(wback) {STR_IMM9(ed, wback, fixedaddress);}
+// Send back wb to either ed or wback
+#define SBACK(wb)   if(wback) {STR_IMM9(wb, wback, fixedaddress);} else {MOV_REG(ed, wb);}
 //GETEDO can use r1 for ed, and r2 for wback. wback is 0 if ed is xEAX..xEDI
 #define GETEDO(O)   if((nextop&0xC0)==0xC0) {   \
                     ed = xEAX+(nextop&7);   \
                     wback = 0;              \
                 } else {                    \
-                    SMREAD();               \
                     addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 0, NULL); \
                     LDR_REG_LSL_IMM5(x1, wback, O, 0);  \
                     ed = x1;                 \
@@ -106,14 +78,13 @@
                     ed = xEAX+(nextop&7);               \
                     wback = 0;                          \
                 } else {                                \
-                    SMREAD();                           \
                     addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 0, NULL); \
                     ADD_REG_LSL_IMM5(x2, wback, O, 0);  \
                     if(wback != x2) wback = x2;         \
                     LDR_IMM9(x1, wback, 0);             \
                     ed = x1;                            \
                 }
-#define WBACKO(O)   if(wback) {STR_REG_LSL_IMM5(ed, wback, O, 0); SMWRITE();}
+#define WBACKO(O)   if(wback) {STR_REG_LSL_IMM5(ed, wback, O, 0);}
 //FAKEELike GETED, but doesn't get anything
 #define FAKEED  if((nextop&0xC0)!=0xC0) {   \
                     addr = fakeed(dyn, addr, ninst, nextop); \
@@ -127,7 +98,6 @@
                     ed = i;                 \
                     wb1 = 0;                \
                 } else {                    \
-                    SMREAD();               \
                     addr = geted(dyn, addr, ninst, nextop, &wback, w, &fixedaddress, 255, 0, 0, NULL); \
                     LDRH_IMM8(i, wback, fixedaddress); \
                     ed = i;                 \
@@ -140,7 +110,6 @@
                     ed = i;                 \
                     wb1 = 0;                \
                 } else {                    \
-                    SMREAD();               \
                     addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255, 0, 0, NULL); \
                     LDRH_IMM8(i, wback, fixedaddress); \
                     ed = i;                 \
@@ -153,16 +122,15 @@
                     ed = i;                 \
                     wb1 = 0;                \
                 } else {                    \
-                    SMREAD();               \
                     addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255, 0, 0, NULL); \
                     LDRSH_IMM8(i, wback, fixedaddress);\
                     ed = i;                 \
                     wb1 = 1;                \
                 }
 // Write ed back to original register / memory
-#define EWBACK   if(wb1) {STRH_IMM8(ed, wback, fixedaddress); SMWRITE();} else {BFI(wback, ed, 0, 16);}
+#define EWBACK   if(wb1) {STRH_IMM8(ed, wback, fixedaddress);} else {BFI(wback, ed, 0, 16);}
 // Write w back to original register / memory
-#define EWBACKW(w)   if(wb1) {STRH_IMM8(w, wback, fixedaddress); SMWRITE();} else {BFI(wback, w, 0, 16);}
+#define EWBACKW(w)   if(wb1) {STRH_IMM8(w, wback, fixedaddress);} else {BFI(wback, w, 0, 16);}
 // Write back gd in correct register
 #define GWBACK       BFI((xEAX+((nextop&0x38)>>3)), gd, 0, 16);
 //GETEB will use i for ed, and can use r3 for wback.
@@ -174,7 +142,6 @@
                     wb1 = 0;                \
                     ed = i;                 \
                 } else {                    \
-                    SMREAD();               \
                     addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 4095, 0, 0, NULL); \
                     LDRB_IMM9(i, wback, fixedaddress); \
                     wb1 = 1;                \
@@ -189,7 +156,6 @@
                     wb1 = 0;                \
                     ed = i;                 \
                 } else {                    \
-                    SMREAD();               \
                     addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0, NULL); \
                     ADD_REG_LSL_IMM5(x3, wback, i, 0);  \
                     if(wback!=x3) wback = x3;           \
@@ -206,16 +172,13 @@
                     wb1 = 0;                \
                     ed = i;                 \
                 } else {                    \
-                    SMREAD();               \
                     addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255, 0, 0, NULL); \
                     LDRSB_IMM8(i, wback, fixedaddress);\
                     wb1 = 1;                \
                     ed = i;                 \
                 }
 // Write eb (ed) back to original register / memory
-#define EBBACK   if(wb1) {STRB_IMM9(ed, wback, fixedaddress); SMWRITE();} else {BFI(wback, ed, wb2*8, 8);}
-// Write eb (ed) back to original register / memory (SMWRITE2 version)
-#define EBBACK2   if(wb1) {STRB_IMM9(ed, wback, fixedaddress); SMWRITE2();} else {BFI(wback, ed, wb2*8, 8);}
+#define EBBACK   if(wb1) {STRB_IMM9(ed, wback, fixedaddress);} else {BFI(wback, ed, wb2*8, 8);}
 //GETGB will use i for gd
 #define GETGB(i)    gd = (nextop&0x38)>>3;  \
                     gb2 = ((gd&4)>>2);      \
@@ -260,19 +223,17 @@
 // CALL_1RD will use S as scratch. Return value in D0, 1 ARG in R
 #define CALL_1RD(F, R, S, M) call_rd(dyn, ninst, F, R, S, M, 0);
 
-#define MARK        if(dyn->insts) {dyn->insts[ninst].mark = (uintptr_t)dyn->arm_size;}
-#define GETMARK     ((dyn->insts)?dyn->insts[ninst].mark:(dyn->arm_size+4))
-#define MARK2       if(dyn->insts) {dyn->insts[ninst].mark2 = (uintptr_t)dyn->arm_size;}
-#define GETMARK2    ((dyn->insts)?dyn->insts[ninst].mark2:(dyn->arm_size+4))
-#define MARK3       if(dyn->insts) {dyn->insts[ninst].mark3 = (uintptr_t)dyn->arm_size;}
-#define GETMARK3    ((dyn->insts)?dyn->insts[ninst].mark3:(dyn->arm_size+4))
-#define MARKF       if(dyn->insts) {dyn->insts[ninst].markf = (uintptr_t)dyn->arm_size;}
-#define GETMARKF    ((dyn->insts)?dyn->insts[ninst].markf:(dyn->arm_size+4))
-#define MARKF2      if(dyn->insts) {dyn->insts[ninst].markf2 = (uintptr_t)dyn->arm_size;}
-#define GETMARKF2   ((dyn->insts)?dyn->insts[ninst].markf2:(dyn->arm_size+4))
-#define MARKSEG     if(dyn->insts) {dyn->insts[ninst].markseg = (uintptr_t)dyn->arm_size;}
-#define GETMARKSEG  ((dyn->insts)?dyn->insts[ninst].markseg:(dyn->arm_size+4))
-#define MARKLOCK    if(dyn->insts) {dyn->insts[ninst].marklock = (uintptr_t)dyn->arm_size;}
+#define MARK    if(dyn->insts) {dyn->insts[ninst].mark = (uintptr_t)dyn->arm_size;}
+#define GETMARK ((dyn->insts)?dyn->insts[ninst].mark:(dyn->arm_size+4))
+#define MARK2   if(dyn->insts) {dyn->insts[ninst].mark2 = (uintptr_t)dyn->arm_size;}
+#define GETMARK2 ((dyn->insts)?dyn->insts[ninst].mark2:(dyn->arm_size+4))
+#define MARK3   if(dyn->insts) {dyn->insts[ninst].mark3 = (uintptr_t)dyn->arm_size;}
+#define GETMARK3 ((dyn->insts)?dyn->insts[ninst].mark3:(dyn->arm_size+4))
+#define MARKF   if(dyn->insts) {dyn->insts[ninst].markf = (uintptr_t)dyn->arm_size;}
+#define GETMARKF ((dyn->insts)?dyn->insts[ninst].markf:(dyn->arm_size+4))
+#define MARKSEG if(dyn->insts) {dyn->insts[ninst].markseg = (uintptr_t)dyn->arm_size;}
+#define GETMARKSEG ((dyn->insts)?dyn->insts[ninst].markseg:(dyn->arm_size+4))
+#define MARKLOCK if(dyn->insts) {dyn->insts[ninst].marklock = (uintptr_t)dyn->arm_size;}
 #define GETMARKLOCK ((dyn->insts)?dyn->insts[ninst].marklock:(dyn->arm_size+4))
 
 // Branch to MARK if cond (use j32)
@@ -345,7 +306,7 @@
 
 #ifndef READFLAGS
 #define READFLAGS(A) \
-    if(((A)!=X_PEND && dyn->f.pending!=SF_SET)          \
+    if((dyn->f.pending!=SF_SET)                         \
     && (dyn->f.pending!=SF_SET_PENDING)) {              \
         if(dyn->f.pending!=SF_PENDING) {                \
             LDR_IMM9(x3, xEmu, offsetof(x86emu_t, df)); \
@@ -536,11 +497,9 @@ void* arm_next(x86emu_t* emu, uintptr_t addr);
 #define x87_reget_st    STEPNAME(x87_reget_st)
 #define x87_stackcount  STEPNAME(x87_stackcount)
 #define x87_setround    STEPNAME(x87_setround)
-#define x87_setround_reset    STEPNAME(x87_setround_reset)
 #define x87_restoreround STEPNAME(x87_restoreround)
 #define x87_swapreg     STEPNAME(x87_swapreg)
 #define sse_setround    STEPNAME(sse_setround)
-#define sse_setround_reset    STEPNAME(sse_setround_reset)
 #define mmx_get_reg     STEPNAME(mmx_get_reg)
 #define mmx_get_reg_empty STEPNAME(mmx_get_reg_empty)
 #define sse_get_reg     STEPNAME(sse_get_reg)
@@ -549,13 +508,12 @@ void* arm_next(x86emu_t* emu, uintptr_t addr);
 #define fpu_pushcache   STEPNAME(fpu_pushcache)
 #define fpu_popcache    STEPNAME(fpu_popcache)
 #define fpu_reset       STEPNAME(fpu_reset)
-#define fpu_reset_cache STEPNAME(fpu_reset_cache)
-#define fpu_propagate_stack STEPNAME(fpu_propagate_stack)
 #define fpu_purgecache  STEPNAME(fpu_purgecache)
 #define x87_purgecache  STEPNAME(x87_purgecache)
 #define mmx_purgecache  STEPNAME(mmx_purgecache)
+#ifdef HAVE_TRACE
 #define fpu_reflectcache STEPNAME(fpu_reflectcache)
-#define fpu_unreflectcache STEPNAME(fpu_unreflectcache)
+#endif
 
 // get the single reg that from the double "reg" (so Dx[idx])
 #define fpu_get_single_reg      STEPNAME(fpu_get_single_reg)
@@ -686,16 +644,12 @@ void x87_forget(dynarec_arm_t* dyn, int ninst, int s1, int s2, int st);
 void x87_reget_st(dynarec_arm_t* dyn, int ninst, int s1, int s2, int st);
 // Set rounding according to cw flags, return reg to restore flags
 int x87_setround(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3);
-// Set rounding according to cw flags, return reg to restore flags, also enable exceptions and reset counters
-int x87_setround_reset(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3);
 // Restore round flag
 void x87_restoreround(dynarec_arm_t* dyn, int ninst, int s1);
 // swap 2 x87 regs
 void x87_swapreg(dynarec_arm_t* dyn, int ninst, int s1, int s2, int a, int b);
 // Set rounding according to mxcsr flags, return reg to restore flags
 int sse_setround(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3);
-// Set rounding according to mxcsr flags, return reg to restore flags, also enable exceptions and reset counters
-int sse_setround_reset(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3);
 
 void CacheTransform(dynarec_arm_t* dyn, int ninst, int cacheupd, int s1, int s2, int s3);
 
@@ -744,16 +698,13 @@ int sse_get_reg_empty(dynarec_arm_t* dyn, int ninst, int s1, int a);
 // common coproc helpers
 // reset the cache
 void fpu_reset(dynarec_arm_t* dyn);
-// reset the cache with n
-void fpu_reset_cache(dynarec_arm_t* dyn, int ninst, int reset_n);
-// propagate stack state
-void fpu_propagate_stack(dynarec_arm_t* dyn, int ninst);
 // purge the FPU cache (needs 3 scratch registers) next=1 if for a conditionnal branch jumping out of block (no tracking updated)
 void fpu_purgecache(dynarec_arm_t* dyn, int ninst, int next, int s1, int s2, int s3);
 void x87_purgecache(dynarec_arm_t* dyn, int ninst, int next, int s1, int s2, int s3);
 void mmx_purgecache(dynarec_arm_t* dyn, int ninst, int next, int s1);
+#ifdef HAVE_TRACE
 void fpu_reflectcache(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3);
-void fpu_unreflectcache(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3);
+#endif
 void fpu_pushcache(dynarec_arm_t* dyn, int ninst, int s1);
 void fpu_popcache(dynarec_arm_t* dyn, int ninst, int s1);
 
@@ -800,21 +751,4 @@ uintptr_t dynarecF30F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
 #define MAYUSE(A)   
 #endif
 
-#define NOTEST(s1)                                          \
-    if(box86_dynarec_test) {                                \
-        MOVW(s1, 0);                                        \
-        STR_IMM9(s1, xEmu, offsetof(x86emu_t, test.test));  \
-        STR_IMM9(s1, xEmu, offsetof(x86emu_t, test.clean)); \
-    }
-#define SKIPTEST(s1)                                        \
-    if(box86_dynarec_test) {                                \
-        MOVW(s1, 0);                                        \
-        STR_IMM9(s1, xEmu, offsetof(x86emu_t, test.clean)); \
-    }
-#define GOTEST(s1, s2)                                      \
-    if(box86_dynarec_test) {                                \
-        MOVW(s2, 1);                                        \
-        STR_IMM9(s2, xEmu, offsetof(x86emu_t, test.test));  \
-    }
-
 #endif //__DYNAREC_ARM_HELPER_H__

src/dynarec/dynarec_arm_pass.c

@@ -21,7 +21,6 @@
 #include "dynarec_arm_functions.h"
 #include "dynarec_arm_helper.h"
 #include "custommem.h"
-#include "elfloader.h"
 
 #ifndef STEP
 #error No STEP defined
@@ -39,13 +38,9 @@ uintptr_t arm_pass(dynarec_arm_t* dyn, uintptr_t addr)
     // Clean up (because there are multiple passes)
     dyn->f.pending = 0;
     dyn->f.dfnone = 0;
-    dyn->forward = 0;
-    dyn->forward_to = 0;
-    dyn->forward_size = 0;
-    dyn->forward_ninst = 0;
     fpu_reset(dyn);
     int reset_n = -1;
-    int stopblock = 2+(FindElfAddress(my_context, addr)?0:1); // if block is in elf_memory, it can be extended with bligblocks==2, else it needs 3    // ok, go now
+    // ok, go now
     INIT;
     while(ok) {
         ip = addr;
@@ -56,7 +51,44 @@ uintptr_t arm_pass(dynarec_arm_t* dyn, uintptr_t addr)
                 dyn->f.pending = 0;
                 fpu_reset(dyn);
             } else {
-                fpu_reset_cache(dyn, ninst, reset_n);
+                MESSAGE(LOG_DEBUG, "Reset Caches with %d\n",reset_n);
+                #if STEP > 1
+                // for STEP 2 & 3, just need to refrest with current, and undo the changes (push & swap)
+                dyn->n = dyn->insts[ninst].n;
+                neoncacheUnwind(&dyn->n);
+                #ifdef HAVE_TRACE
+                if(box86_dynarec_dump)
+                    if(memcmp(&dyn->n, &dyn->insts[reset_n].n, sizeof(neon_cache_t))) {
+                        MESSAGE(LOG_DEBUG, "Warning, difference in neoncache: reset=");
+                        for(int i=0; i<24; ++i)
+                            if(dyn->insts[reset_n].n.neoncache[i].v)
+                                MESSAGE(LOG_DEBUG, " %02d:%s", i, getCacheName(dyn->insts[reset_n].n.neoncache[i].t, dyn->insts[reset_n].n.neoncache[i].n));
+                        if(dyn->insts[reset_n].n.combined1 || dyn->insts[reset_n].n.combined2)
+                            MESSAGE(LOG_DEBUG, " %s:%02d/%02d", dyn->insts[reset_n].n.swapped?"SWP":"CMB", dyn->insts[reset_n].n.combined1, dyn->insts[reset_n].n.combined2);
+                        if(dyn->insts[reset_n].n.stack_push || dyn->insts[reset_n].n.stack_pop)
+                            MESSAGE(LOG_DEBUG, " (%d:%d)", dyn->insts[reset_n].n.stack_push, -dyn->insts[reset_n].n.stack_pop);
+                        MESSAGE(LOG_DEBUG, " ==> ");
+                        for(int i=0; i<24; ++i)
+                            if(dyn->insts[ninst].n.neoncache[i].v)
+                                MESSAGE(LOG_DEBUG, " %02d:%s", i, getCacheName(dyn->insts[ninst].n.neoncache[i].t, dyn->insts[ninst].n.neoncache[i].n));
+                        if(dyn->insts[ninst].n.combined1 || dyn->insts[ninst].n.combined2)
+                            MESSAGE(LOG_DEBUG, " %s:%02d/%02d", dyn->insts[ninst].n.swapped?"SWP":"CMB", dyn->insts[ninst].n.combined1, dyn->insts[ninst].n.combined2);
+                        if(dyn->insts[ninst].n.stack_push || dyn->insts[ninst].n.stack_pop)
+                            MESSAGE(LOG_DEBUG, " (%d:%d)", dyn->insts[ninst].n.stack_push, -dyn->insts[ninst].n.stack_pop);
+                        MESSAGE(LOG_DEBUG, " -> ");
+                        for(int i=0; i<24; ++i)
+                            if(dyn->n.neoncache[i].v)
+                                MESSAGE(LOG_DEBUG, " %02d:%s", i, getCacheName(dyn->n.neoncache[i].t, dyn->n.neoncache[i].n));
+                        if(dyn->n.combined1 || dyn->n.combined2)
+                            MESSAGE(LOG_DEBUG, " %s:%02d/%02d", dyn->n.swapped?"SWP":"CMB", dyn->n.combined1, dyn->n.combined2);
+                        if(dyn->n.stack_push || dyn->n.stack_pop)
+                            MESSAGE(LOG_DEBUG, " (%d:%d)", dyn->n.stack_push, -dyn->n.stack_pop);
+                        MESSAGE(LOG_DEBUG, "\n");
+                    }
+                #endif //HAVE_TRACE
+                #else
+                dyn->n = dyn->insts[reset_n].n;
+                #endif
                 dyn->f = dyn->insts[reset_n].f_exit;
                 if(dyn->insts[ninst].x86.barrier&BARRIER_FLOAT) {
                     MESSAGE(LOG_DEBUG, "Apply Barrier Float\n");
@@ -70,29 +102,28 @@ uintptr_t arm_pass(dynarec_arm_t* dyn, uintptr_t addr)
             }
             reset_n = -1;
         }
-        fpu_propagate_stack(dyn, ninst);
-        NEW_INST;
-        if(!ninst) {
-            GOTEST(x1, x2);
+        // propagate ST stack state, especial stack pop that are defered
+        if(dyn->n.stack_pop) {
+            for(int j=0; j<24; ++j)
+                if((dyn->n.neoncache[j].t == NEON_CACHE_ST_D || dyn->n.neoncache[j].t == NEON_CACHE_ST_F)) {
+                    if(dyn->n.neoncache[j].n<dyn->n.stack_pop)
+                        dyn->n.neoncache[j].v = 0;
+                    else
+                        dyn->n.neoncache[j].n-=dyn->n.stack_pop;
+                }
+            dyn->n.stack_pop = 0;
         }
-        if(dyn->insts[ninst].pred_sz>1) {SMSTART();}
+        dyn->n.stack = dyn->n.stack_next;
+        dyn->n.news = 0;
+        dyn->n.stack_push = 0;
+        dyn->n.swapped = 0;
+        NEW_INST;
         fpu_reset_scratch(dyn);
         if((dyn->insts[ninst].x86.need_before&~X_PEND) && !dyn->insts[ninst].pred_sz) {
             READFLAGS(dyn->insts[ninst].x86.need_before&~X_PEND);
         }
-        if(box86_dynarec_test)  {
-            MESSAGE(LOG_DUMP, "TEST INIT  ----\n");
-            fpu_reflectcache(dyn, ninst, x1, x2, x3);
-            MOV32(x1, ip);
-            STM(xEmu, (1<<xEAX)|(1<<xEBX)|(1<<xECX)|(1<<xEDX)|(1<<xESI)|(1<<xEDI)|(1<<xESP)|(1<<xEBP));
-            STR_IMM9(x1, xEmu, offsetof(x86emu_t, ip));
-            MOVW(x2, 1);
-            CALL(x86test_init, -1, 0);
-            fpu_unreflectcache(dyn, ninst, x1, x2, x3);
-            MESSAGE(LOG_DUMP, "----------\n");
-        }
 #ifdef HAVE_TRACE
-        else if(my_context->dec && box86_dynarec_trace) {
+        if(my_context->dec && box86_dynarec_trace) {
         if((trace_end == 0) 
             || ((ip >= trace_start) && (ip < trace_end)))  {
                 MESSAGE(LOG_DUMP, "TRACE ----\n");
@@ -102,7 +133,6 @@ uintptr_t arm_pass(dynarec_arm_t* dyn, uintptr_t addr)
                 STR_IMM9(x1, xEmu, offsetof(x86emu_t, ip));
                 MOVW(x2, 1);
                 CALL(PrintTrace, -1, 0);
-                fpu_unreflectcache(dyn, ninst, x1, x2, x3);
                 MESSAGE(LOG_DUMP, "----------\n");
             }
         }
@@ -125,26 +155,13 @@ uintptr_t arm_pass(dynarec_arm_t* dyn, uintptr_t addr)
                 dyn->f.dfnone = 0;
             }
         }
-        #ifndef PROT_READ
-        #define PROT_READ 1
-        #endif
         #if STEP != 0
         if(!ok && !need_epilog && (addr < (dyn->start+dyn->isize))) {
             ok = 1;
             // we use the 1st predecessor here
             int ii = ninst+1;
-            if(ii<dyn->size && !dyn->insts[ii].pred_sz) {
-                while(ii<dyn->size && (!dyn->insts[ii].pred_sz || (dyn->insts[ii].pred_sz==1 && dyn->insts[ii].pred[0]==ii-1))) {
-                    // may need to skip opcodes to advance
-                    ++ninst;
-                    NEW_INST;
-                    MESSAGE(LOG_DEBUG, "Skipping unused opcode\n");
-                    INST_NAME("Skipped opcode");
-                    INST_EPILOG;
-                    addr += dyn->insts[ii].x86.size;
-                    ++ii;
-                }
-            }
+            while(ii<dyn->size && !dyn->insts[ii].pred_sz) 
+                ++ii;
             if((dyn->insts[ii].x86.barrier&BARRIER_FULL)==BARRIER_FULL)
                 reset_n = -2;    // hack to say Barrier!
             else {
@@ -156,33 +173,15 @@ uintptr_t arm_pass(dynarec_arm_t* dyn, uintptr_t addr)
             }
         }
         #else
-        if(dyn->forward) {
-            if(dyn->forward_to == addr && !need_epilog) {
-                // we made it!
-                if(box86_dynarec_dump) dynarec_log(LOG_NONE, "Forward extend block for %d bytes %p -> %p\n", dyn->forward_to-dyn->forward, (void*)dyn->forward, (void*)dyn->forward_to);
-                dyn->forward = 0;
-                dyn->forward_to = 0;
-                dyn->forward_size = 0;
-                dyn->forward_ninst = 0;
-                ok = 1; // in case it was 0
-            } else if ((dyn->forward_to < addr) || !ok) {
-                // something when wrong! rollback
-                if(box86_dynarec_dump) dynarec_log(LOG_NONE, "Could not forward extend block for %d bytes %p -> %p\n", dyn->forward_to-dyn->forward, (void*)dyn->forward, (void*)dyn->forward_to);
-                ok = 0;
-                dyn->size = dyn->forward_size;
-                ninst = dyn->forward_ninst;
-                addr = dyn->forward;
-                dyn->forward = 0;
-                dyn->forward_to = 0;
-                dyn->forward_size = 0;
-                dyn->forward_ninst = 0;
-            }
-            // else just continue
-        } else if(!ok && !need_epilog && box86_dynarec_bigblock && (getProtection(addr+3)&~PROT_READ))
+        #ifndef PROT_READ
+        #define PROT_READ 1
+        #endif
+        if(!ok && !need_epilog && box86_dynarec_bigblock && (getProtection(addr+3)&PROT_READ))
             if(*(uint32_t*)addr!=0) {   // check if need to continue (but is next 4 bytes are 0, stop)
                 uintptr_t next = get_closest_next(dyn, addr);
                 if(next && (
                     (((next-addr)<15) && is_nops(dyn, addr, next-addr)) 
+                    && (((box86_dynarec_bigblock<2) && isJumpTableDefault((void*)next)) || (box86_dynarec_bigblock>1))
                     /*||(((next-addr)<30) && is_instructions(dyn, addr, next-addr))*/ ))
                 {
                     ok = 1;
@@ -194,73 +193,23 @@ uintptr_t arm_pass(dynarec_arm_t* dyn, uintptr_t addr)
                             ii=ninst;
                         }
                     if(box86_dynarec_dump) dynarec_log(LOG_NONE, "Extend block %p, %p -> %p (ninst=%d, jump from %d)\n", dyn, (void*)addr, (void*)next, ninst, reset_n);
-                } else if(next && (next-addr)<box86_dynarec_forward && (getProtection(next)&PROT_READ)/*box86_dynarec_bigblock>=stopblock*/) {
-                    if(!((box86_dynarec_bigblock<stopblock) && !isJumpTableDefault((void*)next))) {
-                        if(dyn->forward) {
-                            if(next<dyn->forward_to)
-                                dyn->forward_to = next;
-                            reset_n = -2;
-                            ok = 1;
-                        } else {
-                            dyn->forward = addr;
-                            dyn->forward_to = next;
-                            dyn->forward_size = dyn->size;
-                            dyn->forward_ninst = ninst;
-                            reset_n = -2;
-                            ok = 1;
-                        }
-                    }
+                } else if(next && (next-addr)<30) {
+                    if(box86_dynarec_dump) dynarec_log(LOG_NONE, "Cannot extend block %p -> %p (%02X %02X %02X %02X %02X %02X %02X %02x)\n", (void*)addr, (void*)next, PK(0), PK(1), PK(2), PK(3), PK(4), PK(5), PK(6), PK(7));
                 }
             }
         #endif
-        if(ok<0)  {
-            ok = 0; need_epilog=1; 
-            #if STEP == 0
-            if(ninst) {
-                --ninst;
-                if(!dyn->insts[ninst].x86.barrier) {
-                    BARRIER(BARRIER_FLOAT);
-                }
-                dyn->insts[ninst].x86.need_after |= X_PEND;
-                ++ninst;
-            }
-            if(dyn->forward) {
-                // stopping too soon
-                dyn->size = dyn->forward_size;
-                ninst = dyn->forward_ninst+1;
-                addr = dyn->forward;
-                dyn->forward = 0;
-                dyn->forward_to = 0;
-                dyn->forward_size = 0;
-                dyn->forward_ninst = 0;
-            }
-            #endif
-        }
+        if(ok<0)  {ok = 0; need_epilog=1;}
         ++ninst;
         #if STEP == 0
-        if(ok && (((box86_dynarec_bigblock<stopblock) && !isJumpTableDefault((void*)addr)) 
-            || (addr>=box86_nodynarec_start && addr<box86_nodynarec_end)))
+        if((ok && !isJumpTableDefault((void*)addr) && (box86_dynarec_bigblock<2)) ||
+            (ok && dyn->size >= 2000))
         #else
         if(ok && (ninst==dyn->size))
         #endif
         {
-            #if STEP == 0
-            if(dyn->forward) {
-                // stopping too soon
-                dyn->size = dyn->forward_size;
-                ninst = dyn->forward_ninst+1;
-                addr = dyn->forward;
-                dyn->forward = 0;
-                dyn->forward_to = 0;
-                dyn->forward_size = 0;
-                dyn->forward_ninst = 0;
-            }
-            #endif
             int j32;
             MAYUSE(j32);
-            MESSAGE(LOG_DEBUG, "Stopping block %p (%d / %d)\n",(void*)init_addr, ninst, dyn->size);
-            if(!box86_dynarec_dump && addr>=box86_nodynarec_start && addr<box86_nodynarec_end)
-                dynarec_log(LOG_INFO, "Stopping block in no-dynarec zone\n");
+            MESSAGE(LOG_DEBUG, "Stopping block %p (%d / %d)\n",(void*)init_addr, ninst, dyn->size); 
             --ninst;
             if(!dyn->insts[ninst].x86.barrier) {
                 BARRIER(BARRIER_FLOAT);
@@ -269,14 +218,12 @@ uintptr_t arm_pass(dynarec_arm_t* dyn, uintptr_t addr)
             dyn->insts[ninst].x86.need_after |= X_PEND;
             #endif
             ++ninst;
-            NOTEST(x3);
             fpu_purgecache(dyn, ninst, 0, x1, x2, x3);
             jump_to_next(dyn, addr, 0, ninst);
             ok=0; need_epilog=0;
         }
     }
     if(need_epilog) {
-        NOTEST(x3);
         fpu_purgecache(dyn, ninst, 0, x1, x2, x3);
         jump_to_epilog(dyn, ip, 0, ninst);  // no linker here, it's an unknow instruction
     }

src/dynarec/dynarec_arm_pass0.h

@@ -4,7 +4,6 @@
     dyn->isize = addr-sav_addr;\
     dyn->insts[ninst].x86.addr = addr;\
     if(ninst) dyn->insts[ninst-1].x86.size = dyn->insts[ninst].x86.addr - dyn->insts[ninst-1].x86.addr
-
 #define MESSAGE(A, ...)  
 #define MAYSETFLAGS()   dyn->insts[ninst].x86.may_set = 1
 #define READFLAGS(A)    \
@@ -16,13 +15,13 @@
         dyn->f.pending=(B)&SF_SET_PENDING;      \
         dyn->f.dfnone=((B)&SF_SET)?1:0;
 #define EMIT(A)     
-#define JUMP(A, C)      add_next(dyn, (uintptr_t)A); dyn->insts[ninst].x86.jmp = A; dyn->insts[ninst].x86.jmp_cond = C
+#define JUMP(A, C)      if((A)>addr) add_next(dyn, (uintptr_t)(A)); dyn->insts[ninst].x86.jmp = A; dyn->insts[ninst].x86.jmp_cond = C
 #define BARRIER(A)      if(A!=BARRIER_MAYBE) {fpu_purgecache(dyn, ninst, 0, x1, x2, x3); dyn->insts[ninst].x86.barrier = A;} else dyn->insts[ninst].barrier_maybe = 1
 #define BARRIER_NEXT(A) dyn->insts[ninst+1].x86.barrier = A
 #define NEW_INST \
         ++dyn->size;                            \
         if(dyn->size+3>=dyn->cap) {             \
-                dyn->insts = (instruction_arm_t*)dynaRealloc(dyn->insts, sizeof(instruction_arm_t)*dyn->cap*2);\
+                dyn->insts = (instruction_arm_t*)box_realloc(dyn->insts, sizeof(instruction_arm_t)*dyn->cap*2); \
                 memset(&dyn->insts[dyn->cap], 0, sizeof(instruction_arm_t)*dyn->cap);   \
                 dyn->cap *= 2;                  \
         }                                       \
@@ -35,7 +34,7 @@
 #define INST_EPILOG                             \
         dyn->insts[ninst].f_exit = dyn->f;      \
         dyn->insts[ninst].n = dyn->n;           \
-        dyn->insts[ninst].x86.has_next = (ok>0)?1:0;
+        dyn->insts[ninst].x86.has_next = ok;
 #define INST_NAME(name) 
 #define DEFAULT                         \
         --dyn->size;                    \

src/dynarec/dynarec_arm_pass1.h

@@ -2,6 +2,7 @@
 #define FINI
 #define MESSAGE(A, ...)  
 #define EMIT(A)     
+
 #define NEW_INST                                \
         dyn->insts[ninst].f_entry = dyn->f;     \
         dyn->n.combined1 = dyn->n.combined2 = 0;\

src/dynarec/dynarec_arm_pass2.h

@@ -1,16 +1,11 @@
 #define INIT        dyn->arm_size = 0
-#define FINI                                                                                            \
-        if(ninst) {                                                                                     \
-                dyn->insts[ninst].address = (dyn->insts[ninst-1].address+dyn->insts[ninst-1].size);     \
-                dyn->insts_size += 1+((dyn->insts[ninst].x86.size>dyn->insts[ninst].size)?dyn->insts[ninst].x86.size:dyn->insts[ninst].size)/15; \
-        }
+#define FINI        if(ninst) {dyn->insts[ninst].address = (dyn->insts[ninst-1].address+dyn->insts[ninst-1].size);}
 
 #define MESSAGE(A, ...)  
-#define EMIT(A)     do{dyn->insts[ninst].size+=4; dyn->arm_size+=4;}while(0)
+#define EMIT(A)     dyn->insts[ninst].size+=4; dyn->arm_size+=4
 #define NEW_INST                                                                                        \
         if(ninst) {                                                                                     \
                 dyn->insts[ninst].address = (dyn->insts[ninst-1].address+dyn->insts[ninst-1].size);     \
-                dyn->insts_size += 1+((dyn->insts[ninst-1].x86.size>dyn->insts[ninst-1].size)?dyn->insts[ninst-1].x86.size:dyn->insts[ninst-1].size)/15; \
         }
 #define INST_EPILOG dyn->insts[ninst].epilog = dyn->arm_size; 
 #define INST_NAME(name) 

src/dynarec/dynarec_arm_pass3.h

@@ -1,20 +1,58 @@
 #define INIT    
-#define FINI        \
-    if(ninst)       \
-        addInst(dyn->instsize, &dyn->insts_size, dyn->insts[ninst].x86.size, dyn->insts[ninst].size/4); \
-    addInst(dyn->instsize, &dyn->insts_size, 0, 0);
-#define EMIT(A)                                         \
-    do{                                                 \
-        if(box86_dynarec_dump) print_opcode(dyn, ninst, (uint32_t)(A)); \
-        if((uintptr_t)dyn->block<(uintptr_t)dyn->next-sizeof(void*))\
-            *(uint32_t*)(dyn->block) = (uint32_t)(A);   \
-        dyn->block += 4; dyn->arm_size += 4;            \
-        dyn->insts[ninst].size2 += 4;                   \
-    }while(0)
+#define FINI
+#define EMIT(A)     \
+    if(box86_dynarec_dump) {dynarec_log(LOG_NONE, "\t%08x\t%s\n", (A), arm_print(A));} \
+    *(uint32_t*)(dyn->block) = A;       \
+    dyn->block += 4; dyn->arm_size += 4;\
+    dyn->insts[ninst].size2 += 4
 
 #define MESSAGE(A, ...)  if(box86_dynarec_dump) dynarec_log(LOG_NONE, __VA_ARGS__)
 #define NEW_INST        \
-    if(ninst)                                                   \
-        addInst(dyn->instsize, &dyn->insts_size, dyn->insts[ninst-1].x86.size, dyn->insts[ninst-1].size/4);
+
 #define INST_EPILOG     
-#define INST_NAME(name) inst_name_pass3(dyn, ninst, name)
+#define INST_NAME(name) \
+    if(box86_dynarec_dump) {\
+        printf_x86_instruction(my_context->dec, &dyn->insts[ninst].x86, name); \
+        dynarec_log(LOG_NONE, "%s%p: %d emited opcodes, inst=%d, barrier=%d state=%d/%d(%d), %s=%X/%X, use=%X, need=%X/%X", \
+            (box86_dynarec_dump>1)?"\e[32m":"", \
+            (void*)(dyn->arm_start+dyn->insts[ninst].address),  \
+            dyn->insts[ninst].size/4,           \
+            ninst,                              \
+            dyn->insts[ninst].x86.barrier,      \
+            dyn->insts[ninst].x86.state_flags,  \
+            dyn->f.pending,                     \
+            dyn->f.dfnone,                      \
+            dyn->insts[ninst].x86.may_set?"may":"set",          \
+            dyn->insts[ninst].x86.set_flags,    \
+            dyn->insts[ninst].x86.gen_flags,    \
+            dyn->insts[ninst].x86.use_flags,    \
+            dyn->insts[ninst].x86.need_before,  \
+            dyn->insts[ninst].x86.need_after);  \
+        if(dyn->insts[ninst].pred_sz) {         \
+            dynarec_log(LOG_NONE, ", pred=");     \
+            for(int ii=0; ii<dyn->insts[ninst].pred_sz; ++ii)\
+                dynarec_log(LOG_NONE, "%s%d", ii?"/":"", dyn->insts[ninst].pred[ii]);\
+        }                                       \
+        if(dyn->insts[ninst].x86.jmp && dyn->insts[ninst].x86.jmp_insts>=0)\
+            dynarec_log(LOG_NONE, ", jmp=%d", dyn->insts[ninst].x86.jmp_insts);\
+        if(dyn->insts[ninst].x86.jmp && dyn->insts[ninst].x86.jmp_insts==-1)\
+            dynarec_log(LOG_NONE, ", jmp=out");\
+        for(int ii=0; ii<24; ++ii) {            \
+            switch(dyn->insts[ninst].n.neoncache[ii].t) {    \
+                case NEON_CACHE_ST_D: dynarec_log(LOG_NONE, " D%d:%s", ii+8, getCacheName(dyn->insts[ninst].n.neoncache[ii].t, dyn->insts[ninst].n.neoncache[ii].n)); break;            \
+                case NEON_CACHE_ST_F: dynarec_log(LOG_NONE, " S%d:%s", (ii+8)*2, getCacheName(dyn->insts[ninst].n.neoncache[ii].t, dyn->insts[ninst].n.neoncache[ii].n)); break;        \
+                case NEON_CACHE_MM: dynarec_log(LOG_NONE, " D%d:%s", ii+8, getCacheName(dyn->insts[ninst].n.neoncache[ii].t, dyn->insts[ninst].n.neoncache[ii].n)); break;              \
+                case NEON_CACHE_XMMW: dynarec_log(LOG_NONE, " Q%d:%s", (ii+8)/2, getCacheName(dyn->insts[ninst].n.neoncache[ii].t, dyn->insts[ninst].n.neoncache[ii].n)); ++ii; break;  \
+                case NEON_CACHE_XMMR: dynarec_log(LOG_NONE, " Q%d:%s", (ii+8)/2, getCacheName(dyn->insts[ninst].n.neoncache[ii].t, dyn->insts[ninst].n.neoncache[ii].n)); ++ii; break;  \
+                case NEON_CACHE_SCR: dynarec_log(LOG_NONE, " D%d:%s", ii+8, getCacheName(dyn->insts[ninst].n.neoncache[ii].t, dyn->insts[ninst].n.neoncache[ii].n)); break;             \
+                case NEON_CACHE_NONE:           \
+                default:    break;              \
+            }                                   \
+        }                                       \
+        if(dyn->n.stack || dyn->insts[ninst].n.stack_next || dyn->insts[ninst].n.x87stack)     \
+            dynarec_log(LOG_NONE, " X87:%d/%d(+%d/-%d)%d", dyn->n.stack, dyn->insts[ninst].n.stack_next, dyn->insts[ninst].n.stack_push, dyn->insts[ninst].n.stack_pop, dyn->insts[ninst].n.x87stack); \
+        if(dyn->insts[ninst].n.combined1 || dyn->insts[ninst].n.combined2)                     \
+            dynarec_log(LOG_NONE, " %s:%d/%d", dyn->insts[ninst].n.swapped?"SWP":"CMB", dyn->insts[ninst].n.combined1, dyn->insts[ninst].n.combined2);   \
+        dynarec_log(LOG_NONE, "%s\n", (box86_dynarec_dump>1)?"\e[m":"");                       \
+    }
+

src/dynarec/dynarec_arm_private.h

@@ -19,12 +19,12 @@ typedef struct instsize_s instsize_t;
 typedef union neon_cache_s {
     int8_t           v;
     struct {
-        uint8_t t:4;   // reg type
-        uint8_t n:4;   // reg number
+        unsigned int t:4;   // reg type
+        unsigned int n:4;   // reg number
     };
 } neon_cache_t;
 typedef union sse_cache_s {
-    int8_t     v;
+    int     v;
     struct {
         uint8_t reg;
         uint8_t write;
@@ -69,7 +69,7 @@ typedef struct instruction_arm_s {
     int                 pred_sz;    // size of predecessor list
     int                 *pred;      // predecessor array
     uintptr_t           mark, mark2, mark3;
-    uintptr_t           markf, markf2;
+    uintptr_t           markf;
     uintptr_t           markseg;
     uintptr_t           marklock;
     int                 pass2choice;// value for choices that are fixed on pass2 for pass3
@@ -91,7 +91,6 @@ typedef struct dynarec_arm_s {
     void*               block;      // memory pointer where next instruction is emited
     uintptr_t           arm_start;  // start of the arm code
     int                 arm_size;   // size of emitted arm code
-    uintptr_t           jmp_next;   // address of the jump_next address
     flagcache_t         f;
     neoncache_t         n;          // cache for the 8..31 double reg from fpu, plus x87 stack delta
     uintptr_t*          next;       // variable array of "next" jump address
@@ -100,21 +99,12 @@ typedef struct dynarec_arm_s {
     int*                predecessor;// single array of all predecessor
     dynablock_t*        dynablock;
     instsize_t*         instsize;
-    size_t              insts_size; // size of the instruction size array (calculated)
-    uint8_t             smread;    // for strongmem model emulation
-    uint8_t             smwrite;    // for strongmem model emulation
-    uintptr_t           forward;    // address of the last end of code while testing forward
-    uintptr_t           forward_to; // address of the next jump to (to check if everything is ok)
-    int32_t             forward_size;   // size at the forward point
-    int                 forward_ninst;  // ninst at the forward point
-    uint8_t             always_test;
 } dynarec_arm_t;
 
 void add_next(dynarec_arm_t *dyn, uintptr_t addr);
 uintptr_t get_closest_next(dynarec_arm_t *dyn, uintptr_t addr);
 int is_nops(dynarec_arm_t *dyn, uintptr_t addr, int n);
 int is_instructions(dynarec_arm_t *dyn, uintptr_t addr, int n);
-
-void CreateJmpNext(void* addr, void* next);
+void CreateJmpNextTo(void* addr, void* tonext);
 
 #endif //__DYNAREC_ARM_PRIVATE_H_

src/dynarec/dynarec_next.h

@@ -0,0 +1,8 @@
+#ifndef __DYNAREC_NEXT_H__
+#define __DYNAREC_NEXT_H__
+
+void arm_next(void) EXPORTDYN;
+void arm_prolog(x86emu_t* emu, void* addr) EXPORTDYN;
+void arm_epilog() EXPORTDYN;
+
+#endif //__DYNAREC_NEXT_H__

src/dynarec/dynarec_private.h

@@ -44,17 +44,4 @@ typedef struct instruction_x86_s {
 
 void printf_x86_instruction(zydis_dec_t* dec, instruction_x86_t* inst, const char* name);
 
-//#define USE_CUSTOM_MEM
-#ifdef USE_CUSTOM_MEM
-#define dynaMalloc customMalloc
-#define dynaCalloc customCalloc
-#define dynaRealloc customRealloc
-#define dynaFree customFree
-#else
-#define dynaMalloc box_malloc
-#define dynaCalloc box_calloc
-#define dynaRealloc box_realloc
-#define dynaFree box_free
-#endif
-
 #endif //__DYNAREC_PRIVATE_H_

src/dynarec/last_run.txt

@@ -233,9 +233,9 @@ NEON 1 1 1 1 0 1 0 0 1 D 1 0 Rn Vd 1 1 0 0 size 1 @<1> Rm @ param=1 char align[4
 NEON 1 1 1 1 0 1 0 0 1 D 1 0 Rn Vd size 0 0 @<4> 1 1 0 1 @ set uint8_t temp = (2 << size) - 1@ set uint8_t temp2 = param & temp@ temp2=0=param>>1 char align[5] !@ %@ align[0] = '\0'@ sprintf(align, ":%d", 8 << size)@ sprintf(align, "???")@ set uint8_t x = param >> (size + 1)@ @ VLD1<c>.\%d8 &l&l size\ {\vecname[0x20 + d]\[\%dx\]}, [<Rn>\align\]!
 NEON 1 1 1 1 0 1 0 0 1 D 1 0 Rn Vd size 0 0 @<4> 1 1 1 1 @ set uint8_t temp = (2 << size) - 1@ set uint8_t temp2 = param & temp@ temp2=0=param>>1 char align[5] !@ %@ align[0] = '\0'@ sprintf(align, ":%d", 8 << size)@ sprintf(align, "???")@ set uint8_t x = param >> (size + 1)@ @ VLD1<c>.\%d8 &l&l size\ {\vecname[0x20 + d]\[\%dx\]}, [<Rn>\align\]
 NEON 1 1 1 1 0 1 0 0 1 D 1 0 Rn Vd size 0 0 @<4> Rm @ set uint8_t temp = (2 << size) - 1@ set uint8_t temp2 = param & temp@ temp2=0=param>>1 char align[5] !@ %@ align[0] = '\0'@ sprintf(align, ":%d", 8 << size)@ sprintf(align, "???")@ set uint8_t x = param >> (size + 1)@ @ VLD1<c>.\%d8 &l&l size\ {\vecname[0x20 + d]\[\%dx\]}, [<Rn>\align\], <Rm>
-NEON 1 1 1 1 0 1 0 0 1 D 1 0 Rn Vd 1 1 0 1 size @<1> @<1> 1 1 0 1 @ param2_1=1 char align[5] !@ %@ sprintf(align, ":%d", 16 << size)@ align[0] = '\0'@ @ VLD2<c>.\%d8 &l&l size\ {\vecname[0x20 + d]\[], \vecname[0x21 + param1_1 + d]\[]}, [<Rn>\align\]!
-NEON 1 1 1 1 0 1 0 0 1 D 1 0 Rn Vd 1 1 0 1 size @<1> @<1> 1 1 1 1 @ param2_1=1 char align[5] !@ %@ sprintf(align, ":%d", 16 << size)@ align[0] = '\0'@ @ VLD2<c>.\%d8 &l&l size\ {\vecname[0x20 + d]\[], \vecname[0x21 + param1_1 + d]\[]}, [<Rn>\align\]
-NEON 1 1 1 1 0 1 0 0 1 D 1 0 Rn Vd 1 1 0 1 size @<1> @<1> Rm @ param2_1=1 char align[5] !@ %@ sprintf(align, ":%d", 16 << size)@ align[0] = '\0'@ @ VLD2<c>.\%d8 &l&l size\ {\vecname[0x20 + d]\[], \vecname[0x21 + param1_1 + d]\[]}, [<Rn>\align\], <Rm>
+NEON 1 1 1 1 0 1 0 0 1 D 1 0 Rn Vd 1 1 0 1 size @<1> @<1> 1 1 0 1 @ param2_1=1 char align[4] !@ %@ sprintf(align, ":%d", 16 << size)@ align[0] = '\0'@ @ VLD2<c>.\%d8 &l&l size\ {\vecname[0x20 + d]\[], \vecname[0x21 + param1_1 + d]\[]}, [<Rn>\align\]!
+NEON 1 1 1 1 0 1 0 0 1 D 1 0 Rn Vd 1 1 0 1 size @<1> @<1> 1 1 1 1 @ param2_1=1 char align[4] !@ %@ sprintf(align, ":%d", 16 << size)@ align[0] = '\0'@ @ VLD2<c>.\%d8 &l&l size\ {\vecname[0x20 + d]\[], \vecname[0x21 + param1_1 + d]\[]}, [<Rn>\align\]
+NEON 1 1 1 1 0 1 0 0 1 D 1 0 Rn Vd 1 1 0 1 size @<1> @<1> Rm @ param2_1=1 char align[4] !@ %@ sprintf(align, ":%d", 16 << size)@ align[0] = '\0'@ @ VLD2<c>.\%d8 &l&l size\ {\vecname[0x20 + d]\[], \vecname[0x21 + param1_1 + d]\[]}, [<Rn>\align\], <Rm>
 NEON 1 1 1 1 0 1 0 0 1 D 1 0 Rn Vd size 0 1 @<4> 1 1 0 1 @ size=0b00=0b01 uint8_t temp temp,1,1,3@ set uint8_t temp2 = param & temp@ temp2=0=1 char align[5] !@ %@ align[0] = '\0'@ sprintf(align, ":%d", 16 << size)@ sprintf(align, "???")@ set uint8_t x = param >> (size + 1)@ set int spacing = size ? ((param >> size) & 1) : 0@ @ VLD2<c>.\%d8 &l&l size\ {\vecname[0x20 + d]\[\%dx\], \vecname[0x21 + d + spacing]\[\%dx\]}, [<Rn>\align\]!
 NEON 1 1 1 1 0 1 0 0 1 D 1 0 Rn Vd size 0 1 @<4> 1 1 1 1 @ size=0b00=0b01 uint8_t temp temp,1,1,3@ set uint8_t temp2 = param & temp@ temp2=0=1 char align[5] !@ %@ align[0] = '\0'@ sprintf(align, ":%d", 16 << size)@ sprintf(align, "???")@ set uint8_t x = param >> (size + 1)@ set int spacing = size ? ((param >> size) & 1) : 0@ @ VLD2<c>.\%d8 &l&l size\ {\vecname[0x20 + d]\[\%dx\], \vecname[0x21 + d + spacing]\[\%dx\]}, [<Rn>\align\]
 NEON 1 1 1 1 0 1 0 0 1 D 1 0 Rn Vd size 0 1 @<4> Rm @ size=0b00=0b01 uint8_t temp temp,1,1,3@ set uint8_t temp2 = param & temp@ temp2=0=1 char align[5] !@ %@ align[0] = '\0'@ sprintf(align, ":%d", 16 << size)@ sprintf(align, "???")@ set uint8_t x = param >> (size + 1)@ set int spacing = size ? ((param >> size) & 1) : 0@ @ VLD2<c>.\%d8 &l&l size\ {\vecname[0x20 + d]\[\%dx\], \vecname[0x21 + d + spacing]\[\%dx\]}, [<Rn>\align\], <Rm>

src/elfs/elfload_dump.c

@@ -235,12 +235,12 @@ void DumpMainHeader(Elf32_Ehdr *header, elfheader_t *h)
         printf_dump(LOG_NEVER, "ELF Dump ==========\n");
 
         printf_dump(LOG_NEVER, "ELF Dump PEntries (%d)\n", h->numSHEntries);
-        for (uint16_t i=0; i<h->numPHEntries; ++i)
+        for (int i=0; i<h->numPHEntries; ++i)
             printf_dump(LOG_NEVER, "  PHEntry %04d : %s\n", i, DumpPHEntry(h->PHEntries+i));
         printf_dump(LOG_NEVER, "ELF Dump PEntries ====\n");
 
         printf_dump(LOG_NEVER, "ELF Dump Sections (%d)\n", h->numSHEntries);
-        for (uint16_t i=0; i<h->numSHEntries; ++i)
+        for (int i=0; i<h->numSHEntries; ++i)
             printf_dump(LOG_NEVER, "  Section %04d : %s\n", i, DumpSection(h->SHEntries+i, h->SHStrTab));
         printf_dump(LOG_NEVER, "ELF Dump Sections ====\n");
     }
@@ -251,7 +251,7 @@ void DumpSymTab(elfheader_t *h)
     if(box86_dump && h->SymTab) {
         const char* name = ElfName(h);
         printf_dump(LOG_NEVER, "ELF Dump SymTab(%d)=\n", h->numSymTab);
-        for (uint32_t i=0; i<h->numSymTab; ++i)
+        for (int i=0; i<h->numSymTab; ++i)
             printf_dump(LOG_NEVER, "  %s:SymTab[%d] = \"%s\", value=%p, size=%d, info/other=%d/%d index=%d\n", name, 
                 i, h->StrTab+h->SymTab[i].st_name, (void*)h->SymTab[i].st_value, h->SymTab[i].st_size,
                 h->SymTab[i].st_info, h->SymTab[i].st_other, h->SymTab[i].st_shndx);
@@ -263,7 +263,7 @@ void DumpDynamicSections(elfheader_t *h)
 {
     if(box86_dump && h->Dynamic) {
         printf_dump(LOG_NEVER, "ELF Dump Dynamic(%d)=\n", h->numDynamic);
-        for (uint32_t i=0; i<h->numDynamic; ++i)
+        for (int i=0; i<h->numDynamic; ++i)
             printf_dump(LOG_NEVER, "  Dynamic %04d : %s\n", i, DumpDynamic(h->Dynamic+i));
         printf_dump(LOG_NEVER, "ELF Dump Dynamic=====\n");
     }
@@ -274,7 +274,7 @@ void DumpDynSym(elfheader_t *h)
     if(box86_dump && h->DynSym) {
         const char* name = ElfName(h);
         printf_dump(LOG_NEVER, "ELF Dump DynSym(%d)=\n", h->numDynSym);
-        for (uint32_t i=0; i<h->numDynSym; ++i) {
+        for (int i=0; i<h->numDynSym; ++i) {
             int version = h->VerSym?((Elf32_Half*)((uintptr_t)h->VerSym+h->delta))[i]:-1;
             printf_dump(LOG_NEVER, "  %s:DynSym[%d] = %s\n", name, i, DumpSym(h, h->DynSym+i, version));
         }
@@ -286,7 +286,7 @@ void DumpDynamicNeeded(elfheader_t *h)
 {
     if(box86_dump && h->DynStrTab) {
         printf_dump(LOG_NEVER, "ELF Dump DT_NEEDED=====\n");
-        for (uint32_t i=0; i<h->numDynamic; ++i)
+        for (int i=0; i<h->numDynamic; ++i)
             if(h->Dynamic[i].d_tag==DT_NEEDED) {
                 printf_dump(LOG_NEVER, "  Needed : %s\n", h->DynStrTab+h->Dynamic[i].d_un.d_val + h->delta);
             }
@@ -298,7 +298,7 @@ void DumpDynamicRPath(elfheader_t *h)
 {
     if(box86_dump && h->DynStrTab) {
         printf_dump(LOG_NEVER, "ELF Dump DT_RPATH/DT_RUNPATH=====\n");
-        for (uint32_t i=0; i<h->numDynamic; ++i) {
+        for (int i=0; i<h->numDynamic; ++i) {
             if(h->Dynamic[i].d_tag==DT_RPATH) {
                 printf_dump(LOG_NEVER, "   RPATH : %s\n", h->DynStrTab+h->Dynamic[i].d_un.d_val + h->delta);
             }

src/elfs/elfloader_private.h

@@ -11,22 +11,21 @@ typedef struct kh_mapsymbols_s kh_mapsymbols_t;
 struct elfheader_s {
     char*       name;
     char*       path;   // Resolved path to file
-    char*       soname; // soname of the elf
-    uint16_t    numPHEntries;
+    int         numPHEntries;
     Elf32_Phdr  *PHEntries;
-    uint16_t    numSHEntries;
+    int         numSHEntries;
     Elf32_Shdr  *SHEntries;
     int         SHIdx;
     int         numSST;
     char*       SHStrTab;
     char*       StrTab;
     Elf32_Sym*  SymTab;
-    uint32_t    numSymTab;
+    int         numSymTab;
     char*       DynStr;
     Elf32_Sym*  DynSym;
-    uint32_t    numDynSym;
+    int         numDynSym;
     Elf32_Dyn*  Dynamic;
-    uint32_t    numDynamic;
+    int         numDynamic;
     char*       DynStrTab;
     int         szDynStrTab;
     Elf32_Half* VerSym;
@@ -35,7 +34,6 @@ struct elfheader_s {
     Elf32_Verdef*   VerDef;
     int         szVerDef;
     int         e_type;
-    uint32_t    flags;
 
     intptr_t    delta;  // should be 0
 
@@ -68,28 +66,23 @@ struct elfheader_s {
     int         textsz;
     uintptr_t   bss;
     int         bsssz;
-    uintptr_t   ehframe;
-    uintptr_t   ehframe_end;
-    uintptr_t   ehframehdr;
 
     uintptr_t   paddr;
     uintptr_t   vaddr;
-    uint32_t    align;
+    int         align;
     uint32_t    memsz;
     uint32_t    reserve;
     uint32_t    stacksz;
-    uint32_t    stackalign;
+    int         stackalign;
     uintptr_t   tlsaddr;
     uint32_t    tlssize;
     uint32_t    tlsfilesize;
-    uint32_t    tlsalign;
+    int         tlsalign;
 
     int32_t     tlsbase;    // the base of the tlsdata in the global tlsdata (always negative)
 
     int         init_done;
     int         fini_done;
-    int         refcnt;     // ref count for the elf
-    int         malloc_hook_2;  // this elf hook malloc, hacking it
 
     char*       memory; // char* and not void* to allow math on memory pointer
     void**      multiblock;
@@ -98,13 +91,11 @@ struct elfheader_s {
     int         multiblock_n;
 
     library_t   *lib;
-    needed_libs_t *needed;
+    needed_libs_t *neededlibs;
 
     kh_mapsymbols_t   *mapsymbols;
     kh_mapsymbols_t   *weaksymbols;
     kh_mapsymbols_t   *localsymbols;
-    kh_defaultversion_t *globaldefver;  // the global default version for symbols (the XXX@@vvvv of symbols)
-    kh_defaultversion_t *weakdefver;    // the weak default version for symbols (the XXX@@vvvv of symbols)
 };
 
 #define R_386_NONE	0
@@ -121,4 +112,4 @@ struct elfheader_s {
 
 elfheader_t* ParseElfHeader(FILE* f, const char* name, int exec);
 
-#endif //__ELFLOADER_PRIVATE_H_
+#endif //__ELFLOADER_PRIVATE_H_

src/elfs/elfparser.c

@@ -43,7 +43,7 @@ int FindSection(Elf32_Shdr *s, int n, char* SHStrTab, const char* name)
     return 0;
 }
 
-void LoadNamedSection(FILE *f, Elf32_Shdr *s, int size, char* SHStrTab, const char* name, const char* clearname, uint32_t type, void** what, uint32_t* num)
+void LoadNamedSection(FILE *f, Elf32_Shdr *s, int size, char* SHStrTab, const char* name, const char* clearname, uint32_t type, void** what, int* num)
 {
     int n = FindSection(s, size, SHStrTab, name);
     printf_dump(LOG_DEBUG, "Loading %s (idx = %d)\n", clearname, n);
@@ -136,7 +136,7 @@ elfheader_t* ParseElfHeader(FILE* f, const char* name, int exec)
             h->numSHEntries = section.sh_size;
         }
         // now read all section headers
-        printf_dump(LOG_DEBUG, "Read %u Section header\n", h->numSHEntries);
+        printf_dump(LOG_DEBUG, "Read %d Section header\n", h->numSHEntries);
         h->SHEntries = (Elf32_Shdr*)box_calloc(h->numSHEntries, sizeof(Elf32_Shdr));
         fseeko64(f, header.e_shoff ,SEEK_SET);
         if(fread(h->SHEntries, sizeof(Elf32_Shdr), h->numSHEntries, f)!=h->numSHEntries) {
@@ -188,7 +188,7 @@ elfheader_t* ParseElfHeader(FILE* f, const char* name, int exec)
         // grab DT_REL & DT_RELA stuffs
         // also grab the DT_STRTAB string table
         {
-            for (uint32_t i=0; i<h->numDynamic; ++i) {
+            for (int i=0; i<h->numDynamic; ++i) {
                 Elf32_Dyn d = h->Dynamic[i];
                 Elf32_Word val = d.d_un.d_val;
                 Elf32_Addr ptr = d.d_un.d_ptr;
@@ -273,10 +273,6 @@ elfheader_t* ParseElfHeader(FILE* f, const char* name, int exec)
                     h->VerDef = (Elf32_Verdef*)ptr;
                     printf_dump(LOG_DEBUG, "The DT_VERDEF is at address %p\n", h->VerDef);
                     break;
-                case DT_FLAGS:
-                    h->flags = val;
-                    printf_dump(LOG_DEBUG, "The DT_FLAGS is 0x%x\n", h->flags);
-                    break;
                 }
             }
             if(h->rel) {
@@ -355,17 +351,6 @@ elfheader_t* ParseElfHeader(FILE* f, const char* name, int exec)
             h->bsssz = h->SHEntries[ii].sh_size;
             printf_dump(LOG_DEBUG, "The .bss is at address %p, and is %d big\n", (void*)h->bss, h->bsssz);
         }
-        ii = FindSection(h->SHEntries, h->numSHEntries, h->SHStrTab, ".eh_frame");
-        if(ii) {
-            h->ehframe = (uintptr_t)(h->SHEntries[ii].sh_addr);
-            h->ehframe_end = h->ehframe + h->SHEntries[ii].sh_size;
-            printf_dump(LOG_DEBUG, "The .eh_frame section is at address %p..%p\n", (void*)h->ehframe, (void*)h->ehframe_end);
-        }
-        ii = FindSection(h->SHEntries, h->numSHEntries, h->SHStrTab, ".eh_frame_hdr");
-        if(ii) {
-            h->ehframehdr = (uintptr_t)(h->SHEntries[ii].sh_addr);
-            printf_dump(LOG_DEBUG, "The .eh_frame_hdr section is at address %p\n", (void*)h->ehframehdr);
-        }
 
         LoadNamedSection(f, h->SHEntries, h->numSHEntries, h->SHStrTab, ".dynstr", "DynSym Strings", SHT_STRTAB, (void**)&h->DynStr, NULL);
         LoadNamedSection(f, h->SHEntries, h->numSHEntries, h->SHStrTab, ".dynsym", "DynSym", SHT_DYNSYM, (void**)&h->DynSym, &h->numDynSym);
@@ -414,59 +399,3 @@ const char* GetParentSymbolVersion(elfheader_t* h, int index)
     }
     return NULL;
 }
-
-int GetVersionIndice(elfheader_t* h, const char* vername)
-{
-    if(!vername)
-        return 0;
-    if(h->VerDef) {
-        Elf32_Verdef *def = (Elf32_Verdef*)((uintptr_t)h->VerDef + h->delta);
-        while(def) {
-            Elf32_Verdaux *aux = (Elf32_Verdaux*)((uintptr_t)def + def->vd_aux);
-            if(!strcmp(h->DynStr+aux->vda_name, vername))
-                return def->vd_ndx;
-            def = def->vd_next?((Elf32_Verdef*)((uintptr_t)def + def->vd_next)):NULL;
-        }
-    }
-    return 0;
-}
-
-int GetNeededVersionCnt(elfheader_t* h, const char* libname)
-{
-    if(!libname)
-        return 0;
-    if(h->VerNeed) {
-        Elf32_Verneed *ver = (Elf32_Verneed*)((uintptr_t)h->VerNeed + h->delta);
-        while(ver) {
-            char *filename = h->DynStr + ver->vn_file;
-            Elf32_Vernaux *aux = (Elf32_Vernaux*)((uintptr_t)ver + ver->vn_aux);
-            if(!strcmp(filename, libname))
-                return ver->vn_cnt;
-            ver = ver->vn_next?((Elf32_Verneed*)((uintptr_t)ver + ver->vn_next)):NULL;
-        }
-    }
-    return 0;
-}
-
-const char* GetNeededVersionString(elfheader_t* h, const char* libname, int idx)
-{
-    if(!libname)
-        return 0;
-    if(h->VerNeed) {
-        Elf32_Verneed *ver = (Elf32_Verneed*)((uintptr_t)h->VerNeed + h->delta);
-        while(ver) {
-            char *filename = h->DynStr + ver->vn_file;
-            Elf32_Vernaux *aux = (Elf32_Vernaux*)((uintptr_t)ver + ver->vn_aux);
-            if(!strcmp(filename, libname)) {
-                for(int j=0; j<ver->vn_cnt; ++j) {
-                    if(j==idx) 
-                        return h->DynStr+aux->vna_name;
-                    aux = (Elf32_Vernaux*)((uintptr_t)aux + aux->vna_next);
-                }
-                return NULL;    // idx out of bound, return NULL...
-           }
-            ver = ver->vn_next?((Elf32_Verneed*)((uintptr_t)ver + ver->vn_next)):NULL;
-        }
-    }
-    return NULL;
-}

src/emu/modrm.h

@@ -1,25 +1,3 @@
-#include <string.h>
-
-#define F8      *(uint8_t*)(addr++)
-#define F8S     *(int8_t*)(addr++)
-#define F16     *(uint16_t*)(addr+=2, addr-2)
-#define F16S    *(int16_t*)(addr+=2, addr-2)
-#define F32     *(uint32_t*)(addr+=4, addr-4)
-#define F32S    *(int32_t*)(addr+=4, addr-4)
-#define F32S64  (uint64_t)(int64_t)F32S
-#define F64     *(uint64_t*)(addr+=8, addr-8)
-#define F64S    *(int64_t*)(addr+=8, addr-8)
-#define PK(a)   *(uint8_t*)(addr+a)
-#ifdef DYNAREC
-#define STEP if(step) return 0;
-#define STEP2 if(step) {R_EIP = addr; return 0;}
-#define STEP3 if(*step) (*step)++;
-#else
-#define STEP
-#define STEP2
-#define STEP3
-#endif
-
 // ModRM utilities macros
 #define getecommon(A, T) \
     if(!(nextop&0xC0)) { \
@@ -107,7 +85,7 @@
             case 7: base =      R_BX; break;    \
         }                                       \
         switch((m>>6)&3) {                      \
-            case 0: if(m&7==6) base = F16S; break; \
+            case 0: if(m==6) base = F16; break; \
             case 1: base += F8S; break;         \
             case 2: base += F16S; break;        \
         }                                       \
@@ -119,17 +97,6 @@
     if((nextop&0xC0)==0xC0) { \
         A = (reg32_t*)&emu->regs[(nextop&3)].byte[((nextop&0x4)>>2)]; \
     } else getecommon(A, reg32_t)
-#define testeb(A, O) \
-    if((nextop&0xC0)==0xC0) { \
-        A = (reg32_t*)&emu->regs[(nextop&3)].byte[((nextop&0x4)>>2)]; \
-    } else { \
-        reg32_t* ret; \
-        getecommono(ret, reg32_t, O);\
-        test->memsize = 1; \
-        test->memaddr = (uintptr_t)ret;\
-        test->mem[0] = ret->byte[0];\
-        A = (reg32_t*)test->mem;\
-    }
 #define getebo(A, O)          \
     if((nextop&0xC0)==0xC0) { \
         A = (reg32_t*)&emu->regs[(nextop&3)].byte[((nextop&0x4)>>2)]; \
@@ -142,47 +109,14 @@
     if((nextop&0xC0)==0xC0) { \
         A = &emu->regs[(nextop&7)]; \
     } else getecommono(A, reg32_t, O)
-#define tested(A, SZ, O) \
-    if((nextop&0xC0)==0xC0) { \
-        A = &emu->regs[(nextop&7)]; \
-    } else {\
-        reg32_t* ret; \
-        getecommono(ret, reg32_t, O);\
-        test->memsize = SZ; \
-        test->memaddr = (uintptr_t)ret;\
-        memcpy(test->mem, ret->dword, SZ);\
-        A = (reg32_t*)test->mem;\
-    }
 #define getem(A) \
     if((nextop&0xC0)==0xC0) { \
         A = &emu->mmx[(nextop&7)]; \
     } else getecommon(A, mmx87_regs_t)
-#define testem(A) \
-    if((nextop&0xC0)==0xC0) { \
-        A = &emu->mmx[(nextop&7)]; \
-    } else {\
-        mmx87_regs_t* ret; \
-        getecommon(ret, mmx87_regs_t) \
-        test->memsize = 8; \
-        test->memaddr = (uintptr_t)ret;\
-        memcpy(test->mem, ret->ub, 8);\
-        A = (mmx87_regs_t*)test->mem;\
-    }
 #define getex(A) \
     if((nextop&0xC0)==0xC0) { \
         A = &emu->xmm[(nextop&7)]; \
     } else getecommon(A, sse_regs_t)
-#define testex(A) \
-    if((nextop&0xC0)==0xC0) { \
-        A = &emu->xmm[(nextop&7)]; \
-    } else {\
-        sse_regs_t* ret; \
-        getecommon(ret, sse_regs_t);\
-        test->memsize = 16; \
-        test->memaddr = (uintptr_t)ret;\
-        memcpy(test->mem, ret->ub, 16);\
-        A = (sse_regs_t*)test->mem;\
-    }
 #define getew16(A)  \
     if((nextop&0xC0)==0xC0) { \
         A = &emu->regs[(nextop&7)]; \
@@ -191,44 +125,16 @@
     if((nextop&0xC0)==0xC0) {       \
         A = &emu->regs[(nextop&7)]; \
     } else getecommon16o(A, reg32_t, O)
-#define testtew16(A, O)                 \
-    if((nextop&0xC0)==0xC0) {           \
-        A = &emu->regs[(nextop&7)];     \
-    } else {                            \
-        reg32_t* ret;                   \
-        getecommon16o(A, reg32_t, O);   \
-        test->memsize = 2;              \
-        test->memaddr = (uintptr_t)ret; \
-        *(uint16_t*)test->mem = ret->word[0];\
-        A = (reg32_t*)test->mem;        \
-    }
 
 // Macros for ModR/M gets
-#ifdef TEST_INTERPRETER
-#define GET_EB      testeb(oped, 0)
-#define GET_ED      tested(oped, 4, 0)
-#define GET_ED8     tested(oped, 8, 0)
-#define GET_EDT     tested(oped, 10, 0)
-#define GET_ED_OFFS(o) tested(oped, 4, o)
-#define GET_EB_OFFS(o) testeb(oped, o)
-#define GET_EM      testem(opem)
-#define GET_EX      testex(opex)
-#define GET_EW16    testew16(oped, 0)
-#define GET_EW16_OFFS(o)    testtew16(oped, o)
-#else
 #define GET_EB      geteb(oped)
 #define GET_ED      geted(oped)
-#define GET_ED8     geted(oped)
-#define GET_EDT     geted(oped)
 #define GET_ED_OFFS(o) getedo(oped, o)
 #define GET_EB_OFFS(o) getebo(oped, o)
 #define GET_EM      getem(opem)
 #define GET_EX      getex(opex)
 #define GET_EW16    getew16(oped)
 #define GET_EW16_OFFS(o)    getew16o(oped, o)
-#endif
-#define GET_ED_     geted(oped)
-#define GET_EW16_   getew16(oped)
 #define EB          oped
 #define ED          oped
 #define EM          opem

src/emu/run66.h

@@ -0,0 +1,555 @@
+    opcode = F8;
+    goto *opcodes66[opcode];
+
+    #define GO(B, OP)                       \
+    _66_##B##_0: \
+        nextop = F8;               \
+        GET_EB;             \
+        EB->byte[0] = OP##8(emu, EB->byte[0], GB);  \
+        NEXT;                              \
+    _66_##B##_1:                               \
+        nextop = F8;                \
+        GET_EW;                   \
+        EW->word[0] = OP##16(emu, EW->word[0], GW.word[0]); \
+        NEXT;                              \
+    _66_##B##_2: \
+        nextop = F8;               \
+        GET_EB;                   \
+        GB = OP##8(emu, GB, EB->byte[0]); \
+        NEXT;                              \
+    _66_##B##_3:                               \
+        nextop = F8;                \
+        GET_EW;                   \
+        GW.word[0] = OP##16(emu, GW.word[0], EW->word[0]); \
+        NEXT;                              \
+    _66_##B##_4: \
+        R_AL = OP##8(emu, R_AL, F8); \
+        NEXT;                              \
+    _66_##B##_5:                               \
+        R_AX = OP##16(emu, R_AX, F16); \
+        NEXT;
+
+    GO(0x00, add)                   /* ADD 0x01 ~> 0x05 */
+    GO(0x08, or)                    /*  OR 0x09 ~> 0x0D */
+    GO(0x10, adc)                   /* ADC 0x11 ~> 0x15 */
+    GO(0x18, sbb)                   /* SBB 0x19 ~> 0x1D */
+    GO(0x20, and)                   /* AND 0x21 ~> 0x25 */
+    GO(0x28, sub)                   /* SUB 0x29 ~> 0x2D */
+    GO(0x30, xor)                   /* XOR 0x31 ~> 0x35 */
+    //GO(0x38, cmp)                   /* CMP 0x39 ~> 0x3D */
+    #undef GO
+    _66_0x06:                      /* PUSH ES */
+        Push16(emu, emu->segs[_ES]);
+        NEXT;
+    _66_0x07:                      /* POP ES */
+        emu->segs[_ES] = Pop16(emu);    // no check, no use....
+        emu->segs_serial[_ES] = 0;
+        NEXT;
+
+    _66_0x0F:                      /* 66 0f prefix */
+        emu->old_ip = R_EIP;
+        R_EIP = ip-2;   // don't count 66 0F yet
+        Run660F(emu); // implemented in Run660f.c
+        ip = R_EIP;
+        if(emu->quit) goto fini;
+        STEP
+        NEXT;
+
+    _66_0x1E:                      /* PUSH DS */
+        Push16(emu, emu->segs[_DS]);
+        NEXT;
+    _66_0x1F:                      /* POP DS */
+        emu->segs[_DS] = Pop16(emu);    // no check, no use....
+        emu->segs_serial[_DS] = 0;
+        NEXT;
+        
+    _66_0x26:                      /* ES: */
+        // ignored
+        opcode = F8;
+        goto *opcodes66[opcode];
+    _66_0x2E:                      /* CS: */
+        // ignored
+        opcode = F8;
+        goto *opcodes66[opcode];
+    _66_0x36:                      /* SS: */
+        // ignored
+        opcode = F8;
+        goto *opcodes66[opcode];
+
+    _66_0x39:
+        nextop = F8;
+        GET_EW;
+        cmp16(emu, EW->word[0], GW.word[0]);
+        NEXT;
+    _66_0x3B:
+        nextop = F8;
+        GET_EW;
+        cmp16(emu, GW.word[0], EW->word[0]);
+        NEXT;
+    _66_0x3D:
+        cmp16(emu, R_AX, F16);
+        NEXT;
+    _66_0x3E:                      /* DS: */
+        // ignored
+        opcode = F8;
+        goto *opcodes66[opcode];
+    
+    _66_0x40:
+    _66_0x41:
+    _66_0x42:
+    _66_0x43:
+    _66_0x44:
+    _66_0x45:
+    _66_0x46:
+    _66_0x47:                              /* INC Reg */
+        tmp8u = opcode&7;
+        emu->regs[tmp8u].word[0] = inc16(emu, emu->regs[tmp8u].word[0]);
+        NEXT;
+    _66_0x48:
+    _66_0x49:
+    _66_0x4A:
+    _66_0x4B:
+    _66_0x4C:
+    _66_0x4D:
+    _66_0x4E:
+    _66_0x4F:                              /* DEC Reg */
+        tmp8u = opcode&7;
+        emu->regs[tmp8u].word[0] = dec16(emu, emu->regs[tmp8u].word[0]);
+        NEXT;
+    _66_0x50:
+    _66_0x51:
+    _66_0x52:
+    _66_0x53:
+    _66_0x54:
+    _66_0x55:
+    _66_0x56:
+    _66_0x57:                              /* PUSH Reg */
+        tmp8u = opcode&7;
+        Push16(emu, emu->regs[tmp8u].word[0]);
+        NEXT;
+    _66_0x58:
+    _66_0x59:
+    _66_0x5A:
+    _66_0x5B:
+    _66_0x5C:                      
+    _66_0x5D:
+    _66_0x5E:
+    _66_0x5F:                              /* POP Reg */
+        tmp8u = opcode&7;
+        emu->regs[tmp8u].word[0] = Pop16(emu);
+        NEXT;
+    _66_0x60:                              /* PUSHA */
+        tmp16u = R_SP;
+        Push16(emu, R_AX);
+        Push16(emu, R_CX);
+        Push16(emu, R_DX);
+        Push16(emu, R_BX);
+        Push16(emu, tmp16u);
+        Push16(emu, R_BP);
+        Push16(emu, R_SI);
+        Push16(emu, R_DI);
+        NEXT;
+    _66_0x61:                              /* POPA */
+        R_DI = Pop16(emu);
+        R_SI = Pop16(emu);
+        R_BP = Pop16(emu);
+        R_ESP+=2;   // POP ESP
+        R_BX = Pop16(emu);
+        R_DX = Pop16(emu);
+        R_CX = Pop16(emu);
+        R_AX = Pop16(emu);
+        NEXT;
+
+    _66_0x64:
+        R_EIP = ip-2;
+        RunFS66(emu, GetFSBaseEmu(emu));
+        ip = R_EIP;
+        STEP;
+        NEXT;
+
+    _66_0x66:
+        goto _0x66; // 0x66 0x66 => can remove one 0x66
+
+    _66_0x68:                       /* PUSH u16 */
+        tmp16u = F16;
+        Push16(emu, tmp16u);
+        NEXT;
+    _66_0x69:                      /* IMUL Gw,Ew,Iw */
+        nextop = F8;
+        GET_EW;
+        tmp16u = F16;
+        GW.word[0] = imul16(emu, EW->word[0], tmp16u);
+        NEXT;
+    _66_0x6A:                      /* PUSH Ib (as signed word) */
+        tmp16s = F8S;
+        Push16(emu, (uint16_t)tmp16s);
+        NEXT;
+    _66_0x6B:                      /* IMUL Gw,Ew,Ib */
+        nextop = F8;
+        GET_EW;
+        tmp16s = F8S;
+        GW.word[0] = imul16(emu, EW->word[0], (uint16_t)tmp16s);
+        NEXT;
+
+    _66_0x81:                              /* GRP3 Ew,Iw */
+    _66_0x83:                              /* GRP3 Ew,Ib */
+        nextop = F8;
+        GET_EW;
+        if(opcode==0x81) 
+            tmp16u = F16;
+        else {
+            tmp16s = F8S;
+            tmp16u = (uint16_t)tmp16s;
+        }
+        switch((nextop>>3)&7) {
+            case 0: EW->word[0] = add16(emu, EW->word[0], tmp16u); break;
+            case 1: EW->word[0] =  or16(emu, EW->word[0], tmp16u); break;
+            case 2: EW->word[0] = adc16(emu, EW->word[0], tmp16u); break;
+            case 3: EW->word[0] = sbb16(emu, EW->word[0], tmp16u); break;
+            case 4: EW->word[0] = and16(emu, EW->word[0], tmp16u); break;
+            case 5: EW->word[0] = sub16(emu, EW->word[0], tmp16u); break;
+            case 6: EW->word[0] = xor16(emu, EW->word[0], tmp16u); break;
+            case 7:               cmp16(emu, EW->word[0], tmp16u); break;
+        }
+        NEXT;
+
+    _66_0x85:                              /* TEST Ew,Gw */
+        nextop = F8;
+        GET_EW;
+        test16(emu, EW->word[0], GW.word[0]);
+        NEXT;
+
+    _66_0x87:                              /* XCHG Ew,Gw */
+        nextop = F8;
+        GET_EW;
+        tmp16u = GW.word[0];
+        GW.word[0] = EW->word[0];
+        EW->word[0] = tmp16u;
+        NEXT;
+
+    _66_0x89:                              /* MOV Ew,Gw */
+        nextop = F8;
+        GET_EW;
+        EW->word[0] = GW.word[0];
+        NEXT;
+
+    _66_0x8B:                              /* MOV Gw,Ew */
+        nextop = F8;
+        GET_EW;
+        GW.word[0] = EW->word[0];
+        NEXT;
+    _66_0x8C:                              /* MOV Ew,Seg */
+        nextop = F8;
+        GET_EW;
+        EW->word[0] = emu->segs[(nextop&0x38)>>3];
+        NEXT;
+    
+    _66_0x8E:                               /* MOV Seg,Ew */
+        nextop = F8;
+        GET_EW;
+        emu->segs[((nextop&0x38)>>3)] = EW->word[0];
+        emu->segs_serial[((nextop&0x38)>>3)] = 0;
+        NEXT;
+    _66_0x8F:                              /* POP Ew */
+        nextop = F8;
+        GET_EW;
+        EW->word[0] = Pop16(emu);
+        NEXT;
+    _66_0x90:                              /* NOP */
+        NEXT;
+
+    _66_0x91:
+    _66_0x92:
+    _66_0x93:
+    _66_0x94:
+    _66_0x95:
+    _66_0x96:
+    _66_0x97:                      /* XCHG reg,EAX */
+        tmp16u = R_AX;
+        R_AX = emu->regs[opcode&7].word[0];
+        emu->regs[opcode&7].word[0] = tmp16u;
+        NEXT;
+
+    _66_0x98:                               /* CBW */
+        emu->regs[_AX].sword[0] = emu->regs[_AX].sbyte[0];
+        NEXT;
+    _66_0x99:                              /* CWD */
+        R_DX=((R_AX & 0x8000)?0xFFFF:0x0000);
+        NEXT;
+
+    _66_0x9C:                              /* PUSHFW */
+        CHECK_FLAGS(emu);
+        Push16(emu, (uint16_t)emu->eflags.x32);
+        NEXT;
+    _66_0x9D:                              /* POPFW */
+        CHECK_FLAGS(emu);
+        emu->eflags.x32 &=0xffff0000;
+        emu->eflags.x32 |= (Pop16(emu) & 0x3F7FD7) | 0x2;
+        NEXT;
+
+    _66_0xA1:                              /* MOV AX,Ow */
+        R_AX = *(uint16_t*)F32;
+        NEXT;
+    _66_0xA3:                              /* MOV Ow,AX */
+        *(uint16_t*)F32 = R_AX;
+        NEXT;
+    _66_0xA5:                              /* MOVSW */
+        tmp8s = ACCESS_FLAG(F_DF)?-2:+2;
+        *(uint16_t*)R_EDI = *(uint16_t*)R_ESI;
+        R_EDI += tmp8s;
+        R_ESI += tmp8s;
+        NEXT;
+
+    _66_0xA7:                              /* CMPSW */
+        tmp8s = ACCESS_FLAG(F_DF)?-2:+2;
+        tmp16u  = *(uint16_t*)R_EDI;
+        tmp16u2 = *(uint16_t*)R_ESI;
+        R_EDI += tmp8s;
+        R_ESI += tmp8s;
+        cmp16(emu, tmp16u2, tmp16u);
+        NEXT;
+
+    _66_0xA9:                             /* TEST AX,Iw */
+        test16(emu, R_AX, F16);
+        NEXT;
+
+    _66_0xAB:                              /* STOSW */
+        tmp8s = ACCESS_FLAG(F_DF)?-2:+2;
+        *(uint16_t*)R_EDI = R_AX;
+        R_EDI += tmp8s;
+        NEXT;
+    _66_0xAD:                              /* LODSW */
+        tmp8s = ACCESS_FLAG(F_DF)?-2:+2;
+        R_AX = *(uint16_t*)R_ESI;
+        R_ESI += tmp8s;
+        NEXT;
+    _66_0xAF:                              /* SCASW */
+        tmp8s = ACCESS_FLAG(F_DF)?-2:+2;
+        cmp16(emu, R_AX, *(uint16_t*)R_EDI);
+        R_EDI += tmp8s;
+        NEXT;
+
+    _66_0xB8:                              /* MOV AX,Iw */
+    _66_0xB9:                              /* MOV CX,Iw */
+    _66_0xBA:                              /* MOV DX,Iw */
+    _66_0xBB:                              /* MOV BX,Iw */
+    _66_0xBC:                              /*    ...     */
+    _66_0xBD:
+    _66_0xBE:
+    _66_0xBF:
+        emu->regs[opcode&7].word[0] = F16;
+        NEXT;
+
+    _66_0xC1:                              /* GRP2 Ew,Ib */
+        nextop = F8;
+        GET_EW;
+        tmp8u = F8 /*& 0x1f*/;
+        switch((nextop>>3)&7) {
+            case 0: EW->word[0] = rol16(emu, EW->word[0], tmp8u); break;
+            case 1: EW->word[0] = ror16(emu, EW->word[0], tmp8u); break;
+            case 2: EW->word[0] = rcl16(emu, EW->word[0], tmp8u); break;
+            case 3: EW->word[0] = rcr16(emu, EW->word[0], tmp8u); break;
+            case 4:
+            case 6: EW->word[0] = shl16(emu, EW->word[0], tmp8u); break;
+            case 5: EW->word[0] = shr16(emu, EW->word[0], tmp8u); break;
+            case 7: EW->word[0] = sar16(emu, EW->word[0], tmp8u); break;
+        }
+        NEXT;
+
+    _66_0xC7:                              /* MOV Ew,Iw */
+        nextop = F8;
+        GET_EW;
+        EW->word[0] = F16;
+        NEXT;
+
+    _66_0xCB:                               /* FAR RET */
+        ip = Pop(emu);
+        emu->segs[_CS] = Pop(emu);    // no check, no use....
+        emu->segs_serial[_CS] = 0;
+        // need to check status of CS register!
+        STEP
+        NEXT;
+    _66_0xCC:                              /* INT3 */
+        emu->old_ip = R_EIP;
+        R_EIP = ip-1;
+        if(my_context->signals[SIGTRAP])
+            raise(SIGTRAP);
+        ip = R_EIP;
+        if(emu->quit) goto fini;
+        STEP
+        NEXT;
+    _66_0xD1:                              /* GRP2 Ew,1  */
+    _66_0xD3:                              /* GRP2 Ew,CL */
+        nextop = F8;
+        GET_EW;
+        tmp8u=(opcode==0xD3)?R_CL:1;
+        switch((nextop>>3)&7) {
+            case 0: EW->word[0] = rol16(emu, EW->word[0], tmp8u); break;
+            case 1: EW->word[0] = ror16(emu, EW->word[0], tmp8u); break;
+            case 2: EW->word[0] = rcl16(emu, EW->word[0], tmp8u); break;
+            case 3: EW->word[0] = rcr16(emu, EW->word[0], tmp8u); break;
+            case 4: 
+            case 6: EW->word[0] = shl16(emu, EW->word[0], tmp8u); break;
+            case 5: EW->word[0] = shr16(emu, EW->word[0], tmp8u); break;
+            case 7: EW->word[0] = sar16(emu, EW->word[0], tmp8u); break;
+        }
+        NEXT;
+    
+    _66_0xD9:
+        emu->old_ip = R_EIP;
+        R_EIP = ip;
+        Run66D9(emu);
+        ip = R_EIP;
+        if(emu->quit) goto fini;
+        STEP
+        NEXT;
+
+    _66_0xDD:
+        emu->old_ip = R_EIP;
+        R_EIP = ip;
+        Run66DD(emu);
+        ip = R_EIP;
+        if(emu->quit) goto fini;
+        STEP
+        NEXT;
+
+    _66_0xF0:                      /* LOCK prefix */
+        emu->old_ip = R_EIP;
+        R_EIP = ip - 2;
+        RunLock66(emu);
+        ip = R_EIP;
+        if(emu->quit) goto fini;
+        STEP
+        NEXT;
+
+    _66_0xF2:                      /* REPNZ prefix */
+    _66_0xF3:                      /* REPZ prefix */
+        nextop = F8;
+        tmp8s = ACCESS_FLAG(F_DF)?-2:+2;
+        tmp32u = R_ECX;
+        switch(nextop) {
+            case 0xA4:              /* REP MOVSB */
+                while(tmp32u) {
+                    --tmp32u;
+                    *(uint8_t*)R_EDI = *(uint8_t*)R_ESI;
+                    R_EDI += tmp8s;
+                    R_ESI += tmp8s;
+                }
+                break;
+            case 0xA5:              /* REP MOVSW */
+                while(tmp32u) {
+                    --tmp32u;
+                    *(uint16_t*)R_EDI = *(uint16_t*)R_ESI;
+                    R_EDI += tmp8s;
+                    R_ESI += tmp8s;
+                }
+                break;
+            case 0xA7:              /* REP(N)Z CMPSW */
+                tmp16u = 0;
+                tmp16u2 = 0;
+                while(tmp32u) {
+                    --tmp32u;
+                    tmp16u  = *(uint16_t*)R_EDI;
+                    tmp16u2 = *(uint16_t*)R_ESI;
+                    R_EDI += tmp8s;
+                    R_ESI += tmp8s;
+                    if((tmp16u==tmp16u2)==(opcode==0xF2))
+                        break;
+                }
+                if(R_ECX) cmp16(emu, tmp16u2, tmp16u);
+                break;
+            case 0xAB:              /* REP STOSW */
+                while(tmp32u) {
+                    --tmp32u;
+                    *(uint16_t*)R_EDI = R_AX;
+                    R_EDI += tmp8s;
+                }
+                break;
+            case 0xAD:              /* REP LODSW */
+                while(tmp32u) {
+                    --tmp32u;
+                    R_AX = *(uint16_t*)R_ESI;
+                    R_ESI += tmp8s;
+                }
+                break;
+            case 0xAF:              /* REP(N)Z SCASW */
+                tmp16u = 0;
+                while(tmp32u) {
+                    --tmp32u;
+                    tmp16u = *(uint16_t*)R_EDI;
+                    R_EDI += tmp8s;
+                    if((R_AX==tmp16u)==(opcode==0xF2))
+                        break;
+                }
+                if(R_ECX) cmp16(emu, R_AX, tmp16u);
+                break;
+            default:
+                goto _default;
+        }
+        R_ECX = tmp32u;
+        NEXT;
+
+    _66_0xF5:                      /* CMC */
+        CHECK_FLAGS(emu);
+        CONDITIONAL_SET_FLAG(!ACCESS_FLAG(F_CF), F_CF);
+        NEXT;
+
+    _66_0xF7:                      /* GRP3 Ew(,Iw) */
+        nextop = F8;
+        GET_EW;
+        switch((nextop>>3)&7) {
+            case 0: 
+            case 1:                 /* TEST Ew,Iw */
+                test16(emu, EW->word[0], F16);
+                break;
+            case 2:                 /* NOT Ew */
+                EW->word[0] = not16(emu, EW->word[0]);
+                break;
+            case 3:                 /* NEG Ew */
+                EW->word[0] = neg16(emu, EW->word[0]);
+                break;
+            case 4:                 /* MUL AX,Ew */
+                mul16(emu, EW->word[0]);
+                break;
+            case 5:                 /* IMUL AX,Ew */
+                imul16_eax(emu, EW->word[0]);
+                break;
+            case 6:                 /* DIV Ew */
+                div16(emu, EW->word[0]);
+                break;
+            case 7:                 /* IDIV Ew */
+                idiv16(emu, EW->word[0]);
+                break;
+        }
+        NEXT;
+    _66_0xF8:                       /* CLC */
+        CHECK_FLAGS(emu);
+        CLEAR_FLAG(F_CF);
+        NEXT;
+    _66_0xF9:                       /* STC */
+        CHECK_FLAGS(emu);
+        SET_FLAG(F_CF);
+        NEXT;
+
+    _66_0xFF:                      /* GRP 5 Ew */
+        nextop = F8;
+        GET_EW;
+        switch((nextop>>3)&7) {
+            case 0:                 /* INC Ed */
+                EW->word[0] = inc16(emu, EW->word[0]);
+                break;
+            case 1:                 /* DEC Ed */
+                EW->word[0] = dec16(emu, EW->word[0]);
+                break;
+            case 6:
+                Push16(emu, EW->word[0]);
+                break;
+            default:
+                emu->old_ip = R_EIP;
+                R_EIP = ip;
+                printf_log(LOG_NONE, "Illegal Opcode 66 %02X %02X\n", opcode, nextop);
+                emu->quit=1;
+                emu->error |= ERR_ILLEGAL;
+                goto fini;
+        }
+        NEXT;

src/emu/rund8.h

@@ -1,40 +1,7 @@
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-
-#include "debug.h"
-#include "box86stack.h"
-#include "x86emu.h"
-#include "x86run.h"
-#include "x86emu_private.h"
-#include "x86run_private.h"
-#include "x87emu_private.h"
-#include "x86primop.h"
-#include "x86trace.h"
-#include "box86context.h"
-
-#include "modrm.h"
-
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-
-#ifdef TEST_INTERPRETER
-uintptr_t TestD8(x86test_t *test, uintptr_t addr)
-#else
-uintptr_t RunD8(x86emu_t *emu, uintptr_t addr)
-#endif
-{
-    uint8_t nextop;
-    float f;
-    reg32_t *oped;
-    #ifdef TEST_INTERPRETER
-    x86emu_t*emu = test->emu;
-    #endif
-
     nextop = F8;
-    switch (nextop) {
+    switch(nextop) {
         case 0xC0:
         case 0xC1:
         case 0xC2:
@@ -192,9 +159,7 @@ uintptr_t RunD8(x86emu_t *emu, uintptr_t addr)
                 }
                 break;
             default:
-                return 0;
+                goto _default;
         }
     }
-   return addr;
-}
 #pragma GCC diagnostic pop

src/emu/rund9.h

@@ -1,38 +1,3 @@
-#define _GNU_SOURCE
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-
-#include "debug.h"
-#include "box86stack.h"
-#include "x86emu.h"
-#include "x86run.h"
-#include "x86emu_private.h"
-#include "x86run_private.h"
-#include "x87emu_private.h"
-#include "x86primop.h"
-#include "x86trace.h"
-#include "box86context.h"
-
-#include "modrm.h"
-
-#ifdef TEST_INTERPRETER
-uintptr_t TestD9(x86test_t *test, uintptr_t addr)
-#else
-uintptr_t RunD9(x86emu_t *emu, uintptr_t addr)
-#endif
-{
-    uint8_t nextop;
-    int32_t tmp32s;
-    int64_t ll;
-    float f;
-    reg32_t *oped;
-    #ifdef TEST_INTERPRETER
-    x86emu_t*emu = test->emu;
-    #endif
-
     nextop = F8;
     switch (nextop) {
         case 0xC0:
@@ -241,7 +206,7 @@ uintptr_t RunD9(x86emu_t *emu, uintptr_t addr)
         case 0xE6:
         case 0xE7:
         case 0xEF:
-            return 0;
+            goto _default;
         default:
         switch((nextop>>3)&7) {
             case 0:     /* FLD ST0, Ed float */
@@ -276,9 +241,7 @@ uintptr_t RunD9(x86emu_t *emu, uintptr_t addr)
             case 4:     /* FLDENV m */
                 // warning, incomplete
                 GET_ED;
-                #ifndef TEST_INTERPRETER
                 fpu_loadenv(emu, (char*)ED, 0);
-                #endif
                 break;
             case 5:     /* FLDCW Ew */
                 GET_EW;
@@ -288,9 +251,7 @@ uintptr_t RunD9(x86emu_t *emu, uintptr_t addr)
             case 6:     /* FNSTENV m */
                 // warning, incomplete
                 GET_ED;
-                #ifndef TEST_INTERPRETER
                 fpu_savenv(emu, (char*)ED, 0);
-                #endif
                 // intruction pointer: 48bits
                 // data (operand) pointer: 48bits
                 // last opcode: 11bits save: 16bits restaured (1st and 2nd opcode only)
@@ -300,8 +261,6 @@ uintptr_t RunD9(x86emu_t *emu, uintptr_t addr)
                 EW->word[0] = emu->cw.x16;
                 break;
             default:
-                return 0;
+                goto _default;
         }
     }
-   return addr;
-}

src/emu/runda.h

@@ -1,37 +1,3 @@
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-
-#include "debug.h"
-#include "box86stack.h"
-#include "x86emu.h"
-#include "x86run.h"
-#include "x86emu_private.h"
-#include "x86run_private.h"
-#include "x87emu_private.h"
-#include "x86primop.h"
-#include "x86trace.h"
-#include "box86context.h"
-
-#include "modrm.h"
-
-#ifdef TEST_INTERPRETER
-uintptr_t TestDA(x86test_t *test, uintptr_t addr)
-#else
-uintptr_t RunDA(x86emu_t *emu, uintptr_t addr)
-#endif
-{
-    uint8_t nextop;
-    int32_t tmp32s;
-    int64_t ll;
-    float f;
-    reg32_t *oped;
-    #ifdef TEST_INTERPRETER
-    x86emu_t*emu = test->emu;
-    #endif
-
     nextop = F8;
     switch(nextop) {
 
@@ -100,7 +66,8 @@ uintptr_t RunDA(x86emu_t *emu, uintptr_t addr)
     case 0xF8:
     case 0xF9:
     case 0xFD:
-        return 0;
+        UnimpOpcode(emu);
+        break;
     default:
         switch((nextop>>3)&7) {
             case 0:     /* FIADD ST0, Ed int */
@@ -138,5 +105,3 @@ uintptr_t RunDA(x86emu_t *emu, uintptr_t addr)
                 break;
         }
     }
-    return addr;
-}

src/emu/rundb.h

@@ -1,37 +1,3 @@
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-
-#include "debug.h"
-#include "box86stack.h"
-#include "x86emu.h"
-#include "x86run.h"
-#include "x86emu_private.h"
-#include "x86run_private.h"
-#include "x87emu_private.h"
-#include "x86primop.h"
-#include "x86trace.h"
-#include "box86context.h"
-
-#include "modrm.h"
-
-#ifdef TEST_INTERPRETER
-uintptr_t TestDB(x86test_t *test, uintptr_t addr)
-#else
-uintptr_t RunDB(x86emu_t *emu, uintptr_t addr)
-#endif
-{
-    uint8_t nextop;
-    int32_t tmp32s;
-    int64_t ll;
-    float f;
-    reg32_t *oped;
-    #ifdef TEST_INTERPRETER
-    x86emu_t*emu = test->emu;
-    #endif
-
     nextop = F8;
     switch(nextop) {
     case 0xC0:      /* FCMOVNB ST(0), ST(i) */
@@ -127,7 +93,7 @@ uintptr_t RunDB(x86emu_t *emu, uintptr_t addr)
     case 0xE5:
     case 0xE6:
     case 0xE7:
-        return 0;
+        goto _default;
     default:
         switch((nextop>>3)&7) {
             case 0: /* FILD ST0, Ed */
@@ -137,16 +103,15 @@ uintptr_t RunDB(x86emu_t *emu, uintptr_t addr)
                 break;
             case 1: /* FISTTP Ed, ST0 */
                 GET_ED;
-                if(isgreater(ST0.d, (double)0x7fffffff) || isless(ST0.d, -(double)0x80000000U) || !isfinite(ST0.d))
+                tmp32s = ST0.d; // TODO: Handling of FPU Exception
+                if(tmp32s==0x7fffffff && isgreater(ST0.d, (double)(int32_t)0x7fffffff))
                     tmp32s = 0x80000000;
-                else
-                    tmp32s = ST0.d; // TODO: Handling of FPU Exception
                 fpu_do_pop(emu);
                 ED->sdword[0] = tmp32s;
                 break;
             case 2: /* FIST Ed, ST0 */
                 GET_ED;
-                if(isgreater(ST0.d, (double)0x7fffffff) || isless(ST0.d, -(double)0x80000000U) || !isfinite(ST0.d))
+                if(isgreater(ST0.d, (double)(int32_t)0x7fffffff) || isless(ST0.d, -(double)(int32_t)0x7fffffff) || !isfinite(ST0.d))
                     ED->sdword[0] = 0x80000000;
                 else {
                     volatile int32_t tmp = fpu_round(emu, ST0.d);    // tmp to avoid BUS ERROR
@@ -155,7 +120,7 @@ uintptr_t RunDB(x86emu_t *emu, uintptr_t addr)
                 break;
             case 3: /* FISTP Ed, ST0 */
                 GET_ED;
-                if(isgreater(ST0.d, (double)0x7fffffff) || isless(ST0.d, -(double)0x80000000U) || !isfinite(ST0.d))
+                if(isgreater(ST0.d, (double)(int32_t)0x7fffffff) || isless(ST0.d, -(double)(int32_t)0x7fffffff) || !isfinite(ST0.d))
                     ED->sdword[0] = 0x80000000;
                 else {
                     volatile int32_t tmp = fpu_round(emu, ST0.d);    // tmp to avoid BUS ERROR
@@ -164,14 +129,14 @@ uintptr_t RunDB(x86emu_t *emu, uintptr_t addr)
                 fpu_do_pop(emu);
                 break;
             case 5: /* FLD ST0, Et */
-                GET_EDT;
+                GET_ED;
                 fpu_do_push(emu);
                 memcpy(&STld(0).ld, ED, 10);
                 LD2D(&STld(0).ld, &ST(0).d);
                 STld(0).uref = ST0.q;
                 break;
             case 7: /* FSTP tbyte */
-                GET_EDT;
+                GET_ED;
                 if(ST0.q!=STld(0).uref)
                     D2LD(&ST0.d, ED);
                 else
@@ -179,8 +144,6 @@ uintptr_t RunDB(x86emu_t *emu, uintptr_t addr)
                 fpu_do_pop(emu);
                 break;
             default:
-                return 0;
+                goto _default;
         }
     }
-    return addr;
-}

src/emu/rundc.h

@@ -1,37 +1,3 @@
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-
-#include "debug.h"
-#include "box86stack.h"
-#include "x86emu.h"
-#include "x86run.h"
-#include "x86emu_private.h"
-#include "x86run_private.h"
-#include "x87emu_private.h"
-#include "x86primop.h"
-#include "x86trace.h"
-#include "box86context.h"
-
-#include "modrm.h"
-
-#ifdef TEST_INTERPRETER
-uintptr_t TestDC(x86test_t *test, uintptr_t addr)
-#else
-uintptr_t RunDC(x86emu_t *emu, uintptr_t addr)
-#endif
-{
-    uint8_t nextop;
-    int32_t tmp32s;
-    int64_t ll;
-    double d;
-    reg32_t *oped;
-    #ifdef TEST_INTERPRETER
-    x86emu_t*emu = test->emu;
-    #endif
-
     nextop = F8;
     switch(nextop) {
         case 0xC0:
@@ -116,7 +82,7 @@ uintptr_t RunDC(x86emu_t *emu, uintptr_t addr)
             ST(nextop&7).d /=  ST0.d;
             break;
         default:
-            GET_ED8;
+            GET_ED;
             switch((nextop>>3)&7) {
             case 0:         /* FADD ST0, double */
                 if(!(((uintptr_t)ED)&7))
@@ -184,8 +150,7 @@ uintptr_t RunDC(x86emu_t *emu, uintptr_t addr)
                 }
                 break;
             default:
-                return 0;
+                goto _default;
         }
     }
-    return addr;
-}
+#pragma GCC diagnostic pop

src/emu/rundd.h

@@ -1,37 +1,3 @@
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-
-#include "debug.h"
-#include "box86stack.h"
-#include "x86emu.h"
-#include "x86run.h"
-#include "x86emu_private.h"
-#include "x86run_private.h"
-#include "x87emu_private.h"
-#include "x86primop.h"
-#include "x86trace.h"
-#include "box86context.h"
-
-#include "modrm.h"
-
-#ifdef TEST_INTERPRETER
-uintptr_t TestDD(x86test_t *test, uintptr_t addr)
-#else
-uintptr_t RunDD(x86emu_t *emu, uintptr_t addr)
-#endif
-{
-    uint8_t nextop;
-    int32_t tmp32s;
-    int64_t ll;
-    double d;
-    reg32_t *oped;
-    #ifdef TEST_INTERPRETER
-    x86emu_t*emu = test->emu;
-    #endif
-
     nextop = F8;
     switch(nextop) {
     
@@ -113,12 +79,12 @@ uintptr_t RunDD(x86emu_t *emu, uintptr_t addr)
     case 0xFD:
     case 0xFE:
     case 0xFF:
-        return 0;
+        goto _default;
 
     default:
         switch((nextop>>3)&7) {
             case 0: /* FLD double */
-                GET_ED8;
+                GET_ED;
                 fpu_do_push(emu);
                 if(!(((uintptr_t)ED)&7))
                     ST0.d = *(double*)ED;
@@ -127,32 +93,17 @@ uintptr_t RunDD(x86emu_t *emu, uintptr_t addr)
                 }
                 break;
             case 1: /* FISTTP ED qword */
-                GET_ED8;
-                if(!(((uintptr_t)ED)&7)) {
-                    if(STll(0).sref==ST(0).sq)
-                        *(int64_t*)ED = STll(0).sq;
-                    else {
-                        if(isgreater(ST0.d, (double)0x7fffffffffffffffLL) || isless(ST0.d, -(double)0x8000000000000000LL) || !isfinite(ST0.d))
-                            *(uint64_t*)ED = 0x8000000000000000LL;
-                        else
-                            *(int64_t*)ED = ST0.d;
-                    }
-                } else {
-                    int64_t i64;
-                    if(STll(0).sref==ST(0).sq)
-                        i64 = STll(0).sq;
-                    else {
-                        if(isgreater(ST0.d, (double)0x7fffffffffffffffLL) || isless(ST0.d, -(double)0x8000000000000000LL) || !isfinite(ST0.d))
-                            i64 = 0x8000000000000000LL;
-                        else
-                            i64 = ST0.d;
-                    }
+                GET_ED;
+                if(!(((uintptr_t)ED)&7))
+                    *(int64_t*)ED = ST0.d;
+                else {
+                    int64_t i64 = ST0.d;
                     memcpy(ED, &i64, sizeof(int64_t));
                 }
                 fpu_do_pop(emu);
                 break;
             case 2: /* FST double */
-                GET_ED8;
+                GET_ED;
                 if(!(((uintptr_t)ED)&7))
                     *(double*)ED = ST0.d;
                 else {
@@ -160,7 +111,7 @@ uintptr_t RunDD(x86emu_t *emu, uintptr_t addr)
                 }
                 break;
             case 3: /* FSTP double */
-                GET_ED8;
+                GET_ED;
                 if(!(((uintptr_t)ED)&7))
                     *(double*)ED = ST0.d;
                 else {
@@ -169,10 +120,8 @@ uintptr_t RunDD(x86emu_t *emu, uintptr_t addr)
                 fpu_do_pop(emu);
                 break;
             case 4: /* FRSTOR m108byte */
-                GET_ED_;
-                #ifndef TEST_INTERPRETER
+                GET_ED;
                 fpu_loadenv(emu, (char*)ED, 0);
-                #endif
                 // get the STx
                 {
                     char* p =(char*)ED;
@@ -184,10 +133,9 @@ uintptr_t RunDD(x86emu_t *emu, uintptr_t addr)
                 }
                 break;
             case 6: /* FNSAVE m108byte */
-                GET_ED_;
+                GET_ED;
                 // ENV first...
                 // warning, incomplete
-                #ifndef TEST_INTERPRETER
                 fpu_savenv(emu, (char*)ED, 0);
                 // save the STx
                 {
@@ -198,7 +146,6 @@ uintptr_t RunDD(x86emu_t *emu, uintptr_t addr)
                         p+=10;
                     }
                 }
-                #endif
                 reset_fpu(emu);
                 break;
             case 7: /* FNSTSW m2byte */
@@ -207,8 +154,6 @@ uintptr_t RunDD(x86emu_t *emu, uintptr_t addr)
                 *(uint16_t*)ED = emu->sw.x16;
                 break;
             default:
-                return 0;
+                goto _default;
         }
     }
-    return addr;
-}

src/emu/runde.h

@@ -1,37 +1,3 @@
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-
-#include "debug.h"
-#include "box86stack.h"
-#include "x86emu.h"
-#include "x86run.h"
-#include "x86emu_private.h"
-#include "x86run_private.h"
-#include "x87emu_private.h"
-#include "x86primop.h"
-#include "x86trace.h"
-#include "box86context.h"
-
-#include "modrm.h"
-
-#ifdef TEST_INTERPRETER
-uintptr_t TestDE(x86test_t *test, uintptr_t addr)
-#else
-uintptr_t RunDE(x86emu_t *emu, uintptr_t addr)
-#endif
-{
-    uint8_t nextop;
-    int32_t tmp32s;
-    int64_t ll;
-    double d;
-    reg32_t *oped;
-    #ifdef TEST_INTERPRETER
-    x86emu_t*emu = test->emu;
-    #endif
-
     nextop = F8;
     switch (nextop) {
     case 0xC0:  /* FADDP STx, ST0 */
@@ -129,7 +95,7 @@ uintptr_t RunDE(x86emu_t *emu, uintptr_t addr)
     case 0xDD:
     case 0xDE:
     case 0xDF:
-        return 0;
+        goto _default;
     
     default:
         switch((nextop>>3)&7) {
@@ -158,8 +124,6 @@ uintptr_t RunDE(x86emu_t *emu, uintptr_t addr)
                 ST0.d = (double)EW->sword[0] / ST0.d;
                 break;
         default:
-            return 0;
+            goto _default;
         }
     }
-    return addr;
-}

src/emu/rundf.h

@@ -1,37 +1,3 @@
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-
-#include "debug.h"
-#include "box86stack.h"
-#include "x86emu.h"
-#include "x86run.h"
-#include "x86emu_private.h"
-#include "x86run_private.h"
-#include "x87emu_private.h"
-#include "x86primop.h"
-#include "x86trace.h"
-#include "box86context.h"
-
-#include "modrm.h"
-
-#ifdef TEST_INTERPRETER
-uintptr_t TestDF(x86test_t *test, uintptr_t addr)
-#else
-uintptr_t RunDF(x86emu_t *emu, uintptr_t addr)
-#endif
-{
-    uint8_t nextop;
-    int16_t tmp16s;
-    int64_t tmp64s;
-    double d;
-    reg32_t *oped;
-    #ifdef TEST_INTERPRETER
-    x86emu_t*emu = test->emu;
-    #endif
-
     nextop = F8;
     switch (nextop) {
     case 0xC0:  /* FFREEP STx */
@@ -59,11 +25,8 @@ uintptr_t RunDF(x86emu_t *emu, uintptr_t addr)
         break;
 
     case 0xE0:  /* FNSTSW AX */
-        {
-            x87flags_t sw = emu->sw;
-            sw.f.F87_TOP = emu->top&7;
-            R_AX = sw.x16;
-        }
+        emu->sw.f.F87_TOP = emu->top&7;
+        R_AX = emu->sw.x16;
         break;
 
     case 0xE8:  /* FUCOMIP ST0, STx */
@@ -121,7 +84,7 @@ uintptr_t RunDF(x86emu_t *emu, uintptr_t addr)
     case 0xFD:
     case 0xFE:
     case 0xFF:
-        return 0;
+        goto _default;
 
     default:
         switch((nextop>>3)&7) {
@@ -133,35 +96,32 @@ uintptr_t RunDF(x86emu_t *emu, uintptr_t addr)
             break;
         case 1: /* FISTTP Ew, ST0 */
             GET_EW;
-            if(isgreater(ST0.d, (double)(int32_t)0x7fff) || isless(ST0.d, -(double)(int32_t)0x8000) || !isfinite(ST0.d))
-                tmp16s = 0x8000;
-            else
-                tmp16s = ST0.d;
+            tmp16s = ST0.d;
             EW->sword[0] = tmp16s;
             fpu_do_pop(emu);
             break;
         case 2: /* FIST Ew, ST0 */
             GET_EW;
-            if(isgreater(ST0.d, (double)(int32_t)0x7fff) || isless(ST0.d, -(double)(int32_t)0x8000) || !isfinite(ST0.d))
+            if(isgreater(ST0.d, (double)(int32_t)0x7fff) || isless(ST0.d, -(double)(int32_t)0x7fff) || !isfinite(ST0.d))
                 EW->sword[0] = 0x8000;
             else
                 EW->sword[0] = fpu_round(emu, ST0.d);
             break;
         case 3: /* FISTP Ew, ST0 */
             GET_EW;
-            if(isgreater(ST0.d, (double)(int32_t)0x7fff) || isless(ST0.d, -(double)(int32_t)0x8000) || !isfinite(ST0.d))
+            if(isgreater(ST0.d, (double)(int32_t)0x7fff) || isless(ST0.d, -(double)(int32_t)0x7fff) || !isfinite(ST0.d))
                 EW->sword[0] = 0x8000;
             else
                 EW->sword[0] = fpu_round(emu, ST0.d);
             fpu_do_pop(emu);
             break;
         case 4: /* FBLD ST0, tbytes */
-            GET_EDT;
+            GET_ED;
             fpu_do_push(emu);
             fpu_fbld(emu, (uint8_t*)ED);
             break;
         case 5: /* FILD ST0, Gq */
-            GET_ED8;
+            GET_ED;
             tmp64s = *(int64_t*)ED;
             fpu_do_push(emu);
             ST0.d = tmp64s;
@@ -169,19 +129,19 @@ uintptr_t RunDF(x86emu_t *emu, uintptr_t addr)
             STll(0).sref = ST0.sq;
             break;
         case 6: /* FBSTP tbytes, ST0 */
-            GET_EDT;
+            GET_ED;
             fpu_fbst(emu, (uint8_t*)ED);
             fpu_do_pop(emu);
             break;
         case 7: /* FISTP i64 */
-            GET_ED8;
+            GET_ED;
             if((uintptr_t)ED & 0x7) {
                 // un-aligned!
                 if(STll(0).sref==ST(0).sq)
                     memcpy(ED, &STll(0).sq, sizeof(int64_t));
                 else {
                     int64_t i64;
-                    if(isgreater(ST0.d, (double)0x7fffffffffffffffLL) || isless(ST0.d, -(double)0x8000000000000000LL) || !isfinite(ST0.d))
+                    if(isgreater(ST0.d, (double)(int64_t)0x7fffffffffffffffLL) || isless(ST0.d, -(double)(int64_t)0x7fffffffffffffffLL) || !isfinite(ST0.d))
                         i64 = 0x8000000000000000LL;
                     else
                         i64 = fpu_round(emu, ST0.d);
@@ -191,7 +151,7 @@ uintptr_t RunDF(x86emu_t *emu, uintptr_t addr)
                 if(STll(0).sref==ST(0).sq)
                     *(int64_t*)ED = STll(0).sq;
                 else {
-                    if(isgreater(ST0.d, (double)0x7fffffffffffffffLL) || isless(ST0.d, -(double)0x8000000000000000LL) || !isfinite(ST0.d))
+                    if(isgreater(ST0.d, (double)(int64_t)0x7fffffffffffffffLL) || isless(ST0.d, -(double)(int64_t)0x7fffffffffffffffLL) || !isfinite(ST0.d))
                         *(int64_t*)ED = 0x8000000000000000LL;
                     else
                         *(int64_t*)ED = fpu_round(emu, ST0.d);
@@ -200,8 +160,6 @@ uintptr_t RunDF(x86emu_t *emu, uintptr_t addr)
             fpu_do_pop(emu);
             break;
         default:
-            return 0;
+            goto _default;
         }
     }
-    return addr;
-}

src/emu/runf20f.h

@@ -1,51 +1,4 @@
-#define _GNU_SOURCE
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "debug.h"
-#include "box86stack.h"
-#include "x86emu.h"
-#include "x86run.h"
-#include "x86emu_private.h"
-#include "x86run_private.h"
-#include "x86primop.h"
-#include "x86trace.h"
-#include "x87emu_private.h"
-#include "box86context.h"
-#include "bridge.h"
-
-#include "modrm.h"
-
-#ifdef TEST_INTERPRETER
-uintptr_t TestF20F(x86test_t *test, uintptr_t addr, int *step)
-#else
-uintptr_t RunF20F(x86emu_t *emu, uintptr_t addr, int *step)
-#endif
-{
-    uint8_t opcode;
-    uint8_t nextop;
-    int8_t tmp8s;
-    uint8_t tmp8u;
-    int32_t tmp32s;
-    int64_t tmp64s0, tmp64s1;
-    reg32_t *oped, *opgd;
-    sse_regs_t *opex, *opgx, eax1;
-    mmx87_regs_t *opgm;
-    #ifndef NOALIGN
-    int is_nan;
-    #endif
-    #ifdef TEST_INTERPRETER
-    x86emu_t*emu = test->emu;
-    #endif
-
     opcode = F8;
-
     switch(opcode) {
 
     case 0x10:  /* MOVSD Gx, Ex */
@@ -77,31 +30,25 @@ uintptr_t RunF20F(x86emu_t *emu, uintptr_t addr, int *step)
     case 0x2C:  /* CVTTSD2SI Gd, Ex */
         nextop = F8;
         GET_EX;
-        if(!isfinite(EX->d[0]) || EX->d[0]>(double)0x7fffffff || EX->d[0]<-(double)0x80000000U)
-            GD.dword[0] = 0x80000000;
-        else
-            GD.sdword[0] = EX->d[0];
+        GD.sdword[0] = EX->d[0];
         break;
     case 0x2D:  /* CVTSD2SI Gd, Ex */
         nextop = F8;
         GET_EX;
-        if(!isfinite(EX->d[0]) || EX->d[0]>(double)0x7fffffff || EX->d[0]<-(double)0x80000000U)
-            GD.dword[0] = 0x80000000;
-        else
-            switch(emu->mxcsr.f.MXCSR_RC) {
-                case ROUND_Nearest:
-                    GD.sdword[0] = nearbyint(EX->d[0]);
-                    break;
-                case ROUND_Down:
-                    GD.sdword[0] = floor(EX->d[0]);
-                    break;
-                case ROUND_Up:
-                    GD.sdword[0] = ceil(EX->d[0]);
-                    break;
-                case ROUND_Chop:
-                    GD.sdword[0] = EX->d[0];
-                    break;
-            }
+        switch((emu->mxcsr>>13)&3) {
+            case ROUND_Nearest:
+                GD.sdword[0] = floor(EX->d[0]+0.5);
+                break;
+            case ROUND_Down:
+                GD.sdword[0] = floor(EX->d[0]);
+                break;
+            case ROUND_Up:
+                GD.sdword[0] = ceil(EX->d[0]);
+                break;
+            case ROUND_Chop:
+                GD.sdword[0] = EX->d[0];
+                break;
+        }
         break;
     case 0x51:  /* SQRTSD Gx, Ex */
         nextop = F8;
@@ -172,7 +119,7 @@ uintptr_t RunF20F(x86emu_t *emu, uintptr_t addr, int *step)
     case 0x5F:  /* MAXSD Gx, Ex */
         nextop = F8;
         GET_EX;
-        if (isnan(GX.d[0]) || isnan(EX->d[0]) || isgreaterequal(EX->d[0], GX.d[0]))
+        if (isnan(GX.d[0]) || isnan(EX->d[0]) || isgreater(EX->d[0], GX.d[0]))
             GX.d[0] = EX->d[0];
         break;
 
@@ -204,19 +151,6 @@ uintptr_t RunF20F(x86emu_t *emu, uintptr_t addr, int *step)
             GX.f[3] = EX->f[2] + EX->f[3];
         }
         break;
-    case 0x7D:  /* HSUBPS Gx, Ex */
-        nextop = F8;
-        GET_EX;
-        GX.f[0] -= GX.f[1];
-        GX.f[1] = GX.f[2] - GX.f[3];
-        if(EX==&GX) {
-            GX.f[2] = GX.f[0];
-            GX.f[3] = GX.f[1];
-        } else {
-            GX.f[2] = EX->f[0] - EX->f[1];
-            GX.f[3] = EX->f[2] - EX->f[3];
-        }
-        break;
 
     #define GOCOND(BASE, PREFIX, CONDITIONAL)   \
     case BASE+0:                                \
@@ -302,7 +236,7 @@ uintptr_t RunF20F(x86emu_t *emu, uintptr_t addr, int *step)
         
     GOCOND(0x80
         , tmp32s = F32S; CHECK_FLAGS(emu);
-        , addr += tmp32s; STEP3;
+        , ip += tmp32s;
     )                               /* 0x80 -> 0x8F Jxx */
         
     case 0xC2:  /* CMPSD Gx, Ex, Ib */
@@ -341,24 +275,24 @@ uintptr_t RunF20F(x86emu_t *emu, uintptr_t addr, int *step)
     case 0xE6:  /* CVTPD2DQ Gx, Ex */
         nextop = F8;
         GET_EX;
-        for(int i=0; i<2; ++i)
-            if(!isfinite(EX->d[i]) || EX->d[i]>(double)0x7fffffff || EX->d[i]<-(double)0x80000000U)
-                GX.ud[i] = 0x80000000;
-            else
-                switch(emu->mxcsr.f.MXCSR_RC) {
-                    case ROUND_Nearest:
-                        GX.sd[i] = nearbyint(EX->d[i]);
-                        break;
-                    case ROUND_Down:
-                        GX.sd[i] = floor(EX->d[i]);
-                        break;
-                    case ROUND_Up:
-                        GX.sd[i] = ceil(EX->d[i]);
-                        break;
-                    case ROUND_Chop:
-                        GX.sd[i] = EX->d[i];
-                        break;
-                }
+        switch((emu->mxcsr>>13)&3) {
+            case ROUND_Nearest:
+                GX.sd[0] = floor(EX->d[0]+0.5);
+                GX.sd[1] = floor(EX->d[1]+0.5);
+                break;
+            case ROUND_Down:
+                GX.sd[0] = floor(EX->d[0]);
+                GX.sd[1] = floor(EX->d[1]);
+                break;
+            case ROUND_Up:
+                GX.sd[0] = ceil(EX->d[0]);
+                GX.sd[1] = ceil(EX->d[1]);
+                break;
+            case ROUND_Chop:
+                GX.sd[0] = EX->d[0];
+                GX.sd[1] = EX->d[1];
+                break;
+        }
         GX.q[1] = 0;
         break;
 
@@ -369,7 +303,6 @@ uintptr_t RunF20F(x86emu_t *emu, uintptr_t addr, int *step)
         break;
 
     default:
-        return 0;
+        goto _default;
     }
-    return addr;
-}
+

src/emu/runf30f.h

@@ -1,49 +1,4 @@
-#define _GNU_SOURCE
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "debug.h"
-#include "box86stack.h"
-#include "x86emu.h"
-#include "x86run.h"
-#include "x86emu_private.h"
-#include "x86run_private.h"
-#include "x86primop.h"
-#include "x86trace.h"
-#include "x87emu_private.h"
-#include "box86context.h"
-#include "bridge.h"
-
-#include "modrm.h"
-
-#ifdef TEST_INTERPRETER
-uintptr_t TestF30F(x86test_t *test, uintptr_t addr)
-#else
-uintptr_t RunF30F(x86emu_t *emu, uintptr_t addr)
-#endif
-{
-    uint8_t opcode;
-    uint8_t nextop;
-    int8_t tmp8s;
-    uint8_t tmp8u;
-    uint32_t tmp32u;
-    int64_t tmp64s;
-    uint64_t tmp64u;
-    reg32_t *oped, *opgd;
-    sse_regs_t *opex, *opgx, eax1;
-    mmx87_regs_t *opem;
-    #ifdef TEST_INTERPRETER
-    x86emu_t*emu = test->emu;
-    #endif
-
     opcode = F8;
-
     switch(opcode) {
 
     case 0x10:  /* MOVSS Gx Ex */
@@ -92,31 +47,25 @@ uintptr_t RunF30F(x86emu_t *emu, uintptr_t addr)
     case 0x2C:  /* CVTTSS2SI Gd, Ex */
         nextop = F8;
         GET_EX;
-        if(isnanf(EX->f[0]) || isinff(EX->f[0]) || EX->f[0]>=(float)0x80000000U || EX->f[0]<-(float)0x80000000U)
-            GD.dword[0] = 0x80000000;
-        else
-            GD.sdword[0] = EX->f[0];
+        GD.sdword[0] = EX->f[0];
         break;
     case 0x2D:  /* CVTSS2SI Gd, Ex */
         nextop = F8;
         GET_EX;
-        if(isnanf(EX->f[0]) || isinff(EX->f[0]) || EX->f[0]>=(float)0x80000000U || EX->f[0]<-(float)0x80000000U)
-            GD.dword[0] = 0x80000000;
-        else
-            switch(emu->mxcsr.f.MXCSR_RC) {
-                case ROUND_Nearest:
-                    GD.sdword[0] = nearbyintf(EX->f[0]);
-                    break;
-                case ROUND_Down:
-                    GD.sdword[0] = floorf(EX->f[0]);
-                    break;
-                case ROUND_Up:
-                    GD.sdword[0] = ceilf(EX->f[0]);
-                    break;
-                case ROUND_Chop:
-                    GD.sdword[0] = EX->f[0];
-                    break;
-            }
+        switch((emu->mxcsr>>13)&3) {
+            case ROUND_Nearest:
+                GD.sdword[0] = floor(EX->f[0]+0.5);
+                break;
+            case ROUND_Down:
+                GD.sdword[0] = floor(EX->f[0]);
+                break;
+            case ROUND_Up:
+                GD.sdword[0] = ceil(EX->f[0]);
+                break;
+            case ROUND_Chop:
+                GD.sdword[0] = EX->f[0];
+                break;
+        }
         break;
 
     case 0x51:  /* SQRTSS Gx, Ex */
@@ -153,11 +102,10 @@ uintptr_t RunF30F(x86emu_t *emu, uintptr_t addr)
     case 0x5B:  /* CVTTPS2DQ Gx, Ex */
         nextop = F8;
         GET_EX;
-        for(int i=0; i<4; ++i)
-            if(isnanf(EX->f[i]) || isinff(EX->f[i]) || EX->f[i]>=(float)0x80000000U || EX->f[i]<-(float)0x80000000U)
-                GX.ud[i] = 0x80000000;
-            else
-                GX.sd[i] = EX->f[i];
+        GX.sd[0] = EX->f[0];
+        GX.sd[1] = EX->f[1];
+        GX.sd[2] = EX->f[2];
+        GX.sd[3] = EX->f[3];
         break;
 
     case 0x5C:  /* SUBSS Gx, Ex */
@@ -168,7 +116,7 @@ uintptr_t RunF30F(x86emu_t *emu, uintptr_t addr)
     case 0x5D:  /* MINSS Gx, Ex */
         nextop = F8;
         GET_EX;
-        if(isnanf(GX.f[0]) || isnanf(EX->f[0]) || islessequal(EX->f[0], GX.f[0]))
+        if(isnan(GX.f[0]) || isnan(EX->f[0]) || isless(EX->f[0], GX.f[0]))
             GX.f[0] = EX->f[0];
         break;
     case 0x5E:  /* DIVSS Gx, Ex */
@@ -179,7 +127,7 @@ uintptr_t RunF30F(x86emu_t *emu, uintptr_t addr)
     case 0x5F:  /* MAXSS Gx, Ex */
         nextop = F8;
         GET_EX;
-        if (isnanf(GX.f[0]) || isnanf(EX->f[0]) || isgreaterequal(EX->f[0], GX.f[0]))
+        if (isnan(GX.f[0]) || isnan(EX->f[0]) || isgreater(EX->f[0], GX.f[0]))
             GX.f[0] = EX->f[0];
         break;
 
@@ -285,7 +233,5 @@ uintptr_t RunF30F(x86emu_t *emu, uintptr_t addr)
         break;
 
     default:
-        return 0;
+        goto _default;
     }
-    return addr;
-}

src/emu/x86emu.c

@@ -23,13 +23,6 @@
 #ifdef DYNAREC
 #include "custommem.h"
 #endif
-// for the applyFlushTo0
-#ifdef __i386__
-#include <immintrin.h>
-#elif defined(__arm__)
-#else
-#warning Architecture cannot follow SSE Flush to 0 flag
-#endif
 
 typedef struct cleanup_s {
     void*       f;
@@ -54,6 +47,17 @@ uint32_t* GetParityTab()
     return x86emu_parity_tab;
 }
 
+void PushExit(x86emu_t* emu)
+{
+    uintptr_t endMarker = AddCheckBridge(my_context->system, NULL, NULL, 0, "(ExitEmulation)");
+    Push(emu, endMarker);
+}
+
+void* GetExit()
+{
+    return (void*)AddCheckBridge(my_context->system, NULL, NULL, 0, "(ExitEmulation)");
+}
+
 static void internalX86Setup(x86emu_t* emu, box86context_t *context, uintptr_t start, uintptr_t stack, int stacksize, int ownstack)
 {
     emu->context = context;
@@ -77,13 +81,13 @@ static void internalX86Setup(x86emu_t* emu, box86context_t *context, uintptr_t s
     emu->segs[_GS] = 0x33;
     // setup fpu regs
     reset_fpu(emu);
-    emu->mxcsr.x32 = 0x1f80;  
+    emu->mxcsr = 0x1f80;  
 }
 
 EXPORTDYN
 x86emu_t *NewX86Emu(box86context_t *context, uintptr_t start, uintptr_t stack, int stacksize, int ownstack)
 {
-    printf_log(LOG_DEBUG, "%04d|Allocate a new X86 Emu, with EIP=%p and Stack=%p/0x%X\n", GetTID(), (void*)start, (void*)stack, stacksize);
+    printf_log(LOG_DEBUG, "Allocate a new X86 Emu, with EIP=%p and Stack=%p/0x%X\n", (void*)start, (void*)stack, stacksize);
 
     x86emu_t *emu = (x86emu_t*)box_calloc(1, sizeof(x86emu_t));
 
@@ -94,7 +98,7 @@ x86emu_t *NewX86Emu(box86context_t *context, uintptr_t start, uintptr_t stack, i
 
 x86emu_t *NewX86EmuFromStack(x86emu_t* emu, box86context_t *context, uintptr_t start, uintptr_t stack, int stacksize, int ownstack)
 {
-    printf_log(LOG_DEBUG, "%04d|New X86 Emu from stack, with EIP=%p and Stack=%p/0x%X\n", GetTID(), (void*)start, (void*)stack, stacksize);
+    printf_log(LOG_DEBUG, "New X86 Emu from stack, with EIP=%p and Stack=%p/0x%X\n", (void*)start, (void*)stack, stacksize);
 
     internalX86Setup(emu, context, start, stack, stacksize, ownstack);
     
@@ -104,7 +108,6 @@ x86emu_t *NewX86EmuFromStack(x86emu_t* emu, box86context_t *context, uintptr_t s
 EXPORTDYN
 void SetupX86Emu(x86emu_t *emu)
 {
-    (void)emu;
     printf_log(LOG_DEBUG, "Setup X86 Emu\n");
 }
 
@@ -125,7 +128,6 @@ void SetTraceEmu(uintptr_t start, uintptr_t end)
 
 void AddCleanup(x86emu_t *emu, void *p)
 {
-    (void)emu;
     if(my_context->clean_sz == my_context->clean_cap) {
         my_context->clean_cap += 4;
         my_context->cleanups = (cleanup_t*)box_realloc(my_context->cleanups, sizeof(cleanup_t)*my_context->clean_cap);
@@ -137,7 +139,6 @@ void AddCleanup(x86emu_t *emu, void *p)
 
 void AddCleanup1Arg(x86emu_t *emu, void *p, void* a)
 {
-    (void)emu;
     if(my_context->clean_sz == my_context->clean_cap) {
         my_context->clean_cap += 4;
         my_context->cleanups = (cleanup_t*)box_realloc(my_context->cleanups, sizeof(cleanup_t)*my_context->clean_cap);
@@ -187,11 +188,6 @@ void FreeX86Emu(x86emu_t **emu)
         return;
     printf_log(LOG_DEBUG, "%04d|Free a X86 Emu (%p)\n", GetTID(), *emu);
 
-    if((*emu)->test.emu) {
-        internalFreeX86((*emu)->test.emu);
-        box_free((*emu)->test.emu);
-        (*emu)->test.emu = NULL;
-    }
     internalFreeX86(*emu);
 
     box_free(*emu);
@@ -225,10 +221,6 @@ void CloneEmu(x86emu_t *newemu, const x86emu_t* emu)
 	newemu->top = emu->top;
     newemu->fpu_stack = emu->fpu_stack;
     memcpy(newemu->xmm, emu->xmm, sizeof(emu->xmm));
-    newemu->df = emu->df;
-    newemu->op1 = emu->op1;
-    newemu->op2 = emu->op2;
-    newemu->res = emu->res;
     newemu->mxcsr = emu->mxcsr;
     newemu->quit = emu->quit;
     newemu->error = emu->error;
@@ -238,34 +230,6 @@ void CloneEmu(x86emu_t *newemu, const x86emu_t* emu)
     newemu->regs[_SP].dword[0] = emu->regs[_SP].dword[0] + (intptr_t)(newst - oldst);
 }
 
-void CopyEmu(x86emu_t *newemu, const x86emu_t* emu)
-{
-	memcpy(newemu->regs, emu->regs, sizeof(emu->regs));
-    memcpy(&newemu->ip, &emu->ip, sizeof(emu->ip));
-	memcpy(&newemu->eflags, &emu->eflags, sizeof(emu->eflags));
-    newemu->old_ip = emu->old_ip;
-    memcpy(newemu->segs, emu->segs, sizeof(emu->segs));
-    memcpy(newemu->segs_serial, emu->segs_serial, sizeof(emu->segs_serial));
-    memcpy(newemu->segs_offs, emu->segs_offs, sizeof(emu->segs_offs));
-	memcpy(newemu->x87, emu->x87, sizeof(emu->x87));
-	memcpy(newemu->mmx, emu->mmx, sizeof(emu->mmx));
-    memcpy(newemu->xmm, emu->xmm, sizeof(emu->xmm));
-    memcpy(newemu->fpu_ld, emu->fpu_ld, sizeof(emu->fpu_ld));
-    memcpy(newemu->fpu_ll, emu->fpu_ll, sizeof(emu->fpu_ll));
-	memcpy(newemu->p_regs, emu->p_regs, sizeof(emu->p_regs));
-	newemu->cw = emu->cw;
-	newemu->sw = emu->sw;
-	newemu->top = emu->top;
-    newemu->fpu_stack = emu->fpu_stack;
-    newemu->df = emu->df;
-    newemu->op1 = emu->op1;
-    newemu->op2 = emu->op2;
-    newemu->res = emu->res;
-    newemu->mxcsr = emu->mxcsr;
-    newemu->quit = emu->quit;
-    newemu->error = emu->error;
-}
-
 box86context_t* GetEmuContext(x86emu_t* emu)
 {
     return emu->context;
@@ -337,7 +301,7 @@ void ResetFlags(x86emu_t *emu)
 const char* DumpCPURegs(x86emu_t* emu, uintptr_t ip)
 {
     static char buff[800];
-    static const char* regname[] = {"EAX", "ECX", "EDX", "EBX", "ESP", "EBP", "ESI", "EDI"};
+    char* regname[] = {"EAX", "ECX", "EDX", "EBX", "ESP", "EBP", "ESI", "EDI"};
     char tmp[80];
     buff[0] = '\0';
     if(trace_emm) {
@@ -494,15 +458,14 @@ static inline void init_perfcounters (int32_t do_reset, int32_t enable_divider)
 
 uint64_t ReadTSC(x86emu_t* emu)
 {
-    (void)emu;
     // Read the TimeStamp Counter as 64bits.
     // this is supposed to be the number of instructions executed since last reset
 #if defined(__i386__)
     uint64_t ret;
     __asm__ volatile("rdtsc" : "=A"(ret));
     return ret;
-#elif defined(__ARM_ARCH)
 #if 0
+#elif defined(__ARM_ARCH)
 #if (__ARM_ARCH >= 6)
     static int init = 1;
     if(init) {
@@ -534,17 +497,3 @@ void ResetSegmentsCache(x86emu_t *emu)
         return;
     memset(emu->segs_serial, 0, sizeof(emu->segs_serial));
 }
-
-void applyFlushTo0(x86emu_t* emu)
-{
-#ifdef __i386__
-    _mm_setcsr(_mm_getcsr() | (emu->mxcsr.x32&0x8040));
-#elif defined(__arm__)
-    uint64_t fpscr = __builtin_arm_get_fpscr();
-    fpscr &= ~(1<<24);                     // clear bit FZ (24)
-    fpscr |= (emu->mxcsr.f.MXCSR_FZ)<<24;  // set FZ as mxcsr FZ
-    __builtin_arm_set_fpscr(fpscr);
-#else
-    (void)emu;
-#endif
-}

src/emu/x86emu_private.h

@@ -23,17 +23,6 @@ typedef struct forkpty_s {
     void*   f;  // forkpty function
 } forkpty_t;
 
-typedef struct x86emu_s x86emu_t;
-
-typedef struct x86test_s {
-    x86emu_t*   emu;
-    uintptr_t   memaddr;
-    int         memsize;
-    int         test;
-    int         clean;
-    uint8_t     mem[16];
-} x86test_t;
-
 typedef struct x86emu_s {
     // cpu
 	reg32_t     regs[8];
@@ -51,7 +40,7 @@ typedef struct x86emu_s {
 	fpu_p_reg_t p_regs[8];
     // sse
     sse_regs_t  xmm[8];
-    mmxcontrol_t mxcsr;
+    uint32_t    mxcsr;
     uintptr_t   old_ip;
     // defered flags
     defered_flags_t df;
@@ -74,7 +63,6 @@ typedef struct x86emu_s {
     int         exit;
     int         quitonlongjmp;  // quit if longjmp is called
     int         longjmp;        // if quit because of longjmp
-    x86test_t   test;       // used for dynarec testing
     // parent context
     box86context_t *context;
     // cpu helpers
@@ -100,6 +88,4 @@ typedef struct x86emu_s {
 //#define INTR_RAISE_DIV0(emu) {emu->error |= ERR_DIVBY0; emu->quit=1;}
 #define INTR_RAISE_DIV0(emu) {emu->error |= ERR_DIVBY0;} // should rise a SIGFPE and not quit
 
-void applyFlushTo0(x86emu_t* emu);
-
 #endif //__X86EMU_PRIVATE_H_

src/emu/x86int3.c

@@ -10,7 +10,6 @@
 #include <sys/types.h>
 #include <pthread.h>
 #include <signal.h>
-#include <wait.h>
 
 #include "debug.h"
 #include "box86stack.h"
@@ -54,10 +53,7 @@ x86emu_t* x86emu_fork(x86emu_t* emu, int forktype)
         for (int i=0; i<my_context->atfork_sz; --i)
             if(my_context->atforks[i].parent)
                 EmuCall(emu, my_context->atforks[i].parent);
-        if(forktype==3) {
-            // vfork, the parent wait the end or execve of the son
-            waitpid(v, NULL, WEXITED);
-        }
+
     } else if(v==0) {
         // execute atforks child functions
         for (int i=0; i<my_context->atfork_sz; --i)
@@ -91,8 +87,6 @@ void x86Int3(x86emu_t* emu)
             if(h && strstr(ElfName(h), "libMiles")) have_trace = 1;*/
             if(box86_log>=LOG_DEBUG  || cycle_log) {
                 int tid = GetTID();
-                const char *s = NULL;
-                s = GetNativeName((void*)addr);
                 char t_buff[256] = "\0";
                 char buff2[64] = "\0";
                 char buff3[64] = "\0";
@@ -100,220 +94,213 @@ void x86Int3(x86emu_t* emu)
                 char* buffret = cycle_log?my_context->log_ret[my_context->current_line]:NULL;
                 if(buffret) buffret[0] = '\0';
                 if(cycle_log)
-                    my_context->current_line = (my_context->current_line+1)%cycle_log;
+                    my_context->current_line = (my_context->current_line+1)&(CYCLE_LOG-1);
                 char *tmp;
                 int post = 0;
                 int perr = 0;
                 uint32_t *pu32 = NULL;
+                const char *s = NULL;
+                s = GetNativeName((void*)addr);
                 if(addr==(uintptr_t)PltResolver) {
                     snprintf(buff, 256, "%s", cycle_log?"PltResolver ":" ... ");
                 } else
                 if(strstr(s, "SDL_RWFromFile")==s || strstr(s, "SDL_RWFromFile")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%s, %s)", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(char**)(R_ESP+8));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%s, %s)", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(char**)(R_ESP+8));
                 } else  if(strstr(s, "glColor4f")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%f, %f, %f, %f)", tid, *(void**)(R_ESP), s, *(float*)(R_ESP+4), *(float*)(R_ESP+8), *(float*)(R_ESP+12), *(float*)(R_ESP+16));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%f, %f, %f, %f)", tid, *(void**)(R_ESP), s, *(float*)(R_ESP+4), *(float*)(R_ESP+8), *(float*)(R_ESP+12), *(float*)(R_ESP+16));
                 } else  if(strstr(s, "glTexCoord2f")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%f, %f)", tid, *(void**)(R_ESP), s, *(float*)(R_ESP+4), *(float*)(R_ESP+8));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%f, %f)", tid, *(void**)(R_ESP), s, *(float*)(R_ESP+4), *(float*)(R_ESP+8));
                 } else  if(strstr(s, "glVertex2f")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%f, %f)", tid, *(void**)(R_ESP), s, *(float*)(R_ESP+4), *(float*)(R_ESP+8));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%f, %f)", tid, *(void**)(R_ESP), s, *(float*)(R_ESP+4), *(float*)(R_ESP+8));
                 } else  if(strstr(s, "glVertex3f")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%f, %f, %f)", tid, *(void**)(R_ESP), s, *(float*)(R_ESP+4), *(float*)(R_ESP+8), *(float*)(R_ESP+12));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%f, %f, %f)", tid, *(void**)(R_ESP), s, *(float*)(R_ESP+4), *(float*)(R_ESP+8), *(float*)(R_ESP+12));
                 } else  if(strstr(s, "__open64")==s || strcmp(s, "open64")==0) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(\"%s\", %d, %d)", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(int*)(R_ESP+8), *(int*)(R_ESP+12));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(\"%s\", %d, %d)", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(int*)(R_ESP+8), *(int*)(R_ESP+12));
                     perr = 1;
                 } else  if(!strcmp(s, "opendir")) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(\"%s\")", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(\"%s\")", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4));
                     perr = 1;
                 } else  if(strstr(s, "__open")==s || !strcmp(s, "open") || !strcmp(s, "my_open64")) {
                     tmp = *(char**)(R_ESP+4);
-                    snprintf(buff, 256, "%04d|%p: Calling %s(\"%s\", %d (,%d))", tid, *(void**)(R_ESP), s, (tmp)?tmp:"(nil)", *(int*)(R_ESP+8), *(int*)(R_ESP+12));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(\"%s\", %d (,%d))", tid, *(void**)(R_ESP), s, (tmp)?tmp:"(nil)", *(int*)(R_ESP+8), *(int*)(R_ESP+12));
                     perr = 1;
                 } else  if(!strcmp(s, "shm_open")) {
                     tmp = *(char**)(R_ESP+4);
-                    snprintf(buff, 256, "%04d|%p: Calling %s(\"%s\", %d, %d)", tid, *(void**)(R_ESP), s, (tmp)?tmp:"(nil)", *(int*)(R_ESP+8), *(int*)(R_ESP+12));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(\"%s\", %d, %d)", tid, *(void**)(R_ESP), s, (tmp)?tmp:"(nil)", *(int*)(R_ESP+8), *(int*)(R_ESP+12));
                     perr = 1;
                 } else  if(strcmp(s, "mkdir")==0) {
                     tmp = *(char**)(R_ESP+4);
-                    snprintf(buff, 256, "%04d|%p: Calling %s(\"%s\", %d)", tid, *(void**)(R_ESP), s, (tmp)?tmp:"(nil)", *(int*)(R_ESP+8));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(\"%s\", %d)", tid, *(void**)(R_ESP), s, (tmp)?tmp:"(nil)", *(int*)(R_ESP+8));
                     perr = 1;
                 } else  if(!strcmp(s, "fopen")) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(\"%s\", \"%s\")", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(char**)(R_ESP+8));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(\"%s\", \"%s\")", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(char**)(R_ESP+8));
                     perr = 2;
                 } else  if(!strcmp(s, "freopen")) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(\"%s\", \"%s\", %p)", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(char**)(R_ESP+8), *(void**)(R_ESP+12));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(\"%s\", \"%s\", %p)", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(char**)(R_ESP+8), *(void**)(R_ESP+12));
                     perr = 2;
                 } else  if(!strcmp(s, "fopen64")) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(\"%s\", \"%s\")", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(char**)(R_ESP+8));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(\"%s\", \"%s\")", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(char**)(R_ESP+8));
                     perr = 2;
                 } else  if(!strcmp(s, "chdir")) {
                     pu32=*(uint32_t**)(R_ESP+4);
-                    snprintf(buff, 256, "%04d|%p: Calling %s(\"%s\")", tid, *(void**)(R_ESP), s, pu32?((pu32==(uint32_t*)1)?"/1/":(char*)pu32):"/0/");
+                    snprintf(buff, 255, "%04d|%p: Calling %s(\"%s\")", tid, *(void**)(R_ESP), s, pu32?((pu32==(uint32_t*)1)?"/1/":(char*)pu32):"/0/");
                 } else  if(strstr(s, "getenv")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(\"%s\")", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(\"%s\")", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4));
                     post = 2;
                 } else  if(strstr(s, "putenv")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(\"%s\")", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(\"%s\")", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4));
                 } else  if(strstr(s, "pread")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%d, %p, %u, %d)", tid, *(void**)(R_ESP), s, *(int32_t*)(R_ESP+4), *(void**)(R_ESP+8), *(uint32_t*)(R_ESP+12), *(int32_t*)(R_ESP+16));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%d, %p, %u, %d)", tid, *(void**)(R_ESP), s, *(int32_t*)(R_ESP+4), *(void**)(R_ESP+8), *(uint32_t*)(R_ESP+12), *(int32_t*)(R_ESP+16));
                     perr = 1;
                 } else  if(!strcmp(s, "read")) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%d, %p, %u)", tid, *(void**)(R_ESP), s, *(int32_t*)(R_ESP+4), *(void**)(R_ESP+8), *(uint32_t*)(R_ESP+12));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%d, %p, %u)", tid, *(void**)(R_ESP), s, *(int32_t*)(R_ESP+4), *(void**)(R_ESP+8), *(uint32_t*)(R_ESP+12));
                     perr = 1;
                 } else  if(strstr(s, "ioctl")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%d, 0x%x, %p)", tid, *(void**)(R_ESP), s, *(int32_t*)(R_ESP+4), *(int32_t*)(R_ESP+8), *(void**)(R_ESP+12));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%d, 0x%x, %p)", tid, *(void**)(R_ESP), s, *(int32_t*)(R_ESP+4), *(int32_t*)(R_ESP+8), *(void**)(R_ESP+12));
                     perr = 1;
                 } else  if(strstr(s, "statvfs64")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%p(\"%s\"), %p)", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(char**)(R_ESP+4), *(void**)(R_ESP+8));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%p(\"%s\"), %p)", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(char**)(R_ESP+4), *(void**)(R_ESP+8));
                 } else  if(strstr(s, "index")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%p(\"%s\"), %i(%c))", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(char**)(R_ESP+4), *(int32_t*)(R_ESP+8), *(int32_t*)(R_ESP+8));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%p(\"%s\"), %i(%c))", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(char**)(R_ESP+4), *(int32_t*)(R_ESP+8), *(int32_t*)(R_ESP+8));
                 } else  if(strstr(s, "rindex")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%p(\"%s\"), %i(%c))", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(char**)(R_ESP+4), *(int32_t*)(R_ESP+8), *(int32_t*)(R_ESP+8));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%p(\"%s\"), %i(%c))", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(char**)(R_ESP+4), *(int32_t*)(R_ESP+8), *(int32_t*)(R_ESP+8));
                 } else  if(strstr(s, "__xstat64")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%d, %p(\"%s\"), %p)", tid, *(void**)(R_ESP), s, *(int32_t*)(R_ESP+4), *(char**)(R_ESP+8), *(char**)(R_ESP+8), *(void**)(R_ESP+12));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%d, %p(\"%s\"), %p)", tid, *(void**)(R_ESP), s, *(int32_t*)(R_ESP+4), *(char**)(R_ESP+8), *(char**)(R_ESP+8), *(void**)(R_ESP+12));
                     perr = 1;
                 } else  if(strcmp(s, "__xstat")==0) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%d, %p(\"%s\"), %p)", tid, *(void**)(R_ESP), s, *(int32_t*)(R_ESP+4), *(char**)(R_ESP+8), *(char**)(R_ESP+8), *(void**)(R_ESP+12));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%d, %p(\"%s\"), %p)", tid, *(void**)(R_ESP), s, *(int32_t*)(R_ESP+4), *(char**)(R_ESP+8), *(char**)(R_ESP+8), *(void**)(R_ESP+12));
                     perr = 1;
                 } else  if(strstr(s, "__lxstat64")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%d, %p(\"%s\"), %p)", tid, *(void**)(R_ESP), s, *(int32_t*)(R_ESP+4), *(char**)(R_ESP+8), *(char**)(R_ESP+8), *(void**)(R_ESP+12));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%d, %p(\"%s\"), %p)", tid, *(void**)(R_ESP), s, *(int32_t*)(R_ESP+4), *(char**)(R_ESP+8), *(char**)(R_ESP+8), *(void**)(R_ESP+12));
                     perr = 1;
                 } else  if(strstr(s, "sem_timedwait")==s) {
                     pu32 = *(uint32_t**)(R_ESP+8);
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%p, %p[%d sec %d ns])", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(void**)(R_ESP+8), pu32?(int32_t)pu32[0]:-1, pu32?(int32_t)pu32[1]:-1);
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%p, %p[%d sec %d ns])", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(void**)(R_ESP+8), pu32?pu32[0]:-1, pu32?pu32[1]:-1);
                     perr = 1;
                 } else  if(strstr(s, "waitpid")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%d, %p, 0x%x)", tid, *(void**)(R_ESP), s, *(int32_t*)(R_ESP+4), *(void**)(R_ESP+8), *(uint32_t*)(R_ESP+12));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%d, %p, 0x%x)", tid, *(void**)(R_ESP), s, *(int32_t*)(R_ESP+4), *(void**)(R_ESP+8), *(uint32_t*)(R_ESP+12));
                     perr = 1;
                 } else  if(strstr(s, "clock_gettime")==s || strstr(s, "__clock_gettime")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%d, %p)", tid, *(void**)(R_ESP), s, *(uint32_t*)(R_ESP+4), *(void**)(R_ESP+8));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%d, %p)", tid, *(void**)(R_ESP), s, *(uint32_t*)(R_ESP+4), *(void**)(R_ESP+8));
                     post = 1;
                     pu32 = *(uint32_t**)(R_ESP+8);
                 } else  if(strstr(s, "semop")==s) {
                     int16_t* p16 = *(int16_t**)(R_ESP+8);
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%d, %p[%u/%d/0x%x], %d)", tid, *(void**)(R_ESP), s, *(int*)(R_ESP+4), p16, p16[0], p16[1], p16[2], *(int*)(R_ESP+12));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%d, %p[%u/%d/0x%x], %d)", tid, *(void**)(R_ESP), s, *(int*)(R_ESP+4), p16, p16[0], p16[1], p16[2], *(int*)(R_ESP+12));
                     perr = 1;
                 } else  if(!strcmp(s, "mmap64")) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%p, 0x%x, %d, 0x%x, %d, %lld)", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(size_t*)(R_ESP+8), *(int*)(R_ESP+12), *(int*)(R_ESP+16), *(int*)(R_ESP+20), *(int64_t*)(R_ESP+24));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%p, 0x%x, %d, 0x%x, %d, %lld)", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(size_t*)(R_ESP+8), *(int*)(R_ESP+12), *(int*)(R_ESP+16), *(int*)(R_ESP+20), *(int64_t*)(R_ESP+24));
                     perr = 3;
                 } else  if(!strcmp(s, "mmap")) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%p, 0x%x, %d, 0x%x, %d, %d)", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(size_t*)(R_ESP+8), *(int*)(R_ESP+12), *(int*)(R_ESP+16), *(int*)(R_ESP+20), *(int*)(R_ESP+24));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%p, 0x%x, %d, 0x%x, %d, %d)", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(size_t*)(R_ESP+8), *(int*)(R_ESP+12), *(int*)(R_ESP+16), *(int*)(R_ESP+20), *(int*)(R_ESP+24));
                     perr = 3;
                 } else  if(strstr(s, "strcasecmp")==s || strstr(s, "__strcasecmp")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(\"%s\", \"%s\")", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(char**)(R_ESP+8));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(\"%s\", \"%s\")", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(char**)(R_ESP+8));
                 } else  if(strstr(s, "gtk_signal_connect_full")) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%p, \"%s\", %p, %p, %p, %p, %d, %d)", tid, *(void**)(R_ESP), "gtk_signal_connect_full", *(void**)(R_ESP+4), *(char**)(R_ESP+8), *(void**)(R_ESP+12), *(void**)(R_ESP+16), *(void**)(R_ESP+20), *(void**)(R_ESP+24), *(int32_t*)(R_ESP+28), *(int32_t*)(R_ESP+32));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%p, \"%s\", %p, %p, %p, %p, %d, %d)", tid, *(void**)(R_ESP), "gtk_signal_connect_full", *(void**)(R_ESP+4), *(char**)(R_ESP+8), *(void**)(R_ESP+12), *(void**)(R_ESP+16), *(void**)(R_ESP+20), *(void**)(R_ESP+24), *(int32_t*)(R_ESP+28), *(int32_t*)(R_ESP+32));
                 } else  if(strstr(s, "strcmp")==s || strstr(s, "__strcmp")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(\"%s\", \"%s\")", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(char**)(R_ESP+8));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(\"%s\", \"%s\")", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(char**)(R_ESP+8));
                 } else  if(strstr(s, "strstr")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(\"%.127s\", \"%.127s\")", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(char**)(R_ESP+8));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(\"%.127s\", \"%.127s\")", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(char**)(R_ESP+8));
                 } else  if(strstr(s, "strlen")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%p(\"%s\"))", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), ((R_ESP+4))?(*(char**)(R_ESP+4)):"nil");
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%p(\"%s\"))", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), ((R_ESP+4))?(*(char**)(R_ESP+4)):"nil");
                 } else  if(strstr(s, "vsnprintf")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%08X, %u, %p(\"%s\")...)", tid, *(void**)(R_ESP), s, *(uint32_t*)(R_ESP+4), *(uint32_t*)(R_ESP+8), *(void**)(R_ESP+12), *(char**)(R_ESP+12));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%08X, %u, %08X...)", tid, *(void**)(R_ESP), s, *(uint32_t*)(R_ESP+4), *(uint32_t*)(R_ESP+8), *(uint32_t*)(R_ESP+12));
                     pu32 = *(uint32_t**)(R_ESP+4);
                     post = 3;
                 } else  if(strstr(s, "vsprintf")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%p, \"%s\", %p)", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(char**)(R_ESP+8), *(void**)(R_ESP+12));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%p, \"%s\", %p)", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(char**)(R_ESP+8), *(void**)(R_ESP+12));
                     pu32 = *(uint32_t**)(R_ESP+4);
                     post = 3;
                 } else  if(strstr(s, "__vsprintf_chk")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%p, %d, %zu, \"%s\", %p)", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(int*)(R_ESP+8), *(size_t*)(R_ESP+12), *(char**)(R_ESP+16), *(void**)(R_ESP+20));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%p, %d, %zu, \"%s\", %p)", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(int*)(R_ESP+8), *(size_t*)(R_ESP+12), *(char**)(R_ESP+16), *(void**)(R_ESP+20));
                     pu32 = *(uint32_t**)(R_ESP+4);
                     post = 3;
                 } else  if(strstr(s, "__snprintf_chk")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%p, %zu, %d, %d, \"%s\", %p)", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(size_t*)(R_ESP+8), *(int*)(R_ESP+12), *(int*)(R_ESP+16), *(char**)(R_ESP+20), *(void**)(R_ESP+24));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%p, %zu, %d, %d, \"%s\", %p)", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(size_t*)(R_ESP+8), *(int*)(R_ESP+12), *(int*)(R_ESP+16), *(char**)(R_ESP+20), *(void**)(R_ESP+24));
                     pu32 = *(uint32_t**)(R_ESP+4);
                     post = 3;
                 } else  if(strstr(s, "snprintf")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%p, %zu, \"%s\", ...)", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(size_t*)(R_ESP+8), *(char**)(R_ESP+12));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%p, %zu, \"%s\", ...)", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(size_t*)(R_ESP+8), *(char**)(R_ESP+12));
                     pu32 = *(uint32_t**)(R_ESP+4);
                     post = 3;
                 } else  if(strstr(s, "sprintf")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%08X, %08X...)", tid, *(void**)(R_ESP), s, *(uint32_t*)(R_ESP+4), *(uint32_t*)(R_ESP+8));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%08X, %08X...)", tid, *(void**)(R_ESP), s, *(uint32_t*)(R_ESP+4), *(uint32_t*)(R_ESP+8));
                     pu32 = *(uint32_t**)(R_ESP+4);
                     post = 3;
                 } else  if(strstr(s, "printf")==s) {
                     pu32 = *(uint32_t**)(R_ESP+4);
                     if(((uintptr_t)pu32)<0x5) // probably a _chk function
                         pu32 = *(uint32_t**)(R_ESP+8);
-                    snprintf(buff, 256, "%04d|%p: Calling %s(\"%s\"...)", tid, *(void**)(R_ESP), s, pu32?((char*)(pu32)):"nil");
+                    snprintf(buff, 255, "%04d|%p: Calling %s(\"%s\"...)", tid, *(void**)(R_ESP), s, pu32?((char*)(pu32)):"nil");
                 } else  if(strstr(s, "wprintf")==s) {
                     pu32 = *(uint32_t**)(R_ESP+4);
                     if(((uintptr_t)pu32)<0x5) // probably a _chk function
                         pu32 = *(uint32_t**)(R_ESP+8);
-                    snprintf(buff, 256, "%04d|%p: Calling %s(\"%S\"...)", tid, *(void**)(R_ESP), s, pu32?((wchar_t*)(pu32)):L"nil");
+                    snprintf(buff, 255, "%04d|%p: Calling %s(\"%S\"...)", tid, *(void**)(R_ESP), s, pu32?((wchar_t*)(pu32)):L"nil");
                 } else  if(strstr(s, "__vswprintf")==s) {
                     if(*(size_t*)(R_ESP+12)<2) {
-                        snprintf(buff, 256, "%04d|%p: Calling %s(%p, %zu, %p, %p, %p)", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(size_t*)(R_ESP+8), *(void**)(R_ESP+12), *(void**)(R_ESP+16), *(void**)(R_ESP+20));
+                        snprintf(buff, 255, "%04d|%p: Calling %s(%p, %zu, %p, %p, %p)", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(size_t*)(R_ESP+8), *(void**)(R_ESP+12), *(void**)(R_ESP+16), *(void**)(R_ESP+20));
                     } else {
-                        snprintf(buff, 256, "%04d|%p: Calling %s(%p, %zu, \"%S\", %p)", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(size_t*)(R_ESP+8), *(wchar_t**)(R_ESP+12), *(void**)(R_ESP+16));
+                        snprintf(buff, 255, "%04d|%p: Calling %s(%p, %zu, \"%S\", %p)", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(size_t*)(R_ESP+8), *(wchar_t**)(R_ESP+12), *(void**)(R_ESP+16));
                         pu32 = *(uint32_t**)(R_ESP+4);
                         post = 6;
                     }
                 } else  if(strstr(s, "puts")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(\"%s\"...)", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(\"%s\"...)", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4));
                 } else  if(strstr(s, "fputs")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(\"%s\", %p...)", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(void**)(R_ESP+8));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(\"%s\", %p...)", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(void**)(R_ESP+8));
                 } else  if(strstr(s, "fprintf")==s) {
                     pu32 = *(uint32_t**)(R_ESP+8);
                     if(((uintptr_t)pu32)<0x5) // probably a __fprint_chk
                         pu32 = *(uint32_t**)(R_ESP+12);
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%08X, \"%s\", ...)", tid, *(void**)(R_ESP), s, *(uint32_t*)(R_ESP+4), pu32?((char*)(pu32)):"nil");
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%08X, \"%s\", ...)", tid, *(void**)(R_ESP), s, *(uint32_t*)(R_ESP+4), pu32?((char*)(pu32)):"nil");
                 } else  if(strstr(s, "vfprintf")==s) {
                     pu32 = *(uint32_t**)(R_ESP+8);
                     if(((uintptr_t)pu32)<0x5) // probably a _chk function
                         pu32 = *(uint32_t**)(R_ESP+12);
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%08X, \"%s\", ...)", tid, *(void**)(R_ESP), s, *(uint32_t*)(R_ESP+4), pu32?((char*)(pu32)):"nil");
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%08X, \"%s\", ...)", tid, *(void**)(R_ESP), s, *(uint32_t*)(R_ESP+4), pu32?((char*)(pu32)):"nil");
                 } else  if(strstr(s, "vkGetInstanceProcAddr")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%p, \"%s\")", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(char**)(R_ESP+8));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%p, \"%s\")", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(char**)(R_ESP+8));
                 } else  if(strstr(s, "vkGetDeviceProcAddr")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%p, \"%s\")", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(char**)(R_ESP+8));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%p, \"%s\")", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(char**)(R_ESP+8));
                 } else  if(strstr(s, "glXGetProcAddress")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(\"%s\")", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(\"%s\")", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4));
                 } else  if(strstr(s, "sscanf")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(\"%s\", \"%s\", ...)", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(char**)(R_ESP+8));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(\"%s\", \"%s\", ...)", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(char**)(R_ESP+8));
                 } else  if(!strcmp(s, "vsscanf")) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(\"%s\", \"%s\", ...)", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(char**)(R_ESP+8));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(\"%s\", \"%s\", ...)", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(char**)(R_ESP+8));
                 } else if(strstr(s, "XCreateWindow")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%p, %p, %d, %d, %u, %u, %u, %d, %u, %p, %u, %p)", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(void**)(R_ESP+8), *(int*)(R_ESP+12), *(int*)(R_ESP+16), *(uint32_t*)(R_ESP+20), *(uint32_t*)(R_ESP+24), *(uint32_t*)(R_ESP+28), *(int32_t*)(R_ESP+32), *(uint32_t*)(R_ESP+36), *(void**)(R_ESP+40), *(uint32_t*)(R_ESP+44), *(void**)(R_ESP+48));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%p, %p, %d, %d, %u, %u, %u, %d, %u, %p, %u, %p)", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(void**)(R_ESP+8), *(int*)(R_ESP+12), *(int*)(R_ESP+16), *(uint32_t*)(R_ESP+20), *(uint32_t*)(R_ESP+24), *(uint32_t*)(R_ESP+28), *(int32_t*)(R_ESP+32), *(uint32_t*)(R_ESP+36), *(void**)(R_ESP+40), *(uint32_t*)(R_ESP+44), *(void**)(R_ESP+48));
                 } else if(strstr(s, "XLoadQueryFont")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%p, \"%s\")", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(char**)(R_ESP+8));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%p, \"%s\")", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(char**)(R_ESP+8));
                 } else if(strstr(s, "pthread_mutex_lock")==s) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%p)", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%p)", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4));
                 } else if(!strcmp(s, "fmodf")) {
                     post = 4;
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%f, %f)", tid, *(void**)(R_ESP), s, *(float*)(R_ESP+4), *(float*)(R_ESP+8));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%f, %f)", tid, *(void**)(R_ESP), s, *(float*)(R_ESP+4), *(float*)(R_ESP+8));
                 } else if(!strcmp(s, "fmod")) {
                     post = 4;
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%f, %f)", tid, *(void**)(R_ESP), s, *(double*)(R_ESP+4), *(double*)(R_ESP+12));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%f, %f)", tid, *(void**)(R_ESP), s, *(double*)(R_ESP+4), *(double*)(R_ESP+12));
                 } else if(strstr(s, "SDL_GetWindowSurface")==s) {
                     post = 5;
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%p)", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%p)", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4));
                 } else if(strstr(s, "udev_monitor_new_from_netlink")==s) {
                     post = 5;
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%p, \"%s\")", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(char**)(R_ESP+8));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%p, \"%s\")", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(char**)(R_ESP+8));
                 } else  if(!strcmp(s, "syscall")) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%d, %p, %p, %p...)", tid, *(void**)(R_ESP), s, *(int32_t*)(R_ESP+4), *(void**)(R_ESP+8), *(void**)(R_ESP+12), *(void**)(R_ESP+16));
+                    snprintf(buff, 255, "%04d|%p: Calling %s(%d, %p, %p, %p...)", tid, *(void**)(R_ESP), s, *(int32_t*)(R_ESP+4), *(void**)(R_ESP+8), *(void**)(R_ESP+12), *(void**)(R_ESP+16));
                     perr = 1;
-                } else  if(strstr(s, "___tls_get_addr")) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%p[%d, %d])", tid, *(void**)(R_ESP), s, (void*)(R_EAX), ((int*)(R_EAX))[0], ((int*)(R_EAX))[1]);
-                } else  if(strstr(s, "__tls_get_addr")) {
-                    pu32 = *(uint32_t**)(R_ESP+4);
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%p[%d, %d])", tid, *(void**)(R_ESP), s, pu32, pu32[0], pu32[1]);
-                } else if (!strcmp(s, "XDrawImageString")) {
-                    snprintf(buff, 256, "%04d|%p: Calling %s(%p, %p, %p, %i, %i, %p\"%s\", %d)", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(void**)(R_ESP+8), *(void**)(R_ESP+12), *(int*)(R_ESP+16), *(int*)(R_ESP+20), *(char**)(R_ESP+24), *(char**)(R_ESP+24), *(int*)(R_ESP+28));
                 } else {
-                    snprintf(buff, 256, "%04d|%p: Calling %s (%08X, %08X, %08X...)", tid, *(void**)(R_ESP), s, *(uint32_t*)(R_ESP+4), *(uint32_t*)(R_ESP+8), *(uint32_t*)(R_ESP+12));
-                }
-                if(!cycle_log) {
-                    mutex_lock(&emu->context->mutex_trace);
-                    printf_log(LOG_NONE, "%s =>", buff);
-                    mutex_unlock(&emu->context->mutex_trace);
+                    snprintf(buff, 255, "%04d|%p: Calling %s (%08X, %08X, %08X...)", tid, *(void**)(R_ESP), s, *(uint32_t*)(R_ESP+4), *(uint32_t*)(R_ESP+8), *(uint32_t*)(R_ESP+12));
                 }
+                pthread_mutex_lock(&emu->context->mutex_trace);
+                if(!cycle_log) printf_log(LOG_NONE, "%s =>", buff);
+                pthread_mutex_unlock(&emu->context->mutex_trace);
                 w(emu, addr);   // some function never come back, so unlock the mutex first!
                 if(post)
                     switch(post) {
-                    case 1: snprintf(buff2, 63, " [%d sec %d nsec]", pu32?(int32_t)pu32[0]:-1, pu32?(int32_t)pu32[1]:-1);
+                    case 1: snprintf(buff2, 63, " [%d sec %d nsec]", pu32?pu32[0]:-1, pu32?pu32[1]:-1);
                             break;
                     case 2: snprintf(buff2, 63, "(%s)", R_EAX?((char*)R_EAX):"nil");
                             break;
@@ -338,13 +325,12 @@ void x86Int3(x86emu_t* emu)
                     snprintf(buff3, 63, " (errno=%d:\"%s\")", errno, strerror(errno));
                 else if(perr==3 && ((int)R_EAX)==-1)
                     snprintf(buff3, 63, " (errno=%d:\"%s\")", errno, strerror(errno));
+                pthread_mutex_lock(&emu->context->mutex_trace);
                 if(cycle_log)
                     snprintf(buffret, 127, "0x%X%s%s", R_EAX, buff2, buff3);
-                else {
-                    mutex_lock(&emu->context->mutex_trace);
+                else
                     printf_log(LOG_NONE, " return 0x%08X%s%s\n", R_EAX, buff2, buff3);
-                    mutex_unlock(&emu->context->mutex_trace);
-                }
+                pthread_mutex_unlock(&emu->context->mutex_trace);
             } else
                 w(emu, addr);
         }
@@ -360,17 +346,4 @@ void x86Int3(x86emu_t* emu)
 int GetTID()
 {
     return syscall(SYS_gettid);
-}
-
-void print_cycle_log(int loglevel) {
-    if(cycle_log) {
-        printf_log(LOG_INFO, "Last calls\n");
-        int j = (my_context->current_line+1)%cycle_log;
-        for (int i=0; i<cycle_log; ++i) {
-            int k = (i+j)%cycle_log;
-            if(my_context->log_call[k][0]) {
-                printf_log(loglevel, "%s => return %s\n", my_context->log_call[k], my_context->log_ret[k]);
-            }
-        }
-    }
-}
+}

src/emu/x86primop.c

@@ -1044,14 +1044,14 @@ Implements the SBB instruction and side effects.
 ****************************************************************************/
 uint16_t sbb16(x86emu_t *emu, uint16_t d, uint16_t s)
 {
-	uint32_t res;   /* all operands in native machine order */
-	uint32_t bc;
+    uint32_t res;   /* all operands in native machine order */
+    uint32_t bc;
 	CHECK_FLAGS(emu);
 
 	if (ACCESS_FLAG(F_CF))
-		res = d - s - 1;
-	else
-		res = d - s;
+        res = d - s - 1;
+    else
+        res = d - s;
 	CONDITIONAL_SET_FLAG(res & 0x8000, F_SF);
 	CONDITIONAL_SET_FLAG((res & 0xffff) == 0, F_ZF);
 	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);
@@ -1075,9 +1075,9 @@ uint32_t sbb32(x86emu_t *emu, uint32_t d, uint32_t s)
 	CHECK_FLAGS(emu);
 
 	if (ACCESS_FLAG(F_CF))
-		res = d - s - 1;
-	else
-		res = d - s;
+        res = d - s - 1;
+    else
+        res = d - s;
 	CONDITIONAL_SET_FLAG(res & 0x80000000, F_SF);
 	CONDITIONAL_SET_FLAG(!res, F_ZF);
 	CONDITIONAL_SET_FLAG(PARITY(res & 0xff), F_PF);

src/emu/x86primop.h

@@ -247,7 +247,6 @@ Implements the NOT instruction
 ****************************************************************************/
 static inline uint8_t not8(x86emu_t *emu, uint8_t s)
 {
-    (void)emu;
 	return ~s;
 }
 
@@ -257,7 +256,6 @@ Implements the NOT instruction
 ****************************************************************************/
 static inline uint16_t not16(x86emu_t *emu, uint16_t s)
 {
-    (void)emu;
 	return ~s;
 }
 
@@ -267,7 +265,6 @@ Implements the NOT instruction
 ****************************************************************************/
 static inline uint32_t not32(x86emu_t *emu, uint32_t s)
 {
-    (void)emu;
 	return ~s;
 }
 

src/emu/x86run64.c

@@ -1,459 +0,0 @@
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "debug.h"
-#include "box86stack.h"
-#include "x86emu.h"
-#include "x86run.h"
-#include "x86emu_private.h"
-#include "x86run_private.h"
-#include "x86primop.h"
-#include "x86trace.h"
-#include "box86context.h"
-#include "bridge.h"
-#ifdef DYNAREC
-#include "../dynarec/arm_lock_helper.h"
-#endif
-
-#include "modrm.h"
-
-
-#ifdef TEST_INTERPRETER
-uintptr_t Test64(x86test_t *test, int seg, uintptr_t addr)
-#else
-uintptr_t Run64(x86emu_t *emu, int seg, uintptr_t addr)
-#endif
-{
-    uint8_t opcode = F8;
-    uint8_t nextop;
-    reg32_t *oped;
-    uint8_t tmp8u;
-    uint32_t tmp32u;
-    int32_t tmp32s;
-    #ifdef TEST_INTERPRETER
-    x86emu_t* emu = test->emu;
-    #endif
-    uintptr_t tlsdata = (seg==_FS)?GetFSBaseEmu(emu):GetGSBaseEmu(emu);
-    switch(opcode) {
-        case 0x01:              /* ADD GS:Ed, Gd */
-            nextop = F8;
-            GET_ED_OFFS(tlsdata);
-            ED->dword[0] = add32(emu, ED->dword[0], GD.dword[0]);
-            break;
-
-        case 0x03:              /* ADD Gd, GS:Ed */
-            nextop = F8;
-            GET_ED_OFFS(tlsdata);
-            GD.dword[0] = add32(emu, GD.dword[0], ED->dword[0]);
-            break;
-
-        case 0x06:              /* PUSH ES */
-            Push(emu, emu->segs[_ES]);
-            break;
-        case 0x07:             /* POP ES */
-            emu->segs[_ES] = Pop(emu);
-            emu->segs_serial[_ES] = 0;
-            break;
-
-        case 0x0f:
-            #ifdef TEST_INTERPRETER
-            return Test640F(test, tlsdata, addr);
-            #else
-            return Run640F(emu, tlsdata, addr);
-            #endif
-
-        case 0x11:              /* ADC GS:Ed, Gd */
-            nextop = F8;
-            GET_ED_OFFS(tlsdata);
-            ED->dword[0] = adc32(emu, ED->dword[0], GD.dword[0]);
-            break;
-        
-        case 0x13:              /* ADC Gd, GS:Ed */
-            nextop = F8;
-            GET_ED_OFFS(tlsdata);
-            GD.dword[0] = adc32(emu, GD.dword[0], ED->dword[0]);
-            break;
-
-        case 0x21:              /* AND Ed,Gd */
-            nextop = F8;
-            GET_ED_OFFS(tlsdata);
-            ED->dword[0] = and32(emu, ED->dword[0], GD.dword[0]);
-            break;
-
-        case 0x23:              /* AND Gd,Ed */
-            nextop = F8;
-            GET_ED_OFFS(tlsdata);
-            GD.dword[0] = and32(emu, GD.dword[0], ED->dword[0]);
-            break;
-
-        case 0x29:              /* SUB GS:Ed, Gd */
-            nextop = F8;
-            GET_ED_OFFS(tlsdata);
-            ED->dword[0] = sub32(emu, ED->dword[0], GD.dword[0]);
-            break;
-
-        case 0x2B:              /* SUB Gd, GS:Ed */
-            nextop = F8;
-            GET_ED_OFFS(tlsdata);
-            GD.dword[0] = sub32(emu, GD.dword[0], ED->dword[0]);
-            break;
-
-        case 0x31:              /* XOR Ed,Gd */
-            nextop = F8;
-            GET_ED_OFFS(tlsdata);
-            ED->dword[0] = xor32(emu, ED->dword[0], GD.dword[0]);
-            break;
-
-        case 0x33:              /* XOR Gd,Ed */
-            nextop = F8;
-            GET_ED_OFFS(tlsdata);
-            GD.dword[0] = xor32(emu, GD.dword[0], ED->dword[0]);
-            break;
-
-        case 0x39:              /* CMP Ed,Gd */
-            nextop = F8;
-            GET_ED_OFFS(tlsdata);
-            cmp32(emu, ED->dword[0], GD.dword[0]);
-            break;
-
-        case 0x3B:              /* CMP Gd,Ed */
-            nextop = F8;
-            GET_ED_OFFS(tlsdata);
-            cmp32(emu, GD.dword[0], ED->dword[0]);
-            break;
-        
-        case 0x40:
-        case 0x41:
-        case 0x42:
-        case 0x43:
-        case 0x44:
-        case 0x45:
-        case 0x46:
-        case 0x47:             /* INC Reg */
-            tmp8u = opcode&7;
-            emu->regs[tmp8u].dword[0] = inc32(emu, emu->regs[tmp8u].dword[0]);
-            break;
-        case 0x48:
-        case 0x49:
-        case 0x4A:
-        case 0x4B:
-        case 0x4C:
-        case 0x4D:
-        case 0x4E:
-        case 0x4F:            /* DEC Reg */
-            tmp8u = opcode&7;
-            emu->regs[tmp8u].dword[0] = dec32(emu, emu->regs[tmp8u].dword[0]);
-            break;
-        case 0x50:              /* PUSH Reg */
-        case 0x51:
-        case 0x52:
-        case 0x53:
-        case 0x54:               /* PUSH ESP */
-        case 0x55:
-        case 0x56:
-        case 0x57:              
-        case 0x58:              /* POP Reg */
-        case 0x59:
-        case 0x5A:
-        case 0x5B:
-        case 0x5C:              /* POP ESP */
-        case 0x5D:
-        case 0x5E:
-        case 0x5F:
-            // Segment override if for memory loc, no stack segment 
-            return addr-1;
-
-        case 0x64:              /* FS: */
-            // so just ignore that GS: prefix then
-            #ifdef TEST_INTERPRETER
-            return Test64(test, _FS, addr-1); // put FS back
-            #else
-            return Run64(emu, _FS, addr-1); // put FS back
-            #endif
-
-        case 0x66:
-            #ifdef TEST_INTERPRETER
-            return Test6466(test, tlsdata, addr);
-            #else
-            return Run6466(emu, tlsdata, addr);
-            #endif
-        case 0x67:
-            #ifdef TEST_INTERPRETER
-            return Test6467(test, tlsdata, addr);
-            #else
-            return Run6467(emu, tlsdata, addr);
-            #endif
-
-        case 0x69:              /* IMUL Gd,Ed,Id */
-            nextop = F8;
-            GET_ED_OFFS(tlsdata);
-            tmp32u = F32;
-            GD.dword[0] = imul32(emu, ED->dword[0], tmp32u);
-            break;
-        
-        case 0x70:
-        case 0x71:
-        case 0x72:
-        case 0x73:
-        case 0x74:
-        case 0x75:
-        case 0x76:
-        case 0x77:
-        case 0x78:
-        case 0x79:
-        case 0x7A:
-        case 0x7B:
-        case 0x7C:
-        case 0x7D:
-        case 0x7E:
-        case 0x7F:
-            // just ignore the prefix
-            return addr-1;
-        case 0x80:             /* GRP Eb,Ib */
-        case 0x82:             // 0x82 and 0x80 are the same opcodes it seems?
-            nextop = F8;
-            GET_EB_OFFS(tlsdata);
-            tmp8u = F8;
-            switch((nextop>>3)&7) {
-                case 0: EB->byte[0] = add8(emu, EB->byte[0], tmp8u); break;
-                case 1: EB->byte[0] =  or8(emu, EB->byte[0], tmp8u); break;
-                case 2: EB->byte[0] = adc8(emu, EB->byte[0], tmp8u); break;
-                case 3: EB->byte[0] = sbb8(emu, EB->byte[0], tmp8u); break;
-                case 4: EB->byte[0] = and8(emu, EB->byte[0], tmp8u); break;
-                case 5: EB->byte[0] = sub8(emu, EB->byte[0], tmp8u); break;
-                case 6: EB->byte[0] = xor8(emu, EB->byte[0], tmp8u); break;
-                case 7:               cmp8(emu, EB->byte[0], tmp8u); break;
-            }
-            break;
-        case 0x81:              /* GRP Ed,Id */
-        case 0x83:              /* GRP Ed,Ib */
-            nextop = F8;
-            GET_ED_OFFS(tlsdata);
-            if(opcode==0x83) {
-                tmp32s = F8S;
-                tmp32u = (uint32_t)tmp32s;
-            } else
-                tmp32u = F32;
-            switch((nextop>>3)&7) {
-                case 0: ED->dword[0] = add32(emu, ED->dword[0], tmp32u); break;
-                case 1: ED->dword[0] =  or32(emu, ED->dword[0], tmp32u); break;
-                case 2: ED->dword[0] = adc32(emu, ED->dword[0], tmp32u); break;
-                case 3: ED->dword[0] = sbb32(emu, ED->dword[0], tmp32u); break;
-                case 4: ED->dword[0] = and32(emu, ED->dword[0], tmp32u); break;
-                case 5: ED->dword[0] = sub32(emu, ED->dword[0], tmp32u); break;
-                case 6: ED->dword[0] = xor32(emu, ED->dword[0], tmp32u); break;
-                case 7:                cmp32(emu, ED->dword[0], tmp32u); break;
-            }
-            break;
-        case 0x87:
-            nextop = F8;
-#if defined(DYNAREC) && !defined(TEST_INTERPRETER)
-            GET_ED_OFFS(tlsdata);
-            if((nextop&0xC0)==0xC0) {
-                tmp32u = GD.dword[0];
-                GD.dword[0] = ED->dword[0];
-                ED->dword[0] = tmp32u;
-            } else {
-                if(((uintptr_t)ED)&3)
-                {
-                    // not aligned, dont't try to "LOCK"
-                    tmp32u = ED->dword[0];
-                    ED->dword[0] = GD.dword[0];
-                    GD.dword[0] = tmp32u;
-                } else {
-                    // XCHG is supposed to automaticaly LOCK memory bus
-                    GD.dword[0] = arm_lock_xchg(ED, GD.dword[0]);
-                }
-            }
-#else
-            GET_ED_OFFS(tlsdata);
-            if((nextop&0xC0)!=0xC0)
-                pthread_mutex_lock(&emu->context->mutex_lock); // XCHG always LOCK (but when accessing memory only)
-            tmp32u = GD.dword[0];
-            GD.dword[0] = ED->dword[0];
-            ED->dword[0] = tmp32u;
-            if((nextop&0xC0)!=0xC0)
-                pthread_mutex_unlock(&emu->context->mutex_lock);
-#endif
-            break;
-            
-        case 0x89:              /* MOV Ed,Gd */
-            nextop = F8;
-            GET_ED_OFFS(tlsdata);
-            ED->dword[0] = GD.dword[0];
-            break;
-        case 0x8A:              /* MOV Gb,GS:Eb */
-            nextop = F8;
-            GET_EB_OFFS(tlsdata);
-            GB = EB->byte[0];
-            break;
-        case 0x8B:              /* MOV Gd,Ed */
-            nextop = F8;
-            GET_ED_OFFS(tlsdata);
-            GD.dword[0] = ED->dword[0];
-            break;
-        case 0x8C:              /* MOV Seg:Ed, Seg */
-            nextop = F8;
-            GET_ED_OFFS(tlsdata);
-            ED->dword[0] = emu->segs[((nextop&0x38)>>3)];
-            break;
-        case 0x8E:              /* MOV Seg,Seg:Ed */
-            nextop = F8;
-            GET_ED_OFFS(tlsdata);
-            emu->segs[((nextop&0x38)>>3)] = ED->word[0];
-            emu->segs_serial[((nextop&0x38)>>3)] = 0;
-            break;
-        case 0x8F:              /* POP Ed */
-            nextop = F8;
-            GET_ED_OFFS(tlsdata);
-            ED->dword[0] = Pop(emu);
-            break;
-
-        case 0x9C:              /* PUSHFD */
-            // Segment override if for memory loc, no stack segment 
-            return addr-1;   // so ignore prefix and continue
-
-        case 0xA0:              /* MOV AL,Ob */
-            tmp32s = F32S;
-            R_AL = *(uint8_t*)((tlsdata) + tmp32s);
-            break;
-        case 0xA1:              /* MOV EAX,Ov */
-            tmp32s = F32S;
-            R_EAX = *(uint32_t*)((tlsdata) + tmp32s);
-            break;
-        case 0xA2:              /* MOV Ob,AL */
-            tmp32s = F32S;
-            *(uint8_t*)((tlsdata) + tmp32s) = R_AL;
-            break;
-        case 0xA3:             /* MOV Od,EAX */
-            tmp32s = F32S;
-            *(uint32_t*)((tlsdata) + tmp32s) = R_EAX;
-            break;
-
-        case 0xA8:            /* TEST AL, Ib */
-            test8(emu, R_AL, F8);
-            break;
-
-        case 0xC0:             /* GRP2 Eb,Ib */
-            nextop = F8;
-            GET_EB_OFFS(tlsdata);
-            tmp8u = F8/* & 0x1f*/; // masking done in each functions
-            switch((nextop>>3)&7) {
-                case 0: EB->byte[0] = rol8(emu, EB->byte[0], tmp8u); break;
-                case 1: EB->byte[0] = ror8(emu, EB->byte[0], tmp8u); break;
-                case 2: EB->byte[0] = rcl8(emu, EB->byte[0], tmp8u); break;
-                case 3: EB->byte[0] = rcr8(emu, EB->byte[0], tmp8u); break;
-                case 4:
-                case 6: EB->byte[0] = shl8(emu, EB->byte[0], tmp8u); break;
-                case 5: EB->byte[0] = shr8(emu, EB->byte[0], tmp8u); break;
-                case 7: EB->byte[0] = sar8(emu, EB->byte[0], tmp8u); break;
-            }
-            break;
-
-        case 0xC6:              /* MOV Eb,Ib */
-            nextop = F8;
-            GET_EB_OFFS(tlsdata);
-            EB->byte[0] = F8;
-            break;
-        case 0xC7:              /* MOV Ed,Id */
-            nextop = F8;
-            GET_ED_OFFS(tlsdata);
-            ED->dword[0] = F32;
-            break;
-
-        case 0xD0:                      /* GRP2 Eb,1 */
-        case 0xD2:                      /* GRP2 Eb,CL */
-            nextop = F8;
-            GET_EB_OFFS(tlsdata);
-            tmp8u = (opcode==0xD0)?1:R_CL;
-            switch((nextop>>3)&7) {
-                case 0: EB->byte[0] = rol8(emu, EB->byte[0], tmp8u); break;
-                case 1: EB->byte[0] = ror8(emu, EB->byte[0], tmp8u); break;
-                case 2: EB->byte[0] = rcl8(emu, EB->byte[0], tmp8u); break;
-                case 3: EB->byte[0] = rcr8(emu, EB->byte[0], tmp8u); break;
-                case 4: 
-                case 6: EB->byte[0] = shl8(emu, EB->byte[0], tmp8u); break;
-                case 5: EB->byte[0] = shr8(emu, EB->byte[0], tmp8u); break;
-                case 7: EB->byte[0] = sar8(emu, EB->byte[0], tmp8u); break;
-            }
-            break;
-        case 0xD1:                      /* GRP2 Ed,1 */
-        case 0xD3:                      /* GRP2 Ed,CL */
-            nextop = F8;
-            GET_ED_OFFS(tlsdata);
-            tmp8u = (opcode==0xD1)?1:R_CL;
-            switch((nextop>>3)&7) {
-                case 0: ED->dword[0] = rol32(emu, ED->dword[0], tmp8u); break;
-                case 1: ED->dword[0] = ror32(emu, ED->dword[0], tmp8u); break;
-                case 2: ED->dword[0] = rcl32(emu, ED->dword[0], tmp8u); break;
-                case 3: ED->dword[0] = rcr32(emu, ED->dword[0], tmp8u); break;
-                case 4: 
-                case 6: ED->dword[0] = shl32(emu, ED->dword[0], tmp8u); break;
-                case 5: ED->dword[0] = shr32(emu, ED->dword[0], tmp8u); break;
-                case 7: ED->dword[0] = sar32(emu, ED->dword[0], tmp8u); break;
-            }
-            break;
-
-        case 0xE9:
-        case 0xEB:
-            return addr-1;       // ignore FS: to execute regular opcode
-            break;
-
-        case 0xFF:              /* GRP 5 Ed */
-            nextop = F8;
-            GET_ED_OFFS(tlsdata);
-            switch((nextop>>3)&7) {
-                case 0:                 /* INC Ed */
-                    ED->dword[0] = inc32(emu, ED->dword[0]);
-                    break;
-                case 1:                 /* DEC Ed */
-                    ED->dword[0] = dec32(emu, ED->dword[0]);
-                    break;
-                case 2:                 /* CALL NEAR Ed */
-                    R_EIP = (uintptr_t)getAlternate((void*)ED->dword[0]);
-                    Push(emu, addr);
-                    addr = R_EIP;
-                    break;
-                case 3:                 /* CALL FAR Ed */
-                    if(nextop>0xc0) {
-                        printf_log(LOG_NONE, "Illegal Opcode %02X %02X\n", opcode, nextop);
-                        emu->quit=1;
-                        emu->error |= ERR_ILLEGAL;
-                        return 0;
-                    } else {
-                        Push16(emu, R_CS);
-                        Push(emu, addr);
-                        addr = ED->dword[0];
-                        R_CS = (ED+1)->word[0];
-                    }
-                    break;
-                case 4:                 /* JMP NEAR Ed */
-                    addr = (uintptr_t)getAlternate((void*)ED->dword[0]);
-                    break;
-                case 5:                 /* JMP FAR Ed */
-                    if(nextop>0xc0) {
-                        printf_log(LOG_NONE, "Illegal Opcode 0x%02X 0x%02X\n", opcode, nextop);
-                        emu->quit=1;
-                        emu->error |= ERR_ILLEGAL;
-                        return 0;
-                    } else {
-                        addr = ED->dword[0];
-                        R_CS = (ED+1)->word[0];
-                    }
-                    break;
-                case 6:                 /* Push Ed */
-                    Push(emu, ED->dword[0]);
-                    break;
-                default:
-                    printf_log(LOG_NONE, "Illegal Opcode 0x%02X 0x%02X\n", opcode, nextop);
-                    emu->quit=1;
-                    emu->error |= ERR_ILLEGAL;
-                    return 0;
-            }
-            break;
-        default:
-            return 0;
-    }
-    return addr;
-}

src/emu/x86run640f.c

@@ -1,55 +0,0 @@
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "debug.h"
-#include "box86stack.h"
-#include "x86emu.h"
-#include "x86run.h"
-#include "x86emu_private.h"
-#include "x86run_private.h"
-#include "x86primop.h"
-#include "x86trace.h"
-#include "box86context.h"
-#include "bridge.h"
-#ifdef DYNAREC
-#include "../dynarec/arm_lock_helper.h"
-#endif
-
-#include "modrm.h"
-
-
-#ifdef TEST_INTERPRETER
-uintptr_t Test640F(x86test_t *test, uintptr_t tlsdata, uintptr_t addr)
-#else
-uintptr_t Run640F(x86emu_t *emu, uintptr_t tlsdata, uintptr_t addr)
-#endif
-{
-    uint8_t nextop;
-    reg32_t *oped;
-    uint8_t tmp8u;
-    uint32_t tmp32u;
-    int32_t tmp32s;
-    #ifdef TEST_INTERPRETER
-    x86emu_t* emu = test->emu;
-    #endif
-    uint8_t opcode = F8;
-    switch(opcode) {
-
-        case 0xAF:                      /* IMUL Gd,Ed */
-            nextop = F8;
-            GET_ED_OFFS(tlsdata);
-            GD.dword[0] = imul32(emu, GD.dword[0], ED->dword[0]);
-            break;
-
-        case 0xB6:                              /* MOVZX Gd,GS:Eb */
-            nextop = F8;
-            GET_EB_OFFS(tlsdata);
-            GD.dword[0] = EB->byte[0];
-            break;
-
-        default:
-            return 0;
-    }
-    return addr;
-}

src/emu/x86run6466.c

@@ -1,55 +0,0 @@
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "debug.h"
-#include "box86stack.h"
-#include "x86emu.h"
-#include "x86run.h"
-#include "x86emu_private.h"
-#include "x86run_private.h"
-#include "x86primop.h"
-#include "x86trace.h"
-#include "box86context.h"
-#include "bridge.h"
-#ifdef DYNAREC
-#include "../dynarec/arm_lock_helper.h"
-#endif
-
-#include "modrm.h"
-
-
-#ifdef TEST_INTERPRETER
-uintptr_t Test6466(x86test_t *test, uintptr_t tlsdata, uintptr_t addr)
-#else
-uintptr_t Run6466(x86emu_t *emu, uintptr_t tlsdata, uintptr_t addr)
-#endif
-{
-    uint8_t nextop;
-    reg32_t *oped;
-    uint8_t tmp8u;
-    uint32_t tmp32u;
-    int32_t tmp32s;
-    #ifdef TEST_INTERPRETER
-    x86emu_t* emu = test->emu;
-    #endif
-    uint8_t opcode = F8;
-    switch(opcode) {
-
-        case 0x03:                              /* ADD Gw, FS:Ew */
-            nextop = F8;
-            GET_EW_OFFS(tlsdata);
-            GW.word[0] = add16(emu, GW.word[0], EW->word[0]);
-            break;
-
-        case 0x8B:                              /* MOV Gw,FS:Ew */
-            nextop = F8;
-            GET_EW_OFFS(tlsdata);
-            GW.word[0] = EW->word[0];
-            break;
-
-        default:
-            return 0;
-    }
-    return addr;
-}

src/emu/x86run6467.c

@@ -1,92 +0,0 @@
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "debug.h"
-#include "box86stack.h"
-#include "x86emu.h"
-#include "x86run.h"
-#include "x86emu_private.h"
-#include "x86run_private.h"
-#include "x86primop.h"
-#include "x86trace.h"
-#include "box86context.h"
-#include "bridge.h"
-#ifdef DYNAREC
-#include "../dynarec/arm_lock_helper.h"
-#endif
-
-#include "modrm.h"
-
-
-#ifdef TEST_INTERPRETER
-uintptr_t Test6467(x86test_t *test, uintptr_t tlsdata, uintptr_t addr)
-#else
-uintptr_t Run6467(x86emu_t *emu, uintptr_t tlsdata, uintptr_t addr)
-#endif
-{
-    uint8_t nextop;
-    reg32_t *oped;
-    uint8_t tmp8u;
-    uint32_t tmp32u;
-    int32_t tmp32s;
-    #ifdef TEST_INTERPRETER
-    x86emu_t* emu = test->emu;
-    #endif
-    uint8_t opcode = F8;
-    switch(opcode) {
-
-        case 0x3B:                              /* CMP GD, FS:Ed16 */
-            nextop = F8;
-            GET_EW16_OFFS(tlsdata);
-            cmp32(emu, GD.dword[0], ED->dword[0]);
-            break;
-
-        case 0x89:                              /* MOV ED16,Gd */
-            nextop = F8;
-            GET_EW16_OFFS(tlsdata);
-            ED->dword[0] = GD.dword[0];
-            break;
-
-        case 0x8B:                              /* MOV Gd,Ed16 */
-            nextop = F8;
-            GET_EW16_OFFS(tlsdata);
-            GD.dword[0] = ED->dword[0];
-            break;
-
-        case 0x8F:                              /* POP FS:Ed */
-            nextop = F8;
-            GET_EW16_OFFS(tlsdata);
-            ED->dword[0] = Pop(emu);
-            break;
-
-        case 0xA1:                              /* MOV EAX,Ov16 */
-            tmp32u = F16;
-            R_EAX = *(uint32_t*)(tlsdata + tmp32u);
-            break;
-        case 0xA3:                              /* MOV Ov16,EAX */
-            tmp32u = F16;
-            #ifdef TEST_INTERPRETER
-            test->memaddr = tlsdata + tmp32u;
-            test->memsize = 4;
-            *(uint32_t*)(test->mem) = R_EAX;
-            #else
-            *(uint32_t*)(tlsdata + tmp32u) = R_EAX;
-            #endif
-            break;
-        case 0xFF:                              /* GRP 5 Ed */
-            nextop = F8;
-            switch((nextop>>3)&7) {
-                case 6:                         /* Push Ed */
-                    GET_EW16_OFFS(tlsdata);
-                    Push(emu, ED->dword[0]);
-                    break;
-                default:
-                    return 0;
-            }
-            break;
-        default:
-            return 0;
-    }
-    return addr;
-}