Hotfix for steam not launching when libudev1 is wrapped

Bumped to version 0.3.2
Added a profile to fix PixelJunk Shooter linux version
2026-11-07 17:43:14 -10:00 · 2023-08-19 19:07:30 +02:00 · 2023-08-19 17:17:47 +02:00 · 2023-08-19 17:15:31 +02:00 · 2023-08-19 16:39:06 +02:00 · 2023-08-19 16:36:15 +02:00
903 changed files with 38878 additions and 21401 deletions
@@ -29,11 +29,26 @@ jobs:
      matrix:
        platform: [I386, OTHER_ARM, PANDORA, PYRA, GAMESHELL, RPI4, RPI4ARM64, ODROID, RK3399, RK3288, A64, SD845, PHYTIUM, ANDROID]
        type: [Release, Trace]
+        os: [ubuntu-latest]
+        
+        include:
+          - platform: TEGRAX1
+            type: Release
+            os: ubuntu-20.04
+          - platform: TEGRAX1
+            type: Trace
+            os: ubuntu-20.04
+          - platform: TEGRAX1ARM32
+            type: Release
+            os: ubuntu-20.04
+          - platform: TEGRAX1ARM32
+            type: Trace
+            os: ubuntu-20.04

-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
    steps:
      - name: "Checkout Box86 Repository"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

      - name: "Environment preparation"
        run: |
@@ -96,7 +111,7 @@ jobs:
          ctest -j$(nproc)

      - name: "Upload Artifact"
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
        with:
          name: box86-${{ matrix.platform }}-${{ matrix.type }}
          path: build/box86
@@ -5,4 +5,5 @@ build*/
 src/git_head.h
 backup/
 box86_update.sh
-restore_backup.sh
+restore_backup.sh
+.cache
@@ -1,31 +1,44 @@
-cmake_minimum_required(VERSION 3.4)
+cmake_minimum_required(VERSION 3.10)

 option(PANDORA "Set to ON if targeting an OpenPandora device" ${PANDORA})
 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})
 option(PHYTIUM "Set to ON if targeting an Phytium (D2000 or FT2000/4) based device" ${PHYTIUM})
 option(GAMESHELL "Set to ON if targeting a GameShell device" ${GAMESHELL})
 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})
 option(HAVE_TRACE "Set to ON to have Trace ability (needs ZydisInfo library)" ${HAVE_TRACE})
 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})
-if(PANDORA OR PYRA OR RPI2 OR RPI3 OR RPI4 OR GAMESHELL OR ODROID OR GOA_CLONE OR RK3288 OR RK3399 OR ODROIDN2 OR RPI4ARM64 OR PHYTIUM OR SD845 OR A64)
+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)
    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 "")
@@ -58,7 +71,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 RPI4ARM64 OR PHYTIUM OR SD845 OR A64))
+if(_aarch64 AND (RK3399 OR ODROIDN2 OR TEGRAX1 OR RPI3ARM64 OR RPI4ARM64 OR PHYTIUM OR SD845 OR A64 OR LX2160A OR RK3588 OR ARM64))
    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)
@@ -78,6 +91,7 @@ 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)
@@ -101,6 +115,11 @@ 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)
@@ -130,14 +149,35 @@ 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)
    set(CMAKE_ASM_FLAGS  "-pipe -march=armv8-a+crc+simd+crypto -mcpu=cortex-a73.cortex-a53+crypto -mfpu=crypto-neon-fp-armv8 -mfloat-abi=hard")
+elseif(TEGRAX1)
+    add_definitions(-DTEGRAX1)
+    add_definitions(-marm -pipe -march=armv8-a+crc -mcpu=cortex-a57 -mfpu=neon-fp-armv8 -mfloat-abi=hard)
+    set(CMAKE_ASM_FLAGS  "-marm -pipe -march=armv8-a+crc -mcpu=cortex-a57 -mfpu=neon-fp-armv8 -mfloat-abi=hard")
+elseif(TEGRAX1ARM32)
+    add_definitions(-DTEGRAX1ARM32)
+    add_definitions(-marm -pipe -march=armv8-a+crc -mcpu=cortex-a57 -mfpu=neon-fp-armv8 -mfloat-abi=hard)
+    set(CMAKE_ASM_FLAGS  "-marm -pipe -march=armv8-a+crc -mcpu=cortex-a57 -mfpu=neon-fp-armv8 -mfloat-abi=hard")
 elseif(PHYTIUM)
    add_definitions(-DPHYTIUM)
    add_definitions(-pipe -march=armv8.1-a+simd+crypto -mfpu=neon-fp-armv8 -mfloat-abi=hard)
    set(CMAKE_ASM_FLAGS  "-pipe -march=armv8.1-a+simd+crypto -mfpu=neon-fp-armv8 -mfloat-abi=hard")
+elseif(LX2160A)
+    add_definitions(-DLX2160A)
+    add_definitions(-pipe -march=armv8-a+crypto+crc -mcpu=cortex-a72+crypto -mfpu=neon-fp-armv8 -mfloat-abi=hard)
+    set(CMAKE_ASM_FLAGS  "-pipe -march=armv8-a+crypto+crc -mcpu=cortex-a72+crypto -mfpu=neon-fp-armv8 -mfloat-abi=hard")
 elseif(ANDROID)
    add_definitions(-DANDROID)
 elseif(ARM_DYNAREC)
@@ -145,6 +185,10 @@ 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()
@@ -237,6 +281,7 @@ set(ELFLOADER_SRC
    "${BOX86_ROOT}/src/box86context.c"
    "${BOX86_ROOT}/src/build_info.c"
    "${BOX86_ROOT}/src/custommem.c"
+    "${BOX86_ROOT}/src/mallochook.c"
    "${BOX86_ROOT}/src/tools/bridge.c"
    "${BOX86_ROOT}/src/tools/pathcoll.c"
    "${BOX86_ROOT}/src/tools/fileutils.c"
@@ -244,6 +289,7 @@ 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"
@@ -254,9 +300,6 @@ 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"
@@ -264,7 +307,6 @@ 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"
@@ -281,6 +323,33 @@ 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"
@@ -311,6 +380,7 @@ 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"
@@ -392,15 +462,18 @@ 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"
+    "${BOX86_ROOT}/src/wrapped/wrappedappindicator3.c"
    "${BOX86_ROOT}/src/wrapped/wrappedatk.c"
    "${BOX86_ROOT}/src/wrapped/wrappedatkbridge.c"
    "${BOX86_ROOT}/src/wrapped/wrappedpangoft2.c"
    "${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"
@@ -442,6 +515,10 @@ set(WRAPPEDS
    "${BOX86_ROOT}/src/wrapped/wrappedlibvkd3d.c"
    "${BOX86_ROOT}/src/wrapped/wrappedgomp.c"
    "${BOX86_ROOT}/src/wrapped/wrappedcap.c"
+    "${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
@@ -495,7 +572,9 @@ 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_prolog.S"
        "${BOX86_ROOT}/src/dynarec/arm_epilog.S"
@@ -543,6 +622,8 @@ 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)
@@ -554,6 +635,7 @@ if(ARM_DYNAREC)
        $<TARGET_OBJECTS:arm_pass1>
        $<TARGET_OBJECTS:arm_pass2>
        $<TARGET_OBJECTS:arm_pass3>
+        $<TARGET_OBJECTS:test_interpreter>
    )

 endif()
@@ -563,16 +645,18 @@ 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} ${WRAPPEDS}
+        DEPENDS dynarec ${ELFLOADER_SRC} ${INTERPRETER} ${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} ${WRAPPEDS}
+        DEPENDS ${ELFLOADER_SRC} ${INTERPRETER} ${WRAPPEDS}
        VERBATIM)
 endif()

+add_library(interpreter OBJECT ${INTERPRETER})
+
 if(BOX86LIB)
 #build a static or dynamic lib...
 if(BOX86DYNAMIC)
@@ -582,9 +666,9 @@ else()
 endif()
 if(ARM_DYNAREC)
    if(ANDROID)
-        target_link_libraries(${BOX86} dynarec m dl)
+        target_link_libraries(${BOX86} dynarec interpreter m dl)
    else()
-        target_link_libraries(${BOX86} dynarec m dl rt pthread resolv)
+        target_link_libraries(${BOX86} dynarec interpreter m dl rt pthread resolv)
    endif()
 endif()
 if(${CMAKE_VERSION} VERSION_LESS "3.13")
@@ -610,7 +694,9 @@ 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)
+    target_link_libraries(${BOX86} dynarec interpreter)
+else()
+    target_link_libraries(${BOX86} interpreter)
 endif()

 if(${CMAKE_VERSION} VERSION_LESS "3.13")
@@ -629,12 +715,17 @@ endif()
 if(NOT _x86 AND NOT _x86_64)
  install(TARGETS ${BOX86}
    RUNTIME DESTINATION bin)
-  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/)
+  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()
 endif()

 if(NOT TARGET uninstall)
@@ -764,7 +855,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")
+set_tests_properties(sse PROPERTIES ENVIRONMENT "BOX86_DYNAREC_FASTNAN=0;BOX86_DYNAREC_FASTROUND=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 
@@ -790,4 +881,11 @@ 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)
@@ -1,3 +1,64 @@
+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
@@ -6,7 +6,8 @@
 override_dh_auto_configure:
 	dh_auto_configure -- \
 	      -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-	      -DARM_DYNAREC=1
+	      -DARM_DYNAREC=1 \
+		  -DNOGIT=1

 override_dh_shlibdeps:
 	dh_shlibdeps --exclude=libgcc_s.so.1 --exclude=libpng12.so.0 --exclude=libstdc++.so.5 --exclude=libstdc++.so.6 
@@ -1,3 +1,53 @@
+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
@@ -1,5 +1,19 @@
-Compiling
+Compiling/Installing
 ----
+
+#### Debian-based Linux 
+You can use [@Itai-Nelken](https://github.com/Itai-Nelken)'s apt repository to install precompiled box86 debs, updated weekly. 
+
+```
+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
+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

 `mkdir build; cd build; cmake .. -DPANDORA=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo; make`
@@ -14,26 +28,33 @@ Compiling

 #### for Raspberry Pi

-  _a build for model 2, 3 and 4 can be done. Model 1 and 0 cannot (at least not with Dynarec, as they lack NEON support)_
+ _A build for model 2, 3 and 4 can be done. Model 1 and 0 cannot (at least not with Dynarec, as they lack NEON support)_
 
 ```
 git clone https://github.com/ptitSeb/box86
 cd box86
-mkdir build; cd build; cmake .. -DRPI4=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo
-make
+mkdir build; cd build; cmake .. -DRPI4=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo # -DRPI4=1 for Pi4 (use `-DRPI2=1` etc for other models)
+make # can use `make -j2`, `make -j3`, etc to speed up 1st build (but beware of running out of memory if going too high)
 sudo make install
 sudo systemctl restart systemd-binfmt
 ```
-  Note that you can use `make -j2` or more to speed up 1st build, but beware of the memory requirement if you go to high.
 
-#### for Raspberry Pi on 64bits OS
+#### for Raspberry Pi on 64bit OS

-  _For Pi4. Change to RPI2 or RPI3 for other models.  Change `-DRPI4=1` to `-DRPI4ARM64=1` for compiling on arm64. (armhf multiarch or chroot required alongside armhf gcc. Install it with 'sudo apt install gcc-arm-linux-gnueabihf'.)_
+_armhf multiarch or chroot required for running box86 (armhf) on aarch64_

 ```
+# example of enabling multiarch & installing libc6:armhf (to run box86:armhf on aarch64)
+#  (running i386-wine on aarch64 requires more armhf libraries)
+sudo dpkg --add-architecture armhf && sudo apt-get update
+sudo apt-get install libc6:armhf -y
+```
+_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
+mkdir build; cd build; cmake .. -DRPI4ARM64=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo # -DRPI4ARM64=1 for Pi4 aarch64 (use `-DRPI3ARM64=1` for a PI3 model)
 make -j2
 sudo make install
 sudo systemctl restart systemd-binfmt
@@ -47,7 +68,25 @@ sudo systemctl restart systemd-binfmt

 `mkdir build; cd build; cmake .. -DRK3399=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo; make -j3`

-As most RK3399 device run 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 also use `sudo apt install libc6-dev-armhf-cross` or you may have an issue with `crt1.o` and a few other similar file not found at link.
+As most RK3399 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 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

@@ -57,71 +96,103 @@ As most RK3399 device run AARCH64 OS, you'll need an `armhf` multiarch environme

 `mkdir build; cd build; cmake .. -DA64=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo; make -j3`

-As most Allwinner A64 device run 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 also use `sudo apt install libc6-dev-armhf-cross` or you may have an issue with `crt1.o` and a few other similar file not found at link.
+As most Allwinner A64 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 Snapdragon 845

 `mkdir build; cd build; cmake .. -DSD845=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo; make -j4`

-As most Snapdragon 845 device run AARCH64 OS, in most cases you'll need an `armhf` multiarch environment, and an armhf gcc: On mobian, install it with `sudo apt install gcc-arm-linux-gnueabihf`.
+As most Snapdragon 845 devices run an AARCH64 OS, you'll need an `armhf` multiarch environment, and an armhf gcc: On mobian, install it with `sudo apt install gcc-arm-linux-gnueabihf`.

 #### for Phytium

 `mkdir build; cd build; cmake .. -DPHYTIUM=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo; make -j4`

-As most Phytium (D2000 or FT2000/4) device run AARCH64 OS, you'll need an `armhf` multiarch environment, and an armhf gcc: On debian/ubuntu, install it with `sudo apt install gcc-arm-linux-gnueabihf`. Also, on armbian, you may need to also use `sudo apt install libc6-dev-armhf-cross` or you may have an issue with `crt1.o` and a few other similar file not found at link.
+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`

-#### use ccmake
+### use ccmake

 Alternatively, you can use the curses-bases ccmake (or any other gui frontend for cmake) to select wich platform to use interactively.

-#### Customize your build
+### Customize your build

-*use ccache if you have it* 
+#### use ccache if you have it

 Add `-DUSE_CCACHE=1` if you have ccache (it's better if you plan to touch the sources)

-*have some debug info* 
+#### To have some debug info

 The `-DCMAKE_BUILD_TYPE=RelWithDebInfo` argument makes a build that is both optimized for speed, and has debug information embedded. That way, if you have a crash or try to analyse performance, you'll have some symbols.

-*to have a Trace Enabled build* 
+#### To have a Trace Enabled build

-To have a trace enabled build ( ***it will be slower***), add `-DHAVE_TRACE=1` but you will need, at runtime, to have the [Zydis library](https://github.com/zyantific/zydis) library in your `LD_LIBRARY_PATH` or in the system library folders.
+To have a trace enabled build (***the interpreter will be slightly slower***), add `-DHAVE_TRACE=1`. But you will need the [Zydis library](https://github.com/zyantific/zydis) in your `LD_LIBRARY_PATH` or in the system library folders at runtime.

-*to have ARM Dynarec*
+#### to have ARM Dynarec

-The Dynarec is only available on the ARM architecture(Right now, anyways.). Notes also that VFPv3 and NEON are required for the Dynarec. Activate it by using `-DARM_DYNAREC=1`. Also, be sure to use `-marm` in compilation flags (because many compileur use Thumb as default, and the dynarec will not work in this mode). Note that compiling with `ARM_DYNAREC` but without hardware profile is not advise. If you get error building that "target CPU does not support ARM mode", then try to pick hardware profile (like ODROID for armv7 or PI4 for armv8). Also, if you are using a 64bits with armhf multiarch, it's much easier to pick one of the hardware profile like `RPI4ARM64`, `RK3399`, `PHYTIUM` or `SD845`.
+###### *Note: VFPv3 and NEON are required for Dynarec.*

-*not building from a git clone*
+###### *Note: Compiling with `ARM_DYNAREC` without selecting a hardware profile is not advised.*

-If you are not building from a git clone (for example, downloading a release source zipped from github), you need to activate `-DNOGIT=1` from cmake to be able to build (normal process include git sha1 of HEAD in the version that box86 print).
+Dynarec is only available on the ARM architecture (for the meantime anyways). Activate it by using `-DARM_DYNAREC=1`.
+
+You will most likely need `-marm` in compilation flags (Many compilers default to the Thumb instruction set and Dynarec does not support this).
+
+###### *Note: If you get error building that "target CPU does not support ARM mode", then try to pick a hardware profile (like ODROID for armv7 or PI4 for armv8).*
+
+##### 64bit OS with Dynarec
+
+If you are using a 64bit OS with armhf multiarch, it's much easier to pick one of the hardware profiles.
+
+`RPI4ARM64`, `RK3399`, `PHYTIUM` or `SD845`.
+
+#### Not building from a git clone
+If you are not building from a git clone (for example, downloading a release source code zip from github), you need to use `-DNOGIT=1` from cmake to be able to build (box86 uses git SHA1 to show last commit in version number).

 ----

 Testing
 ----
-A few tests are included.
-They can be launched with `ctest`
-They are very basic and don't test much for now.
+A few tests are included with box86.
+
+They can be launched using the `ctest` command.
+
+The tests are very basic and only tests some functionality for now.

 ----

 Note about devices with Tegra X1 and newer.

-Nvidia don't provide armhf libraries for their GPU drivers at this moment so there is no special variable to compile it for them as it would be missleading for many people. If you still want to use it wihout GPU acceleration, building it with RPI4 configuration should work just fine. As instalation of Mesa can break Nvidia driver, safest option is usage of chroot.
+NVIDIA doesn't provide armhf libraries for their GPU drivers at this time. There is no special variable to compile box86 for them, as it would be misleading to many people. If you still want to use it wihout GPU acceleration, building it with RPI4 configuration should work just fine. Installation of Mesa can break the NVIDIA driver, so the safest option is to use a chroot environment.

 ----

 Debian Packaging
 ----
-Box86 can also be packaged into a .deb file with `DEB_BUILD_OPTIONS=nostrip dpkg-buildpackage -us -uc -nc`.
+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`.

@@ -1,8 +1,8 @@
 ![Official logo](img/Box86Logo.png "Official Logo")

-Linux Userspace x86_64 Emulator with a twist
+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) | [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) | [Українська](https://github.com/ptitSeb/box86/blob/master/docs/README_UK.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/).
+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.

-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).)
+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))

 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 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)
+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.

 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_memprotectionhandler` 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_box86signalhandler` in `signals.c` if you want to trap SegFaults.

 ----

@@ -76,27 +76,40 @@ 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 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.
+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.

 ----

 Notes about Steam
 ----

-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`.
- 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. 
- 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 game. To install it on Debian, run `sudo apt install libtcmalloc-minimal4`.
+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.
+- 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.
+- 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)

-Steam for Windows installs fine but doesn't work yet.
+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

 ----

@@ -111,7 +124,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. 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.
+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.

 ----
 Final word
@@ -121,7 +134,7 @@ I want to thank everyone who has contributed to box86 development.
 There are many ways to contribute: code, financial, hardware and advertisement!
 So, in no particular order, I want to thank:
 * For their major code contribution: rajdakin, icecream95, M-HT
- * For their major financial contribution: FlyingFathead, stormchaser3000
+ * For their major financial contribution: FlyingFathead, stormchaser3000, dennis1248, sll00, [libre-computer-project](https://libre.computer/)
 * For their hardware contribution: [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 team](https://twisteros.com/)
 * For their continuous advertisement of box86 project: salva ([microLinux](https://www.youtube.com/channel/UCwFQAEj1lp3out4n7BeBatQ)), [PILab](https://www.youtube.com/channel/UCgfQjdc5RceRlTGfuthBs7g)/[TwisterOS team](https://twisteros.com/), [The Byteman](https://www.youtube.com/channel/UCEr8lpIJ3B5Ctc5BvcOHSnA), [NicoD](https://www.youtube.com/channel/UCpv7NFr0-9AB5xoklh3Snhg)

@@ -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/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/blob/master/docs/README_UK.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)

@@ -126,7 +126,7 @@ Box86已经封装了Vulkan。如果设备的系统有32位的Vulkan驱动程序
 贡献方式有很多种：代码贡献、财务帮助、捐赠捐赠和广告合作！
 以下感谢不分先后： 
 * 代码贡献：rajdakin, icecream95, M-HT
- * 财务帮助：FlyingFathead, stormchaser3000
+ * 财务帮助：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 team](https://twisteros.com/)
 * 为本项目持续的宣传：([microLinux](https://www.youtube.com/channel/UCwFQAEj1lp3out4n7BeBatQ)), [PILab](https://www.youtube.com/channel/UCgfQjdc5RceRlTGfuthBs7g)/[TwisterOS team](https://twisteros.com/), [The Byteman](https://www.youtube.com/channel/UCEr8lpIJ3B5Ctc5BvcOHSnA), [NicoD](https://www.youtube.com/channel/UCpv7NFr0-9AB5xoklh3Snhg)

@@ -0,0 +1,143 @@
+![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 у своєму проекті, будь ласка, не забудьте згадати про це!)
@@ -3,195 +3,296 @@ 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 *
+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)
+
 #### 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_LOAD_ADDR
+#### 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 *
 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_BIGBLOCK
+#### 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 *
 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_STRONGMEM
+#### 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 *
 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)
-* 1 : Only use Double for x87 emulation (slower, may be needed for some specific games, like Crysis)
+* 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_LIBGL
+#### 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 *
+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 *
 * 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
+ 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)
 
-#### 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.)

-#### BOX86_FIX_64BIT_INODES
+#### BOX86_ENV
+ * XXX=yyyy
+ will add XXX=yyyy env. var.
+
+#### BOX86_ENV1
+ * XXX=yyyy
+ will add XXX=yyyy env. var. and continue with BOX86_ENV2 ... until var doesn't exist
+
+#### 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_JITGDB
+#### 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 *
+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 *
+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.
+
+#### BOX86_BOX64
+Define where to find box64 binary
+ * yyyy
+Will use yyyy as x86_64 interpretor, to launch x64_64 binaries
+
+#### 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.
@@ -202,3 +303,11 @@ Fix/Don't fix 64bit inodes
 * 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)
+
@@ -3,10 +3,11 @@ _TwisterOS users: Wine, winetricks, and Box86 are already installed in TwisterOS

 _Raspberry Pi users: Wine requires a 3G/1G split memory kernel. Raspberry Pi OS for the Pi 4 already has a 3G/1G split kernel and works with Wine, but **the Pi 3B+ and earlier models have a 2G/2G kernel and require a custom-compiled 3G/1G kernel to get Wine working.**_

-Using Wine with Box86 allows (x86) Windows programs to run on ARM Linux computers (for x64, use [box64](https://github.com/ptitSeb/box64) & wine-amd64 with an `aarch64` processor).  
 See installation steps below (in the [Examples](#examples) section).

-Box86 needs `wine-i386` to be installed **manually** on ARM devices.  Even though `wine-armhf` is available in many repo's on ARM devices (ie using _apt-get_ will attempt to install `wine-armhf` by default), `wine-armhf` will not work with Box86.  Note that manual installation is required since using `multiarch` will result in your ARM device thinking it needs to install lots of i386 dependencies to make `wine-i386` work. The "twist" in Box86 is that Box86 "wraps" many of Wine's core Linux i386 libraries (.so files) so that their calls are interpretable by your ARM devices other armhf Linux system libraries.  Also note that wrapping libraries is an ongoing process throughout Box86 development and that some programs may not run properly until all of their i386 library dependencies are wrapped.
+Using Wine with Box86 allows (x86) Windows programs to run on ARM Linux computers (for x64, use [box64](https://github.com/ptitSeb/box64) & wine-amd64 with an `aarch64` processor).
+
+Box86 needs `wine-i386` to be installed **manually** on ARM devices.  Even though `wine-armhf` is available in many repo's on ARM devices (ie using _apt-get_ will attempt to install `wine-armhf` by default), `wine-armhf` will not work with Box86.  Note that manual installation is required since using `multiarch` will result in your ARM device thinking it needs to install lots of i386 dependencies to make `wine-i386` work. The "twist" in Box86 is that Box86 "wraps" many of Wine's core Linux i386 libraries (.so files) so that their calls are interpretable by your ARM device's other armhf Linux system libraries.  Also note that wrapping libraries is an ongoing process throughout Box86 development and that some programs may not run properly until all of their i386 library dependencies are wrapped.

 Installation files for Wine can be found in the [WineHQ repository](https://dl.winehq.org/wine-builds/debian/dists/buster/main/binary-i386/), the [TwisterOS FAQ](https://twisteros.com/faq.html) page, or the [PlayOnLinux website repository](https://www.playonlinux.com/wine/). Box86 requires the "i386" (x86) version of Wine even though we are installing it on an ARM processor.

@@ -15,6 +16,7 @@ The general procedure for installing Wine for Box86 is to...
 - Download all the install files (.deb, .zip, or even .pol files) for the version of Wine you wish to install
 - Unzip or dpkg the install files into one folder
 - Move that folder to the directory that you wish Wine to run from (in TwisterOS, this is `~/wine/` by default)
+ - If you are running box86/i386-wine on a 64bit ARM OS (aarch64), you will also have to install some extra armhf libraries.
 - Go to `/usr/local/bin` and make symlinks or scripts that will point to your main wine binaries (`wine`, `winecfg`, and `wineserver`).
 - Boot wine to create a new wineprefix (`wine wineboot`).
 - Download winetricks (which is simply a very complicated bash script), make it executable, then copy it to `/usr/local/bin`.
@@ -40,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 aslo 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 also 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
@@ -50,11 +52,29 @@ sudo chmod +x /usr/local/bin/wine /usr/local/bin/wineboot /usr/local/bin/winecfg
 wine wineboot
 ```

-### Installing Wine for Box86 on Raspberry Pi OS Buster from WineHQ .deb files
+### Installing Wine for Box86 on Raspberry Pi OS from WineHQ .deb files
 _Links from the [WineHQ repo](https://dl.winehq.org/wine-builds/debian/dists/buster/main/binary-i386/)_

-This install method allows you to install different versions of Wine.  You may install any version and any branch of Wine that you wish (wine-devel, wine-stable, or wine-staging).
+This install method allows you to install different versions of Wine.  You may install any version/branch of Wine that you wish.
 ```
+### User-defined Wine version variables ################
+# - Replace the variables below with your system's info.
+# - Note that we need the i386 version for Box86 even though we're installing it on our ARM processor.
+# - Wine download links from WineHQ: https://dl.winehq.org/wine-builds/
+
+wbranch="devel" #example: devel, staging, or stable (wine-staging 4.5+ requires libfaudio0:i386 - see below)
+wversion="7.1" #example: 7.1
+wid="debian" #example: debian, ubuntu
+wdist="bullseye" #example (for debian): bullseye, buster, jessie, wheezy, etc
+wtag="-1" #example: -1 (some wine .deb files have -1 tag on the end and some don't)
+
+########################################################
+
+# Clean up any old wine instances
+wineserver -k # stop any old wine installations from running
+rm -rf ~/.cache/wine # remove old wine-mono/wine-gecko install files
+rm -rf ~/.local/share/applications/wine # remove old program shortcuts
+
 # Backup any old wine installations
 sudo mv ~/wine ~/wine-old
 sudo mv ~/.wine ~/.wine-old
@@ -64,14 +84,12 @@ sudo mv /usr/local/bin/winecfg /usr/local/bin/winecfg-old
 sudo mv /usr/local/bin/wineserver /usr/local/bin/wineserver-old

 # Download, extract wine, and install wine
-# (Replace the links/versions below with links/versions from the WineHQ site for the version of wine you wish to install. Note that we need the i386 version for Box86 even though we're installing it on our ARM processor.)
-# (Pick an i386 version of wine-devel, wine-staging, or wine-stable)
 cd ~/Downloads
-wget https://dl.winehq.org/wine-builds/debian/dists/buster/main/binary-i386/wine-devel-i386_5.21~buster_i386.deb # NOTE: Replace this link with the version you want
-wget https://dl.winehq.org/wine-builds/debian/dists/buster/main/binary-i386/wine-devel_5.21~buster_i386.deb  # NOTE: Also replace this link with the version you want
-dpkg-deb -xv wine-devel-i386_5.21~buster_i386.deb wine-installer # NOTE: Make sure these dpkg command matches the filename of the deb package you just downloaded
-dpkg-deb -xv wine-devel_5.21~buster_i386.deb wine-installer
-mv ~/Downloads/wine-installer/opt/wine* ~/wine
+wget https://dl.winehq.org/wine-builds/${wid}/dists/${wdist}/main/binary-i386/wine-${wbranch}-i386_${wversion}~${wdist}${wtag}_i386.deb # download
+wget https://dl.winehq.org/wine-builds/${wid}/dists/${wdist}/main/binary-i386/wine-${wbranch}_${wversion}~${wdist}${wtag}_i386.deb # (required for wine_i386 if no wine64 / CONFLICTS WITH wine64 support files)
+dpkg-deb -x wine-${wbranch}-i386_${wversion}~${wdist}${wtag}_i386.deb wine-installer # extract
+dpkg-deb -x wine-${wbranch}_${wversion}~${wdist}${wtag}_i386.deb wine-installer
+mv wine-installer/opt/wine* ~/wine # install
 rm wine*.deb # clean up
 rm -rf wine-installer # clean up

@@ -83,7 +101,26 @@ sudo ln -s ~/wine/bin/winecfg /usr/local/bin/winecfg
 sudo ln -s ~/wine/bin/wineserver /usr/local/bin/wineserver
 sudo chmod +x /usr/local/bin/wine /usr/local/bin/wineboot /usr/local/bin/winecfg /usr/local/bin/wineserver

-# These packages are needed for running wine-staging on RPi 4 (Credits: chills340)
+# These packages are needed for running wine on a 64-bit RPiOS via multiarch
+karch=$(uname -m)
+if [ "$karch" = "aarch64" ] || [ "$karch" = "aarch64-linux-gnu" ] || [ "$karch" = "arm64" ] || [ "$karch" = "aarch64_be" ]; then
+    sudo dpkg --add-architecture armhf && sudo apt-get update # enable multi-arch
+    sudo apt-get install -y libasound2:armhf libc6:armhf libglib2.0-0:armhf libgphoto2-6:armhf libgphoto2-port12:armhf \
+        libgstreamer-plugins-base1.0-0:armhf libgstreamer1.0-0:armhf libldap-2.4-2:armhf libopenal1:armhf libpcap0.8:armhf \
+        libpulse0:armhf libsane1:armhf libudev1:armhf libusb-1.0-0:armhf libvkd3d1:armhf libx11-6:armhf libxext6:armhf \
+        libasound2-plugins:armhf ocl-icd-libopencl1:armhf libncurses6:armhf libncurses5:armhf libcap2-bin:armhf libcups2:armhf \
+        libdbus-1-3:armhf libfontconfig1:armhf libfreetype6:armhf libglu1-mesa:armhf libglu1:armhf libgnutls30:armhf \
+        libgssapi-krb5-2:armhf libkrb5-3:armhf libodbc1:armhf libosmesa6:armhf libsdl2-2.0-0:armhf libv4l-0:armhf \
+        libxcomposite1:armhf libxcursor1:armhf libxfixes3:armhf libxi6:armhf libxinerama1:armhf libxrandr2:armhf \
+        libxrender1:armhf libxxf86vm1 libc6:armhf libcap2-bin:armhf # to run wine-i386 through box86:armhf on aarch64
+        # This list found by downloading...
+        #	wget https://dl.winehq.org/wine-builds/debian/dists/bullseye/main/binary-i386/wine-devel-i386_7.1~bullseye-1_i386.deb
+        #	wget https://dl.winehq.org/wine-builds/debian/dists/bullseye/main/binary-i386/winehq-devel_7.1~bullseye-1_i386.deb
+        #	wget https://dl.winehq.org/wine-builds/debian/dists/bullseye/main/binary-i386/wine-devel_7.1~bullseye-1_i386.deb
+        # then `dpkg-deb -I package.deb`. Read output, add `:armhf` to packages in dep list, then try installing them on Pi aarch64.
+fi
+
+# These packages are needed for running wine-staging on RPiOS (Credits: chills340)
 sudo apt install libstb0 -y
 cd ~/Downloads
 wget -r -l1 -np -nd -A "libfaudio0_*~bpo10+1_i386.deb" http://ftp.us.debian.org/debian/pool/main/f/faudio/ # Download libfaudio i386 no matter its version number
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+# create necessary directories
+mkdir -p ~/steam
+mkdir -p ~/steam/tmp
+cd ~/steam/tmp
+
+# download latest deb and unpack
+wget https://cdn.cloudflare.steamstatic.com/client/installer/steam.deb
+ar x steam.deb
+tar xf data.tar.xz
+
+# remove deb archives, not needed anymore
+rm ./*.tar.xz ./steam.deb
+
+# move deb contents to steam folder
+mv ./usr/* ../
+cd ../ && rm -rf ./tmp/
+
+# create run script
+echo "#!/bin/bash
+export STEAMOS=1
+export STEAM_RUNTIME=1
+export DBUS_FATAL_WARNINGS=0
+~/steam/bin/steam 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)
+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
+
+ echo "Don't forget to compile/install Box64!"
+fi
+
+echo "Script complete."
@@ -1,7 +1,7 @@
 # Maintainer: Jai-JAP <[email protected]>, SpacingBat3 <[email protected]>
 # Author: Sebastien Chevalier <[email protected]>
-pkgname=box86-rk3399-git
-pkgver=r3858.5368285
+pkgname=box86-a64-git
+pkgver=r4581.d698861
 pkgrel=1
 pkgdesc="Linux Userspace x86 Emulator with a twist, targeted at ARM Linux devices."
 arch=('armv7h')
@@ -9,21 +9,28 @@ url="https://github.com/ptitSeb/box86"
 license=('MIT')
 optdepends=('gl4es: OpenGL 2 for GLES 2 devices')
 makedepends=('git' 'cmake' 'make')
-provides=("${pkgname%-git}" "${pkgname%-rk3399-git}-git" "${pkgname%-rk3399-git}")
-conflicts=("${pkgname%-git}" "${pkgname%-rk3399-git}-git" "${pkgname%-rk3399-git}")
+provides=("${pkgname%-git}" "${pkgname%-a64-git}-git" "${pkgname%-a64-git}")
+conflicts=("${pkgname%-git}" "${pkgname%-a64-git}-git" "${pkgname%-a64-git}")
 source=('git+https://github.com/ptitSeb/box86')
 md5sums=('SKIP')

 pkgver() {
-	cd "$srcdir/${pkgname%-rk3399-git}"
+	cd "${srcdir}/${pkgname%-a64-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() {
-	cmake -B build -S "${pkgname%-rk3399-git}" -DRK3399=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
-	make -C build
+	cd "${srcdir}/${pkgname%-a64-git}/build"
+	make -j$(nproc)
 }

 package() {
-	make -C build DESTDIR="${pkgdir}/" install
-}
+	cd "${srcdir}/${pkgname%-a64-git}/build"
+	make DESTDIR="${pkgdir}/" install
+}
@@ -1,7 +1,7 @@
 # Maintainer: Jai-JAP <[email protected]>, SpacingBat3 <[email protected]>
 # Author: Sebastien Chevalier <[email protected]>
 pkgname=box86-arm-git
-pkgver=r3858.5368285
+pkgver=r4581.d698861
 pkgrel=1
 pkgdesc="Linux Userspace x86 Emulator with a twist, targeted at ARM Linux devices."
 arch=('armv7h')
@@ -15,15 +15,22 @@ 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() {
-	cmake -B build -S "${pkgname%-arm-git}" -DARM_DYNAREC=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
-	make -C build
+	cd "${srcdir}/${pkgname%-arm-git}/build"
+	make -j$(nproc)
 }

 package() {
-	make -C build DESTDIR="${pkgdir}/" install
-}
+	cd "${srcdir}/${pkgname%-arm-git}/build"
+	make DESTDIR="${pkgdir}/" install
+}
@@ -0,0 +1,36 @@
+# 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
+}
@@ -1,7 +1,7 @@
 # Maintainer: Jai-JAP <[email protected]>, SpacingBat3 <[email protected]>
 # Author: Sebastien Chevalier <[email protected]>
 pkgname=box86-gameshell-git
-pkgver=r3858.5368285
+pkgver=r4581.d698861
 pkgrel=1
 pkgdesc="Linux Userspace x86 Emulator with a twist, targeted at ARM Linux devices."
 arch=('armv7h')
@@ -15,15 +15,22 @@ 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() {
-	cmake -B build -S "${pkgname%-gameshell-git}" -DGAMESHELL=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
-	make -C build
+	cd "${srcdir}/${pkgname%-gameshell-git}/build"
+	make -j$(nproc)
 }

 package() {
-	make -C build DESTDIR="${pkgdir}/" install
-}
+	cd "${srcdir}/${pkgname%-gameshell-git}/build"
+	make DESTDIR="${pkgdir}/" install
+}
@@ -0,0 +1,36 @@
+# 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
+}
@@ -0,0 +1,36 @@
+# 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
+}
@@ -1,7 +1,7 @@
 # Maintainer: Jai-JAP <[email protected]>, SpacingBat3 <[email protected]>
 # Author: Sebastien Chevalier <[email protected]>
 pkgname=box86-odroid-git
-pkgver=r3858.5368285
+pkgver=r4581.d698861
 pkgrel=1
 pkgdesc="Linux Userspace x86 Emulator with a twist, targeted at ARM Linux devices."
 arch=('armv7h')
@@ -15,15 +15,22 @@ 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() {
-	cmake -B build -S "${pkgname%-odroid-git}" -DODROID=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
-	make -C build
+	cd "${srcdir}/${pkgname%-odroid-git}/build"
+	make -j$(nproc)
 }

 package() {
-	make -C build DESTDIR="${pkgdir}/" install
-}
+	cd "${srcdir}/${pkgname%-odroid-git}/build"
+	make DESTDIR="${pkgdir}/" install
+}
@@ -0,0 +1,36 @@
+# 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
+}
@@ -1,7 +1,7 @@
 # Maintainer: Jai-JAP <[email protected]>, SpacingBat3 <[email protected]>
 # Author: Sebastien Chevalier <[email protected]>
 pkgname=box86-pandora-git
-pkgver=r3858.5368285
+pkgver=r4581.d698861
 pkgrel=1
 pkgdesc="Linux Userspace x86 Emulator with a twist, targeted at ARM Linux devices."
 arch=('armv7h')
@@ -15,15 +15,22 @@ 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() {
-	cmake -B build -S "${pkgname%-pandora-git}" -DPANDORA=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
-	make -C build
+	cd "${srcdir}/${pkgname%-pandora-git}/build"
+	make -j$(nproc)
 }

 package() {
-	make -C build DESTDIR="${pkgdir}/" install
-}
+	cd "${srcdir}/${pkgname%-pandora-git}/build"
+	make DESTDIR="${pkgdir}/" install
+}
@@ -0,0 +1,36 @@
+# 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
+}
@@ -1,7 +1,7 @@
 # Maintainer: Jai-JAP <[email protected]>, SpacingBat3 <[email protected]>
 # Author: Sebastien Chevalier <[email protected]>
 pkgname=box86-pyra-git
-pkgver=r3858.5368285
+pkgver=r4581.d698861
 pkgrel=1
 pkgdesc="Linux Userspace x86 Emulator with a twist, targeted at ARM Linux devices."
 arch=('armv7h')
@@ -15,15 +15,22 @@ 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() {
-	cmake -B build -S "${pkgname%-pyra-git}" -DPYRA=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
-	make -C build
+	cd "${srcdir}/${pkgname%-pyra-git}/build"
+	make -j$(nproc)
 }

 package() {
-	make -C build DESTDIR="${pkgdir}/" install
-}
+	cd "${srcdir}/${pkgname%-pyra-git}/build"
+	make DESTDIR="${pkgdir}/" install
+}
@@ -1,7 +1,7 @@
 # Maintainer: Jai-JAP <[email protected]>, SpacingBat3 <[email protected]>
 # Author: Sebastien Chevalier <[email protected]>
 pkgname=box86-rpi-git
-pkgver=r3858.5368285
+pkgver=r4581.d698861
 pkgrel=1
 pkgdesc="Linux Userspace x86 Emulator with a twist, targeted at ARM Linux devices."
 arch=('armv7h')
@@ -16,11 +16,12 @@ 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)"
 }

-build() {
+prepare() {
+	cd "${srcdir}/${pkgname%-rpi-git}"
 	# Check for Pi version number
 	if [[ ${_pimodel} =~ "Raspberry Pi 4" ]]; then
 		_piversion=4
@@ -31,15 +32,20 @@ build() {
 	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 yet).\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).\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
+}

-	cmake -B build -S "${pkgname%-rpi-git}" -DRPI${_piversion}=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
-	make -C build
+build() {
+	cd "${srcdir}/${pkgname%-rpi-git}/build"
+	make -j$(nproc)
 }

 package() {
-	make -C build DESTDIR="${pkgdir}/" install
+	cd "${srcdir}/${pkgname%-rpi-git}/build"
+	make DESTDIR="${pkgdir}/" install
 }
@@ -0,0 +1,50 @@
+# 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
+}
@@ -0,0 +1,36 @@
+# 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
+}
@@ -0,0 +1,36 @@
+# 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
+}
@@ -1,7 +1,7 @@
 # Maintainer: Jai-JAP <[email protected]>, SpacingBat3 <[email protected]>
 # Author: Sebastien Chevalier <[email protected]>
 pkgname=box86-x86-git
-pkgver=r3858.5368285
+pkgver=r4581.d698861
 pkgrel=1
 pkgdesc="Linux Userspace x86 Emulator with a twist, targeted at ARM Linux devices."
 arch=('i386')
@@ -14,15 +14,22 @@ 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() {
-	cmake -B build -S "${pkgname%-x86-git}" -DLD80BITS=1 -DNOALIGN=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/usr
-	make -C build
+	cd "${srcdir}/${pkgname%-x86-git}/build"
+	make -j$(nproc)
 }

 package() {
-	make -C build DESTDIR="${pkgdir}/" install
-}
+	cd "${srcdir}/${pkgname%-x86-git}/build"
+	make DESTDIR="${pkgdir}/" install
+}
@@ -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.
-All specified in [COMPILE.md](../docs/COMPILE.md).
+Most specified in [COMPILE.md](../docs/COMPILE.md). Except PowerPC based.

 ### 3. Any advantages with that sollution?
 This might give you some advantages like those:
@@ -106,7 +106,7 @@ def main(root, ver, __debug_forceAllDebugging=False):
 					alreadyChanged = 0
 					csp = 0
 					while csp < curSplt:
-						if spltln[csp] == '\x00':
+						if spltln[csp] == '\x01':
 							alreadyChanged = 1
 							curSplt = curSplt + 1
 						else:
@@ -119,7 +119,7 @@ def main(root, ver, __debug_forceAllDebugging=False):
 								line = line + spltln[csp] + ">"
 								alreadyChanged = 1
 						csp = csp + 1
-					if spltln[csp] == '\x00':
+					if spltln[csp] == '\x01':
 						alreadyChanged = 1
 						curSplt = curSplt + 1
 						csp = csp + 1
@@ -134,7 +134,7 @@ def main(root, ver, __debug_forceAllDebugging=False):
 						alreadyChanged = 1
 					csp = csp + 1
 					while csp < len(spltln):
-						if spltln[csp] == '\x00':
+						if spltln[csp] == '\x01':
 							alreadyChanged = 1
 							curSplt = curSplt + 1
 						else:
@@ -605,7 +605,7 @@ def main(root, ver, __debug_forceAllDebugging=False):
 				instText = [itp for itp2 in instText for itp in itp2]
 				
 				# Make the failures nicer
-				spltln = spltln[:curSplt] + ["\x00"] + instText
+				spltln = spltln[:curSplt] + ["\x01"] + instText
 				
 				printf_args = ""
 				for idx, text in enumerate(instText):
@@ -858,7 +858,7 @@ def main(root, ver, __debug_forceAllDebugging=False):
 				instText = [itp for itp2 in instText for itp in itp2]
 				
 				# Make the failures nicer
-				spltln = spltln[:curSplt] + ["\x00"] + instText
+				spltln = spltln[:curSplt] + ["\x01"] + instText
 				
 				printf_args = ""
 				for idx, text in enumerate(instText):
@@ -1156,7 +1156,7 @@ def main(root, ver, __debug_forceAllDebugging=False):
 				instText = [itp for itp2 in instText for itp in itp2]
 				
 				# Make the failures nicer
-				spltln = spltln[:curSplt] + ["\x00"] + instText
+				spltln = spltln[:curSplt] + ["\x01"] + instText
 				
 				printf_args = ""
 				for idx, text in enumerate(instText):
@@ -1456,7 +1456,7 @@ def main(root, ver, __debug_forceAllDebugging=False):
 				instText = [itp for itp2 in instText for itp in itp2]
 				
 				# Make the failures nicer
-				spltln = spltln[:curSplt] + ["\x00"] + instText
+				spltln = spltln[:curSplt] + ["\x01"] + instText
 				
 				# inside '{, '...'}'?
 				hasOpened = False
@@ -1675,308 +1675,300 @@ def main(root, ver, __debug_forceAllDebugging=False):
 	
 	# Now the files rebuilding part
 	# File header and guard
-	files_header = {
-		"arm_printer.c": """
-		#include <stdint.h>
-		#include <stddef.h>
-		#include <string.h>
-		#include <stdio.h>
+	header = """
+	#include <stdint.h>
+	#include <stddef.h>
+	#include <string.h>
+	#include <stdio.h>
+	
+	#include "arm_printer.h"
+	
+	// conditions
+	#define cEQ (0b0000<<28)
+	#define cNE (0b0001<<28)
+	#define cCS (0b0010<<28)
+	#define cCC (0b0011<<28)
+	#define cMI (0b0100<<28)
+	#define cPL (0b0101<<28)
+	#define cVS (0b0110<<28)
+	#define cVC (0b0111<<28)
+	#define cHI (0b1000<<28)
+	#define cLS (0b1001<<28)
+	#define cGE (0b1010<<28)
+	#define cLT (0b1011<<28)
+	#define cGT (0b1100<<28)
+	#define cLE (0b1101<<28)
+	#define c__ (0b1110<<28)	// means all
+	
+	static const char* conds[16] = {
+		"EQ", "NE", "CS", "CC",
+		"MI", "PL", "VS", "VC",
+		"HI", "LS", "GE", "LT",
+		"GT", "LE",   "", "##"
+	};
+	
+	static const char* regname[16] = {
+		"r0", "r1", "r2", "r3", "r4",
+		"r5", "r6", "r7", "r8", "r9",
+		"r10", "r11", "r12", "SP", "LR", "PC"
+	};
+	
+	// Single precision are V_:_
+	// Double and quad precision are _:V_
+	// So we always use _:V_ and invert the corresponding single-precision (cleaner? code)
+	static const char* vecname[96] = {
+		"S0",  "S2",  "S4",  "S6",  "S8", "S10", "S12", "S14",
+		"S16", "S18", "S20", "S22", "S24", "S26", "S28", "S30",
+		"S1",  "S3",  "S5",  "S7",  "S9", "S11", "S13", "S15",
+		"S17", "S19", "S21", "S23", "S25", "S27", "S29", "S31",
+		"D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7",
+		"D8", "D9", "D10", "D11", "D12", "D13", "D14", "D15",
+		"D16", "D17", "D18", "D19", "D20", "D21", "D22", "D23",
+		"D24", "D25", "D26", "D27", "D28", "D29", "D30", "D31",
+		"Q0", "!!!", "Q1", "!!!", "Q2", "!!!", "Q3", "!!!",
+		"Q4", "!!!", "Q5", "!!!", "Q6", "!!!", "Q7", "!!!",
+		"Q8", "!!!", "Q9", "!!!", "Q10", "!!!", "Q11", "!!!",
+		"Q12", "!!!", "Q13", "!!!", "Q14", "!!!", "Q15", "!!!"
+	};
+	
+	static const char* dts[16] = {
+		"S8", "S16", "S32", "S64",
+		"U8", "U16", "U32", "U64",
+		"I8", "I16", "I32", "I64",
+		"F8", "F16", "F32", "F64"
+	};
+	
+	static const char* shift_type[4] = {
+		"lsl ", "lsr ", "asr ", "ror "
+	};
+	
+	const char* print_shift(int shift, int comma) {
+		static __thread char ret[20];
+		ret[0] = '\\0';
 		
-		#include "arm_printer.h"
-		
-		// conditions
-		#define cEQ (0b0000<<28)
-		#define cNE (0b0001<<28)
-		#define cCS (0b0010<<28)
-		#define cCC (0b0011<<28)
-		#define cMI (0b0100<<28)
-		#define cPL (0b0101<<28)
-		#define cVS (0b0110<<28)
-		#define cVC (0b0111<<28)
-		#define cHI (0b1000<<28)
-		#define cLS (0b1001<<28)
-		#define cGE (0b1010<<28)
-		#define cLT (0b1011<<28)
-		#define cGT (0b1100<<28)
-		#define cLE (0b1101<<28)
-		#define c__ (0b1110<<28)	// means all
-		
-		static const char* conds[16] = {
-			"EQ", "NE", "CS", "CC",
-			"MI", "PL", "VS", "VC",
-			"HI", "LS", "GE", "LT",
-			"GT", "LE",   "", "##"
-		};
-		
-		static const char* regname[16] = {
-			"r0", "r1", "r2", "r3", "r4",
-			"r5", "r6", "r7", "r8", "r9",
-			"r10", "r11", "r12", "SP", "LR", "PC"
-		};
-		
-		// Single precision are V_:_
-		// Double and quad precision are _:V_
-		// So we always use _:V_ and invert the corresponding single-precision (cleaner? code)
-		static const char* vecname[96] = {
-			"S0",  "S2",  "S4",  "S6",  "S8", "S10", "S12", "S14",
-			"S16", "S18", "S20", "S22", "S24", "S26", "S28", "S30",
-			"S1",  "S3",  "S5",  "S7",  "S9", "S11", "S13", "S15",
-			"S17", "S19", "S21", "S23", "S25", "S27", "S29", "S31",
-			"D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7",
-			"D8", "D9", "D10", "D11", "D12", "D13", "D14", "D15",
-			"D16", "D17", "D18", "D19", "D20", "D21", "D22", "D23",
-			"D24", "D25", "D26", "D27", "D28", "D29", "D30", "D31",
-			"Q0", "!!!", "Q1", "!!!", "Q2", "!!!", "Q3", "!!!",
-			"Q4", "!!!", "Q5", "!!!", "Q6", "!!!", "Q7", "!!!",
-			"Q8", "!!!", "Q9", "!!!", "Q10", "!!!", "Q11", "!!!",
-			"Q12", "!!!", "Q13", "!!!", "Q14", "!!!", "Q15", "!!!"
-		};
-		
-		static const char* dts[16] = {
-			"S8", "S16", "S32", "S64",
-			"U8", "U16", "U32", "U64",
-			"I8", "I16", "I32", "I64",
-			"F8", "F16", "F32", "F64"
-		};
-		
-		static const char* shift_type[4] = {
-			"lsl ", "lsr ", "asr ", "ror "
-		};
-		
-		const char* print_shift(int shift, int comma) {
-			static __thread char ret[20];
-			ret[0] = '\\0';
-			
-			int sh_op = (shift >> 1) & 3;
-			if(shift & 1) {
-				int rs = shift >> 4;
-				sprintf(ret, "%s%s%s", (comma ? ", " : ""), shift_type[sh_op], regname[rs]);
-			} else {
-				uint8_t amount = shift >> 3;
-				if (!amount) {
-					switch (sh_op) {
-					case 0b00:
-						break;
-					case 0b01:
-					case 0b10:
-						sprintf(ret, "%s%s#32", (comma ? ", " : ""), shift_type[sh_op]);
-						break;
-					case 0b11:
-						sprintf(ret, "%srrx", (comma ? ", " : ""));
-						break;
-					}
-				} else {
-					sprintf(ret, "%s%s#%u", (comma ? ", " : ""), shift_type[sh_op], amount);
+		int sh_op = (shift >> 1) & 3;
+		if(shift & 1) {
+			int rs = shift >> 4;
+			sprintf(ret, "%s%s%s", (comma ? ", " : ""), shift_type[sh_op], regname[rs]);
+		} else {
+			uint8_t amount = shift >> 3;
+			if (!amount) {
+				switch (sh_op) {
+				case 0b00:
+					break;
+				case 0b01:
+				case 0b10:
+					sprintf(ret, "%s%s#32", (comma ? ", " : ""), shift_type[sh_op]);
+					break;
+				case 0b11:
+					sprintf(ret, "%srrx", (comma ? ", " : ""));
+					break;
 				}
+			} else {
+				sprintf(ret, "%s%s#%u", (comma ? ", " : ""), shift_type[sh_op], amount);
 			}
-			return ret;
 		}
+		return ret;
+	}
+	
+	#define print_modified_imm_ARM(imm12) (((imm12 & 0xFF) >> (2*(imm12 >> 8))) | ((imm12 & 0xFF) << (32 - 2*(imm12 >> 8))))
+	
+	const char* print_register_list(int list, int size) {
+		int last = -2;
+		int cnt = 0;
+		static __thread char ret[68];
 		
-		#define print_modified_imm_ARM(imm12) (((imm12 & 0xFF) >> (2*(imm12 >> 8))) | ((imm12 & 0xFF) << (32 - 2*(imm12 >> 8))))
+		ret[0] = '{';
+		ret[1] = '\\0';
+		for (int i = 0; i < size; ++i) {
+			if (list & (1 << i)) {
+				if (last >= 0) {
+					++cnt;
+				} else {
+					if (last == -1)
+						strcat(ret, ", ");
+					strcat(ret, regname[i]);
+					last = i;
+				}
+			} else {
+				if (cnt) {
+					strcat(ret, "-");
+					strcat(ret, regname[i - 1]);
+				}
+				if (last != -2) last = -1;
+				cnt = 0;
+			}
+		}
+		if (cnt) {
+			strcat(ret, "-");
+			strcat(ret, regname[size - 1]);
+		}
+		strcat(ret, "}");
 		
-		const char* print_register_list(int list, int size) {
-			int last = -2;
-			int cnt = 0;
-			static __thread char ret[68];
-			
+		return ret;
+	}
+	
+	const char* print_register_list_fpu(uint8_t start, uint8_t size, uint8_t double_prec) {
+		static __thread char ret[68];
+		
+		// Assume VFPSmallRegisterBank(), so no D16 and no S32 (and above)
+		if (start + (double_prec + 1) * size > 32) {
+			return "!!!";
+		}
+		if (size == 0) {
+			return "!!!";
+		}
+		if (double_prec && (size % 2 == 1)) {
+			strcpy(ret, "!! {");
+		} else {
 			ret[0] = '{';
 			ret[1] = '\\0';
-			for (int i = 0; i < size; ++i) {
-				if (list & (1 << i)) {
-					if (last >= 0) {
-						++cnt;
-					} else {
-						if (last == -1)
-							strcat(ret, ", ");
-						strcat(ret, regname[i]);
-						last = i;
-					}
-				} else {
-					if (cnt) {
-						strcat(ret, "-");
-						strcat(ret, regname[i - 1]);
-					}
-					if (last != -2) last = -1;
-					cnt = 0;
-				}
-			}
-			if (cnt) {
-				strcat(ret, "-");
-				strcat(ret, regname[size - 1]);
-			}
-			strcat(ret, "}");
-			
-			return ret;
 		}
 		
-		const char* print_register_list_fpu(uint8_t start, uint8_t size, uint8_t double_prec) {
-			static __thread char ret[68];
-			
-			// Assume VFPSmallRegisterBank(), so no D16 and no S32 (and above)
-			if (start + (double_prec + 1) * size > 32) {
-				return "!!!";
-			}
-			if (size == 0) {
-				return "!!!";
-			}
-			if (double_prec && (size % 2 == 1)) {
-				strcpy(ret, "!! {");
-			} else {
-				ret[0] = '{';
-				ret[1] = '\\0';
-			}
-			
-			char regChr;
-			if (double_prec) {
-				regChr = 'D';
-				size /= 2;
-			} else {
-				regChr = 'S';
-				start = (start >> 4) + ((start & 0xF) << 1);
-			}
-			
-			char tmp[6];
-			for (int cur = start; cur < start + size - 1; ++cur) {
-				sprintf(tmp, "%c%d, ", regChr, cur);
-				strcat(ret, tmp);
-			}
-			sprintf(tmp, "%c%d}", regChr, start + size - 1);
+		char regChr;
+		if (double_prec) {
+			regChr = 'D';
+			size /= 2;
+		} else {
+			regChr = 'S';
+			start = (start >> 4) + ((start & 0xF) << 1);
+		}
+		
+		char tmp[7];
+		for (int cur = start; cur < start + size - 1; ++cur) {
+			sprintf(tmp, "%c%d, ", regChr, cur);
 			strcat(ret, tmp);
-			
-			return ret;
 		}
+		sprintf(tmp, "%c%d}", regChr, start + size - 1);
+		strcat(ret, tmp);
 		
-		static const char* _print_modified_imm_I64_bytes[2] = {"00", "FF"};
+		return ret;
+	}
+	
+	static const char* _print_modified_imm_I64_bytes[2] = {"00", "FF"};
+	
+	const char* print_modified_imm_NEON(int op_cmode, int imm) {
+		static __thread char ret[34] = "???\\0-"; // [dt: 4][imm: 30]
 		
-		const char* print_modified_imm_NEON(int op_cmode, int imm) {
-			static __thread char ret[34] = "???\\0-"; // [dt: 4][imm: 30]
-			
-			strcpy(&ret[4], "UNPREDICTABLE");
-			
-			switch (op_cmode) {
-			case 0b00000: // VMOV.I32
-			case 0b00001: // VORR.I32
-			case 0b10000: // VMVN.I32
-			case 0b10001: // VBIC.I32
+		strcpy(&ret[4], "UNPREDICTABLE");
+		
+		switch (op_cmode) {
+		case 0b00000: // VMOV.I32
+		case 0b00001: // VORR.I32
+		case 0b10000: // VMVN.I32
+		case 0b10001: // VBIC.I32
+			strcpy(ret, "I32");
+			sprintf(&ret[4], "0x%02X", imm);
+			break;
+		case 0b00010: // VMOV.I32
+		case 0b00011: // VORR.I32
+		case 0b10010: // VMVN.I32
+		case 0b10011: // VBIC.I32
+			if (imm) {
 				strcpy(ret, "I32");
-				sprintf(&ret[4], "0x%02X", imm);
-				break;
-			case 0b00010: // VMOV.I32
-			case 0b00011: // VORR.I32
-			case 0b10010: // VMVN.I32
-			case 0b10011: // VBIC.I32
-				if (imm) {
-					strcpy(ret, "I32");
-					sprintf(&ret[4], "0x%02X00", imm);
-				}
-				break;
-			case 0b00100: // VMOV.I32
-			case 0b00101: // VORR.I32
-			case 0b10100: // VMVN.I32
-			case 0b10101: // VBIC.I32
-				if (imm) {
-					strcpy(ret, "I32");
-					sprintf(&ret[4], "0x%02X0000", imm);
-				}
-				break;
-			case 0b00110: // VMOV.I32
-			case 0b00111: // VORR.I32
-			case 0b10110: // VMVN.I32
-			case 0b10111: // VBIC.I32
-				if (imm) {
-					strcpy(ret, "I32");
-					sprintf(&ret[4], "0x%02X000000", imm);
-				}
-				break;
-			case 0b01000: // VMOV.I16
-			case 0b01001: // VORR.I16
-			case 0b11000: // VMVN.I16
-			case 0b11001: // VBIC.I16
-				strcpy(ret, "I16");
-				sprintf(&ret[4], "0x%02X", imm);
-				break;
-			case 0b01010: // VMOV.I16
-			case 0b01011: // VORR.I16
-			case 0b11010: // VMVN.I16
-			case 0b11011: // VBIC.I16
-				if (imm) {
-					strcpy(ret, "I16");
-					sprintf(&ret[4], "0x%02X00", imm);
-				}
-				break;
-			case 0b01100: // VMOV.I32
-			case 0b11100: // VMVN.I32
-				if (imm) {
-					strcpy(ret, "I32");
-					sprintf(&ret[4], "0x%02XFF", imm);
-				}
-				break;
-			case 0b01101: // VMOV.I32
-			case 0b11101: // VMVN.I32
-				if (imm) {
-					strcpy(ret, "I32");
-					sprintf(&ret[4], "0x%02XFFFF", imm);
-				}
-				break;
-			case 0b01110: // VMOV.I8
-				strcpy(ret, "I8");
-				sprintf(&ret[4], "0x%02X", imm);
-				break;
-			case 0b01111: // VMOV.F32
-				strcpy(ret, "F32");
-				sprintf(&ret[4], "%e", (imm & 0x80 ? -1 : 1) * (1 << (((imm >> 4) & 0x7) ^ 0b100)) * (float) (16 + (imm & 0xF)) / 128.);
-				break;
-			case 0b11110: // VMOV.I64
-				{
-					strcpy(ret, "I64");
-					sprintf(&ret[4], "#0x%s%s%s%s%s%s%s%s",
-						_print_modified_imm_I64_bytes[(imm >> 7) & 1], _print_modified_imm_I64_bytes[(imm >> 6) & 1],
-						_print_modified_imm_I64_bytes[(imm >> 5) & 1], _print_modified_imm_I64_bytes[(imm >> 4) & 1],
-						_print_modified_imm_I64_bytes[(imm >> 3) & 1], _print_modified_imm_I64_bytes[(imm >> 2) & 1],
-						_print_modified_imm_I64_bytes[(imm >> 1) & 1], _print_modified_imm_I64_bytes[(imm >> 0) & 1]);
-				}
-				break;
-			case 0b11111: // V???.-
-			default:
-				strcpy(ret, "-");
-				strcpy(&ret[4], "UNDEFINED");
-				break;
+				sprintf(&ret[4], "0x%02X00", imm);
 			}
-			
-			return ret;
+			break;
+		case 0b00100: // VMOV.I32
+		case 0b00101: // VORR.I32
+		case 0b10100: // VMVN.I32
+		case 0b10101: // VBIC.I32
+			if (imm) {
+				strcpy(ret, "I32");
+				sprintf(&ret[4], "0x%02X0000", imm);
+			}
+			break;
+		case 0b00110: // VMOV.I32
+		case 0b00111: // VORR.I32
+		case 0b10110: // VMVN.I32
+		case 0b10111: // VBIC.I32
+			if (imm) {
+				strcpy(ret, "I32");
+				sprintf(&ret[4], "0x%02X000000", imm);
+			}
+			break;
+		case 0b01000: // VMOV.I16
+		case 0b01001: // VORR.I16
+		case 0b11000: // VMVN.I16
+		case 0b11001: // VBIC.I16
+			strcpy(ret, "I16");
+			sprintf(&ret[4], "0x%02X", imm);
+			break;
+		case 0b01010: // VMOV.I16
+		case 0b01011: // VORR.I16
+		case 0b11010: // VMVN.I16
+		case 0b11011: // VBIC.I16
+			if (imm) {
+				strcpy(ret, "I16");
+				sprintf(&ret[4], "0x%02X00", imm);
+			}
+			break;
+		case 0b01100: // VMOV.I32
+		case 0b11100: // VMVN.I32
+			if (imm) {
+				strcpy(ret, "I32");
+				sprintf(&ret[4], "0x%02XFF", imm);
+			}
+			break;
+		case 0b01101: // VMOV.I32
+		case 0b11101: // VMVN.I32
+			if (imm) {
+				strcpy(ret, "I32");
+				sprintf(&ret[4], "0x%02XFFFF", imm);
+			}
+			break;
+		case 0b01110: // VMOV.I8
+			strcpy(ret, "I8");
+			sprintf(&ret[4], "0x%02X", imm);
+			break;
+		case 0b01111: // VMOV.F32
+			strcpy(ret, "F32");
+			sprintf(&ret[4], "%e", (imm & 0x80 ? -1 : 1) * (1 << (((imm >> 4) & 0x7) ^ 0b100)) * (float) (16 + (imm & 0xF)) / 128.);
+			break;
+		case 0b11110: // VMOV.I64
+			{
+				strcpy(ret, "I64");
+				sprintf(&ret[4], "#0x%s%s%s%s%s%s%s%s",
+					_print_modified_imm_I64_bytes[(imm >> 7) & 1], _print_modified_imm_I64_bytes[(imm >> 6) & 1],
+					_print_modified_imm_I64_bytes[(imm >> 5) & 1], _print_modified_imm_I64_bytes[(imm >> 4) & 1],
+					_print_modified_imm_I64_bytes[(imm >> 3) & 1], _print_modified_imm_I64_bytes[(imm >> 2) & 1],
+					_print_modified_imm_I64_bytes[(imm >> 1) & 1], _print_modified_imm_I64_bytes[(imm >> 0) & 1]);
+			}
+			break;
+		case 0b11111: // V???.-
+		default:
+			strcpy(ret, "-");
+			strcpy(&ret[4], "UNDEFINED");
+			break;
 		}
 		
-		const char* arm_print(uint32_t opcode) {
-			static __thread char ret[100];
-			memset(ret, 0, sizeof(ret));
-			
-			"""
+		return ret;
 	}
-	files_guard = {
-		"arm_printer.c": """
-		{
-				strcpy(ret, "???");
-			}
-			
-			return ret;
-		}
+	
+	const char* arm_print(uint32_t opcode) {
+		static __thread char ret[100];
+		memset(ret, 0, sizeof(ret));
+		
 		"""
+	footer = """
+	{
+			strcpy(ret, "???");
+		}
+		
+		return ret;
 	}
+	"""
 	banner = "/*******************************************************" + ('*'*len(ver)) + "***\n" \
 	         " * File automatically generated by rebuild_printer.py (v" + ver + ") *\n" \
 	         " *******************************************************" + ('*'*len(ver)) + "***/\n"
-	trim = lambda string: '\n'.join(line[2:] for line in string.splitlines())[1:]
-	# Yes, the for loops are inverted. This is because both dicts should have the same keys.
-	for fhdr in files_guard:
-		files_header[fhdr] = banner + trim(files_header[fhdr])
-	for fhdr in files_header:
-		files_guard[fhdr] = trim(files_guard[fhdr])
+	trim = lambda string: '\n'.join(line[1:] for line in string.splitlines())[1:]
+	header = banner + trim(header)
+	footer = trim(footer)
 	
-	for f in files_header:
-		with open(os.path.join(root, "src", "dynarec", f), 'w') as file:
-			file.write(files_header[f])
-			file.write(output)
-			file.write(files_guard[f])
+	with open(os.path.join(root, "src", "dynarec", "arm_printer.c"), 'w') as file:
+		file.write(header)
+		file.write(output)
+		file.write(footer)
 	# Save the string for the next iteration, writing was successful
 	with open(os.path.join(root, "src", "dynarec", "last_run.txt"), 'w') as file:
 		file.write('\n'.join(insts))
@@ -1988,6 +1980,6 @@ if __name__ == '__main__':
 	for i, v in enumerate(sys.argv):
 		if v == "--":
 			limit.append(i)
-	if main(sys.argv[1], "1.2.0.05") != 0:
+	if main(sys.argv[1], "1.2.0.06") != 0:
 		exit(2)
 	exit(0)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3

 import os
 import sys
@@ -166,8 +166,8 @@ U = TypeVar('U')
 Filename = str

 class CustOrderedDict(Generic[T, U], Iterable[T]):
-	__keys__: List[T]
-	__actdict__: Dict[T, U]
+	__keys__: List[T] = []
+	__actdict__: Dict[T, U] = {}
 	
 	def __init__(self, src: Optional[Dict[T, U]] = None) -> None:
 		if src is None:
@@ -195,7 +195,7 @@ class CustOrderedDictList(CustOrderedDict[T, List[U]]):
 		return super().__getitem__(k)

 class FirstArgumentSingletonMeta(Generic[T], type):
-	_singletons: Dict[T, Type['FirstArgumentSingletonMeta']]
+	_singletons: Dict[T, Type['FirstArgumentSingletonMeta']] = {}
 	
 	@classmethod
 	def __prepare__(metacls, __name: str, __bases: Tuple[type, ...], **kwds: Any) -> Dict[str, Any]:
@@ -227,10 +227,9 @@ class FileSpec:
 	values:    Sequence[str] = ['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']
 	rvalues:   Sequence[str] = ['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']
 	validrepl: Sequence[str] = ['c', 'w', 'i', 'I', 'C', 'W', 'u', 'U', 'f', 'd', 'D', 'K', 'l', 'L', 'p', 'V', 'O', 'S', '2', 'P', 'G', 'N', 'M', 's']
-	structs:   CustOrderedDict[str, Struct]
 	
 	def __init__(self) -> None:
-		self.structs = CustOrderedDict()
+		self.structs: CustOrderedDict[str, FileSpec.Struct] = CustOrderedDict()
 		
 		self.typedefs: CustOrderedDictList[_BareFunctionType, Function] = CustOrderedDictList()
 		self.structsuses: List[FunctionType] = []
@@ -441,8 +440,8 @@ class Function:
 DefineType = NewType('DefineType', str)
@final
 class Define:
-	name: DefineType
-	inverted_: bool
+	name: DefineType = DefineType("")
+	inverted_: bool = False
 	
 	defines: List[DefineType] = []
 	
@@ -480,7 +479,7 @@ class Define:
 		return isinstance(o, Define) and (self.name == o.name) and (self.inverted_ == o.inverted_)
@final
 class Clause:
-	defines: List[Define]
+	defines: List[Define] = []
 	
 	def __init__(self, defines: Union[List[Define], str] = []) -> None:
 		if isinstance(defines, str):
@@ -528,7 +527,7 @@ class Clauses:
 	Represent a list of clauses, aka a list of or-ed together and-ed "defined()"
 	conditions
 	"""
-	clauses: List[Clause]
+	clauses: List[Clause] = []
 	
 	def __init__(self, clauses: Union[List[Clause], str] = []) -> None:
 		if isinstance(clauses, str):
@@ -680,12 +679,12 @@ class Clauses:
 		return isinstance(o, Clauses) and (self.clauses == o.clauses)

 JumbledFunctions     = CustOrderedDictList[Clause, Function]
-FilesSpecific        = Dict[Filename, FileSpec]
+FileSpecifics        = Dict[Filename, FileSpec]

 SortedGlobals        = CustOrderedDictList[Clauses, FunctionType]
 SortedRedirects      = CustOrderedDictList[Clauses, FunctionType]

-def readFiles(files: Iterable[str]) -> Tuple[JumbledFunctions, JumbledFunctions, FilesSpecific]:
+def readFiles(files: Iterable[str]) -> Tuple[JumbledFunctions, JumbledFunctions, FileSpecifics]:
 	"""
 	readFiles
 	
@@ -694,7 +693,7 @@ def readFiles(files: Iterable[str]) -> Tuple[JumbledFunctions, JumbledFunctions,
 	
 	gbls:      JumbledFunctions = CustOrderedDictList()
 	redirects: JumbledFunctions = CustOrderedDictList()
-	filespecs: FilesSpecific    = {}
+	filespecs: FileSpecifics    = {}
 	
 	symbols: Dict[str, Filename] = {}
 	need_halt: bool = False
@@ -751,9 +750,12 @@ def readFiles(files: Iterable[str]) -> Tuple[JumbledFunctions, JumbledFunctions,
 							 or match("gstinterfaces010","gstvideo")\
 							 or match("gstinterfaces010","gstaudio")\
 							 or match("gstreamer010","gstreamer")	\
+							 or match("appindicator","appindicator3")\
 							 \
 							 or match("libc",        "tcmallocminimal") \
 							 or match("libc",        "ldlinux") 	\
+							 or match("libc",        "tbbmallocproxy") \
+							 or match("tcmallocminimal","tbbmallocproxy") \
 							:
 								# libc and ldlinux have some "__libc_" data symbols in common... TODO check if ok
 								continue
@@ -878,7 +880,7 @@ def readFiles(files: Iterable[str]) -> Tuple[JumbledFunctions, JumbledFunctions,
 	
 	return gbls, redirects, filespecs

-def sortArrays(gbl_funcs: JumbledFunctions, red_funcs: JumbledFunctions, filespecs: FilesSpecific) \
+def sortArrays(gbl_funcs: JumbledFunctions, red_funcs: JumbledFunctions, filespecs: FileSpecifics) \
 -> Tuple[SortedGlobals, SortedRedirects]:
 	# First sort file specific stuff
 	for fn in filespecs:
@@ -942,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, filesspec: FilesSpecific) -> Optional[str]:
+def checkRun(root: str, gbls: SortedGlobals, redirects: SortedRedirects, filespecs: FileSpecifics) -> Optional[str]:
 	# Check if there was any new functions compared to last run
 	functions_list: str = ""
 	for clauses in gbls:
@@ -958,18 +960,18 @@ def checkRun(root: str, gbls: SortedGlobals, redirects: SortedRedirects, filessp
 		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(filesspec.keys()):
+	for filename in sorted(filespecs.keys()):
 		functions_list = functions_list + filename + ":\n"
-		for st in filesspec[filename].structs:
-			struct = filesspec[filename].structs[st]
+		for st in filespecs[filename].structs:
+			struct = filespecs[filename].structs[st]
 			functions_list = functions_list + \
 				"% " + st + " " + struct.name + " " + struct.repl + "\n"
-		for _bare in filesspec[filename].typedefs:
+		for _bare in filespecs[filename].typedefs:
 			functions_list = functions_list + "- " + _bare.orig + ":\n"
-			for fn in filesspec[filename].typedefs[_bare]:
+			for fn in filespecs[filename].typedefs[_bare]:
 				if fn.no_dlsym: continue
 				functions_list = functions_list + "  - " + fn.name + "\n"
-		for funtype in filesspec[filename].structsuses:
+		for funtype in filespecs[filename].structsuses:
 			assert(funtype.redirected is not None)
 			functions_list = functions_list + "% " + funtype.orig + " -> " + funtype.redirected.orig + "\n"
 	
@@ -990,7 +992,7 @@ def checkRun(root: str, gbls: SortedGlobals, redirects: SortedRedirects, filessp
 	return functions_list

 def generate_files(root: str, files: Iterable[str], ver: str, gbls: SortedGlobals, redirects: SortedRedirects, \
- filespecs: FilesSpecific) -> None:
+ filespecs: FileSpecifics) -> None:
 	# Files header and guard
 	files_header = {
 		"wrapper.c": """
@@ -1056,8 +1058,8 @@ def generate_files(root: str, files: Iterable[str], ver: str, gbls: SortedGlobal
 		    memcpy(value+4, v->data, 2*sizeof(double));
 		{rbr}
 		
-		void* VulkanFromx86(void* src, void** save);
-		void VulkanTox86(void* src, void* save);
+		void* VulkanFromx86(void* src);
+		void VulkanTox86(void* src);
 		
 		#define ST0val ST0.d
 		
@@ -1146,6 +1148,13 @@ 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*"]
@@ -1247,7 +1256,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)fcn; ")
+			f.write("(void)emu; ")
 		
 		args = N.orig[2:]
 		if args == 'Ev': args = 'E'
@@ -1257,7 +1266,7 @@ def generate_files(root: str, files: Iterable[str], ver: str, gbls: SortedGlobal
 			delta = 4
 			for c in args:
 				if c == 'P':
-					f.write("void* save{d} = NULL; void *arg{d} = VulkanFromx86(*(void**)(R_ESP + {d}), &save{d}); ".format(d=delta))
+					f.write("void *arg{d} = VulkanFromx86(*(void**)(R_ESP + {d})); ".format(d=delta))
 				if c == 'G':
 					f.write("my_GValue_t arg{d}; alignGValue(&arg{d}, *(void**)(R_ESP + {d})); ".format(d=delta))
 				delta = delta + deltas[FileSpec.values.index(c)]
@@ -1265,7 +1274,7 @@ def generate_files(root: str, files: Iterable[str], ver: str, gbls: SortedGlobal
 			delta = 4
 			for c in args:
 				if c == 'P':
-					f.write("VulkanTox86(arg{d}, save{d}); ".format(d=delta))
+					f.write("VulkanTox86(arg{d}); ".format(d=delta))
 				if c == 'G':
 					f.write("unalignGValue(*(void**)(R_ESP + {d}), &arg{d}); ".format(d=delta))
 				delta = delta + deltas[FileSpec.values.index(c)]
@@ -1307,6 +1316,22 @@ 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:
@@ -1396,6 +1421,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.10") != 0:
+	if main(sys.argv[1], sys.argv[limit[0]+1:], "2.0.0.11") != 0:
 		exit(2)
 	exit(0)
@@ -22,6 +22,8 @@
 #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"
@@ -48,6 +50,7 @@ void finiAllHelpers(box86context_t* context)
    static int finied = 0;
    if(finied)
        return;
+    DeleteParams();
    fini_pthread_helper(context);
    fini_signal_helper();
    fini_bridge_helper();
@@ -74,19 +77,28 @@ void free_tlsdatasize(void* p)
    if(!p)
        return;
    tlsdatasize_t *data = (tlsdatasize_t*)p;
-    free(data->tlsdata);
-    free(p);
+    box_free(data->ptr);
+    box_free(p);
 }

 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)
@@ -100,7 +112,6 @@ int unlockMutex()
    GO(my_context->mutex_thread, 10)
    GO(my_context->mutex_bridge, 11)
    #undef GO
-
    return ret;
 }

@@ -108,7 +119,7 @@ void relockMutex(int locks)
 {
    #define GO(A, B)                    \
        if(locks&(1<<B))                \
-            pthread_mutex_lock(&A);     \
+            mutex_lock(&A);             \

    GO(my_context->mutex_once, 5)
    GO(my_context->mutex_once2, 6)
@@ -127,22 +138,30 @@ 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)
@@ -151,6 +170,31 @@ 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)
 {
@@ -161,12 +205,14 @@ box86context_t *NewBox86Context(int argc)
    }
 #endif
    // init and put default values
-    box86context_t *context = my_context = (box86context_t*)calloc(1, sizeof(box86context_t));
+    box86context_t *context = my_context = (box86context_t*)box_calloc(1, sizeof(box86context_t));
+
+    initCycleLog(context);

 #ifdef BUILD_LIB
    context->deferedInit = 0;
 #else
-    context->deferedInit = 1;
+    context->deferredInit = 1;
 #endif
    context->sel_serial = 1;

@@ -176,10 +222,12 @@ box86context_t *NewBox86Context(int argc)
    context->local_maplib = NewLibrarian(context, 1);
    context->versym = NewDictionnary();
    context->system = NewBridge();
-    context->defver = NewDefaultVersion();
+    // Cannot use Bridge name as the map is not initialized yet
    // 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
@@ -188,7 +236,7 @@ box86context_t *NewBox86Context(int argc)
    context->dlprivate = NewDLPrivate();

    context->argc = argc;
-    context->argv = (char**)calloc(context->argc+1, sizeof(char*));
+    context->argv = (char**)box_calloc(context->argc+1, sizeof(char*));

    init_mutexes(context);
    pthread_atfork(NULL, NULL, atfork_child_box64context);
@@ -201,11 +249,13 @@ 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)
 {
@@ -230,7 +280,7 @@ void FreeBox86Context(box86context_t** context)
    for(int i=0; i<ctx->elfsize; ++i) {
        FreeElfHeader(&ctx->elfs[i]);
    }
-    free(ctx->elfs);
+    box_free(ctx->elfs);

    FreeFTSMap(ctx);

@@ -243,17 +293,17 @@ void FreeBox86Context(box86context_t** context)
    if(ctx->zydis)
        DeleteX86Trace(ctx);

-    if(ctx->deferedInitList)
-        free(ctx->deferedInitList);
+    if(ctx->deferredInitList)
+        box_free(ctx->deferredInitList);

-    free(ctx->argv);
+    /*box_free(ctx->argv);*/
    
-    for (int i=0; i<ctx->envc; ++i)
-        free(ctx->envv[i]);
-    free(ctx->envv);
+    /*for (int i=0; i<ctx->envc; ++i)
+        box_free(ctx->envv[i]);
+    box_free(ctx->envv);*/

    if(ctx->atfork_sz) {
-        free(ctx->atforks);
+        box_free(ctx->atforks);
        ctx->atforks = NULL;
        ctx->atfork_sz = ctx->atfork_cap = 0;
    }
@@ -274,10 +324,11 @@ void FreeBox86Context(box86context_t** context)

    FreeDLPrivate(&ctx->dlprivate);

-//    free(ctx->stack); // don't free the stack, it's owned by main emu!
+//    box_free(ctx->stack); // don't free the stack, it's owned by main emu!

-    free(ctx->fullpath);
-    free(ctx->box86path);
+    box_free(ctx->fullpath);
+    box_free(ctx->box86path);
+    box_free(ctx->bashpath);

    FreeBridge(&ctx->system);

@@ -285,7 +336,7 @@ void FreeBox86Context(box86context_t** context)
    freeALProcWrapper(ctx);

    if(ctx->stack_clone)
-        free(ctx->stack_clone);
+        box_free(ctx->stack_clone);

    void* ptr;
    if ((ptr = pthread_getspecific(ctx->tlskey)) != NULL) {
@@ -295,7 +346,7 @@ void FreeBox86Context(box86context_t** context)
    pthread_key_delete(ctx->tlskey);

    if(ctx->tlsdata)
-        free(ctx->tlsdata);
+        box_free(ctx->tlsdata);

    for(int i=0; i<3; ++i) {
        if(ctx->segtls[i].present) {
@@ -304,46 +355,75 @@ void FreeBox86Context(box86context_t** context)
        }
    }

-    free_neededlib(&ctx->neededlibs);
+    free_neededlib(ctx->neededlibs);
+    ctx->neededlibs = NULL;

    if(ctx->emu_sig)
        FreeX86Emu(&ctx->emu_sig);
-    FreeDefaultVersion(&ctx->defver);
+
+    FreeMapSymbols(&ctx->globdata);

    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

-    free(ctx);
+    freeCycleLog(ctx);
+
+    box_free(ctx);
 }

 int AddElfHeader(box86context_t* ctx, elfheader_t* head) {
-    int idx = ctx->elfsize;
-    if(idx==ctx->elfcap) {
-        // resize...
-        ctx->elfcap += 16;
-        ctx->elfs = (elfheader_t**)realloc(ctx->elfs, sizeof(elfheader_t*) * ctx->elfcap);
+    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;
    }
-    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 = realloc(context->tlsdata, context->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
    memset(context->tlsdata, 0, tlssize);           // fill new space with 0 (not mandatory)
    // clean GS segment for current emu
@@ -2,7 +2,7 @@
 #define __BOX86_VERSION_H_

 #define BOX86_MAJOR 0
-#define BOX86_MINOR 2
-#define BOX86_REVISION 6
+#define BOX86_MINOR 3
+#define BOX86_REVISION 2

 #endif //__BOX86_VERSION_H_
@@ -390,6 +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)))

 // str reg, [addr, #+/-imm9]
 #define STR_IMM9(reg, addr, imm9) EMIT(0xe5000000 | (((imm9)<0)?0:1)<<23 | ((reg) << 12) | ((addr) << 16) | brIMM(imm9) )
@@ -464,7 +466,6 @@ Op is 20-27
 #define LDRH_IMM8(reg, addr, imm8) EMIT(HWS_OFF(c__, 1,  (((imm8)<0)?0:1), 0, 1, addr, reg, 0, 1, abs(imm8)))
 #define LDRH_IMM8_COND(cond, reg, addr, imm8) EMIT(HWS_OFF(cond, 1, (((imm8)<0)?0:1), 0, 1, addr, reg, 0, 1, abs(imm8)))
 #define STRH_IMM8(reg, addr, imm8) EMIT(HWS_OFF(c__, 1, (((imm8)<0)?0:1), 0, 0, addr, reg, 0, 1, abs(imm8)))
-#define STRSH_IMM8(reg, addr, imm8) EMIT(HWS_OFF(c__, 1, (((imm8)<0)?0:1), 0, 0, addr, reg, 1, 1, abs(imm8)))

 #define LDRH_REG(reg, addr, rm) EMIT(HWS_REG(c__, 1, 1, 0, 1, addr, reg, 0, 1, rm))
 #define STRH_REG(reg, addr, rm) EMIT(HWS_REG(c__, 1, 1, 0, 0, addr, reg, 0, 1, rm))
@@ -793,6 +794,8 @@ Op is 20-27
 #define VNEG_F64_cond(cond, Dd, Dm)    EMIT((cond) | (0b1110<<24) | (1<<23) | ((((Dd)>>4)&1)<<22) | (0b11<<20) | (0b0001<<16) | (((Dd)&15)<<12) | (0b101<<9) | (1<<8) | (0b01<<6) | ((((Dm)>>4)&1)<<5) | ((Dm)&15) )
 // Neg F32 Dd = - Dm
 #define VNEG_F32(Sd, Sm)    EMIT(c__ | (0b1110<<24) | (1<<23) | (((Sd)&1)<<22) | (0b11<<20) | (0b0001<<16) | ((((Sd)>>1)&15)<<12) | (0b101<<9) | (0<<8) | (0b01<<6) | (((Sm)&1)<<5) | (((Sm)>>1)&15) )
+// Neg F32 Dd = - Dm
+#define VNEG_F32_cond(cond, Sd, Sm)    EMIT((cond) | (0b1110<<24) | (1<<23) | (((Sd)&1)<<22) | (0b11<<20) | (0b0001<<16) | ((((Sd)>>1)&15)<<12) | (0b101<<9) | (0<<8) | (0b01<<6) | (((Sm)&1)<<5) | (((Sm)>>1)&15) )

 // Sqrt F64 Dd = - Dm
 #define VSQRT_F64(Dd, Dm)    EMIT(c__ | (0b1110<<24) | (1<<23) | ((((Dd)>>4)&1)<<22) | (0b11<<20) | (0b0001<<16) | (((Dd)&15)<<12) | (0b101<<9) | (1<<8) | (0b11<<6) | ((((Dm)>>4)&1)<<5) | ((Dm)&15) )
@@ -819,6 +822,8 @@ 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
@@ -840,6 +845,8 @@ 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
@@ -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[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 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 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>
@@ -16,7 +16,14 @@
 .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

 arm_lock_read_b:
    // address is r0, return is r0
@@ -83,33 +90,117 @@ arm_lock_xchg:
    bx      lr

 arm_lock_storeifnull:
-    // address is r0, value is r1, r1 store to r0 only if [r0] is 0. return new [r0] value (so r1 or old value)
+    // address is r0, value is r1, r1 store to r0 only if [r0] is 0. return old [r0] value
    // r0 needs to be aligned
    dmb     ish
    ldrex   r2, [r0]
    cmp     r2, #0
    bne     arm_lock_storeifnull_exit
-    mov     r2, r1
-    strex   r3, r2, [r0]
+    strex   r3, r1, [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
-    mov     r3, r1
-    strex   r4, r3, [r0]
-    cmp     r4, #1
+    strex   r3, r1, [r0]
+    cmp     r3, #1
    beq     arm_lock_storeifref_loop
+    mov     r0, r1
 arm_lock_storeifref_exit:
-    mov     r0, r3
-    pop     {r4}
+    bx      lr
+
+arm_lock_decifnot0b:
+    dmb     ish
+arm_lock_decifnot0b_0:
+    ldrexb  r1, [r0]
+    cmp     r1, #0
+    subne   r3, r1, #1
+    moveq   r3, r1
+    strexb  r2, r3, [r0]
+    cmp     r2, #1
+    beq     arm_lock_decifnot0b_0
+    dmb     ish
+    mov     r0, r1
+    bx      lr
+
+arm_lock_incb:
+    dmb     ish
+arm_lock_incb_0:
+    ldrexb  r1, [r0]
+    add     r1, r1, #1
+    strexb  r2, r1, [r0]
+    cmp     r2, #1
+    beq     arm_lock_incb_0
+arm_lock_incb_exit:
+    dmb     ish
+    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
+    str     r1, [r0]
+    dmb     ish
+    bx      lr
+
+arm_lock_storeb:
+    dmb     ish
+    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
@@ -25,10 +25,34 @@ 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 new [p] value (so val or old)
+// Atomically store value to [p] only if [p] is NULL. Return old [p] value
 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);
+
+// decrement atomicaly the byte at [p] (but only if p not 0). Return old [p] value
+extern int arm_lock_decifnot0b(void*p);
+
+// increment atomicaly the byte at [p]
+extern void arm_lock_incb(void*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);
+
+// 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);
+
 #endif  //__ARM_LOCK_HELPER__H__
@@ -9,6 +9,7 @@
 .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
@@ -1,5 +1,5 @@
 /******************************************************************
- * File automatically generated by rebuild_printer.py (v1.2.0.05) *
+ * File automatically generated by rebuild_printer.py (v1.2.0.06) *
 ******************************************************************/
 #include <stdint.h>
 #include <stddef.h>
@@ -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[6];
+	char tmp[7];
 	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[4];
+		char align[5];
 		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[4];
+		char align[5];
 		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[4];
+		char align[5];
 		if (param2_1 == 1) {
 			sprintf(align, ":%d", 16 << size);
 		} else {
@@ -20,6 +20,7 @@
 #include "dynablock_private.h"
 #include "dynarec_private.h"
 #include "elfloader.h"
+#include "bridge.h"
 #ifdef ARM
 #include "dynarec_arm.h"
 #include "arm_lock_helper.h"
@@ -40,21 +41,37 @@ uint32_t X31_hash_code(void* addr, int len)
 	return (uint32_t)h;
 }

-dynablocklist_t* NewDynablockList(uintptr_t text, int textsz, int direct)
+dynablock_t* InvalidDynablock(dynablock_t* db, int need_lock)
 {
-    if(!textsz) {
-        printf_log(LOG_NONE, "Error, creating a NULL sized Dynablock\n");
-        return NULL;
+    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);
    }
-    dynablocklist_t* ret = (dynablocklist_t*)calloc(1, sizeof(dynablocklist_t));
-    ret->text = text;
-    ret->textsz = textsz;
-    if(direct && textsz) {
-        ret->direct = (dynablock_t**)calloc(textsz, sizeof(dynablock_t*));
-        if(!ret->direct) {printf_log(LOG_NONE, "Warning, fail to create direct block for dynablock @%p\n", (void*)text);}
+    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);
    }
-    dynarec_log(LOG_DEBUG, "New Dynablocklist %p, from %p->%p\n", ret, (void*)text, (void*)(text+textsz));
-    return ret;
 }

 void FreeDynablock(dynablock_t* db, int need_lock)
@@ -62,238 +79,100 @@ 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 father=%p, with %d son(s) already gone=%d\n", db, db->block, db->x86_addr, db->x86_addr+db->x86_size, db->father, db->sons_size, 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-1, db->gone);
        if(need_lock)
-            pthread_mutex_lock(&my_context->mutex_dyndump);
-        db->done = 0;
-        db->gone = 1;
-        // remove from direct if there
-        uintptr_t startdb = db->parent->text;
-        uintptr_t enddb = db->parent->text + db->parent->textsz;
-        if(db->parent->direct) {
-            uintptr_t addr = (uintptr_t)db->x86_addr;
-            if(addr>=startdb && addr<enddb)
-                db->parent->direct[addr-startdb] = NULL;
-        }
+            mutex_lock(&my_context->mutex_dyndump);
        // remove jumptable
        setJumpTableDefault(db->x86_addr);
-        // remove and free the sons
-        for (int i=0; i<db->sons_size; ++i) {
-            dynablock_t *son = (dynablock_t*)arm_lock_xchg(&db->sons[i], 0);
-            FreeDynablock(son, 0);
-        }
-        // only the father free the DynarecMap
-        if(!db->father) {
-            dynarec_log(LOG_DEBUG, " -- FreeDyrecMap(%p, %d)\n", db->block, db->size);
-            FreeDynarecMap(db, (uintptr_t)db->block, db->size);
-            free(db->sons);
-            free(db->instsize);
-        }
-        free(db);
+        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);
        if(need_lock)
-            pthread_mutex_unlock(&my_context->mutex_dyndump);
+            mutex_unlock(&my_context->mutex_dyndump);
    }
 }

-void FreeDynablockList(dynablocklist_t** dynablocks)
-{
-    if(!dynablocks)
-        return;
-    if(!*dynablocks)
-        return;
-    dynarec_log(LOG_DEBUG, "Free Dynablocklist %p, with Direct Blocks %p\n", *dynablocks, (*dynablocks)->direct);
-    if((*dynablocks)->direct) {
-        for (int i=0; i<(*dynablocks)->textsz; ++i) {
-            if((*dynablocks)->direct[i] && !(*dynablocks)->direct[i]->father) 
-                FreeDynablock((*dynablocks)->direct[i], my_context?1:0);
-        }
-        free((*dynablocks)->direct);
-    }
-    (*dynablocks)->direct = NULL;

-    free(*dynablocks);
-    *dynablocks = NULL;
-}

 void MarkDynablock(dynablock_t* db)
 {
    if(db) {
-        if(db->father)
-            db = db->father;    // mark only father
-        if(db->need_test)
-            return; // already done
-        db->need_test = 1;
-        setJumpTableDefault(db->x86_addr);
-        for(int i=0; i<db->sons_size; ++i)
-            setJumpTableDefault(db->sons[i]->x86_addr);
+        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;
+            }
+        }
    }
 }

-uintptr_t StartDynablockList(dynablocklist_t* db)
-{
-    if(db)
-        return db->text;
-    return 0;
-}
-uintptr_t EndDynablockList(dynablocklist_t* db)
-{
-    if(db)
-        return db->text+db->textsz-1;
-    return 0;
-}
-
-int IntervalIntersects(uintptr_t start1, uintptr_t end1, uintptr_t start2, uintptr_t end2)
+static int IntervalIntersects(uintptr_t start1, uintptr_t end1, uintptr_t start2, uintptr_t end2)
 {
    if(start1 > end2 || start2 > end1)
        return 0;
    return 1;
 }

-void MarkDirectDynablock(dynablocklist_t* dynablocks, uintptr_t addr, uintptr_t size)
+static int MarkedDynablock(dynablock_t* db)
 {
-    if(!dynablocks)
-        return;
-    if(!dynablocks->direct)
-        return;
-    uintptr_t startdb = dynablocks->text;
-    uintptr_t enddb = startdb + dynablocks->textsz -1;
-    uintptr_t start = addr;
-    uintptr_t end = addr+size-1;
-    if(start<startdb)
-        start = startdb;
-    if(end>enddb)
-        end = enddb;
-    dynablock_t *db;
-    if(end>startdb && start<enddb)
-        for(uintptr_t i = start; i<end; ++i)
-            if((db=dynablocks->direct[i-startdb]))
-                if(IntervalIntersects((uintptr_t)db->x86_addr, (uintptr_t)db->x86_addr+db->x86_size-1, addr, addr+size+1))
-                    MarkDynablock(db);
-}
-
-void FreeRangeDynablock(dynablocklist_t* dynablocks, uintptr_t addr, uintptr_t size)
-{
-    if(!dynablocks)
-        return;
-
-    if(dynablocks->direct) {
-        dynablock_t* db;
-        int ret;
-        khint_t k;
-        kh_dynablocks_t *blocks = kh_init(dynablocks);
-        // copy in a temporary list
-        if(dynablocks->direct) {
-            uintptr_t startdb = dynablocks->text;
-            uintptr_t enddb = startdb + dynablocks->textsz;
-            uintptr_t start = addr;
-            uintptr_t end = addr+size;
-            if(start<startdb)
-                start = startdb;
-            if(end>enddb)
-                end = enddb;
-            if(end>startdb && start<enddb)
-                for(uintptr_t i = start; i<end; ++i) {
-                    db = (dynablock_t*)arm_lock_xchg(&dynablocks->direct[i-startdb], 0);
-                    if(db) {
-                        if(db->father)
-                            db = db->father;
-                        if(db->parent==dynablocks) {
-                            k = kh_put(dynablocks, blocks, (uintptr_t)db, &ret);
-                            kh_value(blocks, k) = db;
-                        }
-                    }
-                }
-        }
-        // purge the list
-        kh_foreach_value(blocks, db,
-            FreeDynablock(db, 1);
-        );
-        kh_destroy(dynablocks, blocks);
+    if(db) {
+        if(getNeedTest((uintptr_t)db->x86_addr))
+            return 1; // already done
    }
+    return 0;
 }
-void MarkRangeDynablock(dynablocklist_t* dynablocks, uintptr_t addr, uintptr_t size)
+
+void MarkRangeDynablock(dynablock_t* db, uintptr_t addr, uintptr_t size)
 {
-    if(!dynablocks)
+    // Mark will try to find *any* blocks that intersect the range to mark
+    if(!db)
        return;
-    if(dynablocks->direct) {
-        uintptr_t new_addr = addr - dynablocks->maxsz;
-        uintptr_t new_size = size + dynablocks->maxsz;
-        MarkDirectDynablock(dynablocks, new_addr, new_size);
-        // the blocks check before
-        for(int idx=(new_addr)>>DYNAMAP_SHIFT; idx<(addr>>DYNAMAP_SHIFT); ++idx)
-            MarkDirectDynablock(getDB(idx), new_addr, new_size);
+    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);
+}
+
+int FreeRangeDynablock(dynablock_t* db, uintptr_t addr, uintptr_t size)
+{
+    if(!db)
+        return 1;
+
+    int need_lock = my_context?1:0;
+    if(IntervalIntersects((uintptr_t)db->x86_addr, (uintptr_t)db->x86_addr+db->x86_size-1, addr, addr+size+1)) {
+        FreeDynablock(db, need_lock);
+        return 0;
    }
+    return 1;
 }

-dynablock_t* FindDynablockDynablocklist(void* addr, kh_dynablocks_t* dynablocks)
+dynablock_t *AddNewDynablock(uintptr_t addr)
 {
-    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->father?db->father:db;
-    )
-    return NULL;
-}
-
-static dynablocklist_t* getDBFromAddress(uintptr_t addr)
-{
-    const int idx = (addr>>DYNAMAP_SHIFT);
-    return getDB(idx);
-}
-
-dynablock_t *AddNewDynablock(dynablocklist_t* dynablocks, uintptr_t addr, int* created)
-{
-    if(!dynablocks) {
-        dynarec_log(LOG_INFO, "Warning: Ask to create a dynablock with a NULL dynablocklist (addr=%p)\n", (void*)addr);
-        *created = 0;
+    dynablock_t* block;
+    #if 0
+    // check if memory as the correct flags
+    int prot = getProtection(addr);
+    if(!(prot&(PROT_EXEC|PROT_DYNAREC|PROT_DYNAREC_R))) {
+        dynarec_log(LOG_VERBOSE, "Block asked on a memory with no execution flags 0x%02X\n", prot);
        return NULL;
    }
-    if((addr<dynablocks->text) || (addr>=(dynablocks->text+dynablocks->textsz))) {
-        // this should be useless
-        //dynarec_log(LOG_INFO, "Warning: Refused to create a Direct Block that is out-of-bound: dynablocks=%p (%p:%p), addr=%p\n", dynablocks, (void*)(dynablocks->text), (void*)(dynablocks->text+dynablocks->textsz), (void*)addr);
-        //*created = 0;
-        //return NULL;
-        return AddNewDynablock(getDBFromAddress(addr), addr, created);
-    }
-    dynablock_t* block = NULL;
-    // first, check if it exist in direct access mode
-    if(dynablocks->direct) {
-        block = dynablocks->direct[addr-dynablocks->text];
-        if(block) {
-            dynarec_log(LOG_VERBOSE, "Block already exist in Direct Map\n");
-            *created = 0;
-            return block;
-        }
-    }
    
-    if (!*created)
-        return block;
-    
-    pthread_mutex_lock(&my_context->mutex_dyndump);
-    if(!dynablocks->direct) {
-        dynablock_t** p = (dynablock_t**)calloc(dynablocks->textsz, sizeof(dynablock_t*));
-        if(arm_lock_storeifnull(&dynablocks->direct, p)!=p)
-            free(p);    // someone already create the direct array, too late...
-    }
-
+    #endif
    // create and add new block
    dynarec_log(LOG_VERBOSE, "Ask for DynaRec Block creation @%p\n", (void*)addr);
-
-    block = (dynablock_t*)calloc(1, sizeof(dynablock_t));
-    block->parent = dynablocks; 
-    dynablock_t* tmp = (dynablock_t*)arm_lock_storeifnull(&dynablocks->direct[addr-dynablocks->text], block);
-    pthread_mutex_unlock(&my_context->mutex_dyndump);
-    if(tmp !=  block) {
-        // a block appeard!
-        free(block);
-        *created = 0;
-        return tmp;
-    }
-    *created = 1;
+    block = (dynablock_t*)customCalloc(1, sizeof(dynablock_t));
    return block;
 }

@@ -309,112 +188,120 @@ void cancelFillBlock()
    return NULL if block is not found / cannot be created. 
    Don't create if create==0
 */
-static dynablock_t* internalDBGetBlock(x86emu_t* emu, uintptr_t addr, uintptr_t filladdr, int create, dynablock_t* current, int need_lock)
+static dynablock_t* internalDBGetBlock(x86emu_t* emu, uintptr_t addr, uintptr_t filladdr, int create, int need_lock)
 {
-    // try the quickest way first: get parent of current and check if ok!
-    dynablocklist_t *dynablocks = NULL;
-    dynablock_t* block = NULL;
-    if(current && current->done) {
-        dynablocks = current->parent;
-        if(dynablocks && !(addr>=dynablocks->text && addr<(dynablocks->text+dynablocks->textsz)))
-            dynablocks = NULL;
-    }
-    // nope, lets do the long way
-    if(!dynablocks) {
-        dynablocks = getDBFromAddress(addr);
-        if(!dynablocks) {
-            dynablocks = GetDynablocksFromAddress(emu->context, addr);
-            if(!dynablocks)
+    if(hasAlternate((void*)addr))
+        return NULL;
+    dynablock_t* block = getDB(addr);
+    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;
        }
-    }
-    // check direct first, without lock
-    if(dynablocks->direct/* && (addr>=dynablocks->text) && (addr<(dynablocks->text+dynablocks->textsz))*/)
-        if((block = dynablocks->direct[addr-dynablocks->text]))
+        block = getDB(addr);    // just in case
+        if(block) {
+            mutex_unlock(&my_context->mutex_dyndump);
            return block;
-
-    int created = create;
-    block = AddNewDynablock(dynablocks, addr, &created);
-    if(!created)
-        return block;   // existing block...
+        }
+    }
+    
+    block = AddNewDynablock(addr);

    // fill the block
    block->x86_addr = (void*)addr;
-    if(need_lock)
-        pthread_mutex_lock(&my_context->mutex_dyndump);
    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)
-            pthread_mutex_unlock(&my_context->mutex_dyndump);
+            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);
-        void* old = (void*)arm_lock_storeifref(&dynablocks->direct[addr-dynablocks->text], 0, block);
-        if(old!=block && old) { // put it back in place, strange things are happening here!
-            dynarec_log(LOG_INFO, "Warning, a wild block appeared at %p: %p\n", (void*)addr, old);
-            // Doing nothing else, the block has not been written
-        }
-        free(block);
+        customFree(block);
        block = NULL;
    }
    // check size
-    if(block && block->x86_size) {
+    if(block) {
        int blocksz = block->x86_size;
-        if(dynablocks->maxsz<blocksz) {
-            dynablocks->maxsz = blocksz;
-            for(int idx=(addr>>DYNAMAP_SHIFT)+1; idx<=((addr+blocksz)>>DYNAMAP_SHIFT); ++idx) {
-                dynablocklist_t* dblist;
-                if((dblist = getDB(idx)))
-                    if(dblist->maxsz<blocksz)
-                        dblist->maxsz = blocksz;
-            }
-        }
-        //protectDB((uintptr_t)block->x86_addr, block->x86_size);   // already protected in FillBlock
-        // but check if it already need test
-        if(block->need_test || (block->father && block->father->need_test))
-            return NULL;
+        if(blocksz>my_context->max_db_size)
+            my_context->max_db_size = blocksz;
        // fill-in jumptable
-        addJumpTableIfDefault(block->x86_addr, block->block);
-        for(int i=0; i<block->sons_size; ++i)
-            addJumpTableIfDefault(block->sons[i]->x86_addr, block->sons[i]->block);
+        if(!addJumpTableIfDefault(block->x86_addr, block->dirty?block->jmpnext:block->block)) {
+            FreeDynablock(block, 0);
+            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);

-    dynarec_log(LOG_DEBUG, " --- DynaRec Block %s @%p:%p (%p, 0x%x bytes, with %d son(s))\n", created?"created":"recycled", (void*)addr, (void*)(addr+((block)?block->x86_size:0)), (block)?block->block:0, (block)?block->size:0, (block)?block->sons_size:0);
+    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);

    return block;
 }

-dynablock_t* DBGetBlock(x86emu_t* emu, uintptr_t addr, int create, dynablock_t** current)
+dynablock_t* DBGetBlock(x86emu_t* emu, uintptr_t addr, int create)
 {
-    dynablock_t *db = internalDBGetBlock(emu, addr, addr, create, *current, 1);
-    if(db && db->done && db->block && (db->need_test || (db->father && db->father->need_test))) {
-        if(pthread_mutex_trylock(&my_context->mutex_dyndump))
-            return NULL;
-        dynablock_t *father = db->father?db->father:db;
-        uint32_t hash = (getProtection((uintptr_t)father->x86_addr)&PROT_READ)?X31_hash_code(father->x86_addr, father->x86_size):0;
-        if(hash!=father->hash) {
-            dynarec_log(LOG_DEBUG, "Invalidating block %p from %p:%p (hash:%X/%X) with %d son(s) for %p\n", father, father->x86_addr, father->x86_addr+father->x86_size, hash, father->hash, father->sons_size, (void*)addr);
-            // no more current if it gets invalidated too
-            if(*current && father->x86_addr>=(*current)->x86_addr && (father->x86_addr+father->x86_size)<(*current)->x86_addr)
-                *current = NULL;
-            // Free father, it's now invalid!
-            FreeDynablock(father, 0);
-            // start again... (will create a new block)
-            db = internalDBGetBlock(emu, addr, addr, create, *current, 0);
-        } else {
-            father->need_test = 0;
-            protectDB((uintptr_t)father->x86_addr, father->x86_size);
-            // fill back jumptable
-            addJumpTableIfDefault(father->x86_addr, father->block);
-            for(int i=0; i<father->sons_size; ++i)
-                addJumpTableIfDefault(father->sons[i]->x86_addr, father->sons[i]->block);
+    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(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;
+            }
        }
-        pthread_mutex_unlock(&my_context->mutex_dyndump);
+        uint32_t hash = X31_hash_code(db->x86_addr, db->x86_size);
+        int need_lock = mutex_trylock(&my_context->mutex_dyndump);
+        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);
+            // 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);
+        } else {
+            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);
+            }
+        }
+        if(!need_lock)
+            mutex_unlock(&my_context->mutex_dyndump);
    } 
+    if(!db || !db->block || !db->done)
+        emu->test.test = 0;
    return db;
 }

@@ -422,27 +309,36 @@ 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, NULL, 1);
-    if(db && db->done && db->block && (db->need_test || (db->father && db->father->need_test))) {
-        if(pthread_mutex_trylock(&my_context->mutex_dyndump))
-            return NULL;
-        dynablock_t *father = db->father?db->father:db;
-        uint32_t hash = (getProtection((uintptr_t)father->x86_addr)&PROT_READ)?X31_hash_code(father->x86_addr, father->x86_size):0;
-        if(hash!=father->hash) {
-            dynarec_log(LOG_DEBUG, "Invalidating alt block %p from %p:%p (hash:%X/%X) with %d son(s) for %p\n", father, father->x86_addr, father->x86_addr+father->x86_size, hash, father->hash, father->sons_size, (void*)addr);
-            // Free father, it's now invalid!
-            FreeDynablock(father, 0);
+    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);
+        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);
            // start again... (will create a new block)
-            db = internalDBGetBlock(emu, addr, filladdr, create, NULL, 0);
+            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);
        } else {
-            father->need_test = 0;
-            protectDB((uintptr_t)father->x86_addr, father->x86_size);
+            protectDB((uintptr_t)db->x86_addr, db->x86_size);
            // fill back jumptable
-            addJumpTableIfDefault(father->x86_addr, father->block);
-            for(int i=0; i<father->sons_size; ++i)
-                addJumpTableIfDefault(father->sons[i]->x86_addr, father->sons[i]->block);
+            if(isprotectedDB((uintptr_t)db->x86_addr, db->x86_size) && !db->always_test) {
+                setJumpTableIfRef(db->x86_addr, db->block, db->jmpnext);
+            }
        }
-        pthread_mutex_unlock(&my_context->mutex_dyndump);
+        if(!need_lock)
+            mutex_unlock(&my_context->mutex_dyndump);
    } 
+    if(!db || !db->block || !db->done)
+        emu->test.test = 0;
    return db;
 }
@@ -1,36 +1,26 @@
 #ifndef __DYNABLOCK_PRIVATE_H_
 #define __DYNABLOCK_PRIVATE_H_

-typedef struct dynablocklist_s  dynablocklist_t;
-
 typedef struct instsize_s {
-    unsigned int x86:4;
-    unsigned int nat:4;
+    unsigned char x86:4;
+    unsigned char nat:4;
 } instsize_t;

 typedef struct dynablock_s {
-    dynablocklist_t* parent;
-    void*           block;
+    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         dummy;
+    uint8_t         always_test;
+    uint8_t         dirty;      // if need to be tested as soon as it's created
    int             isize;
-    dynablock_t**   sons;   // sons (kind-of dummy dynablock...)
-    int             sons_size;
-    dynablock_t*    father; // set only in the case of a son
    instsize_t*     instsize;
+    void*           jmpnext;    // a branch jmpnext code when block is marked
 } dynablock_t;

-typedef struct dynablocklist_s {
-    uintptr_t           text;
-    int                 textsz;
-    int                 maxsz;     // maxblock size (for this block or previous block)
-    dynablock_t**       direct;    // direct mapping (waste of space, so the array is created at first write)
-} dynablocklist_t;
-
 #endif //__DYNABLOCK_PRIVATE_H_
@@ -20,6 +20,7 @@
 #include "dynablock.h"
 #include "dynablock_private.h"
 #include "bridge.h"
+void x86test_check(x86emu_t* ref, uintptr_t ip);
 #endif

 #ifdef ARM
@@ -44,26 +45,27 @@ void* LinkNext(x86emu_t* emu, uintptr_t addr, void* x2)
        printf_log(LOG_NONE, "Warning, jumping to NULL address from %p (db=%p, x86addr=%p/%s)\n", x2, db, x86addr, pcname);
    }
    #endif
-    dynablock_t* current = NULL;
    void * jblock;
-    dynablock_t* block = DBGetBlock(emu, addr, 1, &current);
+    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);
    if(!block) {
        // no block, let link table as is...
-        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, &current);
-        }
-        if(!block) {
-            #ifdef HAVE_TRACE
+        #ifdef HAVE_TRACE
+        if(LOG_INFO<=box86_dynarec_log) {
            dynablock_t* db = FindDynablockFromNativeAddress(x2);
-            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;
+            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)");
        }
+        #endif
+        //tableupdate(arm_epilog, addr, table);
+        return arm_epilog;
    }
    if(!block->done) {
        // not finished yet... leave linker
@@ -84,18 +86,25 @@ 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;
-            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]);
+            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]);
                addr = R_EIP;   // not sure if it should still be inside DynaCall!
-                if(a==2)
-                    Run(emu, 1);    // "single step" next instruction that is doing auto-smc
+                #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;
            }
        }
    }
@@ -117,15 +126,18 @@ void DynaCall(x86emu_t* emu, uintptr_t addr)
        dynablock_t* block = NULL;
        dynablock_t* current = NULL;
        while(!emu->quit) {
-            block = DBGetBlock(emu, R_EIP, 1, &current);
+            block = (skip==2)?NULL:DBGetBlock(emu, R_EIP, 1);
            current = block;
            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 (father=%p) emu=%p\n", GetTID(), (void*)R_EIP, block->block, block->isize ,block->father, emu);
+                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);
                CHECK_FLAGS(emu);
                // block is here, let's run it!
                #ifdef ARM
@@ -168,10 +180,12 @@ void DynaCall(x86emu_t* emu, uintptr_t addr)
        ejb->jmpbuf_ok = 0;
 }

+int my_setcontext(x86emu_t* emu, void* ucp);
 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
@@ -184,11 +198,17 @@ int DynaRun(x86emu_t* emu)
 #ifdef DYNAREC
            jmpbuf_reset = 1;
 #endif
-            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
-
+            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;
            }
        }
    }
@@ -201,15 +221,18 @@ int DynaRun(x86emu_t* emu)
        dynablock_t* block = NULL;
        dynablock_t* current = NULL;
        while(!emu->quit) {
-            block = DBGetBlock(emu, R_EIP, 1, &current);
+            block = (skip==2)?NULL:DBGetBlock(emu, R_EIP, 1);
            current = block;
            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 (father=%p) emu=%p\n", GetTID(), (void*)R_EIP, block->block, block->isize, block->father, emu);
+                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);
                // block is here, let's run it!
                #ifdef ARM
                arm_prolog(emu, block->block);
@@ -229,6 +252,10 @@ int DynaRun(x86emu_t* emu)
                        printf_log(LOG_DEBUG, "Setjmp inner DynaRun, fs=0x%x\n", ejb->emu->segs[_FS]);
                }
            }
+            else if(emu->quit && emu->uc_link) {
+                emu->quit = 0;
+                my_setcontext(emu, emu->uc_link);
+            }
        }
    }
    // clear the setjmp
@@ -29,15 +29,15 @@ void printf_x86_instruction(zydis_dec_t* dec, instruction_x86_t* inst, const cha
    if(ip[0]==0xcc && ip[1]=='S' && ip[2]=='C') {
        uint32_t a = *(uint32_t*)(ip+3);
        if(a==0) {
-            dynarec_log(LOG_NONE, "%s%p: Exit x86emu%s\n", (box86_dynarec_dump>1)?"\e[1m":"", (void*)ip, (box86_dynarec_dump>1)?"\e[m":"");
+            dynarec_log(LOG_NONE, "%s%p: Exit x86emu%s\n", (box86_dynarec_dump>1)?"\e[01;33m":"", (void*)ip, (box86_dynarec_dump>1)?"\e[m":"");
        } else {
-            dynarec_log(LOG_NONE, "%s%p: Native call to %p%s\n", (box86_dynarec_dump>1)?"\e[1m":"", (void*)ip, (void*)a, (box86_dynarec_dump>1)?"\e[m":"");
+            dynarec_log(LOG_NONE, "%s%p: Native call to %p%s\n", (box86_dynarec_dump>1)?"\e[01;33m":"", (void*)ip, (void*)a, (box86_dynarec_dump>1)?"\e[m":"");
        }
    } else {
        if(dec) {
-            dynarec_log(LOG_NONE, "%s%p: %s", (box86_dynarec_dump>1)?"\e[1m":"", ip, DecodeX86Trace(dec, inst->addr));
+            dynarec_log(LOG_NONE, "%s%p: %s", (box86_dynarec_dump>1)?"\e[01;33m":"", ip, DecodeX86Trace(dec, inst->addr));
        } else {
-            dynarec_log(LOG_NONE, "%s%p: ", (box86_dynarec_dump>1)?"\e[1m":"", ip);
+            dynarec_log(LOG_NONE, "%s%p: ", (box86_dynarec_dump>1)?"\e[01;33m":"", ip);
            for(int i=0; i<inst->size; ++i) {
                dynarec_log(LOG_NONE, "%02X ", ip[i]);
            }
@@ -73,8 +73,8 @@ void add_next(dynarec_arm_t *dyn, uintptr_t addr) {
        }
    // add slots
    if(dyn->next_sz == dyn->next_cap) {
-        dyn->next_cap += 16;
-        dyn->next = (uintptr_t*)realloc(dyn->next, dyn->next_cap*sizeof(uintptr_t));
+        dyn->next_cap += 64;
+        dyn->next = (uintptr_t*)dynaRealloc(dyn->next, dyn->next_cap*sizeof(uintptr_t));
    }
    dyn->next[dyn->next_sz++] = addr;
 }
@@ -83,11 +83,13 @@ 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]<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]) {
+            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;
    }
@@ -100,7 +102,9 @@ int is_nops(dynarec_arm_t *dyn, uintptr_t addr, int n)
        return 1;
    if(PK(0)==0x90)
        return is_nops(dyn, addr+1, n-1);
-    if(n>1 && PK(0)==0x66)  // if opcode start with 0x66, and there is more after, than is *can* be a NOP
+    if(n>1 && PK(0)==0x2E)  // if opcode start with 0x2E, and there is more after, than this *can* be a NOP
+        return is_nops(dyn, addr+1, n-1);
+    if(n>1 && PK(0)==0x66)  // if opcode start with 0x66, and there is more after, than this *can* be a NOP
        return is_nops(dyn, addr+1, n-1);
    if(n>2 && PK(0)==0x0f && PK(1)==0x1f && PK(2)==0x00)
        return is_nops(dyn, addr+3, n-3);
@@ -239,38 +243,34 @@ int is_instructions(dynarec_arm_t *dyn, uintptr_t addr, int n)
    return (i==n)?1:0;
 }

-static instsize_t* addInst(instsize_t* insts, size_t* size, size_t* cap, int x86_size, int arm_size)
+void addInst(instsize_t* insts, size_t* size, int x86_size, int native_size)
 {
    // x86 instruction is <16 bytes
    int toadd;
-    if(x86_size>arm_size)
+    if(x86_size>native_size)
        toadd = 1 + x86_size/15;
    else
-        toadd = 1 + arm_size/15;
-    if((*size)+toadd>(*cap)) {
-        *cap = (*size)+toadd;
-        insts = (instsize_t*)realloc(insts, (*cap)*sizeof(instsize_t));
-    }
+        toadd = 1 + native_size/15;
    while(toadd) {
        if(x86_size>15)
            insts[*size].x86 = 15;    
        else
            insts[*size].x86 = x86_size;
        x86_size -= insts[*size].x86;
-        if(arm_size>15)
+        if(native_size>15)
            insts[*size].nat = 15;
        else
-            insts[*size].nat = arm_size;
-        arm_size -= insts[*size].nat;
+            insts[*size].nat = native_size;
+        native_size -= insts[*size].nat;
        ++(*size);
        --toadd;
    }
-    return insts;
 }

+
 static void fillPredecessors(dynarec_arm_t* dyn)
 {
-    int pred_sz = 0;
+    int pred_sz = 1;    // to be safe
    // compute total size of predecessor to alocate the array
    // first compute the jumps
    for(int i=0; i<dyn->size; ++i) {
@@ -279,14 +279,21 @@ 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; ++i) {
-        if(i!=dyn->size-1 && dyn->insts[i].x86.has_next && (!i || dyn->insts[i].pred_sz)) {
+    for(int i=0; i<dyn->size-1; ++i) {
+        if(dyn->insts[i].x86.has_next) {
            ++pred_sz;
            ++dyn->insts[i+1].pred_sz;
        }
    }
-    dyn->predecessor = (int*)malloc(pred_sz*sizeof(int));
+    dyn->predecessor = (int*)dynaMalloc(pred_sz*sizeof(int));
    // fill pred pointer
    int* p = dyn->predecessor;
    for(int i=0; i<dyn->size; ++i) {
@@ -294,104 +301,143 @@ static void fillPredecessors(dynarec_arm_t* dyn)
        p += dyn->insts[i].pred_sz;
        dyn->insts[i].pred_sz=0;  // reset size, it's reused to actually fill pred[]
    }
-    assert(p==dyn->predecessor+pred_sz);
    // fill pred
    for(int i=0; i<dyn->size; ++i) {
-        if(i!=dyn->size-1 && dyn->insts[i].x86.has_next && (!i || dyn->insts[i].pred_sz))
+        if((i!=dyn->size-1) && dyn->insts[i].x86.has_next)
            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)
-            dyn->insts[dyn->insts[i].x86.jmp_insts].pred[dyn->insts[dyn->insts[i].x86.jmp_insts].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;
+        }
    }
-
 }

-static void updateNeed(dynarec_arm_t* dyn, int ninst, uint32_t need) {
-    uint32_t old_need = dyn->insts[ninst].x86.need_flags;
-    uint32_t new_need = old_need | need;
-    uint32_t new_use = dyn->insts[ninst].x86.use_flags;
-    uint32_t old_use = dyn->insts[ninst].x86.old_use;
-
-    if((new_need&X_PEND) && dyn->insts[ninst].x86.state_flags==SF_SUBSET) {
-        new_need &=~X_PEND;
-        new_need |= X_ALL;
+// updateNeed goes backward, from last intruction to top
+static int updateNeed(dynarec_arm_t* dyn, int ninst, uint8_t need) {
+    while (ninst>=0) {
+        // need pending but instruction is only a subset: remove pend and use an X_ALL instead
+        need |= dyn->insts[ninst].x86.need_after;
+        if((need&X_PEND) && (dyn->insts[ninst].x86.state_flags==SF_SUBSET)) {
+            need &=~X_PEND;
+            need |= X_ALL;
+        }
+        if((need&X_PEND) && (dyn->insts[ninst].x86.state_flags==SF_SET)) {
+            need &=~X_PEND;
+            need |= dyn->insts[ninst].x86.set_flags;    // SF_SET will compute all flags, it's not SUBSET!
+        }
+        if((need&X_PEND) && dyn->insts[ninst].x86.state_flags==SF_SUBSET_PENDING) {
+            need |= X_ALL&~(dyn->insts[ninst].x86.set_flags);
+        }
+        dyn->insts[ninst].x86.gen_flags = need&dyn->insts[ninst].x86.set_flags;
+        if((need&X_PEND) && (dyn->insts[ninst].x86.state_flags&SF_PENDING))
+            dyn->insts[ninst].x86.gen_flags |= X_PEND;
+        dyn->insts[ninst].x86.need_after = need;
+        need = dyn->insts[ninst].x86.need_after&~dyn->insts[ninst].x86.gen_flags;
+        if(dyn->insts[ninst].x86.may_set)
+            need |= dyn->insts[ninst].x86.gen_flags;    // forward the flags
+        // Consume X_PEND if relevant
+        if((need&X_PEND) && (dyn->insts[ninst].x86.set_flags&SF_PENDING))
+            need &=~X_PEND;
+        need |= dyn->insts[ninst].x86.use_flags;
+        if(dyn->insts[ninst].x86.need_before == need)
+            return ninst - 1;
+        dyn->insts[ninst].x86.need_before = need;
+        if(dyn->insts[ninst].x86.barrier&BARRIER_FLAGS) {
+            need = need?X_PEND:0;
+        }
+        int ok = 0;
+        for(int i=0; i<dyn->insts[ninst].pred_sz; ++i) {
+            if(dyn->insts[ninst].pred[i] == ninst-1)
+                ok = 1;
+            else
+                updateNeed(dyn, dyn->insts[ninst].pred[i], need);
+        }
+        --ninst;
+        if(!ok)
+            return ninst;
    }
-
-    uint32_t new_set = 0;
-    if(dyn->insts[ninst].x86.state_flags & SF_SET)
-        new_set = dyn->insts[ninst].x86.set_flags;
-    if(dyn->insts[ninst].x86.state_flags & SF_PENDING)
-        new_set |= X_PEND;
-    if((new_need&X_PEND) && (
-        dyn->insts[ninst].x86.state_flags==SF_SET || dyn->insts[ninst].x86.state_flags==SF_SUBSET)) {
-        new_need &=~X_PEND;
-        new_need |=X_ALL;
-    }
-    
-    dyn->insts[ninst].x86.need_flags = new_need;
-    dyn->insts[ninst].x86.old_use = new_use;
-
-    if(dyn->insts[ninst].x86.jmp_insts==-1)
-        new_need |= X_PEND;
-
-    // a Flag Barrier will change all need to "Pending", as it clear all flags optimisation
-    if(new_need && dyn->insts[ninst].x86.barrier&BARRIER_FLAGS)
-        new_need = X_PEND;
-    
-    if((new_need == old_need) && (new_use == old_use))    // no changes, bye
-        return;
-    
-    if(!(new_need && dyn->insts[ninst].x86.barrier&BARRIER_FLAGS)) {
-        new_need &=~new_set;    // clean needed flag that were suplied
-        new_need |= new_use;    // new need
-    }
-
-    if((new_need == (X_ALL|X_PEND)) && (dyn->insts[ninst].x86.state_flags & SF_SET))
-        new_need = X_ALL;
-
-    //update need to new need on predecessor
-    for(int i=0; i<dyn->insts[ninst].pred_sz; ++i)
-        updateNeed(dyn, dyn->insts[ninst].pred[i], new_need);
+    return ninst;
 }

-static void resetNeed(dynarec_arm_t* dyn) {
-    for(int i = dyn->size; i-- > 0;) {
-        dyn->insts[i].x86.old_use = 0;
-        dyn->insts[i].x86.need_flags = dyn->insts[i].x86.default_need;
+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;
-    free(helper->next);
-    free(helper->insts);
-    free(helper->predecessor);
-    free(helper->sons_x86);
-    free(helper->sons_arm);
-    if(helper->dynablock && helper->dynablock->block)
-        FreeDynarecMap(helper->dynablock, (uintptr_t)helper->dynablock->block, 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);
+    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);
+        return NULL;
+    }
+    block->size = sz;
+    block->actual_block = actual_p;
+    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*));
+    // 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");
+        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);
        return NULL;
    }
-    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;
@@ -399,33 +445,39 @@ 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*)calloc(helper.cap, sizeof(instruction_arm_t));
+    helper.insts = (instruction_arm_t*)dynaCalloc(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
-    free(helper.next);
+    dynaFree(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();
-        return (void*)block;
+        CancelBlock(0);
+        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
-    protectDB(addr, end-addr);  //end is 1byte after actual end
+    // 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
    uint32_t hash = X31_hash_code((void*)addr, end-addr);
-    // Compute flag_need, without with current barriers
-    resetNeed(&helper);
-    for(int i = helper.size; i-- > 0;)
-        updateNeed(&helper, i, 0);
    // 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) {
+            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;
                helper.insts[i].x86.jmp_insts = -1;
-                helper.insts[i].x86.use_flags |= X_PEND;
+                helper.insts[i].x86.need_after |= X_PEND;
            } else {
                // find jump address instruction
                int k=-1;
@@ -440,65 +492,10 @@ dynarec_log(LOG_DEBUG, "Asked to Fill block %p with %p\n", block, (void*)addr);
        }
    // fill predecessors with the jump address
    fillPredecessors(&helper);
-    // check for the optionnal barriers now
-    for(int i=helper.size-1; i>=0; --i) {
-        if(helper.insts[i].barrier_maybe) {
-            // out-of-block jump
-            if(helper.insts[i].x86.jmp_insts == -1) {
-                // nothing for now
-            } else {
-                // inside block jump
-                int k = helper.insts[i].x86.jmp_insts;
-                if(k>i) {
-                    // jump in the future
-                    if(helper.insts[k].pred_sz>1) {
-                        // with multiple flow, put a barrier
-                        helper.insts[k].x86.barrier|=BARRIER_FLAGS;
-                    }
-                } else {
-                    // jump back
-                    helper.insts[k].x86.barrier|=BARRIER_FLAGS;
-                }
-            }
-	}
-    }
-    // check to remove useless barrier, in case of jump when destination doesn't needs flags
-    /*for(int i=helper.size-1; i>=0; --i) {
-        int k;
-        if(helper.insts[i].x86.jmp
-        && ((k=helper.insts[i].x86.jmp_insts)>=0)
-        && helper.insts[k].x86.barrier&BARRIER_FLAGS) {
-            //TODO: optimize FPU barrier too
-            if((!helper.insts[k].x86.need_flags)
-             ||(helper.insts[k].x86.set_flags==X_ALL
-                  && helper.insts[k].x86.state_flags==SF_SET)
-             ||(helper.insts[k].x86.state_flags==SF_SET_PENDING)) {
-                //if(box86_dynarec_dump) dynarec_log(LOG_NONE, "Removed barrier for inst %d\n", k);
-                helper.insts[k].x86.barrier &= ~BARRIER_FLAGS; // remove flag barrier
-             }
-        }
-    }*/
-    // reset need_flags and compute again, now taking barrier into account (because barrier change use_flags)
-    for(int i = helper.size; i-- > 0;) {
-        int k;
-        if(helper.insts[i].x86.jmp 
-        && ((k=helper.insts[i].x86.jmp_insts)>=0)
-        ) {
-            if(helper.insts[k].x86.barrier&BARRIER_FLAGS)
-                // jumpto barrier
-                helper.insts[i].x86.use_flags |= X_PEND;
-            if(helper.insts[i].x86.barrier&BARRIER_FLAGS && (helper.insts[k].x86.need_flags | helper.insts[k].x86.use_flags))
-                helper.insts[k].x86.barrier|=BARRIER_FLAGS;
-            else
-                helper.insts[i].x86.use_flags |= (helper.insts[k].x86.need_flags | helper.insts[k].x86.use_flags);
-        }
-        if(helper.insts[i].x86.barrier&BARRIER_FLAGS)
-            // immediate barrier
-            helper.insts[i].x86.use_flags |= X_PEND;
-    }
-    resetNeed(&helper);
-    for(int i = helper.size; i-- > 0;)
-        updateNeed(&helper, i, 0);
+
+    int pos = helper.size;
+    while (pos>=0)
+        pos = updateNeed(&helper, pos, 0);

    // pass 1, float optimisations, first pass for flags
    arm_pass1(&helper, addr);
@@ -506,29 +503,69 @@ 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
-    int sz = helper.arm_size;
-    void* p = (void*)AllocDynarecMap(block, sz);
-    if(p==NULL) {
-        dynarec_log(LOG_DEBUG, "AllocDynarecMap(%p, %d) failed, cancelling block\n", block, sz);
-        CancelBlock();
+    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*);
+    if(actual_p==NULL) {
+        dynarec_log(LOG_INFO, "AllocDynarecMap(%p, %zu) failed, cancelling block\n", block, sz);
+        CancelBlock(0);
        return NULL;
    }
    helper.block = p;
+    block->actual_block = actual_p;
    helper.arm_start = (uintptr_t)p;
-    if(helper.sons_size) {
-        helper.sons_x86 = (uintptr_t*)calloc(helper.sons_size, sizeof(uintptr_t));
-        helper.sons_arm = (void**)calloc(helper.sons_size, sizeof(void*));
-    }
-    // pass 3, emit (log emit arm opcode)
+    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)
    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);
-    if(sz!=helper.arm_size) {
-        printf_log(LOG_NONE, "BOX86: Warning, size difference in block between pass2 (%d) & pass3 (%d)!\n", sz, helper.arm_size);
+    // 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);
        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) {
@@ -538,73 +575,19 @@ 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");
-    }
-    // all done...
-    __clear_cache(p, p+sz);   // need to clear the cache before execution...
-    // keep size of instructions for signal handling
-    {
-        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;
-        size_t size = 0;
-        block->instsize = (instsize_t*)calloc(cap, sizeof(instsize_t));
-        for(int i=0; i<helper.size; ++i)
-            block->instsize = addInst(block->instsize, &size, &cap, helper.insts[i].x86.size, helper.insts[i].size/4);
-        block->instsize = addInst(block->instsize, &size, &cap, 0, 0);    // add a "end of block" mark, just in case
-    }
-    // ok, free the helper now
-    free(helper.insts);
-    helper.insts = NULL;
-    free(helper.next);
-    helper.next = NULL;
-    block->size = sz;
-    block->isize = helper.size;
-    block->block = p;
-    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;
-    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();
+        CancelBlock(0);
        return NULL;
    }
-    // fill sons if any
-    dynablock_t** sons = NULL;
-    int sons_size = 0;
-    if(helper.sons_size) {
-        sons = (dynablock_t**)calloc(helper.sons_size, sizeof(dynablock_t*));
-        for (int i=0; i<helper.sons_size; ++i) {
-            int created = 1;
-            dynablock_t *son = AddNewDynablock(block->parent, helper.sons_x86[i], &created);
-            if(created) {    // avoid breaking a working block!
-                son->block = helper.sons_arm[i];
-                son->x86_addr = (void*)helper.sons_x86[i];
-                son->x86_size = end-helper.sons_x86[i];
-                if(!son->x86_size) {printf_log(LOG_NONE, "Warning, son with null x86 size! (@%p / ARM=%p)", son->x86_addr, son->block);}
-                son->father = block;
-                son->done = 1;
-                sons[sons_size++] = son;
-                if(!son->parent)
-                    son->parent = block->parent;
-            }
-        }
-        if(sons_size) {
-            block->sons = sons;
-            block->sons_size = sons_size;
-        } else
-            free(sons);
+    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);
    }
-    free(helper.predecessor);
-    helper.predecessor = NULL;
-    free(helper.sons_x86);
-    helper.sons_x86 = NULL;
-    free(helper.sons_arm);
-    helper.sons_arm = NULL;
    current_helper = NULL;
-    block->done = 1;
+    //block->done = 1;
    return (void*)block;
 }
@@ -5,6 +5,7 @@
 #include <errno.h>
 #include <signal.h>
 #include <string.h>
+#include <sys/mman.h>

 #include "debug.h"
 #include "box86context.h"
@@ -21,10 +22,13 @@
 #include "dynarec_arm.h"
 #include "dynarec_arm_private.h"
 #include "arm_printer.h"
+#include "custommem.h"

 #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;
@@ -36,12 +40,16 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
    uint32_t u32;
    uint8_t wback, wb1, wb2;
    int fixedaddress;
+    int lock;
+    int cacheupd;

    opcode = F8;
    MAYUSE(eb1);
    MAYUSE(eb2);
    MAYUSE(tmp);
    MAYUSE(j32);
+    MAYUSE(lock);
+    MAYUSE(cacheupd);

    switch(opcode) {
        case 0x00:
@@ -575,7 +583,12 @@ 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);
-            PUSH1(gd);
+            if(gd==xESP) {
+                MOV_REG(x1, gd);
+                PUSH1(x1);
+            } else {
+                PUSH1(gd);    
+            }
            break;
        case 0x58:
        case 0x59:
@@ -587,7 +600,16 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
        case 0x5F:
            INST_NAME("POP reg");
            gd = xEAX+(opcode&0x07);
+            #ifdef RPI2
+            if(gd==xESP) {
+                POP1(x1);
+                MOV_REG(gd, x1);
+            } else {
+                POP1(gd);    
+            }
+            #else
            POP1(gd);
+            #endif
            break;
        case 0x60:
            INST_NAME("PUSHAD");
@@ -641,7 +663,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, ip+1);
+                MOV32(x3, addr-4);
                LDR_IMM9(x1, x3, 0);
                PUSH1(x1);
            } else {
@@ -702,11 +724,11 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                i32 = dyn->insts[ninst].epilog-(dyn->arm_size+8);       \
                Bcond(NO, i32);                                         \
                if(dyn->insts[ninst].x86.jmp_insts==-1) {               \
-                    if(!dyn->insts[ninst].x86.barrier)                  \
+                    if(!(dyn->insts[ninst].x86.barrier&BARRIER_FLOAT))  \
                        fpu_purgecache(dyn, ninst, 1, x1, x2, x3);      \
                    jump_to_next(dyn, addr+i8, 0, ninst);               \
                } else {                                                \
-                    fpuCacheTransform(dyn, ninst, x1, x2, x3);          \
+                    CacheTransform(dyn, ninst, cacheupd, x1, x2, x3);   \
                    i32 = dyn->insts[dyn->insts[ninst].x86.jmp_insts].address-(dyn->arm_size+8);\
                    Bcond(c__, i32);                                    \
                }                                                       \
@@ -991,8 +1013,8 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                BFI(eb1, x14, eb2*8, 8);
            } else {
                GETGB(x14);
-                DMB_ISH();
-                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0);
+                SMDMB();
+                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0, LOCK_LOCK);
                MARKLOCK;
                // do the swap with exclusive locking
                LDREXB(x1, ed);
@@ -1001,7 +1023,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);
-                DMB_ISH();
+                SMDMB();
            }
            break;
        case 0x87:
@@ -1017,8 +1039,8 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                }
            } else {
                GETGD;
-                DMB_ISH();
-                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 1);
+                SMDMB();
+                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 1, LOCK_LOCK);
                if(!fixedaddress) {
                    TSTS_IMM8(ed, 3);
                    B_MARK(cNE);
@@ -1041,7 +1063,7 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                if(!fixedaddress) {
                    MARK2;
                }
-                DMB_ISH();
+                SMDMB();
                MOV_REG(gd, x1);
            }
            break;
@@ -1063,8 +1085,9 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                eb2 = ((ed&4)>>2);    // L or H
                BFI(eb1, gd, eb2*8, 8);
            } else {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 4095, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 4095, 0, 0, &lock);
                STRB_IMM9(gd, ed, fixedaddress);
+                SMWRITELOCK(lock);
            }
            break;
        case 0x89:
@@ -1074,8 +1097,9 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
            if((nextop&0xC0)==0xC0) {   // reg <= reg
                MOV_REG(xEAX+(nextop&7), gd);
            } else {                    // mem <= reg
-                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 4095, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 4095, 0, 0, &lock);
                STR_IMM9(gd, ed, fixedaddress);
+                SMWRITELOCK(lock);
            }
            break;
        case 0x8A:
@@ -1097,9 +1121,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))) {
-                        DMB_ISH();
+                        SMDMB();
                    }
-                    addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 4095, 0, 0);
+                    addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 4095, 0, 0, &lock);
+                    SMREADLOCK(lock);
                    LDRB_IMM9(x14, wback, fixedaddress);
                    ed = x14;
                }
@@ -1112,11 +1137,8 @@ uintptr_t dynarec00(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
-                if(box86_dynarec_strongmem && 
-                    (dyn->insts[ninst].x86.barrier || !ninst || (box86_dynarec_strongmem>1) || (ninst && dyn->insts[ninst-1].x86.barrier))) {
-                    DMB_ISH();
-                }
-                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 4095, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 4095, 0, 0, &lock);
+                SMREADLOCK(lock);
                LDR_IMM9(gd, ed, fixedaddress);
            }
            break;
@@ -1127,9 +1149,10 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
            if((nextop&0xC0)==0xC0) {   // reg <= seg
                LDRH_REG(xEAX+(nextop&7), xEmu, x3);
            } else {                    // mem <= seg
-                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0);
+                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:
@@ -1139,7 +1162,7 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
            if((nextop&0xC0)==0xC0) {   // reg <= reg? that's an invalid operation
                DEFAULT;
            } else {                    // mem <= reg
-                addr = geted(dyn, addr, ninst, nextop, &ed, gd, &fixedaddress, 0, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, gd, &fixedaddress, 0, 0, 0, NULL);
                if(gd!=ed) {    // it's sometimes used as a 3 bytes NOP
                    MOV_REG(gd, ed);
                }
@@ -1151,7 +1174,7 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
            if((nextop&0xC0)==0xC0) {
                ed = xEAX+(nextop&7);
            } else {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0, NULL);
                LDRH_IMM8(x1, ed, fixedaddress);
                ed = x1;
            }
@@ -1172,7 +1195,7 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                POP1(xEAX+(nextop&7));
            } else {
                POP1(x2); // so this can handle POP [ESP] and maybe some variant too
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095, 0, 0, NULL);
                if(ed==xESP) {
                    STR_IMM9(x2, ed, fixedaddress);
                } else {
@@ -1224,6 +1247,15 @@ 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");
@@ -1257,12 +1289,14 @@ 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");
@@ -1569,7 +1603,9 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
        case 0xC2:
            INST_NAME("RETN");
            //SETFLAGS(X_ALL, SF_SET);    // Hack, set all flags (to an unknown state...)
-            READFLAGS(X_PEND);  // lets play safe here too
+            if(box86_dynarec_safeflags) {
+                READFLAGS(X_PEND);  // lets play safe here too
+            }
            BARRIER(BARRIER_FLOAT);
            i32 = F16;
            retn_to_epilog(dyn, ninst, i32);
@@ -1580,7 +1616,9 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
            INST_NAME("RET");
            // SETFLAGS(X_ALL, SF_SET);    // Hack, set all flags (to an unknown state...)
            // ^^^ that hack break PlantsVsZombies and GOG Setup under wine....
-            READFLAGS(X_PEND);  // so instead, force the defered flags, so it's not too slow, and flags are not lost
+            if(box86_dynarec_safeflags) {
+                READFLAGS(X_PEND);  // so instead, force the defered flags, so it's not too slow, and flags are not lost
+            }
            BARRIER(BARRIER_FLOAT);
            ret_to_epilog(dyn, ninst);
            *need_epilog = 0;
@@ -1598,10 +1636,11 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                MOVW(x3, u8);
                BFI(eb1, x3, eb2*8, 8);
            } else {                    // mem <= u8
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095, 0, 0, &lock);
                u8 = F8;
                MOVW(x3, u8);
                STRB_IMM9(x3, ed, fixedaddress);
+                SMWRITELOCK(lock);
            }
            break;
        case 0xC7:
@@ -1612,10 +1651,11 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                ed = xEAX+(nextop&7);
                MOV32(ed, i32);
            } else {                    // mem <= i32
-                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 4095, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 4095, 0, 0, &lock);
                i32 = F32S;
                MOV32(x3, i32);
                STR_IMM9(x3, ed, fixedaddress);
+                SMWRITELOCK(lock);
            }
            break;

@@ -1634,6 +1674,7 @@ 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));
@@ -1643,8 +1684,9 @@ 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) {   // call the wrapper directly
+                    if((box86_log<2) && !cycle_log) {   // call the wrapper directly
                        uintptr_t ncall[2]; // to avoid BUSERROR!!!
                        memcpy(ncall,  (void*)addr, 2*sizeof(void*));   // the wrapper + function
                        addr+=8;
@@ -1686,9 +1728,11 @@ 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...)
-            if(PK(0)==0x80) {
+            SKIPTEST(x14);
+            SMEND();
+            u8 = F8;
+            if(u8==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));
@@ -1704,7 +1748,11 @@ 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");
-                DEFAULT;
+                if(box86_wine && u8==0x2D) {
+                    MESSAGE(LOG_DEBUG, "Hack for wine/int 2d\n");
+                } else {
+                    DEFAULT;
+                }
            }
            break;

@@ -2032,6 +2080,7 @@ 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;
@@ -2068,11 +2117,11 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                i32 = dyn->insts[ninst].epilog-(dyn->arm_size+8);       \
                Bcond(NO, i32);                                         \
                if(dyn->insts[ninst].x86.jmp_insts==-1) {               \
-                    if(!dyn->insts[ninst].x86.barrier)                  \
+                    if(!(dyn->insts[ninst].x86.barrier&BARRIER_FLOAT))  \
                        fpu_purgecache(dyn, ninst, 1, x1, x2, x3);      \
                    jump_to_next(dyn, addr+i8, 0, ninst);               \
                } else {                                                \
-                    fpuCacheTransform(dyn, ninst, x1, x2, x3);          \
+                    CacheTransform(dyn, ninst, cacheupd, x1, x2, x3);   \
                    i32 = dyn->insts[dyn->insts[ninst].x86.jmp_insts].address-(dyn->arm_size+8);\
                    Bcond(c__, i32);                                    \
                }                                                       \
@@ -2125,10 +2174,10 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
            #if STEP < 2
            if (i32==0)
                tmp = dyn->insts[ninst].pass2choice = 1;
-            else if (((u32)>0x10000) && (PKa(u32+0)==0x8B) && (((PKa(u32+1))&0xC7)==0x04) && (PKa(u32+2)==0x24) && (PKa(u32+3)==0xC3))
+            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
@@ -2138,18 +2187,19 @@ 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;
-                // disabling this to avoid fetching data outside current block (in case this part changed, this block will not been marck as dirty)
-                /*case 3:
+                case 3:
                    SETFLAGS(X_ALL, SF_SET);    // Hack to set flags to "dont'care" state
                    BARRIER(BARRIER_FULL);
                    BARRIER_NEXT(BARRIER_FULL);
@@ -2157,8 +2207,11 @@ 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
-                    x87_forget(dyn, ninst, x3, x14, 0);
-                    if(box86_log<2 && dyn->insts[ninst].natcall) {   // call the wrapper directly
+                    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);
+                    }
+                    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
                        MOV32(xEIP, dyn->insts[ninst].natcall+2+4+4);
@@ -2188,16 +2241,22 @@ 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(ninst && dyn->insts[ninst-1].x86.set_flags) {
+                    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);
@@ -2221,14 +2280,14 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                INST_NAME("JMP Ib");
                i32 = F8S;
            }
-            JUMP(addr+i32, 0);
+            JUMP((uintptr_t)getAlternate((void*)(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, addr+i32, 0, ninst);
+                jump_to_next(dyn, (uintptr_t)getAlternate((void*)(addr+i32)), 0, ninst);
            } else {
                // inside the block
-                fpuCacheTransform(dyn, ninst, x1, x2, x3);
+                CacheTransform(dyn, ninst, CHECK_CACHE(), x1, x2, x3);
                tmp = dyn->insts[dyn->insts[ninst].x86.jmp_insts].address-(dyn->arm_size+8);
                if(tmp==-4) {
                    NOP;
@@ -2240,9 +2299,19 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
            *ok = 0;
            break;
        
-        case 0xEE:
-            INST_NAME("OUT dx, al");
-            //ignored!
+        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;
            break;

        case 0xF0:
@@ -2284,7 +2353,8 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                        break;
                    case 0xAF:
                        if(opcode==0xF2) {INST_NAME("REPNZ SCASW");} else {INST_NAME("REPZ SCASW");}
-                        SETFLAGS(X_ALL, SF_MAYSET);
+                        MAYSETFLAGS();
+                        SETFLAGS(X_ALL, SF_SET_PENDING);
                        TSTS_REG_LSL_IMM5(xECX, xECX, 0);
                        B_NEXT(cEQ);    // end of loop
                        GETDIR(x3, 2);
@@ -2343,7 +2413,11 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                        break;
                    case 0xC3:
                        INST_NAME("(REPZ) RET");
-                        SETFLAGS(X_ALL, SF_SET);    // Hack to set flags to "dont'care" state
+                        if(box86_dynarec_safeflags>1) {
+                            READFLAGS(X_PEND);
+                        } else {
+                            SETFLAGS(X_ALL, SF_SET);    // Hack to set flags to "dont'care" state
+                        }
                        BARRIER(BARRIER_FLOAT);
                        ret_to_epilog(dyn, ninst);
                        *need_epilog = 0;
@@ -2375,7 +2449,8 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                        break;
                    case 0xA6:
                        if(opcode==0xF2) {INST_NAME("REPNZ CMPSB");} else {INST_NAME("REPZ CMPSB");}
-                        SETFLAGS(X_ALL, SF_MAYSET);
+                        MAYSETFLAGS();
+                        SETFLAGS(X_ALL, SF_SET_PENDING);
                        TSTS_REG_LSL_IMM5(xECX, xECX, 0);
                        B_NEXT(cEQ);    // end of loop
                        GETDIR(x3,1);
@@ -2399,7 +2474,8 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                        break;
                    case 0xA7:
                        if(opcode==0xF2) {INST_NAME("REPNZ CMPSD");} else {INST_NAME("REPZ CMPSD");}
-                        SETFLAGS(X_ALL, SF_MAYSET);
+                        MAYSETFLAGS();
+                        SETFLAGS(X_ALL, SF_SET_PENDING);
                        TSTS_REG_LSL_IMM5(xECX, xECX, 0);
                        B_NEXT(cEQ);    // end of loop
                        GETDIR(x3,4);
@@ -2464,7 +2540,8 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                        break;
                    case 0xAE:
                        if(opcode==0xF2) {INST_NAME("REPNZ SCASB");} else {INST_NAME("REPZ SCASB");}
-                        SETFLAGS(X_ALL, SF_MAYSET);
+                        MAYSETFLAGS();
+                        SETFLAGS(X_ALL, SF_SET_PENDING);
                        TSTS_REG_LSL_IMM5(xECX, xECX, 0);
                        B_NEXT(cEQ);    // end of loop
                        GETDIR(x3,1);
@@ -2488,7 +2565,8 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                        break;
                    case 0xAF:
                        if(opcode==0xF2) {INST_NAME("REPNZ SCASD");} else {INST_NAME("REPZ SCASD");}
-                        SETFLAGS(X_ALL, SF_MAYSET);
+                        MAYSETFLAGS();
+                        SETFLAGS(X_ALL, SF_SET_PENDING);
                        TSTS_REG_LSL_IMM5(xECX, xECX, 0);
                        B_NEXT(cEQ);    // end of loop
                        GETDIR(x3,4);
@@ -2724,13 +2802,16 @@ 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("STI");
-            MOVW(x1, 1);
-            BFI(xFlags, x1, F_IF, 1);
+            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;
            break;
        case 0xFC:
            INST_NAME("CLD");
@@ -2783,10 +2864,13 @@ 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(ninst && dyn->insts[ninst-1].x86.set_flags, 1) {
+                    PASS2IF((box86_dynarec_safeflags>1) ||
+                        ((ninst && dyn->insts[ninst-1].x86.set_flags)
+                        || ((ninst>1) && dyn->insts[ninst-2].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);
@@ -2799,7 +2883,8 @@ uintptr_t dynarec00(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    break;
                case 4: // JMP Ed
                    INST_NAME("JMP Ed");
-                    BARRIER(BARRIER_FULL);
+                    READFLAGS(X_PEND);
+                    BARRIER(BARRIER_FLOAT);
                    GETEDH(xEIP);
                    jump_to_next(dyn, 0, ed, ninst);
                    *need_epilog = 0;
@@ -31,7 +31,8 @@
    if((nextop&0xC0)==0xC0) { \
        a = sse_get_reg(dyn, ninst, x1, nextop&7, w); \
    } else {    \
-        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0); \
+        SMREAD(); \
+        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL); \
        a = fpu_get_scratch_quad(dyn); \
        VLD1Q_64(a, ed);    \
    }
@@ -42,13 +43,15 @@
    if((nextop&0xC0)==0xC0) { \
        a = mmx_get_reg(dyn, ninst, x1, x2, x3, nextop&7); \
    } else {    \
-        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0); \
+        SMREAD(); \
+        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL); \
        a = fpu_get_scratch_double(dyn); \
        VLD1_64(a, ed);    \
    }
 #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)
@@ -66,6 +69,7 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
    int s0;
    int fixedaddress;
    int parity;
+    int cacheupd;
    MAYUSE(s0);
    MAYUSE(q1);
    MAYUSE(v2);
@@ -75,6 +79,7 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
    MAYUSE(eb1);
    MAYUSE(wb2);
    MAYUSE(j32);
+    MAYUSE(cacheupd);
    #if STEP == 3
    static const int8_t mask_shift8[] = { -7, -6, -5, -4, -3, -2, -1, 0 };
    #endif
@@ -85,6 +90,7 @@ 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;

@@ -93,7 +99,7 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
            switch((nextop>>3)&7) {
                case 1:
                    INST_NAME("PREFETCHW");
-                    //addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                    //addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                    addr = fakeed(dyn,addr, ninst, nextop);
                    // should use PLDW, but it's not available on cortex-a8 for example
                    break;
@@ -110,8 +116,9 @@ 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);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-12, 0, 0, NULL);
                //LDRD also have alignment requirements
                LDR_IMM9(x2, ed, fixedaddress+0);
                LDR_IMM9(x3, ed, fixedaddress+4);
@@ -130,7 +137,7 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                v1 = sse_get_reg_empty(dyn, ninst, x1, nextop&7);
                VMOVQ(v1, v0);
            } else {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-16, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-16, 0, 0, NULL);
                VMOVfrV_D(x2, x3, v0);
                // cannot use STRD, this needs alignement too
                STR_IMM9(x2, ed, fixedaddress+0);
@@ -138,6 +145,7 @@ 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:
@@ -150,7 +158,8 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
            } else {
                INST_NAME("MOVLPS Gx,Ex");
                GETGX(v0, 1);
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-4, 0, 0);
+                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);
                VMOVtoV_D(v0, x2, x3);
@@ -166,14 +175,15 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
            } else {
                parity = getedparity(dyn, ninst, addr, nextop, 2);
                if(parity) {
-                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                    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);
+                    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;
@@ -210,7 +220,8 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
            } else {
                INST_NAME("MOVHPS Gx,Ex");
                GETGX(v0, 1);
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                SMREAD();
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                VLD1_64(v0+1, ed);
            }
            break;
@@ -224,14 +235,15 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
            } else {
                parity = getedparity(dyn, ninst, addr, nextop, 2);
                if(parity) {
-                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                    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);
+                    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;
@@ -246,7 +258,7 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                case 2:
                case 3:
                    INST_NAME("PREFETCHh Ed");
-                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0xffff, 0, 0);
+                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0xffff, 0, 0, NULL);
                    MOVW(x3, fixedaddress);
                    if(fixedaddress<0) {
                        PLDn(ed, x3);
@@ -276,7 +288,8 @@ 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);
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                SMREAD();
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                VLD1Q_32(v0, ed);
            }
            break;
@@ -289,8 +302,9 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                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);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                VST1Q_32(v0, ed);
+                SMWRITE2();
            }
            break;
        case 0x2A:
@@ -301,7 +315,8 @@ 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 {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                SMREAD();
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                v1 = fpu_get_scratch_double(dyn);
                VLD1_32(v1, ed);
            }
@@ -316,7 +331,7 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                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);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                VST1Q_32(v0, ed);
            }
            break;
@@ -328,7 +343,8 @@ 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 {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                SMREAD();
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                v1 = fpu_get_scratch_double(dyn);
                VLD1_32(v1, ed);
            }
@@ -342,7 +358,8 @@ 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 {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                SMREAD();
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                v1 = fpu_get_scratch_double(dyn);
                VLD1_32(v1, ed);
            }
@@ -381,10 +398,11 @@ 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) {
-                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0);
+                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0, NULL);
                    VLDR_32(s0, ed, fixedaddress);
                } else {
                    GETED;
@@ -404,6 +422,7 @@ 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;
@@ -442,6 +461,34 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    GETEM(d1);
                    VQRDMULH_S16(d0, d0, d1);
                    break;
+
+                case 0xF0:
+                    INST_NAME("MOVBE Gd, Ed");
+                    nextop=F8;
+                    GETGD;
+                    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);
+                    }
+                    break;
+                case 0xF1:
+                    INST_NAME("MOVBE Ed, Gd");
+                    nextop=F8;
+                    GETGD;
+                    if((nextop&0xC0)==0xC0) {   // reg <= reg
+                        REV(xEAX+(nextop&7), gd);
+                    } else {                    // mem <= reg
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 4095, 0, 0, NULL);
+                        REV(x1, gd);
+                        STR_IMM9(gd, ed, fixedaddress);
+                        SMWRITE();
+                    }
+                    break;
+
                default:
                    DEFAULT;
            }
@@ -480,7 +527,8 @@ 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 { \
-                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 4095, 0, 0);    \
+                SMREAD(); \
+                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 4095, 0, 0, NULL);    \
                LDR_IMM9_COND(YES, gd, ed, fixedaddress); \
            }

@@ -592,7 +640,8 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                BFI(gd, x3, 3, 1);
            } else {
                // EX is memory
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4096-16, 0, 0);
+                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);
                BFI(gd, x3, 0, 1);
@@ -609,6 +658,7 @@ 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;
@@ -648,19 +698,42 @@ 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;
-            v0 = sse_get_reg_empty(dyn, ninst, x1, gd);
+            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;
            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;
-            v0 = sse_get_reg_empty(dyn, ninst, x1, gd);
+            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);
            VRECPEQ_F32(v0, q0);
+            VRECPSQ_F32(v1, v0, q0);
+            VMULQ_F32(q1, v0, v1);
            break;
        case 0x54:
            INST_NAME("ANDPS Gx, Ex");
@@ -744,7 +817,23 @@ 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");
@@ -768,7 +857,23 @@ 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");
@@ -843,7 +948,7 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                d1 = mmx_get_reg(dyn, ninst, x1, x2, x3, nextop&7);
                VMOVD(q0+1, d1);
            } else {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                VLD1_64(q0+1, ed);
            }
            VMOVD(q0, d0);
@@ -919,7 +1024,7 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                VMOVD(v0, v1);
            } else {
                v0 = mmx_get_reg_empty(dyn, ninst, x1, x2, x3, gd);
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                VLD1_64(v0, ed);
            }
            break;
@@ -953,7 +1058,7 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                }
                ADD_IMM8(xSP, xSP, 4);
            } else {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                u8 = F8;
                if (u8) {
                    for (int i=0; i<4; ++i) {
@@ -977,7 +1082,8 @@ 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 {
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                        SMREAD();
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                        d0 = fpu_get_scratch_quad(dyn);
                        VLD1_16(d0, ed);
                    }
@@ -990,6 +1096,7 @@ 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;
@@ -998,7 +1105,8 @@ 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 {
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                        SMREAD();
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                        d0 = fpu_get_scratch_quad(dyn);
                        VLD1_16(d0, ed);
                    }
@@ -1008,6 +1116,7 @@ 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:
@@ -1015,7 +1124,8 @@ 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 {
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                        SMREAD();
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                        d0 = fpu_get_scratch_quad(dyn);
                        VLD1_16(d0, ed);
                    }
@@ -1028,6 +1138,7 @@ 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;
@@ -1037,6 +1148,7 @@ 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:
@@ -1078,6 +1190,7 @@ 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");
@@ -1141,8 +1254,9 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                VMOVfrDx_32(ed, v0, 0);
            } else {
                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);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095, 0, 0, NULL);
                STR_IMM9(x2, ed, fixedaddress);
+                SMWRITE2();
            }
            break;
        case 0x7F:
@@ -1155,13 +1269,15 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
            } else {
                parity = getedparity(dyn, ninst, addr, nextop, 3);
                if(parity) {
-                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0);
+                    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);
+                    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;
@@ -1178,11 +1294,11 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                i32 = dyn->insts[ninst].epilog-(dyn->arm_size+8);       \
                Bcond(NO, i32);                                         \
                if(dyn->insts[ninst].x86.jmp_insts==-1) {               \
-                    if(!dyn->insts[ninst].x86.barrier)                  \
+                    if(!(dyn->insts[ninst].x86.barrier&BARRIER_FLOAT))  \
                        fpu_purgecache(dyn, ninst, 1, x1, x2, x3);      \
                    jump_to_next(dyn, addr+i32_, 0, ninst);             \
                } else {                                                \
-                    fpuCacheTransform(dyn, ninst, x1, x2, x3);          \
+                    CacheTransform(dyn, ninst, cacheupd, x1, x2, x3);   \
                    i32 = dyn->insts[dyn->insts[ninst].x86.jmp_insts].address-(dyn->arm_size+8);\
                    Bcond(c__, i32);                                    \
                }                                                       \
@@ -1279,6 +1395,7 @@ 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;   \
@@ -1291,10 +1408,10 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                eb2 = ((ed&4)>>2);  \
                BFI(eb1, x3, eb2*8, 8); \
            } else {                \
-                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 4095, 0, 0);    \
+                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)
@@ -1415,7 +1532,8 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
            if((nextop&0xC0)==0xC0) {
                ed = xEAX+(nextop&7);
            } else {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x3, &fixedaddress, 4095, 0, 0);
+                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;
                LDR_IMM9(x1, x1, fixedaddress);
@@ -1471,7 +1589,8 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                ed = xEAX+(nextop&7);
                wback = 0;
            } else {
-                addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 4095, 0, 0);
+                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;
                LDR_IMM9(x1, x3, fixedaddress);
@@ -1489,6 +1608,7 @@ 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:
@@ -1516,15 +1636,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");
-                DMB_ISH();
+                SMDMB();
            } else
            if((nextop&0xF8)==0xF0) {
                INST_NAME("MFENCE");
-                DMB_ISH();
+                SMDMB();
            } else
            if((nextop&0xF8)==0xF8) {
                INST_NAME("SFENCE");
-                DMB_ISH();
+                SMDMB();
            } else {
                switch((nextop>>3)&7) {
                    case 0:
@@ -1535,7 +1655,7 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                        if((nextop&0xC0)==0xC0) {
                            DEFAULT;
                        } else {
-                            addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                            addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                            if(ed!=x1) {MOV_REG(x1, ed);}
                            CALL(fpu_fxsave, -1, 0);
                        }
@@ -1547,7 +1667,7 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                        if((nextop&0xC0)==0xC0) {
                            DEFAULT;
                        } else {
-                            addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                            addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                            if(ed!=x1) {MOV_REG(x1, ed);}
                            CALL(fpu_fxrstor, -1, 0);
                        }
@@ -1556,6 +1676,12 @@ 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");
@@ -1563,7 +1689,7 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                            ed = xEAX+(nextop&7);
                            LDR_IMM9(ed, xEmu, offsetof(x86emu_t, mxcsr));
                        } else {
-                            addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 4095, 0, 0);
+                            addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 4095, 0, 0, NULL);
                            LDR_IMM9(x14, xEmu, offsetof(x86emu_t, mxcsr));
                            STR_IMM9(x14, ed, fixedaddress);
                        }
@@ -1572,7 +1698,20 @@ 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;
@@ -1646,7 +1785,8 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                ed = xEAX+(nextop&7);
                wback = 0;
            } else {
-                addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 4095, 0, 0);
+                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;
                wback = x3;
@@ -1664,6 +1804,7 @@ 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;
@@ -1678,7 +1819,8 @@ 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 {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 4095, 0, 0);
+                SMREAD();
+                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 4095, 0, 0, NULL);
                LDRB_IMM9(gd, ed, fixedaddress);
            }
            break;
@@ -1690,7 +1832,8 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                ed = xEAX+(nextop&7);
                UXTH(gd, ed, 0);
            } else {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0);
+                SMREAD();
+                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0, NULL);
                LDRH_IMM8(gd, ed, fixedaddress);
            }
            break;
@@ -1706,7 +1849,8 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    if((nextop&0xC0)==0xC0) {
                        ed = xEAX+(nextop&7);
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 4095, 0, 0);
+                        SMREAD();
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 4095, 0, 0, NULL);
                        LDR_IMM9(x1, wback, fixedaddress);
                        ed = x1;
                    }
@@ -1726,7 +1870,8 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                        ed = xEAX+(nextop&7);
                        wback = 0;
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 4095, 0, 0);
+                        SMREAD();
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 4095, 0, 0, NULL);
                        LDR_IMM9(x1, wback, fixedaddress);
                        ed = x1;
                    }
@@ -1746,6 +1891,7 @@ 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:
@@ -1756,7 +1902,8 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                        ed = xEAX+(nextop&7);
                        wback = 0;
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 4095, 0, 0);
+                        SMREAD();
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 4095, 0, 0, NULL);
                        LDR_IMM9(x1, wback, fixedaddress);
                        ed = x1;
                    }
@@ -1776,6 +1923,7 @@ 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:
@@ -1786,7 +1934,8 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                        ed = xEAX+(nextop&7);
                        wback = 0;
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 4095, 0, 0);
+                        SMREAD();
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 4095, 0, 0, NULL);
                        LDR_IMM9(x1, wback, fixedaddress);
                        ed = x1;
                    }
@@ -1807,6 +1956,7 @@ 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;
@@ -1824,7 +1974,8 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                ed = xEAX+(nextop&7);
                wback = 0;
            } else {
-                addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 4095, 0, 0);
+                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;
                LDR_IMM9(x1, x3, fixedaddress);
@@ -1840,6 +1991,7 @@ 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:
@@ -1896,7 +2048,8 @@ 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 {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0);
+                SMREAD();
+                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0, NULL);
                LDRSB_IMM8(gd, ed, fixedaddress);
            }
            break;
@@ -1908,7 +2061,8 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                ed = xEAX+(nextop&7);
                SXTH(gd, ed, 0);
            } else {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0);
+                SMREAD();
+                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0, NULL);
                LDRSH_IMM8(gd, ed, fixedaddress);
            }
            break;
@@ -1928,12 +2082,11 @@ 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) {
-                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);
+                MOV_REG(gd, ed);
            }
-            emit_add32(dyn, ninst, ed, gd, x3, x14);
+            emit_add32(dyn, ninst, ed, x1, x3, x14);
            WBACK;
            break;
        case 0xC2:
@@ -1975,7 +2128,7 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
            if((nextop&0xC0)==0xC0) {   // reg <= reg
                MOV_REG(xEAX+(nextop&7), gd);   // doesn't exist
            } else {                    // mem <= reg
-                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 4095, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 4095, 0, 0, NULL);
                STR_IMM9(gd, ed, fixedaddress);
            }
            break;
@@ -1988,7 +2141,8 @@ 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 {
-                addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0);
+                SMREAD();
+                addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0, NULL);
                u8 = (F8)&3;
                VLD1LANE_16(d0, wback, u8);
            }
@@ -2002,7 +2156,8 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                u8 = (F8)&3;
                VMOVfrDx_U16(gd, d0, u8);
            } else {
-                addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255-8, 0, 0);
+                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);
            }
@@ -2015,8 +2170,9 @@ 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);
+                addr = geted(dyn, addr, ninst, nextop, &wback, x1, &fixedaddress, 0, 0, 0, NULL);
                u8 = F8;
                q0 = v0;
                // Low part
@@ -2166,7 +2322,8 @@ 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);
-                    addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 4095-4, 0, 0);
+                    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);
                    CMPS_REG_LSL_IMM5(xEAX, x1, 0);
@@ -2183,6 +2340,7 @@ 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;
@@ -2404,7 +2562,7 @@ uintptr_t dynarec0F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                DEFAULT;
            } else {
                v0 = mmx_get_reg(dyn, ninst, x1, x2, x3, gd);
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                VST1_64(v0, ed);
            }
            break;
@@ -29,7 +29,7 @@ uintptr_t dynarecFS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
    int32_t i32, j32;
    uint32_t u32;
    uint8_t gd, ed;
-    uint8_t wback;
+    uint8_t wback, u8;
    int fixedaddress;

    MAYUSE(j32);
@@ -103,6 +103,7 @@ 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;

@@ -114,6 +115,7 @@ 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);
                    }
@@ -129,6 +131,7 @@ 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;

@@ -140,6 +143,7 @@ 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;

@@ -152,6 +156,7 @@ 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:
@@ -163,6 +168,7 @@ 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);
@@ -185,8 +191,9 @@ uintptr_t dynarecFS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
            if((nextop&0xC0)==0xC0) {   // reg <= reg
                MOV_REG(xEAX+(nextop&7), gd);
            } else {                    // mem <= reg
-                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0, NULL);
                STR_REG_LSL_IMM5(gd, ed, x14, 0);
+                SMWRITE2();
            }
            break;

@@ -198,7 +205,8 @@ 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
-                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0);
+                SMREAD();
+                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0, NULL);
                LDR_REG_LSL_IMM5(gd, ed, x14, 0);
            }
            break;
@@ -210,9 +218,10 @@ uintptr_t dynarecFS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
            if((nextop&0xC0)==0xC0) {
                POP1(xEAX+(nextop&7));
            } else {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                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;

@@ -224,6 +233,7 @@ 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;
@@ -235,6 +245,7 @@ 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;
@@ -247,6 +258,7 @@ 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:
@@ -255,12 +267,23 @@ 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;

+        case 0xA8:
+            INST_NAME("TEST AL, Ib");
+            SETFLAGS(X_ALL, SF_SET_PENDING);
+            UXTB(x1, xEAX, 0);
+            u8 = F8;
+            MOVW(x2, u8);
+            emit_test8(dyn, ninst, x1, x2, x3, x14);
+            break;
+
        case 0xC7:
            INST_NAME("MOV FS:Ed, Id");
            grab_fsdata(dyn, addr, ninst, x14);
@@ -270,10 +293,11 @@ uintptr_t dynarecFS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                ed = xEAX+(nextop&7);
                MOV32(ed, i32);
            } else {                    // mem <= i32
-                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0, NULL);
                i32 = F32S;
                MOV32(x3, i32);
                STR_REG_LSL_IMM5(x3, ed, x14, 0);
+                SMWRITE2();
            }
            break;
            
@@ -289,7 +313,10 @@ 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(ninst && dyn->insts[ninst-1].x86.set_flags, 1) {
+                    PASS2IF((box86_dynarec_safeflags>1) ||
+                        ((ninst && dyn->insts[ninst-1].x86.set_flags)
+                        || ((ninst>1) && dyn->insts[ninst-2].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
@@ -297,7 +324,7 @@ uintptr_t dynarecFS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    if((nextop&0xC0)==0xC0) {   // reg
                        MOV_REG(xEIP, xEAX+(nextop&7));
                    } else {                    // mem
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0, NULL);
                        LDR_REG_LSL_IMM5(xEIP, ed, x14, 0);
                    }
                    BARRIER(BARRIER_FULL);
@@ -312,7 +339,8 @@ uintptr_t dynarecFS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    if((nextop&0xC0)==0xC0) {   // reg
                        DEFAULT;
                    } else {                    // mem <= i32
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0);
+                        SMREAD();
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0, NULL);
                        LDR_REG_LSL_IMM5(x3, ed, x14, 0);
                        PUSH1(x3);
                    }
@@ -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);
-            WBACK;
+            WBACK2;
            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);
-            WBACK;
+            WBACK2;
            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);
-            WBACK;
+            WBACK2;
            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);
-            WBACK;
+            WBACK2;
            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);
-                    EBBACK;
+                    EBBACK2;
                    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);
-                    EBBACK;
+                    EBBACK2;
                    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);
-                    EBBACK;
+                    EBBACK2;
                    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);
-                    EBBACK;
+                    EBBACK2;
                    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);
-                    EBBACK;
+                    EBBACK2;
                    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);
-                    EBBACK;
+                    EBBACK2;
                    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);
-                    EBBACK;
+                    EBBACK2;
                    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);
-                    WBACK;
+                    WBACK2;
                    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);
-                    WBACK;
+                    WBACK2;
                    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);
-                    WBACK;
+                    WBACK2;
                    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);
-                    WBACK;
+                    WBACK2;
                    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);
-                    WBACK;
+                    WBACK2;
                    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);
-                    WBACK;
+                    WBACK2;
                    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);
-                    WBACK;
+                    WBACK2;
                    break;
                case 7: //CMP
                    if(opcode==0x81) {INST_NAME("CMP Ed, Id");} else {INST_NAME("CMP Ed, Ib");}
@@ -372,8 +372,9 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
            if((nextop&0xC0)==0xC0) {   // reg <= reg
                MOV_REG(xEAX+(nextop&7), gd);
            } else {                    // mem <= reg
-                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0, NULL);
                STR_REG_LSL_IMM5(gd, ed, x14, 0);
+                SMWRITE2();
            }
            break;

@@ -385,7 +386,8 @@ 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
-                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0);
+                SMREAD();
+                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0, NULL);
                LDR_REG_LSL_IMM5(gd, ed, x14, 0);
            }
            break;
@@ -397,9 +399,10 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
            if((nextop&0xC0)==0xC0) {
                POP1((xEAX+(nextop&7)));
            } else {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                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;

@@ -407,6 +410,7 @@ 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 {
@@ -416,6 +420,16 @@ 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);
@@ -423,6 +437,7 @@ 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:
@@ -437,10 +452,11 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                MOVW(x3, u8);
                BFI(eb1, x3, eb2*8, 8);
            } else {                    // mem <= u8
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                u8 = F8;
                MOVW(x3, u8);
                STRB_REG_LSL_IMM5(x3, ed, x14, 0);
+                SMWRITE2();
            }
            break;
        case 0xC7:
@@ -452,10 +468,11 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                ed = xEAX+(nextop&7);
                MOV32(ed, i32);
            } else {                    // mem <= i32
-                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0, NULL);
                i32 = F32S;
                MOV32(x3, i32);
                STR_REG_LSL_IMM5(x3, ed, x14, 0);
+                SMWRITE2();
            }
            break;

@@ -468,14 +485,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);
-                    WBACK;
+                    WBACK2;
                    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);
-                    WBACK;
+                    WBACK2;
                    break;
                case 2:
                    INST_NAME("RCL Ed, 1");
@@ -484,10 +501,9 @@ 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<<x14));
-                    SBACK(wb);
+                    CALL_(rcl32, ed, (1<<x2));
+                    WBACK2;
                    break;
                case 3:
                    INST_NAME("RCR Ed, 1");
@@ -495,10 +511,9 @@ 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<<x14));
-                    SBACK(wb);
+                    CALL_(rcr32, ed, (1<<x2));
+                    WBACK2;
                    break;
                case 4:
                case 6:
@@ -506,21 +521,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);
-                    WBACK;
+                    WBACK2;
                    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);
-                    WBACK;
+                    WBACK2;
                    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);
-                    WBACK;
+                    WBACK2;
                    break;
            }
            break;
@@ -537,7 +552,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);
-                    WBACK;
+                    WBACK2;
                    UFLAG_IF {  // calculate flags directly
                        CMPS_IMM8(x3, 31);
                        B_MARK(cNE);
@@ -558,7 +573,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);
-                    WBACK;
+                    WBACK2;
                    UFLAG_IF {  // calculate flags directly
                        CMPS_IMM8(x3, 1);
                        B_MARK(cNE);
@@ -578,10 +593,9 @@ 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<<x14));
-                    SBACK(wb);
+                    CALL_(rcl32, ed, (1<<x2));
+                    WBACK2;
                    break;
                case 3:
                    INST_NAME("RCR Ed, CL");
@@ -589,10 +603,9 @@ 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));
-                    SBACK(wb);
+                    WBACK2;
                    break;
                case 4:
                case 6:
@@ -601,7 +614,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);
-                    WBACK;
+                    WBACK2;
                    break;
                case 5:
                    INST_NAME("SHR Ed, CL");
@@ -609,7 +622,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);
-                    WBACK;
+                    WBACK2;
                    break;
                case 7:
                    INST_NAME("SAR Ed, CL");
@@ -618,7 +631,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);
-                    WBACK;
+                    WBACK2;
                    UFLAG_RES(ed);
                    UFLAG_DF(x3, d_sar32);
                    break;
@@ -640,7 +653,8 @@ uintptr_t dynarecGS(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    if((nextop&0xC0)==0xC0) {   // reg
                        DEFAULT;
                    } else {                    // mem <= i32
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0);
+                        SMREAD();
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0, NULL);
                        LDR_REG_LSL_IMM5(x3, ed, x14, 0);
                        PUSH1(x3);
                    }
@@ -33,12 +33,14 @@ uintptr_t dynarec66(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
    uint16_t u16;
    uint8_t gd, ed;
    uint8_t wback, wb1;
+    int lock;
    int fixedaddress;
    MAYUSE(u16);
    MAYUSE(u8);
    MAYUSE(j32);
+    MAYUSE(lock);
    while(opcode==0x66) opcode = F8;    // "unlimited" 0x66 as prefix for variable sized NOP
-    if(opcode==0x2E) opcode = F8;       // cs: is ignored
+    if((opcode==0x26) || (opcode==0x2E) || (opcode==0x36) || (opcode==0x3E)) opcode = F8;       // segment prefix are ignored
    switch(opcode) {
        
        case 0x01:
@@ -503,7 +505,7 @@ uintptr_t dynarec66(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
            break;

        case 0x87:
-            INST_NAME("XCHG Ew, Gw");
+            INST_NAME("(LOCK) XCHG Ew, Gw");
            nextop = F8;
            if((nextop&0xC0)==0xC0) {
                GETGD;
@@ -516,7 +518,8 @@ uintptr_t dynarec66(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
            } else {
                GETGD;
                UXTH(x14, gd, 0);
-                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0);
+                SMDMB();
+                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 0, 0, 0, LOCK_LOCK);
                #if 0
                MARKLOCK;
                // do the swap with exclusive locking
@@ -529,6 +532,7 @@ 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;
@@ -543,8 +547,9 @@ uintptr_t dynarec66(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    BFI(ed, gd, 0, 16);
                }
            } else {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0, &lock);
                STRH_IMM8(gd, ed, fixedaddress);
+                SMWRITELOCK(lock);
            }
            break;
        case 0x8B:
@@ -557,7 +562,8 @@ uintptr_t dynarec66(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    BFI(gd, ed, 0, 16);
                }
            } else {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0, &lock);
+                SMREADLOCK(lock);
                LDRH_IMM8(x1, ed, fixedaddress);
                BFI(gd, x1, 0, 16);
            }
@@ -571,8 +577,9 @@ uintptr_t dynarec66(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                ed = xEAX+(nextop&7);
                BFI(ed, x1, 0, 16);
            } else {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0, NULL);
                STRH_IMM8(x1, ed, fixedaddress);
+                SMWRITE2();
            }
            break;

@@ -584,7 +591,8 @@ 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 {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0);
+                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]));
                STRH_REG(x1, xEmu, x2);
@@ -641,6 +649,7 @@ 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;
@@ -649,6 +658,7 @@ 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");
@@ -798,7 +808,7 @@ uintptr_t dynarec66(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                MOVW(x1, u16);
                BFI(ed, x1, 0, 16);
            } else {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0, NULL);
                u16 = F16;
                MOVW(x1, u16);
                STRH_IMM8(x1, ed, fixedaddress);
@@ -939,7 +949,8 @@ uintptr_t dynarec66(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,

                case 0xA7:
                    if(opcode==0xF2) {INST_NAME("REPNZ CMPSW");} else {INST_NAME("REPZ CMPSW");}
-                    SETFLAGS(X_ALL, SF_MAYSET);
+                    MAYSETFLAGS();
+                    SETFLAGS(X_ALL, SF_SET_PENDING);
                    TSTS_REG_LSL_IMM5(xECX, xECX, 0);
                    B_NEXT(cEQ);    // end of loop
                    GETDIR(x3, 2);
@@ -975,7 +986,8 @@ uintptr_t dynarec66(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,

                case 0xAF:
                    if(opcode==0xF2) {INST_NAME("REPNZ SCASW");} else {INST_NAME("REPZ SCASW");}
-                    SETFLAGS(X_ALL, SF_MAYSET);
+                    MAYSETFLAGS();
+                    SETFLAGS(X_ALL, SF_SET_PENDING);
                    TSTS_REG_LSL_IMM5(xECX, xECX, 0);
                    B_NEXT(cEQ);    // end of loop
                    GETDIR(x3, 2);
@@ -27,9 +27,10 @@
    if((nextop&0xC0)==0xC0) {   \
        a = sse_get_reg(dyn, ninst, x1, nextop&7, w);  \
    } else {                    \
-        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0); \
+        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;  \
@@ -70,8 +71,9 @@ 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);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-12, 0, 0, NULL);
                LDR_IMM9(x2, ed, fixedaddress+0);
                LDR_IMM9(x3, ed, fixedaddress+4);
                VMOVtoV_D(v0, x2, x3);
@@ -89,13 +91,14 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                v1 = sse_get_reg_empty(dyn, ninst, x1, nextop&7);
                VMOVQ(v1, v0);
            } else {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 255-16, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 255-16, 0, 0, NULL);
                VMOVfrV_D(x2, x3, v0);
                STR_IMM9(x2, ed, fixedaddress+0);
                STR_IMM9(x3, ed, fixedaddress+4);
                VMOVfrV_D(x2, x3, v0+1);
                STR_IMM9(x2, ed, fixedaddress+8);
                STR_IMM9(x3, ed, fixedaddress+12);
+                SMWRITE2();
            }
            break;
        case 0x12:
@@ -108,11 +111,12 @@ 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);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0, NULL);
                VLDR_64(v0, ed, fixedaddress);
            } else {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-8, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-8, 0, 0, NULL);
                LDR_IMM9(x2, ed, fixedaddress);
                LDR_IMM9(x3, ed, fixedaddress+4);
                VMOVtoV_D(v0, x2, x3);
@@ -129,14 +133,15 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
            }
            parity = getedparity(dyn, ninst, addr, nextop, 3);
            if(parity) {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0, NULL);
                VSTR_64(v0, ed, fixedaddress);
            } else {
                VMOVfrV_D(x2, x3, v0);
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-8, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-8, 0, 0, NULL);
                STR_IMM9(x2, ed, fixedaddress);
                STR_IMM9(x3, ed, fixedaddress+4);
            }
+            SMWRITE2();
            break;
        case 0x14:
            INST_NAME("UNPCKLPD Gx, Ex");
@@ -146,7 +151,8 @@ 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 {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0);
+                SMREAD();
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0, NULL);
                VLDR_64(v0+1, ed, fixedaddress);
            }
            break;
@@ -159,7 +165,8 @@ 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 {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023-4, 3, 0);
+                SMREAD();
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023-4, 3, 0, NULL);
                VLDR_64(v0+1, ed, fixedaddress+4);
            }
            break;
@@ -173,11 +180,12 @@ 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);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0, NULL);
                VLDR_64(v0+1, ed, fixedaddress);    // vfpu opcode here
            } else {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-8, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-8, 0, 0, NULL);
                LDR_IMM9(x2, ed, fixedaddress);
                LDR_IMM9(x3, ed, fixedaddress+4);
                VMOVtoV_D(v0+1,x2, x3);
@@ -194,14 +202,15 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
            }
            parity = getedparity(dyn, ninst, addr, nextop, 3);
            if(parity) {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0, NULL);
                VSTR_64(v0+1, ed, fixedaddress);
            } else {
                VMOVfrV_D(x2, x3, v0+1);
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-8, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-8, 0, 0, NULL);
                STR_IMM9(x2, ed, fixedaddress);
                STR_IMM9(x3, ed, fixedaddress+4);
            }
+            SMWRITE2();
            break;

        case 0x1F:
@@ -220,8 +229,9 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                VMOVQ(v0, v1);
            } else {
                v0 = sse_get_reg_empty(dyn, ninst, x1, gd);
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
-                VLD1Q_32(v0, ed);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
+                VLD1Q_64(v0, ed);
+                SMWRITE2();
            }
            break;
        case 0x29:
@@ -233,8 +243,25 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                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);
-                VST1Q_32(v0, ed);
+                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();
            }
            break;

@@ -262,7 +289,8 @@ 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 {
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                        SMREAD();
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                        VLD1Q_64(q1, ed);
                        v0 = q1;
                    }
@@ -469,7 +497,8 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
            if((nextop&0xC0)==0xC0) {   \
                ed = xEAX+(nextop&7);   \
            } else { \
-                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0);    \
+                SMREAD(); \
+                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0, NULL);\
                LDRH_IMM8_COND(YES, x1, ed, fixedaddress); \
                ed = x1;                        \
            }   \
@@ -622,24 +651,24 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
            GETGX(q1, 1);
            if(!box86_dynarec_fastnan) {
                VMRS(x14);               // get fpscr
-                ORR_IMM8(x3, x14, 0b001, 6); // enable exceptions
+                ORR_IMM8(x3, x14, 0b010, 9); // enable exceptions
                BIC_IMM8(x3, x3, 0b10011111, 0);
                VMSR(x3);
            }
            VADD_F64(q1, q1, q0);
            if(!box86_dynarec_fastnan) {
-                VMRS(x3);   // get the FPCSR reg and test FPU execption (invalid operation only)
+                VMRS(x3);   // get the FPSCR reg and test FPU execption (invalid operation only)
                TSTS_IMM8_ROR(x3, 0b00000001, 0);
                VNEG_F64_cond(cNE, q1, q1);
-                ORR_IMM8(x3, x14, 0b001, 6); // enable exceptions
                BIC_IMM8(x3, x3, 0b10011111, 0);
                VMSR(x3);
            }
            VADD_F64(q1+1, q1+1, q0+1);
            if(!box86_dynarec_fastnan) {
-                VMRS(x3);   // get the FPCSR reg and test FPU execption (invalid operation only)
+                VMRS(x3);   // get the FPSCR reg and test FPU execption (invalid operation only)
                TSTS_IMM8_ROR(x3, 0b00000001, 0);
                VNEG_F64_cond(cNE, q1+1, q1+1);
+                VMSR(x14);  // restore fpscr
            }
            break;
        case 0x59:
@@ -649,24 +678,24 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
            GETGX(q1, 1);
            if(!box86_dynarec_fastnan) {
                VMRS(x14);               // get fpscr
-                ORR_IMM8(x3, x14, 0b001, 6); // enable exceptions
+                ORR_IMM8(x3, x14, 0b010, 9); // enable exceptions
                BIC_IMM8(x3, x3, 0b10011111, 0);
                VMSR(x3);
            }
            VMUL_F64(q1, q1, q0);
            if(!box86_dynarec_fastnan) {
-                VMRS(x3);   // get the FPCSR reg and test FPU execption (invalid operation only)
+                VMRS(x3);   // get the FPSCR reg and test FPU execption (invalid operation only)
                TSTS_IMM8_ROR(x3, 0b00000001, 0);
                VNEG_F64_cond(cNE, q1, q1);
-                ORR_IMM8(x3, x14, 0b001, 6); // enable exceptions
                BIC_IMM8(x3, x3, 0b10011111, 0);
                VMSR(x3);
            }
            VMUL_F64(q1+1, q1+1, q0+1);
            if(!box86_dynarec_fastnan) {
-                VMRS(x3);   // get the FPCSR reg and test FPU execption (invalid operation only)
+                VMRS(x3);   // get the FPSCR reg and test FPU execption (invalid operation only)
                TSTS_IMM8_ROR(x3, 0b00000001, 0);
                VNEG_F64_cond(cNE, q1+1, q1+1);
+                VMSR(x14);  // restore fpscr
            }
            break;
        case 0x5A:
@@ -687,8 +716,26 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
            nextop = F8;
            GETGX(v0, 1);
            GETEX(v1, 0);
-            // need rounding?
-            VCVTQ_S32_F32(v0, v1);
+            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);
            break;
        case 0x5C:
            INST_NAME("SUBPD Gx, Ex");
@@ -697,24 +744,24 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
            GETGX(q1, 1);
            if(!box86_dynarec_fastnan) {
                VMRS(x14);               // get fpscr
-                ORR_IMM8(x3, x14, 0b001, 6); // enable exceptions
+                ORR_IMM8(x3, x14, 0b010, 9); // enable exceptions
                BIC_IMM8(x3, x3, 0b10011111, 0);
                VMSR(x3);
            }
            VSUB_F64(q1, q1, q0);
            if(!box86_dynarec_fastnan) {
-                VMRS(x3);   // get the FPCSR reg and test FPU execption (invalid operation only)
+                VMRS(x3);   // get the FPSCR reg and test FPU execption (invalid operation only)
                TSTS_IMM8_ROR(x3, 0b00000001, 0);
                VNEG_F64_cond(cNE, q1, q1);
-                ORR_IMM8(x3, x14, 0b001, 6); // enable exceptions
                BIC_IMM8(x3, x3, 0b10011111, 0);
                VMSR(x3);
            }
            VSUB_F64(q1+1, q1+1, q0+1);
            if(!box86_dynarec_fastnan) {
-                VMRS(x3);   // get the FPCSR reg and test FPU execption (invalid operation only)
+                VMRS(x3);   // get the FPSCR reg and test FPU execption (invalid operation only)
                TSTS_IMM8_ROR(x3, 0b00000001, 0);
                VNEG_F64_cond(cNE, q1+1, q1+1);
+                VMSR(x14);  // restore fpscr
            }
            break;
        case 0x5D:
@@ -737,24 +784,24 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
            GETGX(q1, 1);
            if(!box86_dynarec_fastnan) {
                VMRS(x14);               // get fpscr
-                ORR_IMM8(x3, x14, 0b001, 6); // enable exceptions
+                ORR_IMM8(x3, x14, 0b010, 9); // enable exceptions
                BIC_IMM8(x3, x3, 0b10011111, 0);
                VMSR(x3);
            }
            VDIV_F64(q1, q1, q0);
            if(!box86_dynarec_fastnan) {
-                VMRS(x3);   // get the FPCSR reg and test FPU execption (invalid operation only)
+                VMRS(x3);   // get the FPSCR reg and test FPU execption (invalid operation only)
                TSTS_IMM8_ROR(x3, 0b00000001, 0);
                VNEG_F64_cond(cNE, q1, q1);
-                ORR_IMM8(x3, x14, 0b001, 6); // enable exceptions
                BIC_IMM8(x3, x3, 0b10011111, 0);
                VMSR(x3);
            }
            VDIV_F64(q1+1, q1+1, q0+1);
            if(!box86_dynarec_fastnan) {
-                VMRS(x3);   // get the FPCSR reg and test FPU execption (invalid operation only)
+                VMRS(x3);   // get the FPSCR reg and test FPU execption (invalid operation only)
                TSTS_IMM8_ROR(x3, 0b00000001, 0);
                VNEG_F64_cond(cNE, q1+1, q1+1);
+                VMSR(x14);  // restore fpscr
            }
            break;
        case 0x5F:
@@ -893,7 +940,8 @@ 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 {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0);
+                SMREAD();
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0, NULL);
                VLDR_64(v0+1, ed, fixedaddress);
            }
            break;
@@ -906,7 +954,8 @@ 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 {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023-8, 3, 0);
+                SMREAD();
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023-8, 3, 0, NULL);
                VLDR_64(q0+1, ed, fixedaddress+8);
            }
            break;
@@ -928,8 +977,9 @@ 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);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                VLD1Q_64(v0, ed);
            }
            break;
@@ -952,6 +1002,9 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                    VMOVD(v0+1, v1+1);
                } else if (u8==0b10110001) {
                    VREV64Q_32(v0, v1);
+                } else if (u8==0b01010001) {
+                    VDUP_32(v0+1, v1, 1);
+                    VREV64Q_32(v0, v1);
                } else if (u8==0b00011011) {
                    VREV64Q_32(v0, v1);
                    VSWP(v0, v0+1);
@@ -1040,8 +1093,9 @@ 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);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                u8 = F8;
                if ((u8==0) || (u8==0b01010101) || (u8==0b10101010) || (u8==0b11111111)) {
                    if(u8&3) {
@@ -1068,7 +1122,8 @@ 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 {
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                        SMREAD();
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                        q0 = fpu_get_scratch_quad(dyn);
                        VLD1Q_16(q0, ed);
                    }
@@ -1081,6 +1136,7 @@ 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;
@@ -1089,7 +1145,8 @@ 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 {
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                        SMREAD();
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                        q0 = fpu_get_scratch_quad(dyn);
                        VLD1Q_16(q0, ed);
                    }
@@ -1099,6 +1156,7 @@ 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:
@@ -1106,7 +1164,8 @@ 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 {
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                        SMREAD();
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                        q0 = fpu_get_scratch_quad(dyn);
                        VLD1Q_16(q0, ed);
                    }
@@ -1119,6 +1178,7 @@ 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;
@@ -1135,7 +1195,8 @@ 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 {
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                        SMREAD();
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                        q0 = fpu_get_scratch_quad(dyn);
                        VLD1Q_32(q0, ed);
                    }
@@ -1148,6 +1209,7 @@ 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;
@@ -1156,7 +1218,8 @@ 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 {
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                        SMREAD();
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                        q0 = fpu_get_scratch_quad(dyn);
                        VLD1Q_32(q0, ed);
                    }
@@ -1166,6 +1229,7 @@ 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:
@@ -1173,7 +1237,8 @@ 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 {
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                        SMREAD();
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                        q0 = fpu_get_scratch_quad(dyn);
                        VLD1Q_32(q0, ed);
                    }
@@ -1186,6 +1251,7 @@ 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;
@@ -1201,7 +1267,8 @@ 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 {
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                        SMREAD();
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                        q0 = fpu_get_scratch_quad(dyn);
                        VLD1Q_64(q0, ed);
                    }
@@ -1214,6 +1281,7 @@ 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;
@@ -1222,7 +1290,8 @@ 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 {
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                        SMREAD();
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                        q0 = fpu_get_scratch_quad(dyn);
                        VLD1Q_64(q0, ed);
                    }
@@ -1237,6 +1306,7 @@ 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;
@@ -1245,7 +1315,8 @@ 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 {
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                        SMREAD();
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                        q0 = fpu_get_scratch_quad(dyn);
                        VLD1Q_64(q0, ed);
                    }
@@ -1258,6 +1329,7 @@ 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;
@@ -1266,7 +1338,8 @@ 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 {
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                        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,6 +1354,7 @@ 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;
@@ -1320,8 +1394,9 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                VMOVfrDx_32(ed, v0, 0);
            } else {
                VMOVfrDx_32(x2, v0, 0); // to avoid Bus Error, using regular store
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095, 0, 0, NULL);
                STR_IMM9(x2, ed, fixedaddress);
+                SMWRITE2();
            }
            break;
        case 0x7F:
@@ -1332,8 +1407,9 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                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);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                VST1Q_32(v0, ed);
+                SMWRITE2();
            }
            break;

@@ -1346,7 +1422,8 @@ 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 {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x3, &fixedaddress, 255, 0, 0);
+                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;
                LDRH_IMM8(x1, x1, fixedaddress);
@@ -1388,7 +1465,8 @@ 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 {
-                addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255, 0, 0);
+                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;
                LDRH_IMM8(x14, x3, fixedaddress);
@@ -1404,6 +1482,7 @@ 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:
@@ -1436,7 +1515,7 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
            if((nextop&0xC0)==0xC0) {
                ed = xEAX+(nextop&7);
            } else {
-                addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255, 0, 0, NULL);
                LDRH_IMM8(x1, wback, fixedaddress);
                ed = x1;
            }
@@ -1456,7 +1535,8 @@ 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 {
-                addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255, 0, 0);
+                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;
                LDRH_IMM8(x14, x3, fixedaddress);
@@ -1472,6 +1552,7 @@ 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;

@@ -1485,7 +1566,8 @@ 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 {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 4095, 0, 0);
+                SMREAD();
+                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 4095, 0, 0, NULL);
                LDRB_IMM9(x1, ed, fixedaddress);
            }
            BFI(gd, x1, 0, 16);
@@ -1498,7 +1580,8 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                ed = xEAX + (nextop&7);
                UXTH(x1, ed, 0);
            } else {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0);
+                SMREAD();
+                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0, NULL);
                LDRH_IMM8(x1, ed, fixedaddress);
            }
            BFI(gd, x1, 0, 16);
@@ -1514,7 +1597,8 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                    if((nextop&0xC0)==0xC0) {
                        ed = xEAX+(nextop&7);
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255, 0, 0);
+                        SMREAD();
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255, 0, 0, NULL);
                        LDRH_IMM8(x1, wback, fixedaddress);
                        ed = x1;
                    }
@@ -1534,7 +1618,8 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                        ed = xEAX+(nextop&7);
                        wback = 0;
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255, 0, 0);
+                        SMREAD();
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255, 0, 0, NULL);
                        LDRH_IMM8(x1, wback, fixedaddress);
                        ed = x1;
                    }
@@ -1552,6 +1637,7 @@ 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;
@@ -1563,7 +1649,8 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                        ed = xEAX+(nextop&7);
                        wback = 0;
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255, 0, 0);
+                        SMREAD();
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255, 0, 0, NULL);
                        LDRH_IMM8(x1, wback, fixedaddress);
                        ed = x1;
                    }
@@ -1581,6 +1668,7 @@ 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;
@@ -1592,7 +1680,8 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                        ed = xEAX+(nextop&7);
                        wback = 0;
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255, 0, 0);
+                        SMREAD();
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255, 0, 0, NULL);
                        LDRH_IMM8(x1, wback, fixedaddress);
                        ed = x1;
                    }
@@ -1609,6 +1698,7 @@ 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;
@@ -1626,7 +1716,8 @@ 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 {
-                addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255, 0, 0);
+                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;
                LDRH_IMM8(x14, x3, fixedaddress);
@@ -1640,6 +1731,7 @@ 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:
@@ -1685,7 +1777,8 @@ 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 {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0);
+                SMREAD();
+                addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 255, 0, 0, NULL);
                LDRSB_IMM8(x1, ed, fixedaddress);
            }
            BFI(gd, x1, 0, 16);
@@ -1756,7 +1849,8 @@ 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 {
-                addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0);
+                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);
            }
@@ -1770,7 +1864,8 @@ 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 {
-                addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255-14, 0, 0);
+                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);
            }
@@ -1827,8 +1922,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);
-            VDUPQ_16(v0, q1, 0);
-            VNEGNQ_16(v0, v0);   // because we want SHR and not SHL
+            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
            VSHLQ_U16(q0, q0, v0);
            break;
        case 0xD2:
@@ -1837,11 +1935,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);
-            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);
+            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
            VSHLQ_U32(q0, q0, v0);
            break;
        case 0xD3:
@@ -1850,11 +1948,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);
-            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
+            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
            VSHLQ_U64(q0, q0, v0);
            break;
        case 0xD4:
@@ -1883,14 +1981,15 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                parity = getedparity(dyn, ninst, addr, nextop, 3);
                // can be unaligned sometimes
                if(parity) {
-                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0);
+                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0, NULL);
                    VSTR_64(q0, ed, fixedaddress);
                } else {
-                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-4, 0, 0);
+                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-4, 0, 0, NULL);
                    VMOVfrV_D(x2, x3, q0);
                    STR_IMM9(x2, ed, fixedaddress+0);
                    STR_IMM9(x3, ed, fixedaddress+4);
                }
+                SMWRITE2();
            }
            break;
        case 0xD7:
@@ -1996,13 +2095,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);
-            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);
+            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
            VSHLQ_S16(q0, q0, v0);
            break;
        case 0xE2:
@@ -2011,11 +2108,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);
-            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);
+            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
            VSHLQ_S32(q0, q0, v0);
            break;
        case 0xE3:
@@ -2072,7 +2169,7 @@ uintptr_t dynarec660F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                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);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                VST1Q_64(v0, ed);
            }
            break;
@@ -2145,12 +2242,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);
-            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);
+            VQMOVN_S64(v0, q1);
+            VQMOVN_S32(v0, v0);
+            VQMOVN_S16(v0, v0);
+            VDUPQ_8(v0, v0, 0); // only 8 bits are taken
            VSHLQ_U16(q0, q0, v0);
            break;
        case 0xF2:
@@ -2159,10 +2254,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);
-            VMOVD(v0, q1);
-            VMOVD(v0+1, q1);
-            VQMOVN_S64(v0, v0); // 2*q1 in 32bits now
-            VMOVD(v0+1, v0);
+            VQMOVN_S64(v0, q1);
+            VQMOVN_S32(v0, v0);
+            VQMOVN_S16(v0, v0);
+            VDUPQ_8(v0, v0, 0); // only 8 bits are taken
            VSHLQ_U32(q0, q0, v0);
            break;
        case 0xF3:
@@ -2171,8 +2266,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);
-            VMOVD(v0, q1);
-            VMOVD(v0+1, q1);
+            VQMOVN_S64(v0, q1);
+            VQMOVN_S32(v0, v0);
+            VQMOVN_S16(v0, v0);
+            VDUPQ_8(v0, v0, 0); // only 8 bits are taken
            VSHLQ_U64(q0, q0, v0);
            break;
        case 0xF4:
@@ -2214,7 +2311,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);
@@ -30,6 +30,7 @@ uintptr_t dynarec66F0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
    uint8_t ed, gd, u8;
    int fixedaddress;
    int32_t i32, j32;
+    int16_t i16;
    MAYUSE(i32);
    MAYUSE(j32);
    MAYUSE(gb1);
@@ -37,10 +38,64 @@ uintptr_t dynarec66F0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
    MAYUSE(wb1);
    MAYUSE(wb2);
    switch(opcode) {
-        
+        case 0x81:
+        case 0x83:
+            nextop = F8;
+            SMDMB();
+            switch((nextop>>3)&7) {
+                case 0: //ADD
+                    if(opcode==0x81) {
+                        INST_NAME("LOCK ADD Ew, Iw");
+                    } else {
+                        INST_NAME("LOCK ADD Ew, Ib");
+                    }
+                    SETFLAGS(X_ALL, SF_SET_PENDING);
+                    SMDMB();
+                    if((nextop&0xC0)==0xC0) {
+                        if(opcode==0x81) i16 = F16S; else i16 = F8S;
+                        ed = xEAX+(nextop&7);
+                        emit_add16c(dyn, ninst, ed, i16, x3, x14);
+                    } else {
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 1, LOCK_LOCK);
+                        if(opcode==0x81) i16 = F16S; else i16 = F8S;
+                        if(!fixedaddress) {
+                            TSTS_IMM8(wback, 0x1);
+                            B_MARK(cNE);
+                        }
+                        if(!fixedaddress || (fixedaddress && !(fixedaddress&1))) {
+                            MARKLOCK;
+                            LDREXH(x1, wback);
+                            emit_add16c(dyn, ninst, x1, i16, x3, x14);
+                            STREXH(x3, x1, wback);
+                            CMPS_IMM8(x3, 0);
+                            B_MARKLOCK(cNE);
+                        }
+                        if(!fixedaddress) {
+                            SMDMB();
+                            B_NEXT(c__);
+                        }
+                        if(!fixedaddress || (fixedaddress && (fixedaddress&1))) {
+                            MARK;   // unaligned! also, not enough
+                            LDRH_IMM8(x1, wback, 0);
+                            LDREXB(x14, wback);
+                            BFI(x1, x14, 0, 8); // re-inject
+                            emit_add16c(dyn, ninst, x1, i16, x3, x14);
+                            STREXB(x3, x1, wback);
+                            CMPS_IMM8(x3, 0);
+                            B_MARK(cNE);
+                            STRH_IMM8(x1, wback, 0); // put the whole value
+                        }
+                        SMDMB();
+                    }
+                    break;
+                default:
+                  DEFAULT;
+            }
+            SMDMB();
+            break;
        case 0xFF:
            nextop = F8;
-            DMB_ISH();
+            SMDMB();
            switch((nextop>>3)&7)
            {
                case 0: // INC Ew
@@ -51,7 +106,7 @@ uintptr_t dynarec66F0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                        emit_inc16(dyn, ninst, ed, x3, x14);
                        EWBACK(x1);
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 1);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 1, LOCK_LOCK);
                        if(!fixedaddress) {
                            TSTS_IMM8(wback, 1);
                            B_MARK(cNE);    // unaligned
@@ -65,7 +120,7 @@ uintptr_t dynarec66F0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                            B_MARKLOCK(cNE);
                        }
                        if(!fixedaddress) {
-                            DMB_ISH();
+                            SMDMB();
                            B_NEXT(c__);
                        }
                        if(!fixedaddress || (fixedaddress && (fixedaddress&1))) {
@@ -89,7 +144,7 @@ uintptr_t dynarec66F0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                        emit_dec32(dyn, ninst, ed, x3, x14);
                        EWBACK(x1);
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 1);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 1, LOCK_LOCK);
                        if(!fixedaddress) {
                            TSTS_IMM8(wback, 1);
                            B_MARK(cNE);    // unaligned
@@ -103,7 +158,7 @@ uintptr_t dynarec66F0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                            B_MARKLOCK(cNE);
                        }
                        if(!fixedaddress) {
-                            DMB_ISH();
+                            SMDMB();
                            B_NEXT(c__);
                        }
                        if(!fixedaddress || (fixedaddress && (fixedaddress&3))) {
@@ -123,7 +178,7 @@ uintptr_t dynarec66F0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                    // default to NO LOCK
                    addr-=2;
            }
-            DMB_ISH();
+            SMDMB();
            break;
        default:
            DEFAULT;
@@ -30,9 +30,11 @@ uintptr_t dynarec67(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
    uint32_t u32;
    uint8_t gd, ed;
    int fixedaddress;
+    int cacheupd;

    MAYUSE(i32);
    MAYUSE(j32);
+    MAYUSE(cacheupd);
    
    nextop = F8;

@@ -56,6 +58,7 @@ 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;

@@ -70,6 +73,7 @@ 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);
                    }
@@ -85,6 +89,7 @@ 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;

@@ -96,6 +101,7 @@ 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;

@@ -108,6 +114,7 @@ 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:
@@ -119,6 +126,7 @@ 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);
@@ -142,11 +150,11 @@ uintptr_t dynarec67(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                i32 = dyn->insts[ninst].epilog-(dyn->arm_size+8);       \
                Bcond(NO, i32);                                         \
                if(dyn->insts[ninst].x86.jmp_insts==-1) {               \
-                    if(!dyn->insts[ninst].x86.barrier)                  \
+                    if(!(dyn->insts[ninst].x86.barrier&BARRIER_FLOAT))  \
                        fpu_purgecache(dyn, ninst, 1, x1, x2, x3);      \
                    jump_to_next(dyn, addr+i8, 0, ninst);               \
                } else {                                                \
-                    fpuCacheTransform(dyn, ninst, x1, x2, x3);          \
+                    CacheTransform(dyn, ninst, cacheupd, x1, x2, x3);   \
                    i32 = dyn->insts[dyn->insts[ninst].x86.jmp_insts].address-(dyn->arm_size+8);\
                    Bcond(c__, i32);                                    \
                }                                                       \
@@ -190,7 +190,7 @@ uintptr_t dynarecD8(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    d1 = fpu_get_scratch_double(dyn);
                    parity = getedparity(dyn, ninst, addr, nextop, 2);
                    if(parity) {
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 1023, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 1023, 0, 0, NULL);
                        VLDR_32(s0, ed, fixedaddress);
                    } else {
                        GETED;
@@ -210,7 +210,7 @@ uintptr_t dynarecD8(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    d1 = fpu_get_scratch_double(dyn);
                    parity = getedparity(dyn, ninst, addr, nextop, 2);
                    if(parity) {
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 1023, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 1023, 0, 0, NULL);
                        VLDR_32(s0, ed, fixedaddress);
                    } else {
                        GETED;
@@ -230,7 +230,7 @@ uintptr_t dynarecD8(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    d1 = fpu_get_scratch_double(dyn);
                    parity = getedparity(dyn, ninst, addr, nextop, 2);
                    if(parity) {
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 1023, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 1023, 0, 0, NULL);
                        VLDR_32(s0, ed, fixedaddress);
                    } else {
                        GETED;
@@ -251,7 +251,7 @@ uintptr_t dynarecD8(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    d1 = fpu_get_scratch_double(dyn);
                    parity = getedparity(dyn, ninst, addr, nextop, 2);
                    if(parity) {
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 1023, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 1023, 0, 0, NULL);
                        VLDR_32(s0, ed, fixedaddress);
                    } else {
                        GETED;
@@ -273,7 +273,7 @@ uintptr_t dynarecD8(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    d1 = fpu_get_scratch_double(dyn);
                    parity = getedparity(dyn, ninst, addr, nextop, 2);
                    if(parity) {
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 1023, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 1023, 0, 0, NULL);
                        VLDR_32(s0, ed, fixedaddress);
                    } else {
                        GETED;
@@ -293,7 +293,7 @@ uintptr_t dynarecD8(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    d1 = fpu_get_scratch_double(dyn);
                    parity = getedparity(dyn, ninst, addr, nextop, 2);
                    if(parity) {
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 1023, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 1023, 0, 0, NULL);
                        VLDR_32(s0, ed, fixedaddress);
                    } else {
                        GETED;
@@ -313,7 +313,7 @@ uintptr_t dynarecD8(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    d1 = fpu_get_scratch_double(dyn);
                    parity = getedparity(dyn, ninst, addr, nextop, 2);
                    if(parity) {
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 1023, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 1023, 0, 0, NULL);
                        VLDR_32(s0, ed, fixedaddress);
                    } else {
                        GETED;
@@ -333,7 +333,7 @@ uintptr_t dynarecD8(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    d1 = fpu_get_scratch_double(dyn);
                    parity = getedparity(dyn, ninst, addr, nextop, 2);
                    if(parity) {
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 1023, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 1023, 0, 0, NULL);
                        VLDR_32(s0, ed, fixedaddress);
                    } else {
                        GETED;
@@ -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, NEON_CACHE_ST_F);
+            v1 = x87_do_push(dyn, ninst, x1, box86_dynarec_x87double?NEON_CACHE_ST_D: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, NEON_CACHE_ST_F);
+            v1 = x87_do_push(dyn, ninst, x1, box86_dynarec_x87double?NEON_CACHE_ST_D: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, NEON_CACHE_ST_F);
+            v1 = x87_do_push(dyn, ninst, x1, box86_dynarec_x87double?NEON_CACHE_ST_D: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, NEON_CACHE_ST_F);
+            v1 = x87_do_push(dyn, ninst, x1, box86_dynarec_x87double?NEON_CACHE_ST_D: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, NEON_CACHE_ST_F);
+            v1 = x87_do_push(dyn, ninst, x1, box86_dynarec_x87double?NEON_CACHE_ST_D: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, NEON_CACHE_ST_F);
+            v1 = x87_do_push(dyn, ninst, x1, box86_dynarec_x87double?NEON_CACHE_ST_D: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, NEON_CACHE_ST_F);
+            v1 = x87_do_push(dyn, ninst, x1, box86_dynarec_x87double?NEON_CACHE_ST_D: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, NEON_CACHE_ST_F);
+            v2 = x87_do_push(dyn, ninst, x1, box86_dynarec_x87double?NEON_CACHE_ST_D: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);
@@ -575,10 +575,10 @@ uintptr_t dynarecD9(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                        s0 = fpu_get_scratch_single(dyn);
                    parity = getedparity(dyn, ninst, addr, nextop, 2);
                    if(parity) {
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 1023, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 1023, 0, 0, NULL);
                        VLDR_32(s0, ed, fixedaddress);
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095, 0, 0, NULL);
                        LDR_IMM9(x2, ed, fixedaddress);
                        VMOVtoV(s0, x2);
                    }
@@ -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, NEON_CACHE_ST_F);
+                    v1 = x87_get_st(dyn, ninst, x1, x2, 0, box86_dynarec_x87double?NEON_CACHE_ST_D:NEON_CACHE_ST_F);
                    if(ST_IS_F(0))
                        s0 = v1;
                    else {
@@ -598,17 +598,17 @@ uintptr_t dynarecD9(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    }
                    parity = getedparity(dyn, ninst, addr, nextop, 2);
                    if(parity) {
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 1023, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 1023, 0, 0, NULL);
                        VSTR_32(s0, ed, fixedaddress);
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095, 0, 0, NULL);
                        VMOVfrV(x2, s0);
                        STR_IMM9(x2, ed, fixedaddress);
                    }
                    break;
                case 3:
                    INST_NAME("FSTP float[ED], ST0");
-                    v1 = x87_get_st(dyn, ninst, x1, x2, 0, NEON_CACHE_ST_F);
+                    v1 = x87_get_st(dyn, ninst, x1, x2, 0, box86_dynarec_x87double?NEON_CACHE_ST_D:NEON_CACHE_ST_F);
                    if(ST_IS_F(0))
                        s0 = v1;
                    else {
@@ -617,10 +617,10 @@ uintptr_t dynarecD9(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    }
                    parity = getedparity(dyn, ninst, addr, nextop, 2);
                    if(parity) {
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 1023, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 1023, 0, 0, NULL);
                        VSTR_32(s0, ed, fixedaddress);
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095, 0, 0, NULL);
                        VMOVfrV(x2, s0);
                        STR_IMM9(x2, ed, fixedaddress);
                    }
@@ -630,7 +630,7 @@ uintptr_t dynarecD9(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    INST_NAME("FLDENV Ed");
                    MESSAGE(LOG_DUMP, "Need Optimization\n");
                    fpu_purgecache(dyn, ninst, 0, x1, x2, x3); // maybe only x87, not SSE?
-                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                    if(ed!=x1) {
                        MOV_REG(x1, ed);
                    }
@@ -641,14 +641,12 @@ uintptr_t dynarecD9(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    INST_NAME("FLDCW Ew");
                    GETEW(x1);
                    STRH_IMM8(x1, xEmu, offsetof(x86emu_t, cw));    // hopefully cw is not too far for an imm8
-                    UBFX(x1, x1, 10, 2);    // extract round
-                    STR_IMM9(x1, xEmu, offsetof(x86emu_t, round));
                    break;
                case 6:
                    INST_NAME("FNSTENV Ed");
                    MESSAGE(LOG_DUMP, "Need Optimization\n");
                    fpu_purgecache(dyn, ninst, 0, x1, x2, x3); // maybe only x87, not SSE?
-                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                    if(ed!=x1) {
                        MOV_REG(x1, ed);
                    }
@@ -657,7 +655,7 @@ uintptr_t dynarecD9(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    break;
                case 7:
                    INST_NAME("FNSTCW Ew");
-                    addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255, 0, 0);
+                    addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255, 0, 0, NULL);
                    ed = x1;
                    wb1 = 1;
                    LDRH_IMM8(x1, xEmu, offsetof(x86emu_t, cw));
@@ -187,7 +187,7 @@ uintptr_t dynarecDB(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    s0 = fpu_get_scratch_single(dyn);
                    parity = getedparity(dyn, ninst, addr, nextop, 2);
                    if(parity) {
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 1023, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x2, &fixedaddress, 1023, 0, 0, NULL);
                        VLDR_32(s0, ed, fixedaddress);
                    } else {
                        GETED;
@@ -202,13 +202,13 @@ uintptr_t dynarecDB(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                        ed = xEAX+(nextop&7);
                        wback = 0;
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 4095, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 4095, 0, 0, NULL);
                        ed = x1;
                    }
                    s0 = fpu_get_scratch_single(dyn);
                    MSR_nzcvq_0();
                    VMRS(x14);   // Get FPCSR reg to clear exceptions flags
-                    ORR_IMM8(x3, x14, 0b001, 6); // enable exceptions
+                    ORR_IMM8(x3, x14, 0b010, 9); // enable exceptions
                    BIC_IMM8(x3, x3, 0b10011111, 0);
                    VMSR(x3);
                    VCVT_S32_F64(s0, v1);
@@ -223,20 +223,16 @@ 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(dyn, ninst, x1, x2, x14); // x1 have the modified RPSCR reg
+                    u8 = x87_setround_reset(dyn, ninst, x1, x2, x14); // x1 have the modified RPSCR reg
                    if((nextop&0xC0)==0xC0) {
                        ed = xEAX+(nextop&7);
                        wback = 0;
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 4095, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 4095, 0, 0, NULL);
                        ed = x1; // will not be writen immediatly, so x1 is safe for now
                    }
                    s0 = fpu_get_scratch_single(dyn);
                    MSR_nzcvq_0();
-                    // x1 already have FPCSR reg to clear exceptions flags
-                    ORR_IMM8(x3, x1, 0b001, 6); // 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);
@@ -248,20 +244,16 @@ 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(dyn, ninst, x1, x2, x14); // x1 have the modified RPSCR reg
+                    u8 = x87_setround_reset(dyn, ninst, x1, x2, x14); // x1 have the modified RPSCR reg
                    if((nextop&0xC0)==0xC0) {
                        ed = xEAX+(nextop&7);
                        wback = 0;
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 4095, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 4095, 0, 0, NULL);
                        ed = x1;
                    }
                    s0 = fpu_get_scratch_single(dyn);
                    MSR_nzcvq_0();
-                    // The FPCSR reg to clear exceptions flags
-                    ORR_IMM8(x3, x1, 0b001, 6); // 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);
@@ -273,7 +265,7 @@ uintptr_t dynarecDB(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    break;
                case 5:
                    INST_NAME("FLD tbyte");
-                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                    if(PK(0)==0xDB && ((PK(1)>>3)&7)==7) {
                        // the FLD is immediatly followed by an FSTP
                        LDR_IMM9(x2, ed, 0);
@@ -283,21 +275,93 @@ uintptr_t dynarecDB(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                        MESSAGE(LOG_DUMP, "\tHack: FSTP tbyte\n");
                        nextop = F8;    //0xDB
                        nextop = F8;    //modrm
-                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                        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);
                        }
-                        x87_do_push_empty(dyn, ninst, x3);
-                        CALL(arm_fld, -1, 0);
+                        CALL(arm_fstp, -1, 0);
                        #else
-                        v1 = x87_do_push(dyn, ninst, x2, NEON_CACHE_ST_D);
-                        // copy 10bytes of *ED to STld(0)
+                        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) {
@@ -308,85 +372,41 @@ 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);
-                        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);
+                        // 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
                    }
-                    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);
-                    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);
-                    // 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:
@@ -184,10 +184,10 @@ uintptr_t dynarecDC(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    d1 = fpu_get_scratch_double(dyn);
                    parity = getedparity(dyn, ninst, addr, nextop, 2);
                    if(parity) {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 1023, 3, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 1023, 3, 0, NULL);
                        VLDR_64(d1, wback, fixedaddress);
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x1, &fixedaddress, 4095-4, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x1, &fixedaddress, 4095-4, 0, 0, NULL);
                        LDR_IMM9(x2, wback, fixedaddress);
                        LDR_IMM9(x3, wback, fixedaddress+4);
                        VMOVtoV_D(d1, x2, x3);
@@ -200,10 +200,10 @@ uintptr_t dynarecDC(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    d1 = fpu_get_scratch_double(dyn);
                    parity = getedparity(dyn, ninst, addr, nextop, 2);
                    if(parity) {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 1023, 3, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 1023, 3, 0, NULL);
                        VLDR_64(d1, wback, fixedaddress);
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x1, &fixedaddress, 4095-4, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x1, &fixedaddress, 4095-4, 0, 0, NULL);
                        LDR_IMM9(x2, wback, fixedaddress);
                        LDR_IMM9(x3, wback, fixedaddress+4);
                        VMOVtoV_D(d1, x2, x3);
@@ -216,10 +216,10 @@ uintptr_t dynarecDC(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    d1 = fpu_get_scratch_double(dyn);
                    parity = getedparity(dyn, ninst, addr, nextop, 2);
                    if(parity) {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 1023, 3, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 1023, 3, 0, NULL);
                        VLDR_64(d1, wback, fixedaddress);
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x1, &fixedaddress, 4095-4, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x1, &fixedaddress, 4095-4, 0, 0, NULL);
                        LDR_IMM9(x2, wback, fixedaddress);
                        LDR_IMM9(x3, wback, fixedaddress+4);
                        VMOVtoV_D(d1, x2, x3);
@@ -233,10 +233,10 @@ uintptr_t dynarecDC(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    d1 = fpu_get_scratch_double(dyn);
                    parity = getedparity(dyn, ninst, addr, nextop, 2);
                    if(parity) {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 1023, 3, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 1023, 3, 0, NULL);
                        VLDR_64(d1, wback, fixedaddress);
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x1, &fixedaddress, 4095-4, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x1, &fixedaddress, 4095-4, 0, 0, NULL);
                        LDR_IMM9(x2, wback, fixedaddress);
                        LDR_IMM9(x3, wback, fixedaddress+4);
                        VMOVtoV_D(d1, x2, x3);
@@ -251,10 +251,10 @@ uintptr_t dynarecDC(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    d1 = fpu_get_scratch_double(dyn);
                    parity = getedparity(dyn, ninst, addr, nextop, 2);
                    if(parity) {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 1023, 3, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 1023, 3, 0, NULL);
                        VLDR_64(d1, wback, fixedaddress);
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x1, &fixedaddress, 4095-4, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x1, &fixedaddress, 4095-4, 0, 0, NULL);
                        LDR_IMM9(x2, wback, fixedaddress);
                        LDR_IMM9(x3, wback, fixedaddress+4);
                        VMOVtoV_D(d1, x2, x3);
@@ -267,10 +267,10 @@ uintptr_t dynarecDC(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    d1 = fpu_get_scratch_double(dyn);
                    parity = getedparity(dyn, ninst, addr, nextop, 2);
                    if(parity) {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 1023, 3, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 1023, 3, 0, NULL);
                        VLDR_64(d1, wback, fixedaddress);
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x1, &fixedaddress, 4095-4, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x1, &fixedaddress, 4095-4, 0, 0, NULL);
                        LDR_IMM9(x2, wback, fixedaddress);
                        LDR_IMM9(x3, wback, fixedaddress+4);
                        VMOVtoV_D(d1, x2, x3);
@@ -283,10 +283,10 @@ uintptr_t dynarecDC(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    d1 = fpu_get_scratch_double(dyn);
                    parity = getedparity(dyn, ninst, addr, nextop, 2);
                    if(parity) {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 1023, 3, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 1023, 3, 0, NULL);
                        VLDR_64(d1, wback, fixedaddress);
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x1, &fixedaddress, 4095-4, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x1, &fixedaddress, 4095-4, 0, 0, NULL);
                        LDR_IMM9(x2, wback, fixedaddress);
                        LDR_IMM9(x3, wback, fixedaddress+4);
                        VMOVtoV_D(d1, x2, x3);
@@ -299,10 +299,10 @@ uintptr_t dynarecDC(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    d1 = fpu_get_scratch_double(dyn);
                    parity = getedparity(dyn, ninst, addr, nextop, 2);
                    if(parity) {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 1023, 3, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 1023, 3, 0, NULL);
                        VLDR_64(d1, wback, fixedaddress);
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x1, &fixedaddress, 4095-4, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x1, &fixedaddress, 4095-4, 0, 0, NULL);
                        LDR_IMM9(x2, wback, fixedaddress);
                        LDR_IMM9(x3, wback, fixedaddress+4);
                        VMOVtoV_D(d1, x2, x3);
@@ -156,10 +156,10 @@ uintptr_t dynarecDD(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    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);
+                        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);
+                        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);
@@ -168,7 +168,7 @@ uintptr_t dynarecDD(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                case 1:
                    INST_NAME("FISTTP i64, ST0");
                    x87_forget(dyn, ninst, x1, x2, 0);
-                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                    if(ed!=x1) {MOV_REG(x1, ed);}
                    CALL(arm_fistt64, -1, 0);
                    x87_do_pop(dyn, ninst, x3);
@@ -178,10 +178,10 @@ uintptr_t dynarecDD(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    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);
+                        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);
+                        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);
@@ -192,10 +192,10 @@ uintptr_t dynarecDD(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    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);
+                        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);
+                        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);
@@ -205,20 +205,20 @@ uintptr_t dynarecDD(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                case 4: 
                    INST_NAME("FRSTOR m108byte");
                    fpu_purgecache(dyn, ninst, 0, x1, x2, x3);
-                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                    if(ed!=x1) {MOV_REG(x1, ed);}
                    CALL(arm_frstor, -1, 0);
                    break;
                case 6: 
                    INST_NAME("FSAVE m108byte");
                    fpu_purgecache(dyn, ninst, 0, x1, x2, x3);
-                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                    if(ed!=x1) {MOV_REG(x1, ed);}
                    CALL(arm_fsave, -1, 0);
                    break;
                case 7:
                    INST_NAME("FNSTSW m2byte");
-                    addr = geted(dyn, addr, ninst, nextop, &ed, x14, &fixedaddress, 0, 0, 0);
+                    addr = geted(dyn, addr, ninst, nextop, &ed, x14, &fixedaddress, 0, 0, 0, NULL);
                    LDR_IMM9(x2, xEmu, offsetof(x86emu_t, top));
                    LDRH_IMM8(x1, xEmu, offsetof(x86emu_t, sw));
                    if(dyn->n.x87stack) {
@@ -166,11 +166,27 @@ uintptr_t dynarecDE(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
            INST_NAME("FDIVP STx, ST0");
            v1 = x87_get_st(dyn, ninst, x1, x2, 0, X87_COMBINE(0, nextop&7));
            v2 = x87_get_st(dyn, ninst, x1, x2, nextop&7, X87_COMBINE(0, nextop&7));
+            if(!box86_dynarec_fastnan) {
+                VMRS(x14);               // get fpscr
+                ORR_IMM8(x3, x14, 0b010, 9); // enable exceptions
+                BIC_IMM8(x3, x3, 0b10011111, 0);
+                VMSR(x3);
+            }
            if(ST_IS_F(0)) {
                VDIV_F32(v2, v2, v1);
            } else {
                VDIV_F64(v2, v2, v1);
            }
+            if(!box86_dynarec_fastnan) {
+                VMRS(x3);   // get the FPCSR reg and test FPU execption (invalid operation only)
+                TSTS_IMM8_ROR(x3, 0b00000001, 0);
+                if(ST_IS_F(0)) {
+                    VNEG_F32_cond(cNE, v2, v2);
+                } else {
+                    VNEG_F64_cond(cNE, v2, v2);
+                }
+                VMSR(x14);  // restore fpscr
+            }
            x87_do_pop(dyn, ninst, x3);
            break;

@@ -161,8 +161,8 @@ 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, NEON_CACHE_ST_F);
-                    addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255, 0, 0);
+                    v1 = x87_do_push(dyn, ninst, x1, box86_dynarec_x87double?NEON_CACHE_ST_D: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)) {
                        VMOVtoV(v1, x1);
@@ -175,14 +175,14 @@ 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, NEON_CACHE_ST_F);
-                    addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 255, 0, 0);
+                    v1 = x87_get_st(dyn, ninst, x1, x2, 0, box86_dynarec_x87double?NEON_CACHE_ST_D: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);
                    MSR_nzcvq_0();
                    VMRS(x14);               // get fpscr
                    // x1 already have FPCSR reg to clear exceptions flags
-                    ORR_IMM8(x3, x14, 0b001, 6); // enable exceptions
+                    ORR_IMM8(x3, x14, 0b010, 9); // enable exceptions
                    BIC_IMM8(x3, x3, 0b10011111, 0);
                    VMSR(x3);
                    if(ST_IS_F(0)) {
@@ -202,16 +202,12 @@ 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, NEON_CACHE_ST_F);
-                    u8 = x87_setround(dyn, ninst, x1, x2, x14);
-                    addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 255, 0, 0);
+                    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);
+                    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, 0b001, 6); // enable exceptions
-                    BIC_IMM8(x3, x3, 0b10011111, 0);
-                    VMSR(x3);
                    if(ST_IS_F(0)) {
                        VCVTR_S32_F32(s0, v1);
                    } else {
@@ -228,16 +224,12 @@ 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, NEON_CACHE_ST_F);
-                    u8 = x87_setround(dyn, ninst, x1, x2, x14);
-                    addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 255, 0, 0);
+                    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);
+                    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, 0b001, 6); // enable exceptions
-                    BIC_IMM8(x3, x3, 0b10011111, 0);
-                    VMSR(x3);
                    if(ST_IS_F(0)) {
                        VCVTR_S32_F32(s0, v1);
                    } else {
@@ -257,7 +249,7 @@ uintptr_t dynarecDF(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    INST_NAME("FBLD ST0, tbytes");
                    MESSAGE(LOG_DUMP, "Need Optimization\n");
                    x87_do_push_empty(dyn, ninst, x1);
-                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                    if(ed!=x1) {MOV_REG(x1, ed);}
                    CALL(fpu_fbld, -1, 0);
                    break;
@@ -267,7 +259,7 @@ uintptr_t dynarecDF(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    v2 = fpu_get_scratch_double(dyn);
                    s0 = fpu_get_scratch_single(dyn);
                    parity = getedparity(dyn, ninst, addr, nextop, 3);
-                    addr = geted(dyn, addr, ninst, nextop, &wback, x1, &fixedaddress, 0, 0, 0);
+                    addr = geted(dyn, addr, ninst, nextop, &wback, x1, &fixedaddress, 0, 0, 0, NULL);
                    if(parity) {
                        LDRD_IMM8(x2, wback, 0);    // x2/x3 is 64bits
                    } else {
@@ -320,7 +312,7 @@ uintptr_t dynarecDF(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    INST_NAME("FBSTP tbytes, ST0");
                    MESSAGE(LOG_DUMP, "Need Optimization\n");
                    x87_forget(dyn, ninst, x1, x2, 0);
-                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                    if(ed!=x1) {MOV_REG(x1, ed);}
                    CALL(fpu_fbst, -1, 0);
                    x87_do_pop(dyn, ninst, x3);
@@ -328,7 +320,7 @@ uintptr_t dynarecDF(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                case 7: // could be inlined for most thing, but is it usefull?
                    INST_NAME("FISTP i64, ST0");
                    parity = getedparity(dyn, ninst, addr, nextop, 3);
-                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                    if(ninst
                      && dyn->insts[ninst-1].x86.addr
                      && *(uint8_t*)dyn->insts[ninst-1].x86.addr==0xDF
@@ -343,7 +335,7 @@ uintptr_t dynarecDF(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    } else {
                        #if 1
                        v1 = x87_get_st(dyn, ninst, x2, x3, 0, NEON_CACHE_ST_D);
-                        //addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                        //addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                        fpu_get_scratch_double(dyn); // to alocate v0
                        v2 = fpu_get_scratch_double(dyn);
                        #if 1
@@ -413,7 +405,7 @@ uintptr_t dynarecDF(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                        VDIV_F64(v2, v1, v0);   // v2 = abs(ST0)/(1<<32) : so 32 bits high part
                        MSR_nzcvq_0();
                        VMRS(x2);               // get fpscr
-                        ORR_IMM8(x3, x2, 0b001, 6); // enable exceptions
+                        ORR_IMM8(x3, x2, 0b010, 9); // enable exceptions
                        BIC_IMM8(x3, x3, 0b10011111, 0);
                        VMSR(x3);
                        VCVT_U32_F64(s0, v2);   // convert high part to U32
@@ -27,8 +27,6 @@
 void emit_or32(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3, int s4)
 {
    IFX(X_PEND) {
-        STR_IMM9(s1, xEmu, offsetof(x86emu_t, op1));
-        STR_IMM9(s2, xEmu, offsetof(x86emu_t, op2));
        SET_DF(s4, d_or32);
    } else IFX(X_ALL) {
        SET_DFNONE(s4);
@@ -63,9 +61,6 @@ void emit_or32(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3, int s4)
 void emit_or32c(dynarec_arm_t* dyn, int ninst, int s1, int32_t c, int s3, int s4)
 {
    IFX(X_PEND) {
-        MOV32(s3, c);
-        STR_IMM9(s1, xEmu, offsetof(x86emu_t, op1));
-        STR_IMM9(s3, xEmu, offsetof(x86emu_t, op2));
        SET_DF(s4, d_or32);
    } else IFX(X_ALL) {
        SET_DFNONE(s4);
@@ -77,7 +72,7 @@ void emit_or32c(dynarec_arm_t* dyn, int ninst, int s1, int32_t c, int s3, int s4
            ORR_IMM8(s1, s1, c, 0);
        }
    } else {
-        IFX(X_PEND) {} else {MOV32(s3, c);}
+        MOV32(s3, c);
        IFX(X_ALL) {
            ORRS_REG_LSL_IMM5(s1, s1, s3, 0);
        } else {
@@ -109,8 +104,6 @@ void emit_or32c(dynarec_arm_t* dyn, int ninst, int s1, int32_t c, int s3, int s4
 void emit_xor32(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3, int s4)
 {
    IFX(X_PEND) {
-        STR_IMM9(s1, xEmu, offsetof(x86emu_t, op1));
-        STR_IMM9(s2, xEmu, offsetof(x86emu_t, op2));
        SET_DF(s4, d_xor32);
    } else IFX(X_ALL) {
        SET_DFNONE(s4);
@@ -145,9 +138,6 @@ void emit_xor32(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3, int s4)
 void emit_xor32c(dynarec_arm_t* dyn, int ninst, int s1, int32_t c, int s3, int s4)
 {
    IFX(X_PEND) {
-        MOV32(s3, c);
-        STR_IMM9(s1, xEmu, offsetof(x86emu_t, op1));
-        STR_IMM9(s3, xEmu, offsetof(x86emu_t, op2));
        SET_DF(s4, d_xor32);
    } else IFX(X_ALL) {
        SET_DFNONE(s4);
@@ -159,7 +149,7 @@ void emit_xor32c(dynarec_arm_t* dyn, int ninst, int s1, int32_t c, int s3, int s
            XOR_IMM8(s1, s1, c);
        }
    } else {
-        IFX(X_PEND) {} else {MOV32(s3, c);}
+        MOV32(s3, c);
        IFX(X_ALL) {
            XORS_REG_LSL_IMM5(s1, s1, s3, 0);
        } else {
@@ -191,8 +181,6 @@ void emit_xor32c(dynarec_arm_t* dyn, int ninst, int s1, int32_t c, int s3, int s
 void emit_and32(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3, int s4)
 {
    IFX(X_PEND) {
-        STR_IMM9(s1, xEmu, offsetof(x86emu_t, op1));
-        STR_IMM9(s2, xEmu, offsetof(x86emu_t, op2));
        SET_DF(s4, d_and32);
    } else IFX(X_ALL) {
        SET_DFNONE(s4);
@@ -227,9 +215,6 @@ void emit_and32(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3, int s4)
 void emit_and32c(dynarec_arm_t* dyn, int ninst, int s1, int32_t c, int s3, int s4)
 {
    IFX(X_PEND) {
-        MOV32(s3, c);
-        STR_IMM9(s1, xEmu, offsetof(x86emu_t, op1));
-        STR_IMM9(s3, xEmu, offsetof(x86emu_t, op2));
        SET_DF(s4, d_and32);
    } else IFX(X_ALL) {
        SET_DFNONE(s4);
@@ -248,7 +233,7 @@ void emit_and32c(dynarec_arm_t* dyn, int ninst, int s1, int32_t c, int s3, int s
                BIC_IMM8(s1, s1, ~c, 0);
            }
        } else {
-            IFX(X_PEND) {} else {MOV32(s3, c);}
+            MOV32(s3, c);
            IFX(X_ALL) {
                ANDS_REG_LSL_IMM5(s1, s1, s3, 0);
            } else {
@@ -281,8 +266,6 @@ void emit_and32c(dynarec_arm_t* dyn, int ninst, int s1, int32_t c, int s3, int s
 void emit_or8(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3, int s4)
 {
    IFX(X_PEND) {
-        STR_IMM9(s1, xEmu, offsetof(x86emu_t, op1));
-        STR_IMM9(s2, xEmu, offsetof(x86emu_t, op2));
        SET_DF(s3, d_or8);
    } else IFX(X_ALL) {
        SET_DFNONE(s3);
@@ -317,9 +300,6 @@ void emit_or8(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3, int s4)
 void emit_or8c(dynarec_arm_t* dyn, int ninst, int s1, int32_t c, int s3, int s4)
 {
    IFX(X_PEND) {
-        MOV32(s3, c&0xff);
-        STR_IMM9(s1, xEmu, offsetof(x86emu_t, op1));
-        STR_IMM9(s3, xEmu, offsetof(x86emu_t, op2));
        SET_DF(s4, d_or8);
    } else IFX(X_ALL) {
        SET_DFNONE(s4);
@@ -354,8 +334,6 @@ void emit_or8c(dynarec_arm_t* dyn, int ninst, int s1, int32_t c, int s3, int s4)
 void emit_xor8(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3, int s4)
 {
    IFX(X_PEND) {
-        STR_IMM9(s1, xEmu, offsetof(x86emu_t, op1));
-        STR_IMM9(s2, xEmu, offsetof(x86emu_t, op2));
        SET_DF(s3, d_xor8);
    } else IFX(X_ALL) {
        SET_DFNONE(s3);
@@ -390,9 +368,6 @@ void emit_xor8(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3, int s4)
 void emit_xor8c(dynarec_arm_t* dyn, int ninst, int s1, int32_t c, int s3, int s4)
 {
    IFX(X_PEND) {
-        MOV32(s3, c&0xff);
-        STR_IMM9(s1, xEmu, offsetof(x86emu_t, op1));
-        STR_IMM9(s3, xEmu, offsetof(x86emu_t, op2));
        SET_DF(s4, d_xor8);
    } else IFX(X_ALL) {
        SET_DFNONE(s4);
@@ -427,8 +402,6 @@ void emit_xor8c(dynarec_arm_t* dyn, int ninst, int s1, int32_t c, int s3, int s4
 void emit_and8(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3, int s4)
 {
    IFX(X_PEND) {
-        STR_IMM9(s1, xEmu, offsetof(x86emu_t, op1));
-        STR_IMM9(s2, xEmu, offsetof(x86emu_t, op2));
        SET_DF(s3, d_and8);
    } else IFX(X_ALL) {
        SET_DFNONE(s3);
@@ -463,9 +436,6 @@ void emit_and8(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3, int s4)
 void emit_and8c(dynarec_arm_t* dyn, int ninst, int s1, int32_t c, int s3, int s4)
 {
    IFX(X_PEND) {
-        MOV32(s3, c&0xff);
-        STR_IMM9(s1, xEmu, offsetof(x86emu_t, op1));
-        STR_IMM9(s3, xEmu, offsetof(x86emu_t, op2));
        SET_DF(s4, d_and8);
    } else IFX(X_ALL) {
        SET_DFNONE(s4);
@@ -501,8 +471,6 @@ void emit_and8c(dynarec_arm_t* dyn, int ninst, int s1, int32_t c, int s3, int s4
 void emit_or16(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3, int s4)
 {
    IFX(X_PEND) {
-        STR_IMM9(s1, xEmu, offsetof(x86emu_t, op1));
-        STR_IMM9(s2, xEmu, offsetof(x86emu_t, op2));
        SET_DF(s3, d_or16);
    } else IFX(X_ALL) {
        SET_DFNONE(s3);
@@ -537,9 +505,6 @@ void emit_or16(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3, int s4)
 void emit_or16c(dynarec_arm_t* dyn, int ninst, int s1, int32_t c, int s3, int s4)
 {
    IFX(X_PEND) {
-        MOVW(s3, c);
-        STR_IMM9(s1, xEmu, offsetof(x86emu_t, op1));
-        STR_IMM9(s3, xEmu, offsetof(x86emu_t, op2));
        SET_DF(s4, d_or16);
    } else IFX(X_ALL) {
        SET_DFNONE(s4);
@@ -551,7 +516,7 @@ void emit_or16c(dynarec_arm_t* dyn, int ninst, int s1, int32_t c, int s3, int s4
            ORR_IMM8(s1, s1, c, 0);
        }
    } else {
-        IFX(X_PEND) {} else {MOVW(s3, c);}
+        MOVW(s3, c);
        IFX(X_ALL) {
            ORRS_REG_LSL_IMM5(s1, s1, s3, 0);
        } else {
@@ -583,8 +548,6 @@ void emit_or16c(dynarec_arm_t* dyn, int ninst, int s1, int32_t c, int s3, int s4
 void emit_xor16(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3, int s4)
 {
    IFX(X_PEND) {
-        STR_IMM9(s1, xEmu, offsetof(x86emu_t, op1));
-        STR_IMM9(s2, xEmu, offsetof(x86emu_t, op2));
        SET_DF(s3, d_xor16);
    } else IFX(X_ALL) {
        SET_DFNONE(s3);
@@ -619,9 +582,6 @@ void emit_xor16(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3, int s4)
 void emit_xor16c(dynarec_arm_t* dyn, int ninst, int s1, int32_t c, int s3, int s4)
 {
    IFX(X_PEND) {
-        MOVW(s3, c);
-        STR_IMM9(s1, xEmu, offsetof(x86emu_t, op1));
-        STR_IMM9(s3, xEmu, offsetof(x86emu_t, op2));
        SET_DF(s4, d_xor16);
    } else IFX(X_ALL) {
        SET_DFNONE(s4);
@@ -633,7 +593,7 @@ void emit_xor16c(dynarec_arm_t* dyn, int ninst, int s1, int32_t c, int s3, int s
            XOR_IMM8(s1, s1, c);
        }
    } else {
-        IFX(X_PEND) {} else {MOVW(s3, c);}
+        MOVW(s3, c);
        IFX(X_ALL) {
            XORS_REG_LSL_IMM5(s1, s1, s3, 0);
        } else {
@@ -665,8 +625,6 @@ void emit_xor16c(dynarec_arm_t* dyn, int ninst, int s1, int32_t c, int s3, int s
 void emit_and16(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3, int s4)
 {
    IFX(X_PEND) {
-        STR_IMM9(s1, xEmu, offsetof(x86emu_t, op1));
-        STR_IMM9(s2, xEmu, offsetof(x86emu_t, op2));
        SET_DF(s3, d_and16);
    } else IFX(X_ALL) {
        SET_DFNONE(s3);
@@ -701,9 +659,6 @@ void emit_and16(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3, int s4)
 void emit_and16c(dynarec_arm_t* dyn, int ninst, int s1, int32_t c, int s3, int s4)
 {
    IFX(X_PEND) {
-        MOVW(s3, c);
-        STR_IMM9(s1, xEmu, offsetof(x86emu_t, op1));
-        STR_IMM9(s3, xEmu, offsetof(x86emu_t, op2));
        SET_DF(s4, d_and16);
    } else IFX(X_ALL) {
        SET_DFNONE(s4);
@@ -715,7 +670,7 @@ void emit_and16c(dynarec_arm_t* dyn, int ninst, int s1, int32_t c, int s3, int s
            AND_IMM8(s1, s1, c);
        }
    } else {
-        IFX(X_PEND) {} else {MOVW(s3, c);}
+        MOVW(s3, c);
        IFX(X_ALL) {
            ANDS_REG_LSL_IMM5(s1, s1, s3, 0);
        } else {
@@ -76,7 +76,7 @@ void emit_add32(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3, int s4)
 // emit ADD32 instruction, from s1 , constant c, store result in s1 using s3 and s4 as scratch
 void emit_add32c(dynarec_arm_t* dyn, int ninst, int s1, int32_t c, int s3, int s4)
 {
-    if(s1==xESP && (!dyn->insts || (dyn->insts[ninst].x86.need_flags==X_PEND || dyn->insts[ninst].x86.need_flags==X_ALL)))
+    if(s1==xESP && (!dyn->insts || (dyn->insts[ninst].x86.gen_flags==X_PEND || dyn->insts[ninst].x86.gen_flags==X_ALL)))
    {
        // special case when doing math on ESP and only PEND is needed: ignoring it!
        if(c>=0 && c<256) {
@@ -210,7 +210,7 @@ void emit_sub32(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3, int s4)
 // emit SUB32 instruction, from s1 , constant c, store result in s1 using s3 and s4 as scratch
 void emit_sub32c(dynarec_arm_t* dyn, int ninst, int s1, int32_t c, int s3, int s4)
 {
-    if(s1==xESP && (!dyn->insts || (dyn->insts[ninst].x86.need_flags==X_PEND || dyn->insts[ninst].x86.need_flags==X_ALL)))
+    if(s1==xESP && (!dyn->insts || (dyn->insts[ninst].x86.gen_flags==X_PEND || dyn->insts[ninst].x86.gen_flags==X_ALL)))
    {
        // special case when doing math on ESP and only PEND is needed: ignoring it!
        if(c>=0 && c<256) {
@@ -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);
-            DMB_ISH();
+            SMDMB();
            if((nextop&0xC0)==0xC0) {
                wback = (nextop&7);    
                wb2 = (wback>>2);      
@@ -51,7 +51,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                emit_add8(dyn, ninst, x1, x2, x14, x3, 0);
                BFI(wback, ed, wb2*8, 8);
            } else {                   
-                addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0, LOCK_LOCK);
                MARKLOCK;
                LDREXB(x1, wback);
                emit_add8(dyn, ninst, x1, x2, x14, x3, (wback==x3)?1:0);
@@ -59,19 +59,19 @@ 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
            }
-            DMB_ISH();
+            SMDMB();
            break;
        case 0x01:
            INST_NAME("LOCK ADD Ed, Gd");
            SETFLAGS(X_ALL, SF_SET_PENDING);
            nextop = F8;
            GETGD;
-            DMB_ISH();
+            SMDMB();
            if((nextop&0xC0)==0xC0) {
                ed = xEAX+(nextop&7);
                emit_add32(dyn, ninst, ed, gd, x3, x14);
            } else {
-                addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 0, LOCK_LOCK);
                MARKLOCK;
                LDREX(x1, wback);
                emit_add32(dyn, ninst, x1, 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);
            }
-            DMB_ISH();
+            SMDMB();
            break;
        case 0x08:
            INST_NAME("LOCK OR Eb, Gb");
            SETFLAGS(X_ALL, SF_SET_PENDING);
            nextop = F8;
-            DMB_ISH();
+            SMDMB();
            if((nextop&0xC0)==0xC0) {
                GETGB(x2);
                wback = (nextop&7);    
@@ -95,7 +95,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                emit_or8(dyn, ninst, x1, x2, x14, x3);
                BFI(wback, ed, wb2*8, 8);
            } else {                   
-                addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0, LOCK_LOCK);
                MARKLOCK;
                GETGB(x2);
                LDREXB(x1, wback);
@@ -104,19 +104,19 @@ 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
            }
-            DMB_ISH();
+            SMDMB();
            break;
        case 0x09:
            INST_NAME("LOCK OR Ed, Gd");
            SETFLAGS(X_ALL, SF_SET_PENDING);
            nextop = F8;
            GETGD;
-            DMB_ISH();
+            SMDMB();
            if((nextop&0xC0)==0xC0) {
                ed = xEAX+(nextop&7);
                emit_or32(dyn, ninst, ed, gd, x3, x14);
            } else {
-                addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 0, LOCK_LOCK);
                MARKLOCK;
                LDREX(x1, wback);
                emit_or32(dyn, ninst, x1, 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);
            }
-            DMB_ISH();
+            SMDMB();
            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);
-            DMB_ISH();
+            SMDMB();
            if((nextop&0xC0)==0xC0) {
                wback = (nextop&7);    
                wb2 = (wback>>2);      
@@ -141,7 +141,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                emit_adc8(dyn, ninst, x1, x2, x14, x3, 0);
                BFI(wback, ed, wb2*8, 8);
            } else {                   
-                addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0, LOCK_LOCK);
                MARKLOCK;
                LDREXB(x1, wback);
                emit_adc8(dyn, ninst, x1, x2, x14, x3, (wback==x3)?1:0);
@@ -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
            }
-            DMB_ISH();
+            SMDMB();
            break;
        case 0x11:
            INST_NAME("LOCK ADC Ed, Gd");
@@ -157,12 +157,12 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
            SETFLAGS(X_ALL, SF_SET_PENDING);
            nextop = F8;
            GETGD;
-            DMB_ISH();
+            SMDMB();
            if((nextop&0xC0)==0xC0) {
                ed = xEAX+(nextop&7);
                emit_adc32(dyn, ninst, ed, gd, x3, x14);
            } else {
-                addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 0, LOCK_LOCK);
                MARKLOCK;
                LDREX(x1, wback);
                emit_adc32(dyn, ninst, x1, 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);
            }
-            DMB_ISH();
+            SMDMB();
            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);
-            DMB_ISH();
+            SMDMB();
            if((nextop&0xC0)==0xC0) {
                wback = (nextop&7);    
                wb2 = (wback>>2);      
@@ -187,7 +187,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                emit_sbb8(dyn, ninst, x1, x2, x14, x3, 0);
                BFI(wback, ed, wb2*8, 8);
            } else {                   
-                addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0, LOCK_LOCK);
                MARKLOCK;
                LDREXB(x1, wback);
                emit_sbb8(dyn, ninst, x1, x2, x14, x3, (wback==x3)?1:0);
@@ -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
            }
-            DMB_ISH();
+            SMDMB();
            break;
        case 0x19:
            INST_NAME("LOCK SBB Ed, Gd");
@@ -203,12 +203,12 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
            SETFLAGS(X_ALL, SF_SET_PENDING);
            nextop = F8;
            GETGD;
-            DMB_ISH();
+            SMDMB();
            if((nextop&0xC0)==0xC0) {
                ed = xEAX+(nextop&7);
                emit_sbb32(dyn, ninst, ed, gd, x3, x14);
            } else {
-                addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 0, LOCK_LOCK);
                MARKLOCK;
                LDREX(x1, wback);
                emit_sbb32(dyn, ninst, x1, 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);
            }
-            DMB_ISH();
+            SMDMB();
            break;
        case 0x20:
            INST_NAME("LOCK AND Eb, Gb");
            SETFLAGS(X_ALL, SF_SET_PENDING);
            nextop = F8;
-            DMB_ISH();
+            SMDMB();
            if((nextop&0xC0)==0xC0) {
                GETGB(x2);
                wback = (nextop&7);    
@@ -232,7 +232,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                emit_and8(dyn, ninst, x1, x2, x14, x3);
                BFI(wback, ed, wb2*8, 8);
            } else {                   
-                addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0, LOCK_LOCK);
                MARKLOCK;
                GETGB(x2);
                LDREXB(x1, wback);
@@ -241,19 +241,19 @@ 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
            }
-            DMB_ISH();
+            SMDMB();
            break;
        case 0x21:
            INST_NAME("LOCK AND Ed, Gd");
            SETFLAGS(X_ALL, SF_SET_PENDING);
            nextop = F8;
            GETGD;
-            DMB_ISH();
+            SMDMB();
            if((nextop&0xC0)==0xC0) {
                ed = xEAX+(nextop&7);
                emit_and32(dyn, ninst, ed, gd, x3, x14);
            } else {
-                addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 0, LOCK_LOCK);
                MARKLOCK;
                LDREX(x1, wback);
                emit_and32(dyn, ninst, x1, 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);
            }
-            DMB_ISH();
+            SMDMB();
            break;
        case 0x28:
            INST_NAME("LOCK SUB Eb, Gb");
            SETFLAGS(X_ALL, SF_SET_PENDING);
            nextop = F8;
            GETGB(x2);
-            DMB_ISH();
+            SMDMB();
            if((nextop&0xC0)==0xC0) {
                wback = (nextop&7);    
                wb2 = (wback>>2);      
@@ -277,7 +277,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                emit_sub8(dyn, ninst, x1, x2, x14, x3, 0);
                BFI(wback, ed, wb2*8, 8);
            } else {                   
-                addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0, LOCK_LOCK);
                MARKLOCK;
                LDREXB(x1, wback);
                emit_sub8(dyn, ninst, x1, x2, x14, x3, (wback==x3)?1:0);
@@ -285,19 +285,19 @@ 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
            }
-            DMB_ISH();
+            SMDMB();
            break;
        case 0x29:
            INST_NAME("LOCK SUB Ed, Gd");
            SETFLAGS(X_ALL, SF_SET_PENDING);
            nextop = F8;
            GETGD;
-            DMB_ISH();
+            SMDMB();
            if((nextop&0xC0)==0xC0) {
                ed = xEAX+(nextop&7);
                emit_sub32(dyn, ninst, ed, gd, x3, x14);
            } else {
-                addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 0, LOCK_LOCK);
                MARKLOCK;
                LDREX(x1, wback);
                emit_sub32(dyn, ninst, x1, 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);
            }
-            DMB_ISH();
+            SMDMB();
            break;
        case 0x38:
            INST_NAME("LOCK XOR Eb, Gb");
            SETFLAGS(X_ALL, SF_SET_PENDING);
            nextop = F8;
-            DMB_ISH();
+            SMDMB();
            if((nextop&0xC0)==0xC0) {
                GETGB(x2);
                wback = (nextop&7);    
@@ -321,7 +321,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                emit_xor8(dyn, ninst, x1, x2, x14, x3);
                BFI(wback, ed, wb2*8, 8);
            } else {                   
-                addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0, LOCK_LOCK);
                MARKLOCK;
                GETGB(x2);
                LDREXB(x1, wback);
@@ -330,19 +330,19 @@ 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
            }
-            DMB_ISH();
+            SMDMB();
            break;
        case 0x39:
            INST_NAME("LOCK XOR Ed, Gd");
            SETFLAGS(X_ALL, SF_SET_PENDING);
            nextop = F8;
            GETGD;
-            DMB_ISH();
+            SMDMB();
            if((nextop&0xC0)==0xC0) {
                ed = xEAX+(nextop&7);
                emit_xor32(dyn, ninst, ed, gd, x3, x14);
            } else {
-                addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 0, LOCK_LOCK);
                MARKLOCK;
                LDREX(x1, wback);
                emit_xor32(dyn, ninst, x1, 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);
            }
-            DMB_ISH();
+            SMDMB();
            break;
        
        case 0x66:
@@ -368,13 +368,13 @@ 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);
-                    DMB_ISH();
+                    SMDMB();
                    if((nextop&0xC0)==0xC0) {
                        if(opcode==0x81) i32 = F32S; else i32 = F8S;
                        ed = xEAX+(nextop&7);
                        emit_add32c(dyn, ninst, ed, i32, x3, x14);
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 1);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 1, LOCK_LOCK);
                        if(opcode==0x81) i32 = F32S; else i32 = F8S;
                        if(!fixedaddress) {
                            TSTS_IMM8(wback, 0x3);
@@ -389,7 +389,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                            B_MARKLOCK(cNE);
                        }
                        if(!fixedaddress) {
-                            DMB_ISH();
+                            SMDMB();
                            B_NEXT(c__);
                        }
                        if(!fixedaddress || (fixedaddress && (fixedaddress&3))) {
@@ -403,19 +403,19 @@ 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
                        }
-                        DMB_ISH();
+                        SMDMB();
                    }
                    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);
-                    DMB_ISH();
+                    SMDMB();
                    if((nextop&0xC0)==0xC0) {
                        if(opcode==0x81) i32 = F32S; else i32 = F8S;
                        ed = xEAX+(nextop&7);
                        emit_or32c(dyn, ninst, ed, i32, x3, x14);
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 0, LOCK_LOCK);
                        if(opcode==0x81) i32 = F32S; else i32 = F8S;
                        MARKLOCK;
                        LDREX(x1, wback);
@@ -424,19 +424,19 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                        CMPS_IMM8(x3, 0);
                        B_MARKLOCK(cNE);
                    }
-                    DMB_ISH();
+                    SMDMB();
                    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);
-                    DMB_ISH();
+                    SMDMB();
                    if((nextop&0xC0)==0xC0) {
                        if(opcode==0x81) i32 = F32S; else i32 = F8S;
                        ed = xEAX+(nextop&7);
                        emit_adc32c(dyn, ninst, ed, i32, x3, x14);
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 0, LOCK_LOCK);
                        if(opcode==0x81) i32 = F32S; else i32 = F8S;
                        MARKLOCK;
                        LDREX(x1, wback);
@@ -445,19 +445,19 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                        CMPS_IMM8(x3, 0);
                        B_MARKLOCK(cNE);
                    }
-                    DMB_ISH();
+                    SMDMB();
                    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);
-                    DMB_ISH();
+                    SMDMB();
                    if((nextop&0xC0)==0xC0) {
                        if(opcode==0x81) i32 = F32S; else i32 = F8S;
                        ed = xEAX+(nextop&7);
                        emit_sbb32c(dyn, ninst, ed, i32, x3, x14);
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 0, LOCK_LOCK);
                        if(opcode==0x81) i32 = F32S; else i32 = F8S;
                        MARKLOCK;
                        LDREX(x1, wback);
@@ -466,18 +466,18 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                        CMPS_IMM8(x3, 0);
                        B_MARKLOCK(cNE);
                    }
-                    DMB_ISH();
+                    SMDMB();
                    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);
-                    DMB_ISH();
+                    SMDMB();
                    if((nextop&0xC0)==0xC0) {
                        if(opcode==0x81) i32 = F32S; else i32 = F8S;
                        ed = xEAX+(nextop&7);
                        emit_and32c(dyn, ninst, ed, i32, x3, x14);
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 0, LOCK_LOCK);
                        if(opcode==0x81) i32 = F32S; else i32 = F8S;
                        MARKLOCK;
                        LDREX(x1, wback);
@@ -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);
                    }
-                    DMB_ISH();
+                    SMDMB();
                    break;
                case 5: //SUB
                    if(opcode==0x81) {INST_NAME("LOCK SUB Ed, Id");} else {INST_NAME("LOCK SUB Ed, Ib");}
@@ -496,8 +496,8 @@ 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 {
-                        DMB_ISH();
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 1);
+                        SMDMB();
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 1, LOCK_LOCK);
                        if(opcode==0x81) i32 = F32S; else i32 = F8S;
                        if(!fixedaddress) {
                            TSTS_IMM8(wback, 0x3);
@@ -512,7 +512,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                            B_MARKLOCK(cNE);
                        }
                        if(!fixedaddress) {
-                            DMB_ISH();
+                            SMDMB();
                            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
                        }
-                        DMB_ISH();
+                        SMDMB();
                    }
                    break;
                case 6: //XOR
@@ -537,8 +537,8 @@ 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 {
-                        DMB_ISH();
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 0);
+                        SMDMB();
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 0, LOCK_LOCK);
                        if(opcode==0x81) i32 = F32S; else i32 = F8S;
                        MARKLOCK;
                        LDREX(x1, wback);
@@ -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);
-                        DMB_ISH();
+                        SMDMB();
                    }
                    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);
-                    DMB_ISH();
+                    SMDMB();
                    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:
-            DMB_ISH();
+            SMDMB();
            --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:
-            DMB_ISH();
+            SMDMB();
            --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);
-                    DMB_ISH();
+                    SMDMB();
                    nextop = F8;
                    if((nextop&0xC0)==0xC0) {
                        wback = (nextop&7);    
@@ -613,7 +613,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                        ed = x2;
                        wb1 = 0;
                    } else {                   
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0, LOCK_LOCK);
                        MARKLOCK;
                        LDREXB(x2, wback);
                        ed = x2;
@@ -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;
-                    DMB_ISH();
+                    SMDMB();
                    // done, do the cmp now
                    UFLAG_IF {emit_cmp8(dyn, ninst, x1, x2, x3, x14);}
                    break;
@@ -649,53 +649,71 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    SETFLAGS(X_ALL, SF_SET_PENDING);
                    nextop = F8;
                    GETGD;
-                    DMB_ISH();
+                    SMDMB();
                    if((nextop&0xC0)==0xC0) {
                        ed = xEAX+(nextop&7);
-                        wback = 0;
-                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 1);
-                        MARKLOCK;
-                        if(!fixedaddress || (fixedaddress && (fixedaddress&3))) {
-                            TSTS_IMM8(wback, 3);    // can be unaligned it seems
-                            LDREX_COND(cEQ, x1, wback);
-                            LDR_IMM9_COND(cNE, x1, wback, 0);
-                            LDREXB_COND(cNE, x3, wback); // dummy read, to arm the write...
-                        } else {
-                            LDREX(x1, wback);
-                        }
-                        ed = x1;
-                    }
-                    CMPS_REG_LSL_IMM5(xEAX, ed, 0);
-                    B_MARK(cNE);
-                    // EAX == Ed
-                    if(wback) {
-                        if(!fixedaddress || (fixedaddress && (fixedaddress&3))) {
-                            TSTS_IMM8(wback, 3);
-                            STREX_COND(cEQ, x14, gd, wback);
-                            STREXB_COND(cNE, x14, gd, wback);
-                        } else {
-                            STREX(x14, gd, wback);
-                        }
-                        CMPS_IMM8(x14, 0);
-                        B_MARKLOCK(cNE);
-                        if(!fixedaddress || (fixedaddress && (fixedaddress&3))) {
-                            TSTS_IMM8(wback, 3);    // anoying, all those test
-                            STR_IMM9_COND(cNE, gd, wback, 0);
-                        }
-                        UFLAG_IF {emit_cmp32(dyn, ninst, xEAX, ed, x1, x14);}
-                    } else {
-                        UFLAG_IF {emit_cmp32(dyn, ninst, xEAX, ed, x1, x14);}
+                        // same as no lock, all in regs...
+                        CMPS_REG_LSL_IMM5(xEAX, ed, 0);
+                        B_MARK(cNE);
+                        // EAX == Ed
+                        MOV_REG(x3, ed);
                        MOV_REG(ed, gd);
+                        emit_cmp32(dyn, ninst, xEAX, x3, x1, x14);
+                        B_NEXT(c__);
+                        MARK;
+                        // EAX != Ed
+                        emit_cmp32(dyn, ninst, xEAX, ed, x3, x14);
+                        MOV_REG(xEAX, ed);
+                    } else {
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 1, LOCK_LOCK);
+                        ed = x1;
+                        if(!fixedaddress || (fixedaddress && (fixedaddress&3))) {
+                            if(!fixedaddress) {
+                                // alignment is undetermined
+                                TSTS_IMM8(wback, 3);
+                                B_MARK2(cNE);
+                                MARKLOCK;
+                                // aligned
+                                LDREX(ed, wback);
+                                CMPS_REG_LSL_IMM5(xEAX, ed, 0);
+                                B_MARK(cNE);
+                                // EAX == Ed
+                                STREX(x14, gd, wback);
+                                SMDMB();
+                                CMPS_IMM8(x14, 0);
+                                B_MARKLOCK(cNE);
+                                B_MARK(c__);
+                            }
+                            // unaligned
+                            MARK2;
+                            LDR_IMM9(x1, wback, 0);
+                            LDREXB( x3, wback); // dummy read, to arm the write...
+                            CMPS_REG_LSL_IMM5(xEAX, ed, 0);
+                            B_MARK(cNE);
+                            // EAX == Ed
+                            STREXB(x14, gd, wback);
+                            CMPS_IMM8(x14, 0);
+                            B_MARK2(cNE);
+                            STR_IMM9(gd, wback, 0);
+                            SMDMB();
+                        } else {
+                            MARKLOCK;
+                            // alignment is good
+                            LDREX(ed, wback);
+                            CMPS_REG_LSL_IMM5(xEAX, ed, 0);
+                            B_MARK(cNE);
+                            // EAX == Ed
+                            STREX(x14, gd, wback);
+                            CMPS_IMM8(x14, 0);
+                            B_MARKLOCK(cNE);
+                            SMDMB();
+                        }
+                        // end of EAX == Ed or EAX != Ed
+                        MARK;
+                        UFLAG_IF { MOV_REG(x2, xEAX); }
+                        MOV_REG(xEAX, ed);    
+                        UFLAG_IF { emit_cmp32(dyn, ninst, x2, ed, x3, x14); }
                    }
-                    // done
-                    B_MARK3(c__);   // not next, in case its called with a LOCK prefix
-                    MARK;
-                    // EAX != Ed
-                    UFLAG_IF {emit_cmp32(dyn, ninst, xEAX, ed, x3, x14);}
-                    MOV_REG(xEAX, ed);
-                    MARK3
-                    DMB_ISH();
                    break;
                case 0xB3:
                    INST_NAME("LOCK BTR Ed, Gd");
@@ -703,12 +721,12 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    SET_DFNONE(x1);
                    nextop = F8;
                    GETGD;
-                    DMB_ISH();
+                    SMDMB();
                    if((nextop&0xC0)==0xC0) {
                        ed = xEAX+(nextop&7);
                        wback = 0;
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0, LOCK_LOCK);
                        MOV_REG_ASR_IMM5(x1, gd, 5);    // r1 = (gd>>5);
                        ADD_REG_LSL_IMM5(x3, wback, x1, 2); //(&ed)+=r1*4;
                        wback = x3;
@@ -729,12 +747,12 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                        B_MARKLOCK(cNE);
                    }
                    MARK3;
-                    DMB_ISH();
+                    SMDMB();
                    break;

                case 0xBA:
                    nextop = F8;
-                    DMB_ISH();
+                    SMDMB();
                    switch((nextop>>3)&7) {
                        case 4:
                            INST_NAME("(LOCK) BT Ed, Ib");
@@ -744,7 +762,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                            if((nextop&0xC0)==0xC0) {
                                ed = xEAX+(nextop&7);
                            } else {
-                                addr = geted(dyn, addr, ninst, nextop, &ed, x3, &fixedaddress, 4095-32, 0, 0);
+                                addr = geted(dyn, addr, ninst, nextop, &ed, x3, &fixedaddress, 4095-32, 0, 0, LOCK_LOCK);
                                LDR_IMM9(x1, ed, fixedaddress);
                                ed = x1;
                            }
@@ -767,7 +785,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                                MOVW(gd, u8&0x1f);
                                wback = 0;
                            } else {
-                                addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0);
+                                addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0, LOCK_LOCK);
                                u8 = F8;
                                ed = x1;
                                MOVW(gd, u8&0x1f);
@@ -798,7 +816,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                                MOVW(gd, u8&0x1f);
                                wback = 0;
                            } else {
-                                addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0);
+                                addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0, LOCK_LOCK);
                                u8 = F8;
                                ed = x1;
                                MOVW(gd, u8&0x1f);
@@ -821,7 +839,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                        default:
                            DEFAULT;
                    }
-                    DMB_ISH();
+                    SMDMB();
                    break;
                case 0xBB:
                    INST_NAME("LOCK BTC Ed, Gd");
@@ -829,12 +847,12 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    SET_DFNONE(x1);
                    nextop = F8;
                    GETGD;
-                    DMB_ISH();
+                    SMDMB();
                    if((nextop&0xC0)==0xC0) {
                        ed = xEAX+(nextop&7);
                        wback = 0;
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0, LOCK_LOCK);
                        MOV_REG_ASR_IMM5(x1, gd, 5);    // r1 = (gd>>5);
                        ADD_REG_LSL_IMM5(x3, wback, x1, 2); //(&ed)+=r1*4;
                        MARKLOCK;
@@ -852,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);
                    }
-                    DMB_ISH();
+                    SMDMB();
                    break;
            
                case 0xC0:
                    INST_NAME("LOCK XADD Gb, Eb");
                    SETFLAGS(X_ALL, SF_SET_PENDING);
                    nextop = F8;
-                    DMB_ISH();
+                    SMDMB();
                    GETGB(x1);
                    if((nextop&0xC0)==0xC0) {
                        wback = (nextop&7); 
@@ -869,7 +887,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                        wb1 = 0;
                        ed = x2;
                    } else { 
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0); 
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0, LOCK_LOCK); 
                        MARKLOCK;
                        LDREXB(x2, wback); 
                        wb1 = 1;
@@ -884,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);
                    }
-                    DMB_ISH();
+                    SMDMB();
                    break;
                case 0xC1:
                    INST_NAME("LOCK XADD Gd, Ed");
                    SETFLAGS(X_ALL, SF_SET_PENDING);
                    nextop = F8;
                    GETGD;
-                    DMB_ISH();
+                    SMDMB();
                    if((nextop&0xC0)==0xC0) {
                        ed = xEAX+(nextop&7);
                        if(gd!=ed) {
@@ -901,7 +919,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                        }
                        emit_add32(dyn, ninst, ed, gd, x3, x14);
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 1);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 1, LOCK_LOCK);
                        if(!fixedaddress) {
                            TSTS_IMM8(wback, 3);
                            B_MARK(cNE);    // unaligned
@@ -937,7 +955,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                        }
                        MOV_REG(gd, x1);
                    }
-                    DMB_ISH();
+                    SMDMB();
                    break;

                case 0xC7:
@@ -946,8 +964,8 @@ 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);
-                            DMB_ISH();
-                            addr = geted(dyn, addr, ninst, nextop, &wback, x1, &fixedaddress, 0, 0, 1);
+                            SMDMB();
+                            addr = geted(dyn, addr, ninst, nextop, &wback, x1, &fixedaddress, 0, 0, 1, LOCK_LOCK);
                            MARKLOCK;
                            if(!fixedaddress || (fixedaddress && (fixedaddress&7))) {
                                TSTS_IMM8(wback, 7);
@@ -983,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;
-                            DMB_ISH();
+                            SMDMB();
                            BFI(xFlags, x1, F_ZF, 1);
                            break;
                        default:
@@ -999,7 +1017,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,

        case 0xFF:
            nextop = F8;
-            DMB_ISH();
+            SMDMB();
            switch((nextop>>3)&7)
            {
                case 0: // INC Ed
@@ -1009,7 +1027,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                        ed = xEAX+(nextop&7);
                        emit_inc32(dyn, ninst, ed, x3, x14);
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 1);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 1, LOCK_LOCK);
                        if(!fixedaddress) {
                            TSTS_IMM8(wback, 3);
                            B_MARK(cNE);    // unaligned
@@ -1023,7 +1041,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                            B_MARKLOCK(cNE);
                        }
                        if(!fixedaddress) {
-                            DMB_ISH();
+                            SMDMB();
                            B_NEXT(c__);
                        }
                        if(!fixedaddress || (fixedaddress && (fixedaddress&3))) {
@@ -1046,7 +1064,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                        ed = xEAX+(nextop&7);
                        emit_dec32(dyn, ninst, ed, x3, x14);
                    } else {
-                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 1);
+                        addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 1, LOCK_LOCK);
                        if(!fixedaddress) {
                            TSTS_IMM8(wback, 3);
                            B_MARK(cNE);    // unaligned
@@ -1060,7 +1078,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                            B_MARKLOCK(cNE);
                        }
                        if(!fixedaddress) {
-                            DMB_ISH();
+                            SMDMB();
                            B_NEXT(c__);
                        }
                        if(!fixedaddress || (fixedaddress && (fixedaddress&3))) {
@@ -1080,7 +1098,7 @@ uintptr_t dynarecF0(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int ninst,
                    // default to NO LOCK
                    addr-=2;
            }
-            DMB_ISH();
+            SMDMB();
            break;
       
        default:
@@ -29,11 +29,12 @@
    } 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); \
+            addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0, NULL); \
            VLDR_64(a, ed, fixedaddress);           \
        } else {                                    \
-            addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-4, 0, 0);\
+            addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-4, 0, 0, NULL);\
            LDR_IMM9(x2, ed, fixedaddress+0);       \
            LDR_IMM9(x3, ed, fixedaddress+4);       \
            VMOVtoV_D(a, x2, x3);                   \
@@ -72,8 +73,9 @@ 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);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-4, 0, 0, NULL);
                LDR_IMM9(x2, ed, fixedaddress+0);
                LDR_IMM9(x3, ed, fixedaddress+4);
                VMOVtoV_D(v0, x2, x3);
@@ -90,9 +92,10 @@ uintptr_t dynarecF20F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                VMOVD(d0, v0);
            } else {
                VMOVfrV_D(x2, x3, v0);
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-4, 0, 0);
+                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:
@@ -104,8 +107,9 @@ 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);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-4, 0, 0, NULL);
                LDR_IMM9(x2, ed, fixedaddress+0);
                LDR_IMM9(x3, ed, fixedaddress+4);
                VMOVtoV_D(v0, x2, x3);
@@ -132,28 +136,50 @@ 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 {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0);
+                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");
-            u8 = sse_setround(dyn, ninst, x1, x2, x14);
+            if(!box86_dynarec_fastround)
+                u8 = sse_setround_reset(dyn, ninst, x1, x2, x14);
+            else
+                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 {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0);
+                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;

@@ -165,7 +191,7 @@ uintptr_t dynarecF20F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
            GETEX(d0, 0);
            if(!box86_dynarec_fastnan) {
                VMRS(x14);               // get fpscr
-                ORR_IMM8(x3, x14, 0b001, 6); // enable exceptions
+                ORR_IMM8(x3, x14, 0b010, 9); // enable exceptions
                BIC_IMM8(x3, x3, 0b10011111, 0);
                VMSR(x3);
            }
@@ -174,6 +200,7 @@ uintptr_t dynarecF20F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                VMRS(x3);   // get the FPCSR reg and test FPU execption (invalid operation only)
                TSTS_IMM8_ROR(x3, 0b00000001, 0);
                VNEG_F64_cond(cNE, v0, v0);
+                VMSR(x14);  // restore FPSCR
            }
            break;

@@ -185,7 +212,7 @@ uintptr_t dynarecF20F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
            GETEX(d0, 0);
            if(!box86_dynarec_fastnan) {
                VMRS(x14);               // get fpscr
-                ORR_IMM8(x3, x14, 0b001, 6); // enable exceptions
+                ORR_IMM8(x3, x14, 0b010, 9); // enable exceptions
                BIC_IMM8(x3, x3, 0b10011111, 0);
                VMSR(x3);
            }
@@ -194,6 +221,7 @@ uintptr_t dynarecF20F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                VMRS(x3);   // get the FPCSR reg and test FPU execption (invalid operation only)
                TSTS_IMM8_ROR(x3, 0b00000001, 0);
                VNEG_F64_cond(cNE, v0, v0);
+                VMSR(x14);  // restore FPSCR
            }
            break;
        case 0x59:
@@ -204,7 +232,7 @@ uintptr_t dynarecF20F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
            GETEX(d0, 0);
            if(!box86_dynarec_fastnan) {
                VMRS(x14);               // get fpscr
-                ORR_IMM8(x3, x14, 0b001, 6); // enable exceptions
+                ORR_IMM8(x3, x14, 0b010, 9); // enable exceptions
                BIC_IMM8(x3, x3, 0b10011111, 0);
                VMSR(x3);
            }
@@ -213,6 +241,7 @@ uintptr_t dynarecF20F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                VMRS(x3);   // get the FPCSR reg and test FPU execption (invalid operation only)
                TSTS_IMM8_ROR(x3, 0b00000001, 0);
                VNEG_F64_cond(cNE, v0, v0);
+                VMSR(x14);  // restore FPSCR
            }
            break;
        case 0x5A:
@@ -239,7 +268,7 @@ uintptr_t dynarecF20F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
            GETEX(d0, 0);
            if(!box86_dynarec_fastnan) {
                VMRS(x14);               // get fpscr
-                ORR_IMM8(x3, x14, 0b001, 6); // enable exceptions
+                ORR_IMM8(x3, x14, 0b010, 9); // enable exceptions
                BIC_IMM8(x3, x3, 0b10011111, 0);
                VMSR(x3);
            }
@@ -248,6 +277,7 @@ uintptr_t dynarecF20F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                VMRS(x3);   // get the FPCSR reg and test FPU execption (invalid operation only)
                TSTS_IMM8_ROR(x3, 0b00000001, 0);
                VNEG_F64_cond(cNE, v0, v0);
+                VMSR(x14);  // restore FPSCR
            }
            break;
        case 0x5D:
@@ -269,7 +299,7 @@ uintptr_t dynarecF20F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
            GETEX(d0, 0);
            if(!box86_dynarec_fastnan) {
                VMRS(x14);               // get fpscr
-                ORR_IMM8(x3, x14, 0b001, 6); // enable exceptions
+                ORR_IMM8(x3, x14, 0b010, 9); // enable exceptions
                BIC_IMM8(x3, x3, 0b10011111, 0);
                VMSR(x3);
            }
@@ -278,6 +308,7 @@ uintptr_t dynarecF20F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                VMRS(x3);   // get the FPCSR reg and test FPU execption (invalid operation only)
                TSTS_IMM8_ROR(x3, 0b00000001, 0);
                VNEG_F64_cond(cNE, v0, v0);
+                VMSR(x14);  // restore FPSCR
            }
            break;
        case 0x5F:
@@ -300,7 +331,8 @@ 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 {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                SMREAD();
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                v1 = fpu_get_scratch_quad(dyn);
                VLD1Q_64(v1, ed);
            }
@@ -335,7 +367,8 @@ 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 {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                SMREAD();
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                v1 = fpu_get_scratch_quad(dyn);
                VLD1Q_64(v1, ed);
            }
@@ -347,6 +380,24 @@ uintptr_t dynarecF20F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
            }
            break;

+        case 0x80:
+        case 0x81:
+        case 0x82:
+        case 0x83:
+        case 0x84:
+        case 0x85:
+        case 0x86:
+        case 0x87:
+        case 0x88:
+        case 0x89:
+        case 0x8A:
+        case 0x8B:
+        case 0x8C:
+        case 0x8D:
+        case 0x8E:
+        case 0x8F:
+            return dynarec0F(dyn, addr-1, ip, ninst, ok, need_epilog);
+
        case 0xC2:
            INST_NAME("CMPSD Gx, Ex");
            nextop = F8;
@@ -378,6 +429,33 @@ 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;
@@ -387,8 +465,9 @@ 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);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-12, 0, 0, NULL);
                LDR_IMM9(x2, ed, fixedaddress+0);
                LDR_IMM9(x3, ed, fixedaddress+4);
                VMOVtoV_D(v0, x2, x3);
@@ -37,8 +37,9 @@
        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); \
+            addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 0, 0, NULL); \
            VLDR_32(a, ed, fixedaddress);           \
        } else {                                    \
            GETED;                                  \
@@ -102,12 +103,13 @@ 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);
+                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 0, 0, NULL);
                    VLDR_32(v0*2, ed, fixedaddress);
                } else {
-                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095, 0, 0);
+                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095, 0, 0, NULL);
                    LDR_IMM9(x2, ed, fixedaddress);   // to avoid bus errors
                    VEORQ(v0, v0, v0);
                    VMOVtoDx_32(v0, 0, x2);
@@ -140,13 +142,14 @@ uintptr_t dynarecF30F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
            } else {
                parity = getedparity(dyn, ninst, addr, nextop, 2);
                if(parity && (v0<16)) {
-                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 0, 0);
+                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 0, 0, NULL);
                    VSTR_32(v0*2, ed, fixedaddress);
                } else {
                    VMOVfrDx_32(x2, v0, 0);
-                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095, 0, 0);
+                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095, 0, 0, NULL);
                    STR_IMM9(x2, ed, fixedaddress);
                }
+                SMWRITE2();
            }
            break;
        case 0x12:
@@ -156,7 +159,8 @@ 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 {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                SMREAD();
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                q1 = fpu_get_scratch_quad(dyn);
                VLD1Q_64(q1, ed);
            }
@@ -172,7 +176,8 @@ 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 {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                SMREAD();
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                q1 = fpu_get_scratch_quad(dyn);
                VLD1Q_64(q1, ed);
            }
@@ -229,21 +234,37 @@ 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);
+                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0, NULL);
                    VLDR_32(s0, ed, fixedaddress);
                } else {
-                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095, 0, 0);
+                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095, 0, 0, NULL);
                    LDR_IMM9(x2, ed, fixedaddress);
                    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");
-            u8 = sse_setround(dyn, ninst, x1, x2, x14);
+            if(!box86_dynarec_fastround)
+                u8 = sse_setround_reset(dyn, ninst, x1, x2, x14);
+            else
+                u8 = sse_setround(dyn, ninst, x1, x2, x14);
            nextop = F8;
            GETGD;
            s0 = fpu_get_scratch_single(dyn);
@@ -258,17 +279,23 @@ 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);
+                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0, NULL);
                    VLDR_32(s0, ed, fixedaddress);
                } else {
-                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095, 0, 0);
+                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095, 0, 0, NULL);
                    LDR_IMM9(x2, ed, fixedaddress);
                    VMOVtoV(s0, x2);
                }
            }
            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;

@@ -396,7 +423,8 @@ 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 {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                SMREAD();
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                v1 = fpu_get_scratch_quad(dyn);
                VLD1Q_64(v1, ed);
            }
@@ -500,8 +528,9 @@ 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);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-12, 0, 0, NULL);
                LDR_IMM9(x2, ed, fixedaddress+0);
                LDR_IMM9(x3, ed, fixedaddress+4);
                VMOVtoV_D(v0, x2, x3);
@@ -514,14 +543,15 @@ 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 {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0);
+                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;
@@ -554,8 +584,9 @@ 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);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 0, 0, 0, NULL);
                VLD1_64(v0, ed);
            }
            VEOR(v0+1, v0+1, v0+1);
@@ -569,13 +600,14 @@ uintptr_t dynarecF30F(dynarec_arm_t* dyn, uintptr_t addr, uintptr_t ip, int nins
                v1 = sse_get_reg_empty(dyn, ninst, x1, nextop&7);
                VMOVQ(v1, v0);
            } else {
-                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-12, 0, 0);
+                addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-12, 0, 0, NULL);
                VMOVfrV_D(x2, x3, v0);
                STR_IMM9(x2, ed, fixedaddress+0);
                STR_IMM9(x3, ed, fixedaddress+4);
                VMOVfrV_D(x2, x3, v0+1);
                STR_IMM9(x2, ed, fixedaddress+8);
                STR_IMM9(x3, ed, fixedaddress+12);
+                SMWRITE2();
            }
            break;

@@ -640,11 +672,12 @@ 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);
+                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0, NULL);
                    VLDR_64(v0, ed, fixedaddress);    // vfpu opcode here
                } else {
-                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-8, 0, 0);
+                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-8, 0, 0, NULL);
                    LDR_IMM9(x2, ed, fixedaddress);
                    LDR_IMM9(x3, ed, fixedaddress+4);
                    VMOVtoV_D(v0, x2, x3);
@@ -666,11 +699,12 @@ 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);
+                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 1023, 3, 0, NULL);
                    VLDR_64(v0, ed, fixedaddress);    // vfpu opcode here
                } else {
-                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-8, 0, 0);
+                    addr = geted(dyn, addr, ninst, nextop, &ed, x1, &fixedaddress, 4095-8, 0, 0, NULL);
                    LDR_IMM9(x2, ed, fixedaddress);
                    LDR_IMM9(x3, ed, fixedaddress+4);
                    VMOVtoV_D(v0, x2, x3);
@@ -27,6 +27,8 @@
 #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)
 {
@@ -109,7 +111,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)(int64_t)0x8000000000000000LL) || !isfinite(ST0.d))
+        if(isgreater(ST0.d, (double)(int64_t)0x7fffffffffffffffLL) || isless(ST0.d, -(double)(uint64_t)0x8000000000000000LL) || !isfinite(ST0.d))
            tmp = 0x8000000000000000LL;
        else
            tmp = fpu_round(emu, ST0.d);
@@ -120,7 +122,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)(int64_t)0x8000000000000000LL) || !isfinite(d))
+    if(isgreater(d, (double)(int64_t)0x7fffffffffffffffLL) || isless(d, -(double)(uint64_t)0x8000000000000000LL) || !isfinite(d))
        tmp = 0x8000000000000000LL;
    else
        tmp = nearbyint(d);
@@ -129,7 +131,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)(int64_t)0x8000000000000000LL) || !isfinite(d))
+    if(isgreater(d, (double)(int64_t)0x7fffffffffffffffLL) || isless(d, -(double)(uint64_t)0x8000000000000000LL) || !isfinite(d))
        tmp = 0x8000000000000000LL;
    else
        tmp = floor(d);
@@ -138,7 +140,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)(int64_t)0x8000000000000000LL) || !isfinite(d))
+    if(isgreater(d, (double)(int64_t)0x7fffffffffffffffLL) || isless(d, -(double)(uint64_t)0x8000000000000000LL) || !isfinite(d))
        tmp = 0x8000000000000000LL;
    else
        tmp = ceil(d);
@@ -147,7 +149,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)(int64_t)0x8000000000000000LL) || !isfinite(d))
+    if(isgreater(d, (double)(int64_t)0x7fffffffffffffffLL) || isless(d, -(double)(uint64_t)0x8000000000000000LL) || !isfinite(d))
        tmp = 0x8000000000000000LL;
    else
        tmp = trunc(d);
@@ -170,9 +172,22 @@ 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);
@@ -208,6 +223,10 @@ 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)
@@ -491,7 +510,7 @@ int getNominalPred(dynarec_arm_t* dyn, int ninst) {
    return dyn->insts[ninst].pred[0];
 }

-int fpuCacheNeedsTransform(dynarec_arm_t* dyn, int ninst) {
+static int fpuCacheNeedsTransform(dynarec_arm_t* dyn, int ninst) {
    int i2 = dyn->insts[ninst].x86.jmp_insts;
    if(i2<0)
        return 1;
@@ -608,6 +627,7 @@ 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;
@@ -702,13 +722,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)
+    if(!addr || !getProtection(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)    // too low, that is suspicious
+    if(addr<0x10000 || !getProtection(addr))    // 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) {
@@ -737,20 +757,98 @@ 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)
+static int flagsCacheNeedsTransform(dynarec_arm_t* dyn, int ninst) {
+    int jmp = dyn->insts[ninst].x86.jmp_insts;
+    if(jmp<0)
        return 0;
-    if(dyn->insts[ninst].x86.state_flags)
+    if(dyn->insts[ninst].f_exit.dfnone)  // flags are fully known, nothing we can do more
        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;
+/*    if((dyn->f.pending!=SF_SET)
+    && (dyn->f.pending!=SF_SET_PENDING)) {
+        if(dyn->f.pending!=SF_PENDING) {*/
+    switch (dyn->insts[jmp].f_entry.pending) {
+        case SF_UNKNOWN: return 0;
+        case SF_SET: 
+            if(dyn->insts[ninst].f_exit.pending!=SF_SET && dyn->insts[ninst].f_exit.pending!=SF_SET_PENDING) 
+                return 1; 
+            else 
+                return 0;
+        case SF_SET_PENDING:
+            if(dyn->insts[ninst].f_exit.pending!=SF_SET 
+            && dyn->insts[ninst].f_exit.pending!=SF_SET_PENDING
+            && dyn->insts[ninst].f_exit.pending!=SF_PENDING) 
+                return 1; 
+            else 
+                return 0;
+        case SF_PENDING:
+            if(dyn->insts[ninst].f_exit.pending!=SF_SET 
+            && dyn->insts[ninst].f_exit.pending!=SF_SET_PENDING
+            && dyn->insts[ninst].f_exit.pending!=SF_PENDING)
+                return 1;
+            else
+                return (dyn->insts[jmp].f_entry.dfnone  == dyn->insts[ninst].f_exit.dfnone)?0:1;
+    }
+    if(dyn->insts[jmp].f_entry.dfnone && !dyn->insts[ninst].f_exit.dfnone)
+        return 1;
+    return 0;
+}
+int CacheNeedsTransform(dynarec_arm_t* dyn, int ninst) {
+    int ret = 0;
+    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));
 }
@@ -23,12 +23,16 @@ 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

@@ -66,14 +70,11 @@ void neoncache_promote_double(dynarec_arm_t* dyn, int ninst, int a);
 int neoncache_combine_st(dynarec_arm_t* dyn, int ninst, int a, int b);  // with stack current dyn->n_stack*

 // FPU Cache transformation (for loops)
-int fpuCacheNeedsTransform(dynarec_arm_t* dyn, int i1);
+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);
@@ -88,4 +89,7 @@ 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__
@@ -4,6 +4,7 @@
 #include <pthread.h>
 #include <errno.h>
 #include <assert.h>
+#include <string.h>

 #include "debug.h"
 #include "box86context.h"
@@ -27,8 +28,11 @@
 #include "dynarec_arm_helper.h"

 /* setup r2 to address pointed by ED, also fixaddress is an optionnal delta in the range [-absmax, +absmax], with delta&mask==0 to be added to ed for LDR/STR */
-uintptr_t geted(dynarec_arm_t* dyn, uintptr_t addr, int ninst, uint8_t nextop, uint8_t* ed, uint8_t hint, int* fixaddress, uint32_t absmax, uint32_t mask, int getfixonly)
+uintptr_t geted(dynarec_arm_t* dyn, uintptr_t addr, int ninst, uint8_t nextop, uint8_t* ed, uint8_t hint, int* fixaddress, uint32_t absmax, uint32_t mask, int getfixonly, int* l)
 {
+    int lock = l?((l==LOCK_LOCK)?1:2):0;
+    if(lock==2)
+        *l = (box86_dynarec_strongmem==2)?1:0;
    uint8_t ret = 2;
    uint8_t scratch = 2;
    *fixaddress = 0;
@@ -51,6 +55,10 @@ uintptr_t geted(dynarec_arm_t* dyn, uintptr_t addr, int ninst, uint8_t nextop, u
                        *fixaddress = tmp;
                    }
                } else {
+                    switch(lock) {
+                        case 1: addLockAddress(tmp); break;
+                        case 2: if(isLockAddress(tmp)) *l=1; break;
+                    }
                    MOV32(ret, tmp);
                }
            } else {
@@ -169,8 +177,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==6) {
-        offset = F16;
+    if(!n && (m&7)==6) {
+        offset = F16S;
        MOVW(ret, offset);
    } else {
        switch(n) {
@@ -178,7 +186,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;
        }
@@ -244,6 +252,7 @@ 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);
 }

@@ -270,6 +279,7 @@ 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);
 }

@@ -286,6 +296,7 @@ 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);
 }

@@ -308,6 +319,7 @@ 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);
 }

@@ -330,6 +342,7 @@ 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);
 }

@@ -471,7 +484,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, reg);
+    fpu_pushcache(dyn, ninst, s1);
    if(saveflags) {
        STR_IMM9(xFlags, xEmu, offsetof(x86emu_t, eflags));
    }
@@ -483,7 +496,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, reg);
+    fpu_popcache(dyn, ninst, s1);
    POP(xSP, (1<<xEmu) | mask);
    if(saveflags) {
        LDR_IMM9(xFlags, xEmu, offsetof(x86emu_t, eflags));
@@ -849,10 +862,29 @@ 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)
 {
-    x87_stackcount(dyn, ninst, s1);
+    // 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));
+    }
    int ret = 0;
    for (int i=0; (i<8) && (!ret); ++i)
        if(dyn->n.x87cache[i] != -1)
@@ -860,13 +892,20 @@ static void x87_reflectcache(dynarec_arm_t* dyn, int ninst, int s1, int s2, int
    if(!ret)    // nothing to do
        return;
    // Get top
-    LDR_IMM9(s2, xEmu, offsetof(x86emu_t, top));
+    if(!a) {
+        // already there
+        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) {
-            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(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);
+            }
            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));
@@ -875,7 +914,31 @@ static void x87_reflectcache(dynarec_arm_t* dyn, int ninst, int s1, int s2, int
            }
        }
 }
-#endif
+
+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));
+    }
+}

 int x87_get_current_cache(dynarec_arm_t* dyn, int ninst, int st, int t)
 {
@@ -1059,15 +1122,13 @@ 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(s2, s1, 10, 2);    // extract round...
-    MOV32(s1, round_map);
-    LDR_REG_LSL_IMM5(s2, s1, s2, 2);
+    UBFX(s1, s1, 10, 2);    // extract round...
+    UBFX(s2, s1, 1, 1);     // swap bits 0 and 1
+    BFI(s2, s1, 1, 1);
    VMRS(s1);               // get fpscr
    MOV_REG(s3, s1);
    BFI(s1, s2, 22, 2);     // inject new round
@@ -1075,6 +1136,21 @@ 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;
@@ -1098,10 +1174,10 @@ 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)
 {
-    LDRH_IMM8(s1, xEmu, offsetof(x86emu_t, mxcsr));
-    UBFX(s2, s1, 13, 2);    // extract round...
-    MOV32(s1, round_map);
-    LDR_REG_LSL_IMM5(s2, s1, s2, 2);
+    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(s1);               // get fpscr
    MOV_REG(s3, s1);
    BFI(s1, s2, 22, 2);     // inject new round
@@ -1109,6 +1185,21 @@ 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)
 {
@@ -1183,7 +1274,6 @@ 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;
@@ -1201,7 +1291,6 @@ static void mmx_reflectcache(dynarec_arm_t* dyn, int ninst, int s1)
            VST1_32_W(dyn->n.mmxcache[i], s1);
        }
 }
-#endif


 // SSE / SSE2 helpers
@@ -1281,7 +1370,6 @@ 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;
@@ -1305,7 +1393,6 @@ 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)
 {
@@ -1326,7 +1413,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_32_W(i, s1);
+            VST1_64_W(i, s1);
        }
    }
    MESSAGE(LOG_DUMP, "\t------- Push FPU Cache (%d)\n", n);
@@ -1345,7 +1432,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_32_W(i, s1);
+            VLD1_64_W(i, s1);
        }
    }
    if(n>=8) {
@@ -1406,8 +1493,10 @@ 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);
@@ -1589,7 +1678,7 @@ static void unloadCache(dynarec_arm_t* dyn, int ninst, int stack_cnt, int s1, in
    cache->neoncache[i].v = 0;
 }

-void fpuCacheTransform(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3)
+static void fpuCacheTransform(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3)
 {
 #if STEP > 1
    int i2 = dyn->insts[ninst].x86.jmp_insts;
@@ -1677,7 +1766,7 @@ void fpuCacheTransform(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3)
        stack_cnt = cache_i2.stack;
    }
    neoncache_t cache = dyn->n;
-    // sanitize XMM regs alocation
+    // sanitize XMM regs alocation, cache_i2 has been sanitized in neoncacheUnwind already
    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];
@@ -1747,17 +1836,71 @@ void fpuCacheTransform(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3)
    MESSAGE(LOG_DUMP, "\t---- Cache Transform\n");
 #endif
 }
+static void flagsCacheTransform(dynarec_arm_t* dyn, int ninst, int s1)
+{
+#if STEP > 1
+    int j32;
+    int jmp = dyn->insts[ninst].x86.jmp_insts;
+    if(jmp<0)
+        return;
+    if(dyn->f.dfnone)  // flags are fully known, nothing we can do more
+        return;
+    MESSAGE(LOG_DUMP, "\tFlags fetch ---- ninst=%d -> %d\n", ninst, jmp);
+    int go = 0;
+    switch (dyn->insts[jmp].f_entry.pending) {
+        case SF_UNKNOWN: break;
+        case SF_SET: 
+            if(dyn->f.pending!=SF_SET && dyn->f.pending!=SF_SET_PENDING) 
+                go = 1; 
+            break;
+        case SF_SET_PENDING:
+            if(dyn->f.pending!=SF_SET 
+            && dyn->f.pending!=SF_SET_PENDING
+            && dyn->f.pending!=SF_PENDING) 
+                go = 1; 
+            break;
+        case SF_PENDING:
+            if(dyn->f.pending!=SF_SET 
+            && dyn->f.pending!=SF_SET_PENDING
+            && dyn->f.pending!=SF_PENDING)
+                go = 1;
+            else
+                go = (dyn->insts[jmp].f_entry.dfnone  == dyn->f.dfnone)?0:1;
+            break;
+    }
+    if(dyn->insts[jmp].f_entry.dfnone && !dyn->f.dfnone)
+        go = 1;
+    if(go) {
+        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);
+            Bcond(cEQ, j32);
+        }
+        CALL_(UpdateFlags, -1, 0);
+        MARKF2;
+    }
+#endif
+}
+
+void CacheTransform(dynarec_arm_t* dyn, int ninst, int cacheupd, int s1, int s2, int s3) {
+    if(cacheupd&1)
+        fpuCacheTransform(dyn, ninst, s1, s2, s3);
+    if(cacheupd&2)
+        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);
-    if(trace_emm)
-       mmx_reflectcache(dyn, ninst, s1);
-    if(trace_xmm)
-       sse_reflectcache(dyn, ninst, s1);
+    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);
 }
-#endif

 void fpu_reset(dynarec_arm_t* dyn)
 {
@@ -1794,3 +1937,64 @@ 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;
+}
@@ -27,6 +27,33 @@
 #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
+
 // GETGD    get x86 register in gd
 #define GETGD   gd = xEAX+((nextop&0x38)>>3)
 //GETED can use r1 for ed, and r2 for wback. wback is 0 if ed is xEAX..xEDI
@@ -34,7 +61,8 @@
                    ed = xEAX+(nextop&7);   \
                    wback = 0;              \
                } else {                    \
-                    addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 4095, 0, 0); \
+                    SMREAD();               \
+                    addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 4095, 0, 0, NULL); \
                    LDR_IMM9(x1, wback, fixedaddress); \
                    ed = x1;                \
                }
@@ -43,7 +71,8 @@
                    ed = xEAX+(nextop&7);   \
                    wback = 0;              \
                } else {                    \
-                    addr = geted(dyn, addr, ninst, nextop, &wback, (hint==x2)?x1:x2, &fixedaddress, 4095, 0, 0); \
+                    SMREAD();               \
+                    addr = geted(dyn, addr, ninst, nextop, &wback, (hint==x2)?x1:x2, &fixedaddress, 4095, 0, 0, NULL); \
                    LDR_IMM9(hint, wback, fixedaddress); \
                    ed = hint;              \
                }
@@ -53,20 +82,22 @@
                    MOV_REG(ret, ed);       \
                    wback = 0;              \
                } else {                    \
-                    addr = geted(dyn, addr, ninst, nextop, &wback, hint, &fixedaddress, 4095, 0, 0); \
+                    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);}
-// Send back wb to either ed or wback
-#define SBACK(wb)   if(wback) {STR_IMM9(wb, wback, fixedaddress);} else {MOV_REG(ed, wb);}
+#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();}
 //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 {                    \
-                    addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 0); \
+                    SMREAD();               \
+                    addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 0, NULL); \
                    LDR_REG_LSL_IMM5(x1, wback, O, 0);  \
                    ed = x1;                 \
                }
@@ -75,13 +106,14 @@
                    ed = xEAX+(nextop&7);               \
                    wback = 0;                          \
                } else {                                \
-                    addr = geted(dyn, addr, ninst, nextop, &wback, x2, &fixedaddress, 0, 0, 0); \
+                    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);}
+#define WBACKO(O)   if(wback) {STR_REG_LSL_IMM5(ed, wback, O, 0); SMWRITE();}
 //FAKEELike GETED, but doesn't get anything
 #define FAKEED  if((nextop&0xC0)!=0xC0) {   \
                    addr = fakeed(dyn, addr, ninst, nextop); \
@@ -95,7 +127,8 @@
                    ed = i;                 \
                    wb1 = 0;                \
                } else {                    \
-                    addr = geted(dyn, addr, ninst, nextop, &wback, w, &fixedaddress, 255, 0, 0); \
+                    SMREAD();               \
+                    addr = geted(dyn, addr, ninst, nextop, &wback, w, &fixedaddress, 255, 0, 0, NULL); \
                    LDRH_IMM8(i, wback, fixedaddress); \
                    ed = i;                 \
                    wb1 = 1;                \
@@ -107,7 +140,8 @@
                    ed = i;                 \
                    wb1 = 0;                \
                } else {                    \
-                    addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255, 0, 0); \
+                    SMREAD();               \
+                    addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255, 0, 0, NULL); \
                    LDRH_IMM8(i, wback, fixedaddress); \
                    ed = i;                 \
                    wb1 = 1;                \
@@ -119,15 +153,16 @@
                    ed = i;                 \
                    wb1 = 0;                \
                } else {                    \
-                    addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255, 0, 0); \
+                    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);} else {BFI(wback, ed, 0, 16);}
+#define EWBACK   if(wb1) {STRH_IMM8(ed, wback, fixedaddress); SMWRITE();} else {BFI(wback, ed, 0, 16);}
 // Write w back to original register / memory
-#define EWBACKW(w)   if(wb1) {STRH_IMM8(w, wback, fixedaddress);} else {BFI(wback, w, 0, 16);}
+#define EWBACKW(w)   if(wb1) {STRH_IMM8(w, wback, fixedaddress); SMWRITE();} 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.
@@ -139,7 +174,8 @@
                    wb1 = 0;                \
                    ed = i;                 \
                } else {                    \
-                    addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 4095, 0, 0); \
+                    SMREAD();               \
+                    addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 4095, 0, 0, NULL); \
                    LDRB_IMM9(i, wback, fixedaddress); \
                    wb1 = 1;                \
                    ed = i;                 \
@@ -153,7 +189,8 @@
                    wb1 = 0;                \
                    ed = i;                 \
                } else {                    \
-                    addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 0, 0, 0); \
+                    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;           \
                    LDRB_IMM9(i, wback, fixedaddress);  \
@@ -169,13 +206,16 @@
                    wb1 = 0;                \
                    ed = i;                 \
                } else {                    \
-                    addr = geted(dyn, addr, ninst, nextop, &wback, x3, &fixedaddress, 255, 0, 0); \
+                    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);} else {BFI(wback, ed, wb2*8, 8);}
+#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);}
 //GETGB will use i for gd
 #define GETGB(i)    gd = (nextop&0x38)>>3;  \
                    gb2 = ((gd&4)>>2);      \
@@ -220,17 +260,19 @@
 // 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 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 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 GETMARKLOCK ((dyn->insts)?dyn->insts[ninst].marklock:(dyn->arm_size+4))

 // Branch to MARK if cond (use j32)
@@ -258,11 +300,11 @@
    j32 = GETMARKLOCK-(dyn->arm_size+8);   \
    Bcond(cond, j32)

-#define IFX(A)  if((dyn->insts[ninst].x86.need_flags&(A)))
-#define IFX_PENDOR0  if((dyn->insts[ninst].x86.need_flags&(X_PEND) || !dyn->insts[ninst].x86.need_flags))
-#define IFXX(A) if((dyn->insts[ninst].x86.need_flags==(A)))
-#define IFX2X(A, B) if((dyn->insts[ninst].x86.need_flags==(A) || dyn->insts[ninst].x86.need_flags==(B) || dyn->insts[ninst].x86.need_flags==((A)|(B))))
-#define IFXN(A, B)  if((dyn->insts[ninst].x86.need_flags&(A) && !(dyn->insts[ninst].x86.need_flags&(B))))
+#define IFX(A)  if((dyn->insts[ninst].x86.gen_flags&(A)))
+#define IFX_PENDOR0  if((dyn->insts[ninst].x86.gen_flags&(X_PEND) || !dyn->insts[ninst].x86.gen_flags))
+#define IFXX(A) if((dyn->insts[ninst].x86.gen_flags==(A)))
+#define IFX2X(A, B) if((dyn->insts[ninst].x86.gen_flags==(A) || dyn->insts[ninst].x86.gen_flags==(B) || dyn->insts[ninst].x86.gen_flags==((A)|(B))))
+#define IFXN(A, B)  if((dyn->insts[ninst].x86.gen_flags&(A) && !(dyn->insts[ninst].x86.gen_flags&(B))))

 // Generate FCOM with s1 and s2 scratch regs (the VCMP is already done)
 #define FCOM(s1, s2)    \
@@ -297,9 +339,13 @@
 #define SET_NODF()          dyn->f.dfnone = 0
 #define SET_DFOK()          dyn->f.dfnone = 1

+#ifndef MAYSETFLAGS
+#define MAYSETFLAGS()
+#endif
+
 #ifndef READFLAGS
 #define READFLAGS(A) \
-    if((dyn->f.pending!=SF_SET)                         \
+    if(((A)!=X_PEND && 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)); \
@@ -313,23 +359,21 @@
        SET_DFOK();                                     \
    }
 #endif
-// SF_MAYSET doesn't change the flags status cache
-// it also doesn't consume any needed flags
+
 #ifndef SETFLAGS
 #define SETFLAGS(A, B)                                                                          \
    if(dyn->f.pending!=SF_SET                                                                   \
-    && (B==SF_SUBSET || B==SF_SUBSET_PENDING)                                                   \
-    && (dyn->insts[ninst].x86.need_flags&(~((A)|((B==SF_SUBSET_PENDING)?X_PEND:0)))))           \
-        READFLAGS(dyn->insts[ninst].x86.need_flags&(~(A)|X_PEND));                              \
-    if(dyn->insts[ninst].x86.need_flags) switch(B) {                                            \
+    && ((B)&SF_SUB)                                                                             \
+    && (dyn->insts[ninst].x86.gen_flags&(~(A))))                                               \
+        READFLAGS(((dyn->insts[ninst].x86.gen_flags&X_PEND)?X_ALL:dyn->insts[ninst].x86.gen_flags)&(~(A)));\
+    if(dyn->insts[ninst].x86.gen_flags) switch(B) {                                            \
        case SF_SUBSET:                                                                         \
        case SF_SET: dyn->f.pending = SF_SET; break;                                            \
        case SF_PENDING: dyn->f.pending = SF_PENDING; break;                                    \
        case SF_SUBSET_PENDING:                                                                 \
        case SF_SET_PENDING:                                                                    \
-            dyn->f.pending = (dyn->insts[ninst].x86.need_flags&X_PEND)?SF_SET_PENDING:SF_SET;   \
+            dyn->f.pending = (dyn->insts[ninst].x86.gen_flags&X_PEND)?SF_SET_PENDING:SF_SET;   \
            break;                                                                              \
-        case SF_MAYSET: break;                                                                  \
    } else dyn->f.pending = SF_SET
 #endif
 #ifndef JUMP
@@ -341,12 +385,12 @@
 #ifndef BARRIER_NEXT
 #define BARRIER_NEXT(A)
 #endif
-#define UFLAG_OP1(A) if(dyn->insts[ninst].x86.need_flags) {STR_IMM9(A, xEmu, offsetof(x86emu_t, op1));}
-#define UFLAG_OP2(A) if(dyn->insts[ninst].x86.need_flags) {STR_IMM9(A, xEmu, offsetof(x86emu_t, op2));}
-#define UFLAG_OP12(A1, A2) if(dyn->insts[ninst].x86.need_flags) {STR_IMM9(A1, xEmu, offsetof(x86emu_t, op1));STR_IMM9(A2, 0, offsetof(x86emu_t, op2));}
-#define UFLAG_RES(A) if(dyn->insts[ninst].x86.need_flags) {STR_IMM9(A, xEmu, offsetof(x86emu_t, res));}
-#define UFLAG_DF(r, A) if(dyn->insts[ninst].x86.need_flags) {SET_DF(r, A)}
-#define UFLAG_IF if(dyn->insts[ninst].x86.need_flags)
+#define UFLAG_OP1(A) if(dyn->insts[ninst].x86.gen_flags) {STR_IMM9(A, xEmu, offsetof(x86emu_t, op1));}
+#define UFLAG_OP2(A) if(dyn->insts[ninst].x86.gen_flags) {STR_IMM9(A, xEmu, offsetof(x86emu_t, op2));}
+#define UFLAG_OP12(A1, A2) if(dyn->insts[ninst].x86.gen_flags) {STR_IMM9(A1, xEmu, offsetof(x86emu_t, op1));STR_IMM9(A2, 0, offsetof(x86emu_t, op2));}
+#define UFLAG_RES(A) if(dyn->insts[ninst].x86.gen_flags) {STR_IMM9(A, xEmu, offsetof(x86emu_t, res));}
+#define UFLAG_DF(r, A) if(dyn->insts[ninst].x86.gen_flags) {SET_DF(r, A)}
+#define UFLAG_IF if(dyn->insts[ninst].x86.gen_flags)
 #ifndef DEFAULT
 #define DEFAULT      *ok = -1; BARRIER(BARRIER_NOFLAGS)
 #endif
@@ -492,9 +536,11 @@ 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)
@@ -503,22 +549,23 @@ 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)
-#endif
+#define fpu_unreflectcache STEPNAME(fpu_unreflectcache)

 // get the single reg that from the double "reg" (so Dx[idx])
 #define fpu_get_single_reg      STEPNAME(fpu_get_single_reg)
 // put back (if needed) the single reg in place
 #define fpu_putback_single_reg  STEPNAME(fpu_putback_single_reg)

-#define fpuCacheTransform       STEPNAME(fpuCacheTransform)
+#define CacheTransform       STEPNAME(CacheTransform)

 /* setup r2 to address pointed by */
-uintptr_t geted(dynarec_arm_t* dyn, uintptr_t addr, int ninst, uint8_t nextop, uint8_t* ed, uint8_t hint, int* fixedaddress, uint32_t absmax, uint32_t mask, int getfixonly);
+uintptr_t geted(dynarec_arm_t* dyn, uintptr_t addr, int ninst, uint8_t nextop, uint8_t* ed, uint8_t hint, int* fixedaddress, uint32_t absmax, uint32_t mask, int getfixonly, int* l);

 /* setup r2 to address pointed by */
 uintptr_t geted16(dynarec_arm_t* dyn, uintptr_t addr, int ninst, uint8_t nextop, uint8_t* ed, uint8_t hint, int* fixedaddress, uint32_t absmax, uint32_t mask);
@@ -639,19 +686,23 @@ 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 fpuCacheTransform(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);

 #if STEP < 2
 #define CHECK_CACHE()   0
 #else
-#define CHECK_CACHE()   fpuCacheNeedsTransform(dyn, ninst)
+#define CHECK_CACHE()   (cacheupd = CacheNeedsTransform(dyn, ninst))
 #endif

 #define neoncache_st_coherency STEPNAME(neoncache_st_coherency)
@@ -693,13 +744,16 @@ 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);
-#endif
+void fpu_unreflectcache(dynarec_arm_t* dyn, int ninst, int s1, int s2, int s3);
 void fpu_pushcache(dynarec_arm_t* dyn, int ninst, int s1);
 void fpu_popcache(dynarec_arm_t* dyn, int ninst, int s1);

@@ -746,4 +800,21 @@ 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__
@@ -0,0 +1,12 @@
+#include <stdint.h>
+#include <stdlib.h>
+
+#include "arm_emitter.h"
+
+#define EMIT(A) *block = (A); ++block
+void CreateJmpNext(void* addr, void* next)
+{
+    uint32_t* block = (uint32_t*)addr;
+    LDR_literal(x2, ((intptr_t)next - (intptr_t)addr)-8);
+    BX(x2);
+}
@@ -21,6 +21,7 @@
 #include "dynarec_arm_functions.h"
 #include "dynarec_arm_helper.h"
 #include "custommem.h"
+#include "elfloader.h"

 #ifndef STEP
 #error No STEP defined
@@ -30,17 +31,21 @@ uintptr_t arm_pass(dynarec_arm_t* dyn, uintptr_t addr)
 {
    int ok = 1;
    int ninst = 0;
+    int j32;
    uintptr_t ip = addr;
    uintptr_t init_addr = addr;
    MAYUSE(init_addr);
    int need_epilog = 1;
-    dyn->sons_size = 0;
    // 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;
-    // ok, go now
+    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
    INIT;
    while(ok) {
        ip = addr;
@@ -51,44 +56,7 @@ uintptr_t arm_pass(dynarec_arm_t* dyn, uintptr_t addr)
                dyn->f.pending = 0;
                fpu_reset(dyn);
            } else {
-                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
+                fpu_reset_cache(dyn, ninst, reset_n);
                dyn->f = dyn->insts[reset_n].f_exit;
                if(dyn->insts[ninst].x86.barrier&BARRIER_FLOAT) {
                    MESSAGE(LOG_DEBUG, "Apply Barrier Float\n");
@@ -102,25 +70,29 @@ uintptr_t arm_pass(dynarec_arm_t* dyn, uintptr_t addr)
            }
            reset_n = -1;
        }
-        // 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;
-        }
-        dyn->n.stack = dyn->n.stack_next;
-        dyn->n.news = 0;
-        dyn->n.stack_push = 0;
-        dyn->n.swapped = 0;
+        fpu_propagate_stack(dyn, ninst);
        NEW_INST;
+        if(!ninst) {
+            GOTEST(x1, x2);
+        }
+        if(dyn->insts[ninst].pred_sz>1) {SMSTART();}
        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
-        if(my_context->dec && box86_dynarec_trace) {
+        else if(my_context->dec && box86_dynarec_trace) {
        if((trace_end == 0) 
            || ((ip >= trace_start) && (ip < trace_end)))  {
                MESSAGE(LOG_DUMP, "TRACE ----\n");
@@ -130,6 +102,7 @@ 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");
            }
        }
@@ -152,13 +125,26 @@ 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;
-            while(ii<dyn->size && !dyn->insts[ii].pred_sz) 
-                ++ii;
+            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;
+                }
+            }
            if((dyn->insts[ii].x86.barrier&BARRIER_FULL)==BARRIER_FULL)
                reset_n = -2;    // hack to say Barrier!
            else {
@@ -170,7 +156,29 @@ uintptr_t arm_pass(dynarec_arm_t* dyn, uintptr_t addr)
            }
        }
        #else
-        if(!ok && !need_epilog && box86_dynarec_bigblock && getProtection(addr+3)&~PROT_CUSTOM)
+        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))
            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 && (
@@ -186,44 +194,93 @@ 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)<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));
+                } 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;
+                        }
+                    }
                }
            }
        #endif
-        if(ok<0)  {ok = 0; need_epilog=1;}
+        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
+        }
        ++ninst;
        #if STEP == 0
-        if((ok && !isJumpTableDefault((void*)addr) && (box86_dynarec_bigblock<2)) ||
-            (ok && dyn->size >= 2000))
+        if(ok && (((box86_dynarec_bigblock<stopblock) && !isJumpTableDefault((void*)addr)) 
+            || (addr>=box86_nodynarec_start && addr<box86_nodynarec_end)))
        #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); 
+            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");
            --ninst;
            if(!dyn->insts[ninst].x86.barrier) {
                BARRIER(BARRIER_FLOAT);
            }
            #if STEP == 0
-            if(dyn->insts[ninst].x86.set_flags)
-                dyn->insts[ninst].x86.default_need |= X_PEND;
-            else
-                dyn->insts[ninst].x86.use_flags |= X_PEND;
+            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
    }
    FINI;
-    MESSAGE(LOG_DUMP, "---- END OF BLOCK ---- (%d, %d sons)\n", dyn->size, dyn->sons_size);
+    MESSAGE(LOG_DUMP, "---- END OF BLOCK ---- (%d)\n", dyn->size);
    return addr;
 }
@@ -4,25 +4,25 @@
    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)    \
        dyn->insts[ninst].x86.use_flags = A; dyn->f.dfnone = 1;\
        dyn->f.pending=SF_SET
 #define SETFLAGS(A,B)   \
-        dyn->insts[ninst].x86.set_flags = A;            \
-        if(B!=SF_MAYSET) {                              \
-                dyn->insts[ninst].x86.state_flags = B;  \
-                dyn->f.pending=(B)&SF_SET_PENDING;      \
-                dyn->f.dfnone=((B)&SF_SET)?1:0;         \
-        }
+        dyn->insts[ninst].x86.set_flags = A;    \
+        dyn->insts[ninst].x86.state_flags = B;  \
+        dyn->f.pending=(B)&SF_SET_PENDING;      \
+        dyn->f.dfnone=((B)&SF_SET)?1:0;
 #define EMIT(A)     
-#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 JUMP(A, C)      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*)realloc(dyn->insts, sizeof(instruction_arm_t)*dyn->cap*2);     \
+                dyn->insts = (instruction_arm_t*)dynaRealloc(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,14 +35,14 @@
 #define INST_EPILOG                             \
        dyn->insts[ninst].f_exit = dyn->f;      \
        dyn->insts[ninst].n = dyn->n;           \
-        dyn->insts[ninst].x86.has_next = ok;
+        dyn->insts[ninst].x86.has_next = (ok>0)?1:0;
 #define INST_NAME(name) 
 #define DEFAULT                         \
        --dyn->size;                    \
        *ok = -1;                       \
        if(box86_dynarec_log>=LOG_INFO || box86_dynarec_dump) {\
-        dynarec_log(LOG_NONE, "%p: Dynarec stopped because of Opcode %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X", \
-        (void*)ip, PKip(0),             \
+        dynarec_log(LOG_NONE, "%p: Dynarec stopped @ %s (%s:%u) because of Opcode %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X", \
+        (void*)ip, __FUNCTION__, __FILE__, __LINE__, PKip(0), \
        PKip(1), PKip(2), PKip(3),      \
        PKip(4), PKip(5), PKip(6),      \
        PKip(7), PKip(8), PKip(9),      \
@@ -2,7 +2,6 @@
 #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;\
@@ -1,13 +1,16 @@
 #define INIT        dyn->arm_size = 0
-#define FINI        if(ninst) {dyn->insts[ninst].address = (dyn->insts[ninst-1].address+dyn->insts[ninst-1].size);}
+#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 MESSAGE(A, ...)  
-#define EMIT(A)     dyn->insts[ninst].size+=4; dyn->arm_size+=4
+#define EMIT(A)     do{dyn->insts[ninst].size+=4; dyn->arm_size+=4;}while(0)
 #define NEW_INST                                                                                        \
        if(ninst) {                                                                                     \
                dyn->insts[ninst].address = (dyn->insts[ninst-1].address+dyn->insts[ninst-1].size);     \
-                if(ninst && isInstClean(dyn, ninst))                                                    \
-                        ++dyn->sons_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) 
@@ -1,61 +1,20 @@
 #define INIT    
-#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 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 MESSAGE(A, ...)  if(box86_dynarec_dump) dynarec_log(LOG_NONE, __VA_ARGS__)
 #define NEW_INST        \
-    if(ninst && isInstClean(dyn, ninst)) {                      \
-        dyn->sons_x86[dyn->sons_size] = (uintptr_t)ip;          \
-        dyn->sons_arm[dyn->sons_size] = dyn->block;             \
-        MESSAGE(LOG_DUMP, "----> potential Son here %p/%p\n", (void*)ip, dyn->block);  \
-        ++dyn->sons_size;                                       \
-    }
-
+    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) \
-    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), set=%X, use=%X, need=%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.set_flags,    \
-            dyn->insts[ninst].x86.use_flags,    \
-            dyn->insts[ninst].x86.need_flags);  \
-        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":"");                       \
-    }
-
+#define INST_NAME(name) inst_name_pass3(dyn, ninst, name)
@@ -5,6 +5,7 @@

 typedef struct x86emu_s x86emu_t;
 typedef struct dynablock_s dynablock_t;
+typedef struct instsize_s instsize_t;

 #define BARRIER_MAYBE   8

@@ -18,12 +19,12 @@ typedef struct dynablock_s dynablock_t;
 typedef union neon_cache_s {
    int8_t           v;
    struct {
-        unsigned int t:4;   // reg type
-        unsigned int n:4;   // reg number
+        uint8_t t:4;   // reg type
+        uint8_t n:4;   // reg number
    };
 } neon_cache_t;
 typedef union sse_cache_s {
-    int     v;
+    int8_t     v;
    struct {
        uint8_t reg;
        uint8_t write;
@@ -68,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;
+    uintptr_t           markf, markf2;
    uintptr_t           markseg;
    uintptr_t           marklock;
    int                 pass2choice;// value for choices that are fixed on pass2 for pass3
@@ -90,16 +91,23 @@ 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
    int                 next_sz;
    int                 next_cap;
-    uintptr_t*          sons_x86;   // the x86 address of potential dynablock sons
-    void**              sons_arm;   // the arm address of potential dynablock sons
-    int                 sons_size;  // number of potential dynablock sons
    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);
@@ -107,4 +115,6 @@ 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);
+
 #endif //__DYNAREC_ARM_PRIVATE_H_
@@ -24,7 +24,6 @@
 #define SF_SUB      4
 #define SF_SUBSET   (SF_SUB|SF_SET)
 #define SF_SUBSET_PENDING   (SF_SUBSET|SF_PENDING)
-#define SF_MAYSET   8

 typedef struct instruction_x86_s {
    uintptr_t   addr;   //address of the instruction
@@ -37,11 +36,25 @@ typedef struct instruction_x86_s {
    uint8_t     state_flags;// One of SF_XXX state
    uint8_t     use_flags;  // 0 or combination of X_?F
    uint8_t     set_flags;  // 0 or combination of X_?F
-    uint8_t     default_need;// 0 or X_PEND basically
-    uint8_t     need_flags; // calculated
-    uint8_t     old_use;    // calculated
+    uint8_t     may_set;    // 1 if the flags may not be set
+    uint8_t     gen_flags;  // calculated
+    uint8_t     need_before; // calculated
+    uint8_t     need_after;    // calculated
 } instruction_x86_t;

 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_
@@ -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[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 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 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>
@@ -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 (int i=0; i<h->numPHEntries; ++i)
+        for (uint16_t 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 (int i=0; i<h->numSHEntries; ++i)
+        for (uint16_t 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 (int i=0; i<h->numSymTab; ++i)
+        for (uint32_t 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 (int i=0; i<h->numDynamic; ++i)
+        for (uint32_t 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 (int i=0; i<h->numDynSym; ++i) {
+        for (uint32_t 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 (int i=0; i<h->numDynamic; ++i)
+        for (uint32_t 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 (int i=0; i<h->numDynamic; ++i) {
+        for (uint32_t 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);
            }
@@ -1,33 +1,32 @@
 #ifndef __ELFLOADER_PRIVATE_H_
 #define __ELFLOADER_PRIVATE_H_

-#ifdef DYNAREC
-typedef struct dynablocklist_s dynablocklist_t;
-#endif
-
 typedef struct library_s library_t;
 typedef struct needed_libs_s needed_libs_t;
+typedef struct kh_mapsymbols_s kh_mapsymbols_t;

-#include <pthread.h>
+#include <elf.h>
+#include "elfloader.h"

 struct elfheader_s {
    char*       name;
    char*       path;   // Resolved path to file
-    int         numPHEntries;
+    char*       soname; // soname of the elf
+    uint16_t    numPHEntries;
    Elf32_Phdr  *PHEntries;
-    int         numSHEntries;
+    uint16_t    numSHEntries;
    Elf32_Shdr  *SHEntries;
    int         SHIdx;
    int         numSST;
    char*       SHStrTab;
    char*       StrTab;
    Elf32_Sym*  SymTab;
-    int         numSymTab;
+    uint32_t    numSymTab;
    char*       DynStr;
    Elf32_Sym*  DynSym;
-    int         numDynSym;
+    uint32_t    numDynSym;
    Elf32_Dyn*  Dynamic;
-    int         numDynamic;
+    uint32_t    numDynamic;
    char*       DynStrTab;
    int         szDynStrTab;
    Elf32_Half* VerSym;
@@ -36,6 +35,7 @@ struct elfheader_s {
    Elf32_Verdef*   VerDef;
    int         szVerDef;
    int         e_type;
+    uint32_t    flags;

    intptr_t    delta;  // should be 0

@@ -66,22 +66,30 @@ struct elfheader_s {
    uintptr_t   plt_end;
    uintptr_t   text;
    int         textsz;
+    uintptr_t   bss;
+    int         bsssz;
+    uintptr_t   ehframe;
+    uintptr_t   ehframe_end;
+    uintptr_t   ehframehdr;

    uintptr_t   paddr;
    uintptr_t   vaddr;
-    int         align;
+    uint32_t    align;
    uint32_t    memsz;
+    uint32_t    reserve;
    uint32_t    stacksz;
-    int         stackalign;
+    uint32_t    stackalign;
    uintptr_t   tlsaddr;
    uint32_t    tlssize;
    uint32_t    tlsfilesize;
-    int         tlsalign;
+    uint32_t    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;
@@ -90,7 +98,13 @@ struct elfheader_s {
    int         multiblock_n;

    library_t   *lib;
-    needed_libs_t *neededlibs;
+    needed_libs_t *needed;
+
+    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
@@ -107,4 +121,4 @@ struct elfheader_s {

 elfheader_t* ParseElfHeader(FILE* f, const char* name, int exec);

-#endif //__ELFLOADER_PRIVATE_H_
+#endif //__ELFLOADER_PRIVATE_H_
@@ -17,16 +17,16 @@
 int LoadSH(FILE *f, Elf32_Shdr *s, void** SH, const char* name, uint32_t type)
 {
    if(type && (s->sh_type != type)) {
-        printf_log(LOG_INFO, "Section Header \"%s\" (off=%d, size=%d) has incorect type (%d != %d)\n", name, s->sh_offset, s->sh_size, s->sh_type, type);
+        printf_dump(LOG_INFO, "Section Header \"%s\" (off=%d, size=%d) has incorect type (%d != %d)\n", name, s->sh_offset, s->sh_size, s->sh_type, type);
        return -1;
    }
    if (type==SHT_SYMTAB && s->sh_size%sizeof(Elf32_Sym)) {
-        printf_log(LOG_INFO, "Section Header \"%s\" (off=%d, size=%d) has size (not multiple of %d)\n", name, s->sh_offset, s->sh_size, sizeof(Elf32_Sym));
+        printf_dump(LOG_INFO, "Section Header \"%s\" (off=%d, size=%d) has size (not multiple of %d)\n", name, s->sh_offset, s->sh_size, sizeof(Elf32_Sym));
    }
-    *SH = calloc(1, s->sh_size);
+    *SH = box_calloc(1, s->sh_size);
    fseeko64(f, s->sh_offset ,SEEK_SET);
    if(fread(*SH, s->sh_size, 1, f)!=1) {
-            printf_log(LOG_INFO, "Cannot read Section Header \"%s\" (off=%d, size=%d)\n", name, s->sh_offset, s->sh_size);
+            printf_dump(LOG_INFO, "Cannot read Section Header \"%s\" (off=%d, size=%d)\n", name, s->sh_offset, s->sh_size);
            return -1;
    }

@@ -43,10 +43,10 @@ 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, int* num)
+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)
 {
    int n = FindSection(s, size, SHStrTab, name);
-    printf_log(LOG_DEBUG, "Loading %s (idx = %d)\n", clearname, n);
+    printf_dump(LOG_DEBUG, "Loading %s (idx = %d)\n", clearname, n);
    if(n)
        LoadSH(f, s+n, what, name, type);
    if(type==SHT_SYMTAB || type==SHT_DYNSYM) {
@@ -63,59 +63,59 @@ elfheader_t* ParseElfHeader(FILE* f, const char* name, int exec)
    Elf32_Ehdr header;
    int level = (exec)?LOG_INFO:LOG_DEBUG;
    if(fread(&header, sizeof(Elf32_Ehdr), 1, f)!=1) {
-        printf_log(level, "Cannot read ELF Header\n");
+        printf_dump(level, "Cannot read ELF Header\n");
        return NULL;
    }
    if(memcmp(header.e_ident, ELFMAG, SELFMAG)!=0) {
-        printf_log(LOG_INFO, "Not an ELF file (sign=%c%c%c%c)\n", header.e_ident[0], header.e_ident[1], header.e_ident[2], header.e_ident[3]);
+        printf_dump(LOG_INFO, "Not an ELF file (sign=%c%c%c%c)\n", header.e_ident[0], header.e_ident[1], header.e_ident[2], header.e_ident[3]);
        return NULL;
    }
    if(header.e_ident[EI_CLASS]!=ELFCLASS32) {
        if(header.e_ident[EI_CLASS]==ELFCLASS64) {
-            printf_log(LOG_INFO, "This is a 64bits ELF! box86 can only run 32bits ELF!\n");
+            printf_dump(LOG_INFO, "This is a 64bits ELF! box86 can only run 32bits ELF!\n");
        } else {
-            printf_log(LOG_INFO, "Not a 32bits ELF (%d)\n", header.e_ident[EI_CLASS]);
+            printf_dump(LOG_INFO, "Not a 32bits ELF (%d)\n", header.e_ident[EI_CLASS]);
        }
        return NULL;
    }
    if(header.e_ident[EI_DATA]!=ELFDATA2LSB) {
-        printf_log(LOG_INFO, "Not a LittleEndian ELF (%d)\n", header.e_ident[EI_DATA]);
+        printf_dump(LOG_INFO, "Not a LittleEndian ELF (%d)\n", header.e_ident[EI_DATA]);
        return NULL;
    }
    if(header.e_ident[EI_VERSION]!=EV_CURRENT) {
-        printf_log(LOG_INFO, "Incorrect ELF version (%d)\n", header.e_ident[EI_VERSION]);
+        printf_dump(LOG_INFO, "Incorrect ELF version (%d)\n", header.e_ident[EI_VERSION]);
        return NULL;
    }
    if(header.e_ident[EI_OSABI]!=ELFOSABI_LINUX && header.e_ident[EI_OSABI]!=ELFOSABI_NONE && header.e_ident[EI_OSABI]!=ELFOSABI_SYSV) {
-        printf_log(LOG_INFO, "Not a Linux ELF (%d)\n",header.e_ident[EI_OSABI]);
+        printf_dump(LOG_INFO, "Not a Linux ELF (%d)\n",header.e_ident[EI_OSABI]);
        return NULL;
    }

    if(header.e_type != ET_EXEC && header.e_type != ET_DYN) {
-        printf_log(LOG_INFO, "Not an Executable (%d)\n", header.e_type);
+        printf_dump(LOG_INFO, "Not an Executable (%d)\n", header.e_type);
        return NULL;
    }

    if(header.e_machine != EM_386) {
-        printf_log(level, "Not an i386 ELF (%d)\n", header.e_machine);
+        printf_dump(level, "Not an i386 ELF (%d)\n", header.e_machine);
        return NULL;
    }

    if(header.e_entry == 0 && exec) {
-        printf_log(LOG_INFO, "No entry point in ELF\n");
+        printf_dump(LOG_INFO, "No entry point in ELF\n");
        return NULL;
    }
    if(header.e_phentsize != sizeof(Elf32_Phdr)) {
-        printf_log(LOG_INFO, "Program Header Entry size incorrect (%d != %d)\n", header.e_phentsize, sizeof(Elf32_Phdr));
+        printf_dump(LOG_INFO, "Program Header Entry size incorrect (%d != %d)\n", header.e_phentsize, sizeof(Elf32_Phdr));
        return NULL;
    }
    if(header.e_shentsize != sizeof(Elf32_Shdr) && header.e_shentsize != 0) {
-        printf_log(LOG_INFO, "Section Header Entry size incorrect (%d != %d)\n", header.e_shentsize, sizeof(Elf32_Shdr));
+        printf_dump(LOG_INFO, "Section Header Entry size incorrect (%d != %d)\n", header.e_shentsize, sizeof(Elf32_Shdr));
        return NULL;
    }

-    elfheader_t *h = calloc(1, sizeof(elfheader_t));
-    h->name = strdup(name);
+    elfheader_t *h = box_calloc(1, sizeof(elfheader_t));
+    h->name = box_strdup(name);
    h->entrypoint = header.e_entry;
    h->numPHEntries = header.e_phnum;
    h->numSHEntries = header.e_shnum;
@@ -124,55 +124,55 @@ elfheader_t* ParseElfHeader(FILE* f, const char* name, int exec)
    if(header.e_shentsize && header.e_shnum) {
        // special cases for nums
        if(h->numSHEntries == 0) {
-            printf_log(LOG_DEBUG, "Read number of Sections in 1st Section\n");
+            printf_dump(LOG_DEBUG, "Read number of Sections in 1st Section\n");
            // read 1st section header and grab actual number from here
            fseeko64(f, header.e_shoff, SEEK_SET);
            Elf32_Shdr section;
            if(fread(&section, sizeof(Elf32_Shdr), 1, f)!=1) {
-                free(h);
-                printf_log(LOG_INFO, "Cannot read Initial Section Header\n");
+                box_free(h);
+                printf_dump(LOG_INFO, "Cannot read Initial Section Header\n");
                return NULL;
            }
            h->numSHEntries = section.sh_size;
        }
        // now read all section headers
-        printf_log(LOG_DEBUG, "Read %d Section header\n", h->numSHEntries);
-        h->SHEntries = (Elf32_Shdr*)calloc(h->numSHEntries, sizeof(Elf32_Shdr));
+        printf_dump(LOG_DEBUG, "Read %u 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) {
                FreeElfHeader(&h);
-                printf_log(LOG_INFO, "Cannot read all Section Header\n");
+                printf_dump(LOG_INFO, "Cannot read all Section Header\n");
                return NULL;
        }

        if(h->numPHEntries == PN_XNUM) {
-            printf_log(LOG_DEBUG, "Read number of Program Header in 1st Section\n");
+            printf_dump(LOG_DEBUG, "Read number of Program Header in 1st Section\n");
            // read 1st section header and grab actual number from here
            h->numPHEntries = h->SHEntries[0].sh_info;
        }
    }

-    printf_log(LOG_DEBUG, "Read %d Program header\n", h->numPHEntries);
-    h->PHEntries = (Elf32_Phdr*)calloc(h->numPHEntries, sizeof(Elf32_Phdr));
+    printf_dump(LOG_DEBUG, "Read %d Program header\n", h->numPHEntries);
+    h->PHEntries = (Elf32_Phdr*)box_calloc(h->numPHEntries, sizeof(Elf32_Phdr));
    fseeko64(f, header.e_phoff ,SEEK_SET);
    if(fread(h->PHEntries, sizeof(Elf32_Phdr), h->numPHEntries, f)!=h->numPHEntries) {
            FreeElfHeader(&h);
-            printf_log(LOG_INFO, "Cannot read all Program Header\n");
+            printf_dump(LOG_INFO, "Cannot read all Program Header\n");
            return NULL;
    }

    if(header.e_shentsize && header.e_shnum) {
        if(h->SHIdx == SHN_XINDEX) {
-            printf_log(LOG_DEBUG, "Read number of String Table in 1st Section\n");
+            printf_dump(LOG_DEBUG, "Read number of String Table in 1st Section\n");
            h->SHIdx = h->SHEntries[0].sh_link;
        }
        if(h->SHIdx > h->numSHEntries) {
-            printf_log(LOG_INFO, "Incoherent Section String Table Index : %d / %d\n", h->SHIdx, h->numSHEntries);
+            printf_dump(LOG_INFO, "Incoherent Section String Table Index : %d / %d\n", h->SHIdx, h->numSHEntries);
            FreeElfHeader(&h);
            return NULL;
        }
        // load Section table
-        printf_log(LOG_DEBUG, "Loading Sections Table String (idx = %d)\n", h->SHIdx);
+        printf_dump(LOG_DEBUG, "Loading Sections Table String (idx = %d)\n", h->SHIdx);
        if(LoadSH(f, h->SHEntries+h->SHIdx, (void*)&h->SHStrTab, ".shstrtab", SHT_STRTAB)) {
            FreeElfHeader(&h);
            return NULL;
@@ -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 (int i=0; i<h->numDynamic; ++i) {
+            for (uint32_t 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;
@@ -231,65 +231,69 @@ elfheader_t* ParseElfHeader(FILE* f, const char* name, int exec)
                    break;
                case DT_INIT: // Entry point
                    h->initentry = ptr;
-                    printf_log(LOG_DEBUG, "The DT_INIT is at address %p\n", (void*)h->initentry);
+                    printf_dump(LOG_DEBUG, "The DT_INIT is at address %p\n", (void*)h->initentry);
                    break;
                case DT_INIT_ARRAY:
                    h->initarray = ptr;
-                    printf_log(LOG_DEBUG, "The DT_INIT_ARRAY is at address %p\n", (void*)h->initarray);
+                    printf_dump(LOG_DEBUG, "The DT_INIT_ARRAY is at address %p\n", (void*)h->initarray);
                    break;
                case DT_INIT_ARRAYSZ:
                    h->initarray_sz = val / sizeof(Elf32_Addr);
-                    printf_log(LOG_DEBUG, "The DT_INIT_ARRAYSZ is %d\n", h->initarray_sz);
+                    printf_dump(LOG_DEBUG, "The DT_INIT_ARRAYSZ is %d\n", h->initarray_sz);
                    break;
                case DT_PREINIT_ARRAYSZ:
                    if(val)
-                        printf_log(LOG_NONE, "Warning, PreInit Array (size=%d) present and ignored!\n", val);
+                        printf_dump(LOG_NONE, "Warning, PreInit Array (size=%d) present and ignored!\n", val);
                    break;
                case DT_FINI: // Exit hook
                    h->finientry = ptr;
-                    printf_log(LOG_DEBUG, "The DT_FINI is at address %p\n", (void*)h->finientry);
+                    printf_dump(LOG_DEBUG, "The DT_FINI is at address %p\n", (void*)h->finientry);
                    break;
                case DT_FINI_ARRAY:
                    h->finiarray = ptr;
-                    printf_log(LOG_DEBUG, "The DT_FINI_ARRAY is at address %p\n", (void*)h->finiarray);
+                    printf_dump(LOG_DEBUG, "The DT_FINI_ARRAY is at address %p\n", (void*)h->finiarray);
                    break;
                case DT_FINI_ARRAYSZ:
                    h->finiarray_sz = val / sizeof(Elf32_Addr);
-                    printf_log(LOG_DEBUG, "The DT_FINI_ARRAYSZ is %d\n", h->finiarray_sz);
+                    printf_dump(LOG_DEBUG, "The DT_FINI_ARRAYSZ is %d\n", h->finiarray_sz);
                    break;
                case DT_VERNEEDNUM:
                    h->szVerNeed = val;
-                    printf_log(LOG_DEBUG, "The DT_VERNEEDNUM is %d\n", h->szVerNeed);
+                    printf_dump(LOG_DEBUG, "The DT_VERNEEDNUM is %d\n", h->szVerNeed);
                    break;
                case DT_VERNEED:
                    h->VerNeed = (Elf32_Verneed*)ptr;
-                    printf_log(LOG_DEBUG, "The DT_VERNEED is at address %p\n", h->VerNeed);
+                    printf_dump(LOG_DEBUG, "The DT_VERNEED is at address %p\n", h->VerNeed);
                    break;
                case DT_VERDEFNUM:
                    h->szVerDef = val;
-                    printf_log(LOG_DEBUG, "The DT_VERDEFNUM is %d\n", h->szVerDef);
+                    printf_dump(LOG_DEBUG, "The DT_VERDEFNUM is %d\n", h->szVerDef);
                    break;
                case DT_VERDEF:
                    h->VerDef = (Elf32_Verdef*)ptr;
-                    printf_log(LOG_DEBUG, "The DT_VERDEF is at address %p\n", h->VerDef);
+                    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) {
                if(h->relent != sizeof(Elf32_Rel)) {
-                    printf_log(LOG_NONE, "Rel Table Entry size invalid (0x%x should be 0x%x)\n", h->relent, sizeof(Elf32_Rel));
+                    printf_dump(LOG_NONE, "Rel Table Entry size invalid (0x%x should be 0x%x)\n", h->relent, sizeof(Elf32_Rel));
                    FreeElfHeader(&h);
                    return NULL;
                }
-                printf_log(LOG_DEBUG, "Rel Table @%p (0x%x/0x%x)\n", (void*)h->rel, h->relsz, h->relent);
+                printf_dump(LOG_DEBUG, "Rel Table @%p (0x%x/0x%x)\n", (void*)h->rel, h->relsz, h->relent);
            }
            if(h->rela) {
                if(h->relaent != sizeof(Elf32_Rela)) {
-                    printf_log(LOG_NONE, "RelA Table Entry size invalid (0x%x should be 0x%x)\n", h->relaent, sizeof(Elf32_Rela));
+                    printf_dump(LOG_NONE, "RelA Table Entry size invalid (0x%x should be 0x%x)\n", h->relaent, sizeof(Elf32_Rela));
                    FreeElfHeader(&h);
                    return NULL;
                }
-                printf_log(LOG_DEBUG, "RelA Table @%p (0x%x/0x%x)\n", (void*)h->rela, h->relasz, h->relaent);
+                printf_dump(LOG_DEBUG, "RelA Table @%p (0x%x/0x%x)\n", (void*)h->rela, h->relasz, h->relaent);
            }
            if(h->jmprel) {
                if(h->pltrel == DT_REL) {
@@ -297,16 +301,16 @@ elfheader_t* ParseElfHeader(FILE* f, const char* name, int exec)
                } else if(h->pltrel == DT_RELA) {
                    h->pltent = sizeof(Elf32_Rela);
                } else {
-                    printf_log(LOG_NONE, "PLT Table type is unknown (size = 0x%x, type=%d)\n", h->pltsz, h->pltrel);
+                    printf_dump(LOG_NONE, "PLT Table type is unknown (size = 0x%x, type=%d)\n", h->pltsz, h->pltrel);
                    FreeElfHeader(&h);
                    return NULL;
                }
                if((h->pltsz / h->pltent)*h->pltent != h->pltsz) {
-                    printf_log(LOG_NONE, "PLT Table Entry size invalid (0x%x, ent=0x%x, type=%d)\n", h->pltsz, h->pltent, h->pltrel);
+                    printf_dump(LOG_NONE, "PLT Table Entry size invalid (0x%x, ent=0x%x, type=%d)\n", h->pltsz, h->pltent, h->pltrel);
                    FreeElfHeader(&h);
                    return NULL;
                }
-                printf_log(LOG_DEBUG, "PLT Table @%p (type=%d 0x%x/0x%0x)\n", (void*)h->jmprel, h->pltrel, h->pltsz, h->pltent);
+                printf_dump(LOG_DEBUG, "PLT Table @%p (type=%d 0x%x/0x%0x)\n", (void*)h->jmprel, h->pltrel, h->pltsz, h->pltent);
            }
            if(h->DynStrTab && h->szDynStrTab) {
                //DumpDynamicNeeded(h); cannot dump now, it's not loaded yet
@@ -317,32 +321,50 @@ elfheader_t* ParseElfHeader(FILE* f, const char* name, int exec)
        if(ii) {
            h->gotplt = h->SHEntries[ii].sh_addr;
            h->gotplt_end = h->gotplt + h->SHEntries[ii].sh_size;
-            printf_log(LOG_DEBUG, "The GOT.PLT Table is at address %p\n", (void*)h->gotplt);
+            printf_dump(LOG_DEBUG, "The GOT.PLT Table is at address %p\n", (void*)h->gotplt);
        }
        ii = FindSection(h->SHEntries, h->numSHEntries, h->SHStrTab, ".got");
        if(ii) {
            h->got = h->SHEntries[ii].sh_addr;
            h->got_end = h->got + h->SHEntries[ii].sh_size;
-            printf_log(LOG_DEBUG, "The GOT Table is at address %p..%p\n", (void*)h->got, (void*)h->got_end);
+            printf_dump(LOG_DEBUG, "The GOT Table is at address %p..%p\n", (void*)h->got, (void*)h->got_end);
        }
        ii = FindSection(h->SHEntries, h->numSHEntries, h->SHStrTab, ".plt");
        if(ii) {
            h->plt = h->SHEntries[ii].sh_addr;
            h->plt_end = h->plt + h->SHEntries[ii].sh_size;
-            printf_log(LOG_DEBUG, "The PLT Table is at address %p..%p\n", (void*)h->plt, (void*)h->plt_end);
+            printf_dump(LOG_DEBUG, "The PLT Table is at address %p..%p\n", (void*)h->plt, (void*)h->plt_end);
        }
        // grab version of symbols
        ii = FindSection(h->SHEntries, h->numSHEntries, h->SHStrTab, ".gnu.version");
        if(ii) {
            h->VerSym = (Elf32_Half*)(h->SHEntries[ii].sh_addr);
-            printf_log(LOG_DEBUG, "The .gnu.version is at address %p\n", h->VerSym);
+            printf_dump(LOG_DEBUG, "The .gnu.version is at address %p\n", h->VerSym);
        }
-        // grab .text for main code
+        // grab .bss for main code
        ii = FindSection(h->SHEntries, h->numSHEntries, h->SHStrTab, ".text");
        if(ii) {
            h->text = (uintptr_t)(h->SHEntries[ii].sh_addr);
            h->textsz = h->SHEntries[ii].sh_size;
-            printf_log(LOG_DEBUG, "The .text is at address %p, and is %d big\n", (void*)h->text, h->textsz);
+            printf_dump(LOG_DEBUG, "The .text is at address %p, and is %d big\n", (void*)h->text, h->textsz);
+        }
+        // grab .bss to find brk
+        ii = FindSection(h->SHEntries, h->numSHEntries, h->SHStrTab, ".bss");
+        if(ii) {
+            h->bss = (uintptr_t)(h->SHEntries[ii].sh_addr);
+            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);
@@ -355,19 +377,21 @@ elfheader_t* ParseElfHeader(FILE* f, const char* name, int exec)
 const char* GetSymbolVersion(elfheader_t* h, int version)
 {
    version&=0x7fff;    // remove bit15 that switch between hidden/public
-    if(!h->VerNeed || (version<2))
+    if(version<2)
        return NULL;
    /*if(version==1)
        return "*";*/
-    Elf32_Verneed *ver = (Elf32_Verneed*)((uintptr_t)h->VerNeed + h->delta);
-    while(ver) {
-        Elf32_Vernaux *aux = (Elf32_Vernaux*)((uintptr_t)ver + ver->vn_aux);
-        for(int j=0; j<ver->vn_cnt; ++j) {
-            if(aux->vna_other==version)
-                return h->DynStr+aux->vna_name;
-            aux = (Elf32_Vernaux*)((uintptr_t)aux + aux->vna_next);
+    if(h->VerNeed) {
+        Elf32_Verneed *ver = (Elf32_Verneed*)((uintptr_t)h->VerNeed + h->delta);
+        while(ver) {
+            Elf32_Vernaux *aux = (Elf32_Vernaux*)((uintptr_t)ver + ver->vn_aux);
+            for(int j=0; j<ver->vn_cnt; ++j) {
+                if(aux->vna_other==version)
+                    return h->DynStr+aux->vna_name;
+                aux = (Elf32_Vernaux*)((uintptr_t)aux + aux->vna_next);
+            }
+            ver = ver->vn_next?((Elf32_Verneed*)((uintptr_t)ver + ver->vn_next)):NULL;
        }
-        ver = ver->vn_next?((Elf32_Verneed*)((uintptr_t)ver + ver->vn_next)):NULL;
    }
    return GetParentSymbolVersion(h, version);  // if symbol is "internal", use Def table instead
 }
@@ -390,3 +414,59 @@ 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;
+}
@@ -1,3 +1,25 @@
+#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)) { \
@@ -85,7 +107,7 @@
            case 7: base =      R_BX; break;    \
        }                                       \
        switch((m>>6)&3) {                      \
-            case 0: if(m==6) base = F16; break; \
+            case 0: if(m&7==6) base = F16S; break; \
            case 1: base += F8S; break;         \
            case 2: base += F16S; break;        \
        }                                       \
@@ -97,6 +119,17 @@
    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)]; \
@@ -109,14 +142,47 @@
    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)]; \
@@ -125,16 +191,44 @@
    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
@@ -1,551 +0,0 @@
-    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_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;
@@ -23,6 +23,13 @@
 #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;
@@ -47,17 +54,6 @@ 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;
@@ -81,15 +77,15 @@ static void internalX86Setup(x86emu_t* emu, box86context_t *context, uintptr_t s
    emu->segs[_GS] = 0x33;
    // setup fpu regs
    reset_fpu(emu);
-    emu->mxcsr = 0x1f80;  
+    emu->mxcsr.x32 = 0x1f80;  
 }

 EXPORTDYN
 x86emu_t *NewX86Emu(box86context_t *context, uintptr_t start, uintptr_t stack, int stacksize, int ownstack)
 {
-    printf_log(LOG_DEBUG, "Allocate a new X86 Emu, with EIP=%p and Stack=%p/0x%X\n", (void*)start, (void*)stack, stacksize);
+    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);

-    x86emu_t *emu = (x86emu_t*)calloc(1, sizeof(x86emu_t));
+    x86emu_t *emu = (x86emu_t*)box_calloc(1, sizeof(x86emu_t));

    internalX86Setup(emu, context, start, stack, stacksize, ownstack);

@@ -98,7 +94,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, "New X86 Emu from stack, with EIP=%p and Stack=%p/0x%X\n", (void*)start, (void*)stack, stacksize);
+    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);

    internalX86Setup(emu, context, start, stack, stacksize, ownstack);
    
@@ -108,6 +104,7 @@ 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");
 }

@@ -128,9 +125,10 @@ 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*)realloc(my_context->cleanups, sizeof(cleanup_t)*my_context->clean_cap);
+        my_context->cleanups = (cleanup_t*)box_realloc(my_context->cleanups, sizeof(cleanup_t)*my_context->clean_cap);
    }
    my_context->cleanups[my_context->clean_sz].arg = 0;
    my_context->cleanups[my_context->clean_sz].a = NULL;
@@ -139,9 +137,10 @@ 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*)realloc(my_context->cleanups, sizeof(cleanup_t)*my_context->clean_cap);
+        my_context->cleanups = (cleanup_t*)box_realloc(my_context->cleanups, sizeof(cleanup_t)*my_context->clean_cap);
    }
    my_context->cleanups[my_context->clean_sz].arg = 1;
    my_context->cleanups[my_context->clean_sz].a = a;
@@ -171,7 +170,7 @@ void CallAllCleanup(x86emu_t *emu)
        RunFunctionWithEmu(emu, 0, (uintptr_t)(my_context->cleanups[i].f), my_context->cleanups[i].arg, my_context->cleanups[i].a );
    }
    my_context->clean_sz = 0;
-    free(my_context->cleanups);
+    box_free(my_context->cleanups);
    my_context->cleanups = NULL;
 }

@@ -188,9 +187,14 @@ 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);

-    free(*emu);
+    box_free(*emu);
    *emu = NULL;
 }

@@ -217,11 +221,14 @@ void CloneEmu(x86emu_t *newemu, const x86emu_t* emu)
    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;
-	memcpy(&newemu->sw, &emu->sw, sizeof(emu->sw));
+	newemu->sw = emu->sw;
 	newemu->top = emu->top;
    newemu->fpu_stack = emu->fpu_stack;
-	memcpy(&newemu->round, &emu->round, sizeof(emu->round));
    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;
@@ -231,6 +238,34 @@ 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;
@@ -302,7 +337,7 @@ void ResetFlags(x86emu_t *emu)
 const char* DumpCPURegs(x86emu_t* emu, uintptr_t ip)
 {
    static char buff[800];
-    char* regname[] = {"EAX", "ECX", "EDX", "EBX", "ESP", "EBP", "ESI", "EDI"};
+    static const char* regname[] = {"EAX", "ECX", "EDX", "EBX", "ESP", "EBP", "ESI", "EDI"};
    char tmp[80];
    buff[0] = '\0';
    if(trace_emm) {
@@ -459,14 +494,15 @@ 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;
-#if 0
 #elif defined(__ARM_ARCH)
+#if 0
 #if (__ARM_ARCH >= 6)
    static int init = 1;
    if(init) {
@@ -498,3 +534,17 @@ 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
+}
@@ -23,25 +23,35 @@ 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];
 	x86flags_t  eflags;
    reg32_t     ip;
    // fpu / mmx
+	x87control_t cw;
+	x87flags_t  sw;
 	mmx87_regs_t x87[8];
 	mmx87_regs_t mmx[8];
-	uint16_t    cw;
-	x87flags_t  sw;
 	uint32_t    top;        // top is part of sw, but it's faster to have it separatly
    int         fpu_stack;
-	fpu_round_t round;
    fpu_ld_t    fpu_ld[8]; // for long double emulation / 80bits fld fst
    fpu_ll_t    fpu_ll[8]; // for 64bits fild / fist sequence
 	fpu_p_reg_t p_regs[8];
    // sse
    sse_regs_t  xmm[8];
-    uint32_t    mxcsr;
+    mmxcontrol_t mxcsr;
    uintptr_t   old_ip;
    // defered flags
    defered_flags_t df;
@@ -64,6 +74,7 @@ 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
@@ -89,4 +100,6 @@ 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_
@@ -10,6 +10,7 @@
 #include <sys/types.h>
 #include <pthread.h>
 #include <signal.h>
+#include <wait.h>

 #include "debug.h"
 #include "box86stack.h"
@@ -53,7 +54,10 @@ 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)
@@ -85,217 +89,231 @@ void x86Int3(x86emu_t* emu)
            elfheader_t *h = FindElfAddress(my_context, *(uintptr_t*)(R_ESP));
            int have_trace = 0;
            if(h && strstr(ElfName(h), "libMiles")) have_trace = 1;*/
-            if(box86_log>=LOG_DEBUG /*|| have_trace*/) {
+            if(box86_log>=LOG_DEBUG  || cycle_log) {
                int tid = GetTID();
-                char buff[256] = "\0";
+                const char *s = NULL;
+                s = GetNativeName((void*)addr);
+                char t_buff[256] = "\0";
                char buff2[64] = "\0";
                char buff3[64] = "\0";
+                char* buff = cycle_log?my_context->log_call[my_context->current_line]:t_buff;
+                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;
                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", " ... ");
+                    snprintf(buff, 256, "%s", cycle_log?"PltResolver ":" ... ");
                } else
                if(strstr(s, "SDL_RWFromFile")==s || strstr(s, "SDL_RWFromFile")==s) {
-                    snprintf(buff, 255, "%04d|%p: Calling %s(%s, %s)", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(char**)(R_ESP+8));
+                    snprintf(buff, 256, "%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, 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));
+                    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));
                } else  if(strstr(s, "glTexCoord2f")==s) {
-                    snprintf(buff, 255, "%04d|%p: Calling %s(%f, %f)", tid, *(void**)(R_ESP), s, *(float*)(R_ESP+4), *(float*)(R_ESP+8));
+                    snprintf(buff, 256, "%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, 255, "%04d|%p: Calling %s(%f, %f)", tid, *(void**)(R_ESP), s, *(float*)(R_ESP+4), *(float*)(R_ESP+8));
+                    snprintf(buff, 256, "%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, 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));
+                    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));
                } else  if(strstr(s, "__open64")==s || strcmp(s, "open64")==0) {
-                    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));
+                    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));
                    perr = 1;
                } else  if(!strcmp(s, "opendir")) {
-                    snprintf(buff, 255, "%04d|%p: Calling %s(\"%s\")", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4));
+                    snprintf(buff, 256, "%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, 255, "%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, 256, "%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, 255, "%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, 256, "%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, 255, "%04d|%p: Calling %s(\"%s\", %d)", tid, *(void**)(R_ESP), s, (tmp)?tmp:"(nil)", *(int*)(R_ESP+8));
+                    snprintf(buff, 256, "%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, 255, "%04d|%p: Calling %s(\"%s\", \"%s\")", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(char**)(R_ESP+8));
+                    snprintf(buff, 256, "%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, 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));
+                    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));
                    perr = 2;
                } else  if(!strcmp(s, "fopen64")) {
-                    snprintf(buff, 255, "%04d|%p: Calling %s(\"%s\", \"%s\")", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(char**)(R_ESP+8));
+                    snprintf(buff, 256, "%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, 255, "%04d|%p: Calling %s(\"%s\")", tid, *(void**)(R_ESP), s, pu32?((pu32==(uint32_t*)1)?"/1/":(char*)pu32):"/0/");
+                    snprintf(buff, 256, "%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, 255, "%04d|%p: Calling %s(\"%s\")", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4));
+                    snprintf(buff, 256, "%04d|%p: Calling %s(\"%s\")", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4));
                    post = 2;
                } else  if(strstr(s, "putenv")==s) {
-                    snprintf(buff, 255, "%04d|%p: Calling %s(\"%s\")", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4));
+                    snprintf(buff, 256, "%04d|%p: Calling %s(\"%s\")", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4));
                } else  if(strstr(s, "pread")==s) {
-                    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));
+                    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));
                    perr = 1;
                } else  if(!strcmp(s, "read")) {
-                    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));
+                    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));
                    perr = 1;
                } else  if(strstr(s, "ioctl")==s) {
-                    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));
+                    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));
                    perr = 1;
                } else  if(strstr(s, "statvfs64")==s) {
-                    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));
+                    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));
                } else  if(strstr(s, "index")==s) {
-                    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));
+                    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));
                } else  if(strstr(s, "rindex")==s) {
-                    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));
+                    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));
                } else  if(strstr(s, "__xstat64")==s) {
-                    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));
+                    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));
                    perr = 1;
                } else  if(strcmp(s, "__xstat")==0) {
-                    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));
+                    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));
                    perr = 1;
                } else  if(strstr(s, "__lxstat64")==s) {
-                    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));
+                    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));
                    perr = 1;
                } else  if(strstr(s, "sem_timedwait")==s) {
                    pu32 = *(uint32_t**)(R_ESP+8);
-                    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);
+                    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);
                    perr = 1;
                } else  if(strstr(s, "waitpid")==s) {
-                    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));
+                    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));
                    perr = 1;
                } else  if(strstr(s, "clock_gettime")==s || strstr(s, "__clock_gettime")==s) {
-                    snprintf(buff, 255, "%04d|%p: Calling %s(%d, %p)", tid, *(void**)(R_ESP), s, *(uint32_t*)(R_ESP+4), *(void**)(R_ESP+8));
+                    snprintf(buff, 256, "%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, 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));
+                    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));
                    perr = 1;
                } else  if(!strcmp(s, "mmap64")) {
-                    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));
+                    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));
                    perr = 3;
                } else  if(!strcmp(s, "mmap")) {
-                    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));
+                    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));
                    perr = 3;
                } else  if(strstr(s, "strcasecmp")==s || strstr(s, "__strcasecmp")==s) {
-                    snprintf(buff, 255, "%04d|%p: Calling %s(\"%s\", \"%s\")", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(char**)(R_ESP+8));
+                    snprintf(buff, 256, "%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, 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));
+                    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));
                } else  if(strstr(s, "strcmp")==s || strstr(s, "__strcmp")==s) {
-                    snprintf(buff, 255, "%04d|%p: Calling %s(\"%s\", \"%s\")", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(char**)(R_ESP+8));
+                    snprintf(buff, 256, "%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, 255, "%04d|%p: Calling %s(\"%.127s\", \"%.127s\")", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(char**)(R_ESP+8));
+                    snprintf(buff, 256, "%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, 255, "%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, 256, "%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, 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));
+                    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));
                    pu32 = *(uint32_t**)(R_ESP+4);
                    post = 3;
                } else  if(strstr(s, "vsprintf")==s) {
-                    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));
+                    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));
                    pu32 = *(uint32_t**)(R_ESP+4);
                    post = 3;
                } else  if(strstr(s, "__vsprintf_chk")==s) {
-                    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));
+                    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));
                    pu32 = *(uint32_t**)(R_ESP+4);
                    post = 3;
                } else  if(strstr(s, "__snprintf_chk")==s) {
-                    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));
+                    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));
                    pu32 = *(uint32_t**)(R_ESP+4);
                    post = 3;
                } else  if(strstr(s, "snprintf")==s) {
-                    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));
+                    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));
                    pu32 = *(uint32_t**)(R_ESP+4);
                    post = 3;
                } else  if(strstr(s, "sprintf")==s) {
-                    snprintf(buff, 255, "%04d|%p: Calling %s(%08X, %08X...)", tid, *(void**)(R_ESP), s, *(uint32_t*)(R_ESP+4), *(uint32_t*)(R_ESP+8));
+                    snprintf(buff, 256, "%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, 255, "%04d|%p: Calling %s(\"%s\"...)", tid, *(void**)(R_ESP), s, pu32?((char*)(pu32)):"nil");
+                    snprintf(buff, 256, "%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, 255, "%04d|%p: Calling %s(\"%S\"...)", tid, *(void**)(R_ESP), s, pu32?((wchar_t*)(pu32)):L"nil");
+                    snprintf(buff, 256, "%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, 255, "%04d|%p: Calling %s(%p, %zu, %p, %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, 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));
                    } else {
-                        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));
+                        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));
                        pu32 = *(uint32_t**)(R_ESP+4);
                        post = 6;
                    }
                } else  if(strstr(s, "puts")==s) {
-                    snprintf(buff, 255, "%04d|%p: Calling %s(\"%s\"...)", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4));
+                    snprintf(buff, 256, "%04d|%p: Calling %s(\"%s\"...)", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4));
                } else  if(strstr(s, "fputs")==s) {
-                    snprintf(buff, 255, "%04d|%p: Calling %s(\"%s\", %p...)", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(void**)(R_ESP+8));
+                    snprintf(buff, 256, "%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, 255, "%04d|%p: Calling %s(%08X, \"%s\", ...)", tid, *(void**)(R_ESP), s, *(uint32_t*)(R_ESP+4), pu32?((char*)(pu32)):"nil");
+                    snprintf(buff, 256, "%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, 255, "%04d|%p: Calling %s(%08X, \"%s\", ...)", tid, *(void**)(R_ESP), s, *(uint32_t*)(R_ESP+4), pu32?((char*)(pu32)):"nil");
+                    snprintf(buff, 256, "%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, 255, "%04d|%p: Calling %s(%p, \"%s\")", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(char**)(R_ESP+8));
+                    snprintf(buff, 256, "%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, 255, "%04d|%p: Calling %s(%p, \"%s\")", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(char**)(R_ESP+8));
+                    snprintf(buff, 256, "%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, 255, "%04d|%p: Calling %s(\"%s\")", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4));
+                    snprintf(buff, 256, "%04d|%p: Calling %s(\"%s\")", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4));
                } else  if(strstr(s, "sscanf")==s) {
-                    snprintf(buff, 255, "%04d|%p: Calling %s(\"%s\", \"%s\", ...)", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(char**)(R_ESP+8));
+                    snprintf(buff, 256, "%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, 255, "%04d|%p: Calling %s(\"%s\", \"%s\", ...)", tid, *(void**)(R_ESP), s, *(char**)(R_ESP+4), *(char**)(R_ESP+8));
+                    snprintf(buff, 256, "%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, 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));
+                    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));
                } else if(strstr(s, "XLoadQueryFont")==s) {
-                    snprintf(buff, 255, "%04d|%p: Calling %s(%p, \"%s\")", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(char**)(R_ESP+8));
+                    snprintf(buff, 256, "%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, 255, "%04d|%p: Calling %s(%p)", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4));
+                    snprintf(buff, 256, "%04d|%p: Calling %s(%p)", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4));
                } else if(!strcmp(s, "fmodf")) {
                    post = 4;
-                    snprintf(buff, 255, "%04d|%p: Calling %s(%f, %f)", tid, *(void**)(R_ESP), s, *(float*)(R_ESP+4), *(float*)(R_ESP+8));
+                    snprintf(buff, 256, "%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, 255, "%04d|%p: Calling %s(%f, %f)", tid, *(void**)(R_ESP), s, *(double*)(R_ESP+4), *(double*)(R_ESP+12));
+                    snprintf(buff, 256, "%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, 255, "%04d|%p: Calling %s(%p)", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4));
+                    snprintf(buff, 256, "%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, 255, "%04d|%p: Calling %s(%p, \"%s\")", tid, *(void**)(R_ESP), s, *(void**)(R_ESP+4), *(char**)(R_ESP+8));
+                    snprintf(buff, 256, "%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, 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));
+                    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));
                    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, 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));
+                    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);
                }
-                pthread_mutex_lock(&emu->context->mutex_trace);
-                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?pu32[0]:-1, pu32?pu32[1]:-1);
+                    case 1: snprintf(buff2, 63, " [%d sec %d nsec]", pu32?(int32_t)pu32[0]:-1, pu32?(int32_t)pu32[1]:-1);
                            break;
                    case 2: snprintf(buff2, 63, "(%s)", R_EAX?((char*)R_EAX):"nil");
                            break;
@@ -320,9 +338,13 @@ 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);
-                printf_log(LOG_NONE, " return 0x%08X%s%s\n", R_EAX, buff2, buff3);
-                pthread_mutex_unlock(&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);
+                    printf_log(LOG_NONE, " return 0x%08X%s%s\n", R_EAX, buff2, buff3);
+                    mutex_unlock(&emu->context->mutex_trace);
+                }
            } else
                w(emu, addr);
        }
@@ -338,4 +360,17 @@ 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]);
+            }
+        }
+    }
+}
@@ -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);
@@ -165,14 +165,6 @@ Implements the INC instruction and side effects.
 static inline uint32_t inc32(x86emu_t *emu, uint32_t d)
 {
    CHECK_FLAGS(emu);
-	if(emu->df == d_shr32) {
-		// workaround for some wine trickery
-		uint32_t cnt = emu->op2;
-        if (cnt > 0) {
-            uint32_t cc = emu->op1 & (1 << (cnt - 1));
-			CONDITIONAL_SET_FLAG(cc, F_CF);
-		}
-	}
 	emu->res = d + 1;
 	emu->op1 = d;
 	emu->df = d_inc32;
@@ -255,6 +247,7 @@ Implements the NOT instruction
 ****************************************************************************/
 static inline uint8_t not8(x86emu_t *emu, uint8_t s)
 {
+    (void)emu;
 	return ~s;
 }

@@ -264,6 +257,7 @@ Implements the NOT instruction
 ****************************************************************************/
 static inline uint16_t not16(x86emu_t *emu, uint16_t s)
 {
+    (void)emu;
 	return ~s;
 }

@@ -273,6 +267,7 @@ Implements the NOT instruction
 ****************************************************************************/
 static inline uint32_t not32(x86emu_t *emu, uint32_t s)
 {
+    (void)emu;
 	return ~s;
 }

@@ -0,0 +1,459 @@
+#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;
+}
@@ -0,0 +1,55 @@
+#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;
+}
@@ -0,0 +1,55 @@
+#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;
+}
@@ -0,0 +1,92 @@
+#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;
+}
@@ -14,19 +14,14 @@
 #include "x86trace.h"
 #include "box86context.h"

-#define F8      *(uint8_t*)(ip++)
-#define F8S     *(int8_t*)(ip++)
-#define F16     *(uint16_t*)(ip+=2, ip-2)
-#define F16S    *(int16_t*)(ip+=2, ip-2)
-#define F32     *(uint32_t*)(ip+=4, ip-4)
-#define F32S    *(int32_t*)(ip+=4, ip-4)
-#define PK(a)   *(uint8_t*)(ip+a)
-
 #include "modrm.h"

-void Run660F(x86emu_t *emu)
+#ifdef TEST_INTERPRETER
+uintptr_t Test660F(x86test_t *test, uintptr_t addr)
+#else
+uintptr_t Run660F(x86emu_t *emu, uintptr_t addr)
+#endif
 {
-    uintptr_t ip = R_EIP+2; //skip 66 0F
    uint8_t opcode;
    uint8_t nextop;
    reg32_t *oped;
@@ -43,6 +38,9 @@ void Run660F(x86emu_t *emu)
    #endif


+    #ifdef TEST_INTERPRETER
+    x86emu_t* emu = test->emu;
+    #endif
    opcode = F8;
    switch(opcode) {

@@ -144,8 +142,7 @@ void Run660F(x86emu_t *emu)
                EW->word[0] = 0;    // dummy operation. Should be CR0 -> Ew
                break;
            default:
-                ip = R_EIP;
-                UnimpOpcode(emu);
+                return 0;
        }
        break;
    case 0x10:                      /* MOVUPD Gx, Ex */
@@ -160,7 +157,7 @@ void Run660F(x86emu_t *emu)
        break;
    case 0x12:                      /* MOVLPD Gx, Eq */
        nextop = F8;
-        GET_ED;
+        GET_ED8;
        if((uintptr_t)ED & 7)
            memcpy(&GX.q[0], ED, 8);
        else
@@ -168,7 +165,7 @@ void Run660F(x86emu_t *emu)
        break;
    case 0x13:                      /* MOVLPD Eq, Gx */
        nextop = F8;
-        GET_ED;
+        GET_ED8;
        if((uintptr_t)ED & 7)
            memcpy(ED, &GX.q[0], 8);
        else
@@ -187,18 +184,18 @@ void Run660F(x86emu_t *emu)
        break;
    case 0x16:                      /* MOVHPD Gx, Ed */
        nextop = F8;
-        GET_ED;
+        GET_ED8;
        GX.q[1] = *(uint64_t*)ED;
        break;
    case 0x17:                      /* MOVHPD Ed, Gx */
        nextop = F8;
-        GET_ED;
+        GET_ED8;
        *(uint64_t*)ED = GX.q[1];
        break;

    case 0x1F:                      /* NOP (multi-byte) */
        nextop = F8;
-        GET_ED;
+        GET_ED_;
        break;
    
    case 0x28:                      /* MOVAPD Gx, Ex */
@@ -219,35 +216,45 @@ void Run660F(x86emu_t *emu)
        GX.d[0] = EM->sd[0];
        GX.d[1] = EM->sd[1];
        break;
-
-
+    case 0x2B:                      /* MOVNTPD Ex, Gx */
+        nextop = F8;
+        GET_EX;
+        EX->q[0] = GX.q[0]; // Address needs to ba aligned for MOVNTPD
+        EX->q[1] = GX.q[1];
+        break;
    case 0x2C:                      /* CVTTPD2PI Gm, Ex */
        nextop = F8;
        GET_EX;
-        GM.sd[0] = EX->d[0];
-        GM.sd[1] = EX->d[1];
+        if(!isfinite(EX->d[0]) || EX->d[0]>(double)0x7fffffff || EX->d[0]<-(double)0x80000000U)
+            GM.ud[0] = 0x80000000;
+        else
+            GM.sd[0] = EX->d[0];
+        if(!isfinite(EX->d[1]) || EX->d[1]>(double)0x7fffffff || EX->d[1]<-(double)0x80000000U)
+            GM.ud[1] = 0x80000000;
+        else
+            GM.sd[1] = EX->d[1];
        break;
    case 0x2D:                      /* CVTPD2PI Gm, Ex */
        nextop = F8;
        GET_EX;
-        switch((emu->mxcsr>>13)&3) {
-            case ROUND_Nearest:
-                GM.sd[0] = floor(EX->d[0]+0.5);
-                GM.sd[1] = floor(EX->d[1]+0.5);
-                break;
-            case ROUND_Down:
-                GM.sd[0] = floor(EX->d[0]);
-                GM.sd[1] = floor(EX->d[1]);
-                break;
-            case ROUND_Up:
-                GM.sd[0] = ceil(EX->d[0]);
-                GM.sd[1] = ceil(EX->d[1]);
-                break;
-            case ROUND_Chop:
-                GM.sd[0] = EX->d[0];
-                GM.sd[1] = EX->d[1];
-                break;
-        }
+        for(int i=0; i<2; ++i)
+            if(!isfinite(EX->d[i]) || EX->d[i]>(double)0x7fffffff || EX->d[i]<-(double)0x80000000U)
+                GM.ud[i] = 0x80000000;
+            else
+                switch(emu->mxcsr.f.MXCSR_RC) {
+                    case ROUND_Nearest:
+                        GM.sd[i] = nearbyint(EX->d[i]);
+                        break;
+                    case ROUND_Down:
+                        GM.sd[i] = floor(EX->d[i]);
+                        break;
+                    case ROUND_Up:
+                        GM.sd[i] = ceil(EX->d[i]);
+                        break;
+                    case ROUND_Chop:
+                        GM.sd[i] = EX->d[i];
+                        break;
+                }
        break;
    case 0x2E:                      /* UCOMISD Gx, Ex */
        // no special check...
@@ -341,7 +348,34 @@ void Run660F(x86emu_t *emu)
                        GX.sw[4+i] = EX->sw[i*2+0] - EX->sw[i*2+1];
                }
                break;
-                
+            case 0x06:  /* PHSUBD Gx, Ex */
+                nextop = F8;
+                GET_EX;
+                for (int i=0; i<2; ++i)
+                    GX.sd[i] = GX.sd[i*2+0] - GX.sd[i*2+1];
+                if(&GX == EX) {
+                    GX.q[1] = GX.q[0];
+                } else {
+                    for (int i=0; i<2; ++i)
+                        GX.sd[2+i] = EX->sd[i*2+0] - EX->sd[i*2+1];
+                }
+                break;
+            case 0x07:  /* PHSUBSW Gx, Ex */
+                nextop = F8;
+                GET_EX;
+                for (int i=0; i<4; ++i) {
+                    tmp32s = GX.sw[i*2+0]-GX.sw[i*2+1];
+                    GX.sw[i] = (tmp32s<-32768)?-32768:((tmp32s>32767)?32767:tmp32s);
+                }
+                if(&GX == EX) {
+                    GX.q[1] = GX.q[0];
+                } else {
+                    for (int i=0; i<4; ++i) {
+                        tmp32s = EX->sw[i*2+0] - EX->sw[i*2+1];
+                        GX.sw[4+i] = (tmp32s<-32768)?-32768:((tmp32s>32767)?32767:tmp32s);
+                    }
+                }
+                break;
            case 0x08:  /* PSIGNB Gx, Ex */
                nextop = F8;
                GET_EX;
@@ -498,15 +532,119 @@ void Run660F(x86emu_t *emu)
                        GX.sd[i] = EX->sd[i];
                break;

+            case 0x40:  /* PMULLD Gx, Ex */
+                nextop = F8;
+                GET_EX;
+                for (int i=0; i<4; ++i) {
+                    GX.sd[i] *= EX->sd[i];
+                }
+                break;
+
            default:
-                ip = R_EIP;
-                UnimpOpcode(emu);
+                return 0;
        }
        break;

    case 0x3A:  // these are some SSE3 opcodes
        opcode = F8;
        switch(opcode) {
+            case 0x08:          // roundps GX, EX, u8
+                nextop = F8;
+                GET_EX;
+                tmp8u = F8;
+                switch((tmp8u & 4) ? (emu->mxcsr.f.MXCSR_RC) : (tmp8u & 3))
+                {
+                    case ROUND_Nearest:
+                        GX.f[0] = nearbyintf(EX->f[0]);
+                        GX.f[1] = nearbyintf(EX->f[1]);
+                        GX.f[2] = nearbyintf(EX->f[2]);
+                        GX.f[3] = nearbyintf(EX->f[3]);
+                        break;
+                    case ROUND_Down:
+                        GX.f[0] = floorf(EX->f[0]);
+                        GX.f[1] = floorf(EX->f[1]);
+                        GX.f[2] = floorf(EX->f[2]);
+                        GX.f[3] = floorf(EX->f[3]);
+                        break;
+                    case ROUND_Up:
+                        GX.f[0] = ceilf(EX->f[0]);
+                        GX.f[1] = ceilf(EX->f[1]);
+                        GX.f[2] = ceilf(EX->f[2]);
+                        GX.f[3] = ceilf(EX->f[3]);
+                        break;
+                    case ROUND_Chop:
+                        GX.f[0] = truncf(EX->f[0]);
+                        GX.f[1] = truncf(EX->f[1]);
+                        GX.f[2] = truncf(EX->f[2]);
+                        GX.f[3] = truncf(EX->f[3]);
+                        break;
+                }
+                break;
+            case 0x09:          // roundpd GX, EX, u8
+                nextop = F8;
+                GET_EX;
+                tmp8u = F8;
+                switch((tmp8u & 4) ? (emu->mxcsr.f.MXCSR_RC) : (tmp8u & 3))
+                {
+                    case ROUND_Nearest:
+                        GX.d[0] = nearbyint(EX->d[0]);
+                        GX.d[1] = nearbyint(EX->d[1]);
+                        break;
+                    case ROUND_Down:
+                        GX.d[0] = floor(EX->d[0]);
+                        GX.d[1] = floor(EX->d[1]);
+                        break;
+                    case ROUND_Up:
+                        GX.d[0] = ceil(EX->d[0]);
+                        GX.d[1] = ceil(EX->d[1]);
+                        break;
+                    case ROUND_Chop:
+                        GX.d[0] = trunc(EX->d[0]);
+                        GX.d[1] = trunc(EX->d[1]);
+                        break;
+                }
+                break;
+            case 0x0A:          // roundss GX, EX, u8
+                nextop = F8;
+                GET_EX;
+                tmp8u = F8;
+                switch((tmp8u & 4) ? (emu->mxcsr.f.MXCSR_RC) : (tmp8u & 3))
+                {
+                    case ROUND_Nearest:
+                        GX.f[0] = nearbyintf(EX->f[0]);
+                        break;
+                    case ROUND_Down:
+                        GX.f[0] = floorf(EX->f[0]);
+                        break;
+                    case ROUND_Up:
+                        GX.f[0] = ceilf(EX->f[0]);
+                        break;
+                    case ROUND_Chop:
+                        GX.f[0] = truncf(EX->f[0]);
+                        break;
+                }
+                break;
+            case 0x0B:          // roundsd GX, EX, u8
+                nextop = F8;
+                GET_EX;
+                tmp8u = F8;
+                switch((tmp8u & 4) ? (emu->mxcsr.f.MXCSR_RC) : (tmp8u & 3))
+                {
+                    case ROUND_Nearest:
+                        GX.d[0] = nearbyint(EX->d[0]);
+                        break;
+                    case ROUND_Down:
+                        GX.d[0] = floor(EX->d[0]);
+                        break;
+                    case ROUND_Up:
+                        GX.d[0] = ceil(EX->d[0]);
+                        break;
+                    case ROUND_Chop:
+                        GX.d[0] = trunc(EX->d[0]);
+                        break;
+                }
+                break;
+
            case 0x0E:  /* PBLENDW Gx, Ex, Ib */
                nextop = F8;
                GET_EX;
@@ -523,35 +661,12 @@ void Run660F(x86emu_t *emu)
                if(tmp8u>31)
                    {GX.q[0] = GX.q[1] = 0;}
                else
-                #if 0
-                    if(tmp8u>15) {
-                    tmp8u=(tmp8u-16)*8;
-                    if (tmp8u < 64) {
-                        GX.q[0] = (GX.q[0] >> tmp8u) | (GX.q[1] << (64 - tmp8u));
-                        GX.q[1] = (GX.q[1] >> tmp8u);
-                    } else {
-                        GX.q[0] = GX.q[1] >> (tmp8u - 64);
-                        GX.q[1] = 0;
-                    }                    
-                } else {
-                    tmp8u*=8;
-                    if (tmp8u < 64) {
-                        GX.q[0] = (EX->q[0] >> tmp8u) | (EX->q[1] << (64 - tmp8u));
-                        GX.q[1] = (EX->q[1] >> tmp8u) | (GX.q[0] << (64-tmp8u));
-                    } else {
-                        tmp8u -= 64;
-                        GX.q[0] = (EX->q[1] >> tmp8u) | (GX.q[0] << (64 - tmp8u));
-                        GX.q[1] = (GX.q[0] >> tmp8u) | (GX.q[1] >> (64 - tmp8u));
-                    }                    
-                }
-                #else
                {
                    for (int i=0; i<16; ++i, ++tmp8u)
                        eax1.ub[i] = (tmp8u>15)?((tmp8u>31)?0:GX.ub[tmp8u-16]):EX->ub[tmp8u];
                    GX.q[0] = eax1.q[0];
                    GX.q[1] = eax1.q[1];
                }
-                #endif
                break;

            case 0x16:      // PEXTRD ED, GX, u8
@@ -561,6 +676,12 @@ void Run660F(x86emu_t *emu)
                ED->dword[0] = GX.ud[tmp8u&3];
                break;

+            case 0x20:            // PINSRB GX, Ed, Ib
+                nextop = F8;
+                GET_ED;
+                tmp8u = F8;
+                GX.ub[tmp8u&0xF] = ED->byte[0];   // only low 8bits
+                break;
            case 0x21:      // INSERTPS GX, EX, u8
                nextop = F8;
                GET_EX;
@@ -579,8 +700,7 @@ void Run660F(x86emu_t *emu)
                break;

            default:
-                ip = R_EIP;
-                UnimpOpcode(emu);
+                return 0;
        }
        break;

@@ -664,32 +784,25 @@ void Run660F(x86emu_t *emu)
    case 0x5B:                      /* CVTPS2DQ Gx, Ex */
        nextop = F8;
        GET_EX;
-        switch((emu->mxcsr>>13)&3) {
-            case ROUND_Nearest:
-                GX.sd[0] = floorf(EX->f[0]+0.5f);
-                GX.sd[1] = floorf(EX->f[1]+0.5f);
-                GX.sd[2] = floorf(EX->f[2]+0.5f);
-                GX.sd[3] = floorf(EX->f[3]+0.5f);
-                break;
-            case ROUND_Down:
-                GX.sd[0] = floorf(EX->f[0]);
-                GX.sd[1] = floorf(EX->f[1]);
-                GX.sd[2] = floorf(EX->f[2]);
-                GX.sd[3] = floorf(EX->f[3]);
-                break;
-            case ROUND_Up:
-                GX.sd[0] = ceilf(EX->f[0]);
-                GX.sd[1] = ceilf(EX->f[1]);
-                GX.sd[2] = ceilf(EX->f[2]);
-                GX.sd[3] = ceilf(EX->f[3]);
-                break;
-            case ROUND_Chop:
-                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;
-        }
+        for(int i=0; i<4; ++i)
+            // note, converting 0x7fffffff to float gives 0x80000000 basicaly, because of the loss or precision in the mantice. So uing >= here...
+            if(isnanf(EX->f[i]) || isinff(EX->f[i]) || EX->f[i]>=(float)0x80000000U || EX->f[i]<-(float)0x80000000U)
+                GX.sd[i] = 0x80000000;
+            else
+                switch(emu->mxcsr.f.MXCSR_RC) {
+                    case ROUND_Nearest:
+                        GX.sd[i] = nearbyintf(EX->f[i]);
+                        break;
+                    case ROUND_Down:
+                        GX.sd[i] = floorf(EX->f[i]);
+                        break;
+                    case ROUND_Up:
+                        GX.sd[i] = ceilf(EX->f[i]);
+                        break;
+                    case ROUND_Chop:
+                        GX.sd[i] = EX->f[i];
+                        break;
+                }
        break;
    case 0x5C:                      /* SUBPD Gx, Ex */
        nextop = F8;
@@ -907,8 +1020,7 @@ void Run660F(x86emu_t *emu)
                    for (int i=0; i<8; ++i) EX->uw[i] <<= tmp8u;
                break;
            default:
-                ip = R_EIP;
-                UnimpOpcode(emu);
+                return 0;
        }
        break;
    case 0x72:  /* GRP */
@@ -934,8 +1046,7 @@ void Run660F(x86emu_t *emu)
                    for (int i=0; i<4; ++i) EX->ud[i] <<= tmp8u;
                break;
            default:
-                ip = R_EIP;
-                UnimpOpcode(emu);
+                return 0;
        }
        break;
    case 0x73:  /* GRP */
@@ -987,8 +1098,7 @@ void Run660F(x86emu_t *emu)
                }
                break;
            default:
-                ip = R_EIP;
-                UnimpOpcode(emu);
+                return 0;
        }
        break;
    case 0x74:  /* PCMPEQB Gx,Ex */
@@ -1035,6 +1145,31 @@ void Run660F(x86emu_t *emu)
        }
        break;

+    case 0x7D:  /* HSUBPD Gx, Ex */
+        nextop = F8;
+        GET_EX;
+        #ifndef NOALIGN
+        is_nan = isnan(GX.d[0]) || isnan(GX.d[1]);
+        #endif
+        GX.d[0] -= GX.d[1];
+        #ifndef NOALIGN
+        if(!is_nan && isnan(GX.d[0]))
+            GX.d[0] = -NAN;
+        #endif
+        if(EX==&GX) {
+            GX.d[1] = GX.d[0];
+        } else {
+            #ifndef NOALIGN
+            is_nan = isnan(EX->d[0]) || isnan(EX->d[1]);
+            #endif
+            GX.d[1] = EX->d[0] - EX->d[1];
+            #ifndef NOALIGN
+            if(!is_nan && isnan(GX.d[1]))
+                GX.d[1] = -NAN;
+            #endif
+        }
+        break;
+
    case 0x7E:  /* MOVD Ed, Gx */
        nextop = F8;
        GET_ED;
@@ -1056,7 +1191,12 @@ void Run660F(x86emu_t *emu)
        GET_EW;
        if((nextop&0xC0)!=0xC0)
        {
+            #ifdef TEST_INTERPRETER
+            test->memaddr=((test->memaddr)+tmp32s*2);
+            *(uint16_t*)test->mem = *(uint16_t*)test->memaddr;
+            #else
            EW=(reg32_t*)(((uintptr_t)(EW))+(tmp32s*2));
+            #endif
        }
        if(EW->word[0] & (1<<tmp8u))
            SET_FLAG(F_CF);
@@ -1083,7 +1223,12 @@ void Run660F(x86emu_t *emu)
        GET_EW;
        if((nextop&0xC0)!=0xC0)
        {
+            #ifdef TEST_INTERPRETER
+            test->memaddr=((test->memaddr)+tmp32s*2);
+            *(uint16_t*)test->mem = *(uint16_t*)test->memaddr;
+            #else
            EW=(reg32_t*)(((uintptr_t)(EW))+(tmp32s*2));
+            #endif
        }
        if(EW->word[0] & (1<<tmp8u))
            SET_FLAG(F_CF);
@@ -1129,7 +1274,12 @@ void Run660F(x86emu_t *emu)
        GET_EW;
        if((nextop&0xC0)!=0xC0)
        {
+            #ifdef TEST_INTERPRETER
+            test->memaddr=((test->memaddr)+tmp32s*2);
+            *(uint16_t*)test->mem = *(uint16_t*)test->memaddr;
+            #else
            EW=(reg32_t*)(((uintptr_t)(EW))+(tmp32s*2));
+            #endif
        }
        if(EW->word[0] & (1<<tmp8u)) {
            SET_FLAG(F_CF);
@@ -1198,8 +1348,7 @@ void Run660F(x86emu_t *emu)
                break;

            default:
-                ip = R_EIP;
-                UnimpOpcode(emu);
+                return 0;
        }
        break;
    case 0xBB:                      /* BTC Ew,Gw */
@@ -1211,7 +1360,12 @@ void Run660F(x86emu_t *emu)
        GET_EW;
        if((nextop&0xC0)!=0xC0)
        {
+            #ifdef TEST_INTERPRETER
+            test->memaddr=((test->memaddr)+tmp32s*2);
+            *(uint16_t*)test->mem = *(uint16_t*)test->memaddr;
+            #else
            EW=(reg32_t*)(((uintptr_t)(EW))+(tmp32s*2));
+            #endif
        }
        if(EW->word[0] & (1<<tmp8u))
            SET_FLAG(F_CF);
@@ -1378,8 +1532,7 @@ void Run660F(x86emu_t *emu)
                if(EX->ub[i]&0x80)
                    GD.dword[0] |= (1<<i);
        } else {
-            ip = R_EIP;
-            UnimpOpcode(emu);
+            return 0;
        }
        break;
    case 0xD8:  /* PSUBUSB Gx,Ex */
@@ -1454,7 +1607,7 @@ void Run660F(x86emu_t *emu)
    case 0xE2:  /* PSRAD Gx, Ex */
        nextop = F8;
        GET_EX;
-        tmp8u=(EX->q[0]>31)?32:EX->ub[0];
+        tmp8u=(EX->q[0]>31)?31:EX->ub[0];
        for (int i=0; i<4; ++i)
            GX.sd[i] >>= tmp8u;
        break;
@@ -1483,8 +1636,14 @@ void Run660F(x86emu_t *emu)
    case 0xE6:  /* CVTTPD2DQ Gx, Ex */
        nextop = F8;
        GET_EX;
-        GX.sd[0] = EX->d[0];
-        GX.sd[1] = EX->d[1];
+        if(isnan(EX->d[0]) || isinf(EX->d[0]) || EX->d[0]>(double)0x7fffffff || EX->d[0]<-(double)0x80000000U)
+            GX.sd[0] = 0x80000000;
+        else
+            GX.sd[0] = EX->d[0];
+        if(isnan(EX->d[1]) || isinf(EX->d[1]) || EX->d[1]>(double)0x7fffffff || EX->d[1]<-(double)0x80000000U)
+            GX.sd[1] = 0x80000000;
+        else
+            GX.sd[1] = EX->d[1];
        GX.q[1] = 0;
        break;
    case 0xE7:   /* MOVNTDQ Ex, Gx */
@@ -1659,10 +1818,8 @@ void Run660F(x86emu_t *emu)
        break;
 
    default:
-        ip = R_EIP;
-        UnimpOpcode(emu);
+        return 0;
    }

-    R_EIP = ip;
-    return;
+    return addr;
 }
@@ -0,0 +1,103 @@
+#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 Test66D9(x86test_t *test, uintptr_t addr)
+#else
+uintptr_t Run66D9(x86emu_t *emu, uintptr_t addr)
+#endif
+{
+    uint8_t nextop;
+    reg32_t *oped;
+    #ifdef TEST_INTERPRETER
+    x86emu_t* emu = test->emu;
+    #endif
+
+    uint8_t opcode = F8;
+    switch(opcode) {
+        
+        case 0xC0:
+        case 0xC1:
+        case 0xC2:
+        case 0xC3:
+        case 0xC4:
+        case 0xC5:
+        case 0xC6:
+        case 0xC7:
+        case 0xC8:
+        case 0xC9:
+        case 0xCA:
+        case 0xCB:
+        case 0xCC:
+        case 0xCD:
+        case 0xCE:
+        case 0xCF:
+        case 0xD0:
+        case 0xE0:
+        case 0xE5:
+        case 0xE8:
+        case 0xE9:
+        case 0xEA:
+        case 0xEB:
+        case 0xEC:
+        case 0xED:
+        case 0xEE:
+        case 0xFC:
+        case 0xE1:
+        case 0xE4:
+        case 0xF0:
+        case 0xF1:
+        case 0xF2:
+        case 0xF3:
+        case 0xF4:
+        case 0xF5:
+        case 0xF6:
+        case 0xF7:
+        case 0xF8:
+        case 0xF9:
+        case 0xFA:
+        case 0xFB:
+        case 0xFD:
+        case 0xFE:
+        case 0xFF:
+            return 0;
+
+        default:
+            switch((nextop>>3)&7) {
+                case 4:     /* FLDENV m */
+                    // warning, incomplete
+                    GET_EW;
+                    #ifndef TEST_INTERPRETER
+                    fpu_loadenv(emu, (char*)ED, 1);
+                    #endif
+                    break;
+                case 6:     /* FNSTENV m */
+                    // warning, incomplete
+                    GET_EW;
+                    #ifndef TEST_INTERPRETER
+                    fpu_savenv(emu, (char*)ED, 1);
+                    #endif
+                    break;
+                default:
+                    return 0;
+            }
+    }
+
+    return addr;
+}
@@ -0,0 +1,122 @@
+#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 Test66DD(x86test_t *test, uintptr_t addr)
+#else
+uintptr_t Run66DD(x86emu_t *emu, uintptr_t addr)
+#endif
+{
+    uint8_t nextop;
+    reg32_t *oped;
+    #ifdef TEST_INTERPRETER
+    x86emu_t* emu = test->emu;
+    #endif
+
+    uint8_t opcode = F8;
+    switch(opcode) {
+
+        case 0xC0:
+        case 0xC1:
+        case 0xC2:
+        case 0xC3:
+        case 0xC4:
+        case 0xC5:
+        case 0xC6:
+        case 0xC7:
+        case 0xC8:
+        case 0xC9:
+        case 0xCA:
+        case 0xCB:
+        case 0xCC:
+        case 0xCD:
+        case 0xCE:
+        case 0xCF:
+        case 0xD0:
+        case 0xE0:
+        case 0xE5:
+        case 0xE8:
+        case 0xE9:
+        case 0xEA:
+        case 0xEB:
+        case 0xEC:
+        case 0xED:
+        case 0xEE:
+        case 0xFC:
+        case 0xE1:
+        case 0xE4:
+        case 0xF0:
+        case 0xF1:
+        case 0xF2:
+        case 0xF3:
+        case 0xF4:
+        case 0xF5:
+        case 0xF6:
+        case 0xF7:
+        case 0xF8:
+        case 0xF9:
+        case 0xFA:
+        case 0xFB:
+        case 0xFD:
+        case 0xFE:
+        case 0xFF:
+            return 0;
+        break;
+
+        default:
+            switch((nextop>>3)&7) {
+                case 4: /* FRSTOR m94byte */
+                    GET_EW;
+                    #ifndef TEST_INTERPRETER
+                    fpu_loadenv(emu, (char*)ED, 1);
+                    // get the STx
+                    {
+                        char* p =(char*)ED;
+                        p += 14;
+                        for (int i=0; i<8; ++i) {
+                            LD2D(p, &ST(i).d);
+                            p+=10;
+                        }
+                    }
+                    #endif
+                    break;
+                case 6: /* FNSAVE m94byte */
+                    GET_EW;
+                    // ENV first...
+                    #ifndef TEST_INTERPRETER
+                    fpu_savenv(emu, (char*)ED, 1);
+                    // save the STx
+                    {
+                        char* p =(char*)ED;
+                        p += 14;
+                        for (int i=0; i<8; ++i) {
+                            D2LD(&ST(i).d, p);
+                            p+=10;
+                        }
+                    }
+                    #endif
+                    reset_fpu(emu);
+                    break;
+                default:
+                    return 0;
+            }
+    }
+
+    return addr;
+}
@@ -0,0 +1,147 @@
+#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 "my_cpuid.h"
+#include "bridge.h"
+#include "signals.h"
+#ifdef DYNAREC
+#include "../dynarec/arm_lock_helper.h"
+#endif
+
+#include "modrm.h"
+
+#ifdef TEST_INTERPRETER
+uintptr_t Test67(x86test_t *test, int rep, uintptr_t addr)
+#else
+uintptr_t Run67(x86emu_t *emu, int rep, uintptr_t addr)
+#endif
+{
+    uint8_t opcode;
+    uint8_t nextop;
+    reg32_t *oped;
+    uint8_t tmp8u, tmp8u2;
+    int8_t tmp8s;
+    uint16_t tmp16u, tmp16u2;
+    int16_t tmp16s;
+    uint32_t tmp32u, tmp32u2, tmp32u3;
+    int32_t tmp32s, tmp32s2;
+    uint64_t tmp64u;
+    int64_t tmp64s;
+    double d;
+    float f;
+    int64_t ll;
+    sse_regs_t *opex, eax1;
+    mmx87_regs_t *opem, eam1;
+    uintptr_t tlsdata;
+
+#ifdef TEST_INTERPRETER
+    x86emu_t *emu = test->emu;
+#endif
+    opcode = F8;
+
+    while(opcode==0x67)
+        opcode = F8;
+
+    while((opcode==0xF2) || (opcode==0xF3)) {
+        rep = opcode-0xF1;
+        opcode = F8;
+    }
+
+    switch(opcode) {
+
+        case 0x64:
+            tlsdata = GetFSBaseEmu(emu);
+            #ifdef TEST_INTERPRETER
+            return Test6467(test, tlsdata, addr);
+            #else
+            return Run6467(emu, tlsdata, addr);
+            #endif
+
+        case 0x66:                      /* MoooRE opcodes */
+            #ifdef TEST_INTERPRETER
+            return Test6766(test, rep, addr);
+            #else
+            return Run6766(emu, rep, addr);
+            #endif
+
+        case 0x6C:                      /* INSB */
+            tmp32u = rep?R_CX:1;
+            while(tmp32u--) {
+                #ifdef TEST_INTERPRETER
+                *(int8_t*)(R_DI+GetESBaseEmu(emu)) = 0;         // faking port read, using actual segment ES, just in case
+                #endif
+                if(ACCESS_FLAG(F_DF))
+                    R_DI-=1;
+                else
+                    R_DI+=1;
+            }
+            if(rep) R_CX = 0;
+            break;
+
+        case 0xAC:                      /* LODSB */
+            tmp32u = rep?R_CX:1;
+            while(tmp32u--) {
+                R_AL = *(int8_t*)(R_SI+GetDSBaseEmu(emu));
+                if(ACCESS_FLAG(F_DF))
+                    R_SI-=1;
+                else
+                    R_SI+=1;
+            }
+            if(rep) R_CX = 0;
+            break;
+
+        case 0xE0:                      /* LOOPNZ */
+            CHECK_FLAGS(emu);
+            tmp8s = F8S;
+            --R_CX; // don't update flags
+            if(R_CX && !ACCESS_FLAG(F_ZF))
+                addr += tmp8s;
+            break;
+        case 0xE1:                      /* LOOPZ */
+            CHECK_FLAGS(emu);
+            tmp8s = F8S;
+            --R_CX; // don't update flags
+            if(R_CX && ACCESS_FLAG(F_ZF))
+                addr += tmp8s;
+            break;
+        case 0xE2:                      /* LOOP */
+            tmp8s = F8S;
+            --R_CX; // don't update flags
+            if(R_CX)
+                addr += tmp8s;
+            break;
+        case 0xE3:                      /* JCXZ */
+            tmp8s = F8S;
+            if(!R_CX)
+                addr += tmp8s;
+            break;
+
+        case 0xE8:                      /* CALL Id */
+            tmp32s = F32S; // call is relative
+            Push(emu, addr);
+            addr += tmp32s;
+            break;
+
+
+        default:
+            return 0;
+    }
+    return addr;
+}