hack bleach

Update Project to Visual Studio 2017.
Update LLVM 5.0
2017-11-27 22:45:19 +01:00 · 2017-11-27 22:45:19 +01:00 · 2017-11-27 22:37:52 +01:00 · 2017-11-27 22:36:32 +01:00
606 changed files with 42495 additions and 26501 deletions
@@ -6,7 +6,7 @@ or our discord:
 https://discord.me/RPCS3

 PLEASE READ THE GUIDELINES BEFORE OPENING AN ISSUE:
-https://github.com/RPCS3/rpcs3/blob/master/.github/CONTRIBUTING.md
+https://github.com/RPCS3/rpcs3/blob/master/CONTRIBUTING.md

 ====================================================

@@ -59,7 +59,6 @@ rpcs3/git-version.h

 # Visual Studio Files
 .vs/*
-.vscode/*
 *.ipch
 *.vspx
 *.psess
@@ -94,10 +93,6 @@ CMakeCache.txt
 rpcs3/cotire/*
 rpcs3/rpcs3_*_cotire.cmake

-# kdevelop
-*.kdev4
-.kdev4/*
-
 # Qt
 moc_*.cpp
 qrc_resources.cpp
@@ -8,7 +8,7 @@
 [submodule "llvm"]
 	path = llvm
 	url = https://github.com/llvm-mirror/llvm
-	branch = release_60
+	branch = release_50
 [submodule "GSL"]
 	path = 3rdparty/GSL
 	url = https://github.com/Microsoft/GSL.git
@@ -35,14 +35,9 @@
 	path = 3rdparty/hidapi
 	url = https://github.com/Zangetsu38/hidapi
 	branch = master
-	ignore = dirty
 [submodule "3rdparty/Optional"]
 	path = 3rdparty/Optional
 	url = https://github.com/akrzemi1/Optional.git
 [submodule "3rdparty/pugixml"]
 	path = 3rdparty/pugixml
 	url = https://github.com/zeux/pugixml
-[submodule "polly"]
-	path = polly
-	url = https://github.com/llvm-mirror/polly
-	branch = release_60
@@ -22,25 +22,29 @@ matrix:
      compiler: gcc

 git:
-  depth: false # Unshallow clone to obtain proper GIT_VERSION
  submodules: false

-env:
-    - QTVER=5.10.1
-  
 before_install:
+  - if [ "$CC" = "clang" ]; then
+      export CXX="clang++-4.0" CC="clang-4.0";
+    fi;    
  - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" = "g++" ]; then
      export CXX="g++-5" CC="gcc-5" CXXFLAGS="-Wno-format-security";
    fi;
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+      wget http://download.qt.io/official_releases/online_installers/qt-unified-linux-x64-online.run ;
+      chmod a+x ./qt-unified-linux-x64-online.run ;
+      export QT_QPA_PLATFORM=minimal ;
+      ./qt-unified-linux-x64-online.run --script qt-installer-noninteractive.qs --no-force-installations ;
+    fi;

-install:
  # Install updated libglew-dev since the version provided by trusty is outdated
  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
-      wget https://mirrors.kernel.org/ubuntu/pool/universe/g/glew/libglew-dev_2.0.0-5_amd64.deb;
-      wget https://mirrors.kernel.org/ubuntu/pool/universe/g/glew/libglew2.0_2.0.0-5_amd64.deb;
-      wget https://mirrors.kernel.org/ubuntu/pool/universe/v/vulkan/libvulkan1_1.0.61.1+dfsg1-1ubuntu1~16.04.1_amd64.deb;
-      wget https://mirrors.kernel.org/ubuntu/pool/universe/v/vulkan/libvulkan-dev_1.0.61.1+dfsg1-1ubuntu1~16.04.1_amd64.deb;
-      sudo dpkg -i libglew2.0_2.0.0-5_amd64.deb libglew-dev_2.0.0-5_amd64.deb libvulkan1_1.0.61.1+dfsg1-1ubuntu1~16.04.1_amd64.deb libvulkan-dev_1.0.61.1+dfsg1-1ubuntu1~16.04.1_amd64.deb;
+      wget http://mirrors.kernel.org/ubuntu/pool/main/g/glew/libglew-dev_1.13.0-2_amd64.deb;
+      wget http://mirrors.kernel.org/ubuntu/pool/main/g/glew/libglew1.13_1.13.0-2_amd64.deb;
+      wget http://mirrors.kernel.org/ubuntu/pool/universe/v/vulkan/libvulkan1_1.0.42.0+dfsg1-1ubuntu1~16.04.1_amd64.deb;
+      wget http://mirrors.kernel.org/ubuntu/pool/universe/v/vulkan/libvulkan-dev_1.0.42.0+dfsg1-1ubuntu1~16.04.1_amd64.deb;
+      sudo dpkg -i libglew1.13_1.13.0-2_amd64.deb libglew-dev_1.13.0-2_amd64.deb libvulkan1_1.0.42.0+dfsg1-1ubuntu1~16.04.1_amd64.deb libvulkan-dev_1.0.42.0+dfsg1-1ubuntu1~16.04.1_amd64.deb;
    else
      brew update;
      brew install ccache glew llvm40;
@@ -48,52 +52,53 @@ install:

 before_script:
  - git submodule update --init asmjit 3rdparty/ffmpeg 3rdparty/pugixml 3rdparty/GSL 3rdparty/libpng Utilities/yaml-cpp 3rdparty/cereal 3rdparty/hidapi 3rdparty/Optional Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers
-  - mkdir build ; cd build
-  - export CMAKE_PREFIX_PATH=~/Qt/${QTVER}/gcc_64/lib/cmake
-  - export CXXFLAGS="$CXXFLAGS -DTRAVIS=true";
+  - mkdir build
+  - cd build
+  - export CMAKE_PREFIX_PATH=~/Qt/5.9.2/gcc_64/lib/cmake
  - if [ "$TRAVIS_PULL_REQUEST" = false ]; then
      export CXXFLAGS="$CXXFLAGS -DBRANCH=$TRAVIS_REPO_SLUG/$TRAVIS_BRANCH";
    else
      export CXXFLAGS="$CXXFLAGS -DBRANCH=$TRAVIS_REPO_SLUG/$TRAVIS_BRANCH/#$TRAVIS_PULL_REQUEST";
    fi;
-  - cmake .. -DCMAKE_INSTALL_PREFIX=/usr -G Ninja;
-
-script:
-  - ninja
-    
-after_script:
-  - cd build
+  - cmake .. -DCMAKE_INSTALL_PREFIX=/usr;
+  - make -j 3
  - # AppImage generation
-  - if [ -n "$UPLOAD_URL" ] && [ "$TRAVIS_BRANCH" = "master" ] && [ "$CC" = "clang" ] && [ "$TRAVIS_PULL_REQUEST" = false ]; then
-      source /opt/qt510/bin/qt510-env.sh ;
-      echo $LD_LIBRARY_PATH ;
-      export LD_LIBRARY_PATH=/opt/qt510/lib ;
-      DESTDIR=appdir ninja install ; find appdir/ ;
+  - if [ -n "$UPLOAD_URL" ] && [ "$TRAVIS_BRANCH" = "master" ] && [ "$CC" = "clang-4.0" ] && [ "$TRAVIS_PULL_REQUEST" = false ]; then
+      export LD_LIBRARY_PATH=~/Qt/5.9.2/gcc_64/lib;
+      make DESTDIR=appdir install ; find appdir/ ;
      find ../bin ;
-      wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" ;
+      wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" ; 
      chmod a+x linuxdeployqt*.AppImage ;
-      export PATH=~/Qt/$QTVER/gcc_64/bin/:${PATH} ;
+      export PATH=~/Qt/5.9.2/gcc_64/bin/:${PATH} ;
      ./linuxdeployqt*.AppImage --appimage-extract ;
      ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -bundle-non-qt-libs ;
-      rm ./appdir/usr/lib/libfreetype.so.6 ;
+      mkdir ./appdir/usr/plugins/xcbglintegrations/ ; 
+      mkdir ./appdir/usr/plugins/imageformats/ ;
+      cp ~/Qt/5.9.2/gcc_64/lib/libQt5Svg.so.5 ./appdir/usr/lib/ ;
+      cp ~/Qt/5.9.2/gcc_64/plugins/xcbglintegrations/* ./appdir/usr/plugins/xcbglintegrations/ ;
+      cp ~/Qt/5.9.2/gcc_64/plugins/imageformats/* ./appdir/usr/plugins/imageformats/ ;
+      cp ~/Qt/5.9.2/gcc_64/plugins/platforms/* ./appdir/usr/plugins/platforms/ ;
      export PATH=${TRAVIS_BUILD_DIR}/build/squashfs-root/usr/bin/:${PATH} ;
      ./squashfs-root/usr/bin/appimagetool ${TRAVIS_BUILD_DIR}/build/appdir ;
      find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq ;
-      COMM_TAG="$(git describe --tags $(git rev-list --tags --max-count=1))" ;
-      COMM_COUNT="$(git rev-list --count HEAD)" ;
-      curl "${UPLOAD_URL}${TRAVIS_COMMIT:0:8}&t=${COMM_TAG}&a=${COMM_COUNT}" --upload-file ./RPCS3*.AppImage;
+      curl ${UPLOAD_URL}${TRAVIS_COMMIT:0:7}-${TRAVIS_BUILD_NUMBER}_linux64 --upload-file ./RPCS3*.AppImage;
   fi;
+
+script:
+  # Add a command to show all the variables. May be useful for debugging Travis.
+  #- echo "--Shell Export Lists START--" ; export -p; echo "--Shell Export Lists STOP--";
+  # And to ensure the versions of toolchain
+  - echo "--CXX version?"; "$CXX" --version; echo "--CXX version confirmed";
+
 addons:
  apt:
    sources:
      - ubuntu-toolchain-r-test
      - llvm-toolchain-trusty-4.0
      - sourceline: 'ppa:jonathonf/binutils' # We need to update binutils to a newer version to link against the ffmpeg libs on.
-      - sourceline: 'ppa:beineri/opt-qt-5.10.1-trusty' # <<WARNING>>: This needs to be updated manually whenever the QT Version changes. Add QT PPA since the installer is quite bad.
    packages:
      - binutils
      - cmake
-      - ninja-build
      - libasound2-dev
      - libopenal-dev
      - freeglut3-dev
@@ -103,16 +108,15 @@ addons:
      - libc6-dev
      - llvm-4.0
      - llvm-4.0-dev
-      # Clang 5.0 is now bundled in travis, so we no longer need the ppa version.
-      #- clang-4.0
+      - clang-4.0
      - libedit-dev
      - g++-5
      - gcc-5
      - libstdc++-5-dev
      - lib32stdc++6
      - zlib1g-dev
-      # From the beineri PPA
-      - qt510-meta-minimal # <<WARNING>>: This needs to be updated manually whenever the QT Version changes.
+      # We need to install qt 5.9.2 manually because the version trusty provides is too old.
+      #- qtbase5-dev
      - libudev-dev
      - libevdev-dev
      - libpulse-dev
@@ -13,8 +13,8 @@
 *
 * You should have received a copy of the GNU Library General Public
 *  License along with this library; if not, write to the
- *  Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ *  Boston, MA  02111-1307, USA.
 * Or go to http://www.gnu.org/copyleft/lgpl.html
 */

@@ -393,72 +393,6 @@ ALC_API void ALC_APIENTRY alcDeviceResumeSOFT(ALCdevice *device);
 #endif
 #endif

-#ifndef AL_EXT_BFORMAT
-#define AL_EXT_BFORMAT 1
-#define AL_FORMAT_BFORMAT2D_8                    0x20021
-#define AL_FORMAT_BFORMAT2D_16                   0x20022
-#define AL_FORMAT_BFORMAT2D_FLOAT32              0x20023
-#define AL_FORMAT_BFORMAT3D_8                    0x20031
-#define AL_FORMAT_BFORMAT3D_16                   0x20032
-#define AL_FORMAT_BFORMAT3D_FLOAT32              0x20033
-#endif
-
-#ifndef AL_EXT_MULAW_BFORMAT
-#define AL_EXT_MULAW_BFORMAT 1
-#define AL_FORMAT_BFORMAT2D_MULAW                0x10031
-#define AL_FORMAT_BFORMAT3D_MULAW                0x10032
-#endif
-
-#ifndef ALC_SOFT_HRTF
-#define ALC_SOFT_HRTF 1
-#define ALC_HRTF_SOFT                            0x1992
-#define ALC_DONT_CARE_SOFT                       0x0002
-#define ALC_HRTF_STATUS_SOFT                     0x1993
-#define ALC_HRTF_DISABLED_SOFT                   0x0000
-#define ALC_HRTF_ENABLED_SOFT                    0x0001
-#define ALC_HRTF_DENIED_SOFT                     0x0002
-#define ALC_HRTF_REQUIRED_SOFT                   0x0003
-#define ALC_HRTF_HEADPHONES_DETECTED_SOFT        0x0004
-#define ALC_HRTF_UNSUPPORTED_FORMAT_SOFT         0x0005
-#define ALC_NUM_HRTF_SPECIFIERS_SOFT             0x1994
-#define ALC_HRTF_SPECIFIER_SOFT                  0x1995
-#define ALC_HRTF_ID_SOFT                         0x1996
-typedef const ALCchar* (ALC_APIENTRY*LPALCGETSTRINGISOFT)(ALCdevice *device, ALCenum paramName, ALCsizei index);
-typedef ALCboolean (ALC_APIENTRY*LPALCRESETDEVICESOFT)(ALCdevice *device, const ALCint *attribs);
-#ifdef AL_ALEXT_PROTOTYPES
-ALC_API const ALCchar* ALC_APIENTRY alcGetStringiSOFT(ALCdevice *device, ALCenum paramName, ALCsizei index);
-ALC_API ALCboolean ALC_APIENTRY alcResetDeviceSOFT(ALCdevice *device, const ALCint *attribs);
-#endif
-#endif
-
-#ifndef AL_SOFT_gain_clamp_ex
-#define AL_SOFT_gain_clamp_ex 1
-#define AL_GAIN_LIMIT_SOFT                       0x200E
-#endif
-
-#ifndef AL_SOFT_source_resampler
-#define AL_SOFT_source_resampler
-#define AL_NUM_RESAMPLERS_SOFT                   0x1210
-#define AL_DEFAULT_RESAMPLER_SOFT                0x1211
-#define AL_SOURCE_RESAMPLER_SOFT                 0x1212
-#define AL_RESAMPLER_NAME_SOFT                   0x1213
-typedef const ALchar* (AL_APIENTRY*LPALGETSTRINGISOFT)(ALenum pname, ALsizei index);
-#ifdef AL_ALEXT_PROTOTYPES
-AL_API const ALchar* AL_APIENTRY alGetStringiSOFT(ALenum pname, ALsizei index);
-#endif
-#endif
-
-#ifndef AL_SOFT_source_spatialize
-#define AL_SOFT_source_spatialize
-#define AL_SOURCE_SPATIALIZE_SOFT                0x1214
-#define AL_AUTO_SOFT                             0x0002
-#endif
-
-#ifndef ALC_SOFT_output_limiter
-#define ALC_SOFT_output_limiter
-#define ALC_OUTPUT_LIMITER_SOFT                  0x199A
-#endif
-
 #ifdef __cplusplus
 }
 #endif
@@ -345,7 +345,7 @@ typedef struct {
 /* Driving Presets */

 #define EFX_REVERB_PRESET_DRIVING_COMMENTATOR \
-    { 1.0000f, 0.0000f, 0.3162f, 0.5623f, 0.5012f, 2.4200f, 0.8800f, 0.6800f, 0.1995f, 0.0930f, { 0.0000f, 0.0000f, 0.0000f }, 0.2512f, 0.0170f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.2500f, 0.0000f, 0.9886f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }
+    { 1.0000f, 0.0000f, 3.1623f, 0.5623f, 0.5012f, 2.4200f, 0.8800f, 0.6800f, 0.1995f, 0.0930f, { 0.0000f, 0.0000f, 0.0000f }, 0.2512f, 0.0170f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 1.0000f, 0.2500f, 0.0000f, 0.9886f, 5000.0000f, 250.0000f, 0.0000f, 0x1 }

 #define EFX_REVERB_PRESET_DRIVING_PITGARAGE \
    { 0.4287f, 0.5900f, 0.3162f, 0.7079f, 0.5623f, 1.7200f, 0.9300f, 0.8700f, 0.5623f, 0.0000f, { 0.0000f, 0.0000f, 0.0000f }, 1.2589f, 0.0160f, { 0.0000f, 0.0000f, 0.0000f }, 0.2500f, 0.1100f, 0.2500f, 0.0000f, 0.9943f, 5000.0000f, 250.0000f, 0.0000f, 0x0 }
@@ -18,6 +18,9 @@ EXPORTS
    alDeleteBuffers
    alDeleteEffects
    alDeleteFilters
+    alDeleteFontsoundsSOFT
+    alDeletePresetsSOFT
+    alDeleteSoundfontsSOFT
    alDeleteSources
    alDisable
    alDistanceModel
@@ -32,10 +35,17 @@ EXPORTS
    alFilterfv
    alFilteri
    alFilteriv
+    alFontsound2iSOFT
+    alFontsoundModulatoriSOFT
+    alFontsoundiSOFT
+    alFontsoundivSOFT
    alGenAuxiliaryEffectSlots
    alGenBuffers
    alGenEffects
    alGenFilters
+    alGenFontsoundsSOFT
+    alGenPresetsSOFT
+    alGenSoundfontsSOFT
    alGenSources
    alGetAuxiliaryEffectSlotf
    alGetAuxiliaryEffectSlotfv
@@ -64,6 +74,8 @@ EXPORTS
    alGetFilteriv
    alGetFloat
    alGetFloatv
+    alGetFontsoundModulatorivSOFT
+    alGetFontsoundivSOFT
    alGetInteger
    alGetInteger64SOFT
    alGetInteger64vSOFT
@@ -74,7 +86,9 @@ EXPORTS
    alGetListenerfv
    alGetListeneri
    alGetListeneriv
+    alGetPresetivSOFT
    alGetProcAddress
+    alGetSoundfontivSOFT
    alGetSource3dSOFT
    alGetSource3f
    alGetSource3i
@@ -88,7 +102,6 @@ EXPORTS
    alGetSourcei64vSOFT
    alGetSourceiv
    alGetString
-    alGetStringiSOFT
    alIsAuxiliaryEffectSlot
    alIsBuffer
    alIsBufferFormatSupportedSOFT
@@ -96,6 +109,9 @@ EXPORTS
    alIsEnabled
    alIsExtensionPresent
    alIsFilter
+    alIsFontsoundSOFT
+    alIsPresetSOFT
+    alIsSoundfontSOFT
    alIsSource
    alListener3f
    alListener3i
@@ -103,7 +119,21 @@ EXPORTS
    alListenerfv
    alListeneri
    alListeneriv
+    alLoadSoundfontSOFT
+    alMidiEventSOFT
+    alMidiGainSOFT
+    alMidiPauseSOFT
+    alMidiPlaySOFT
+    alMidiResetSOFT
+    alMidiSoundfontSOFT
+    alMidiSoundfontvSOFT
+    alMidiStopSOFT
+    alMidiSysExSOFT
+    alPresetFontsoundsSOFT
+    alPresetiSOFT
+    alPresetivSOFT
    alProcessUpdatesSOFT
+    alSoundfontPresetsSOFT
    alSource3dSOFT
    alSource3f
    alSource3i
@@ -145,9 +175,7 @@ EXPORTS
    alcGetIntegerv
    alcGetProcAddress
    alcGetString
-    alcGetStringiSOFT
    alcGetThreadContext
-    alcIsAmbisonicFormatSupportedSOFT
    alcIsExtensionPresent
    alcIsRenderFormatSupportedSOFT
    alcLoopbackOpenDeviceSOFT
@@ -155,6 +183,5 @@ EXPORTS
    alcOpenDevice
    alcProcessContext
    alcRenderSamplesSOFT
-    alcResetDeviceSOFT
    alcSetThreadContext
    alcSuspendContext
@@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 3.1)

 option(WITH_GDB "WITH_GDB" OFF)
 option(WITHOUT_LLVM "WITHOUT_LLVM" OFF)
-option(USE_NATIVE_INSTRUCTIONS "USE_NATIVE_INSTRUCTIONS makes rpcs3 compile with -march=native, which is useful for local builds, but not good for packages." ON)
-option(VULKAN_PREBUILT "" OFF)

 if (WITH_GDB)
 	add_definitions(-DWITH_GDB_DEBUGGER)
@@ -37,6 +35,8 @@ if (NOT USE_SYSTEM_LIBPNG)
 	add_subdirectory( 3rdparty/libpng )
 endif()

+option(VULKAN_PREBUILT "" OFF)
+
 # TODO: do real installation, including copying directory structure
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${PROJECT_BINARY_DIR}/bin")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${PROJECT_BINARY_DIR}/bin")
@@ -24,16 +24,15 @@ If you want to contribute please take a look at the [Coding Style](https://githu
 * [Visual C++ Redistributable Packages for Visual Studio 2017](https://go.microsoft.com/fwlink/?LinkId=746572)
 * [Cmake 3.1.0+](https://www.cmake.org/download/) (required; add to PATH)
 * [Python 3.3+](https://www.python.org/downloads/) (required; add to PATH)
-* [Qt 5.10+](https://www.qt.io/download-open-source/) (required; add QTDIR environment variable if you do not want to use the Visual Studio Qt Plugin: e.g. `<QtInstallFolder>\5.10.1\msvc2017_64\`)
+* [Qt 5.9.2](https://www.qt.io/download-open-source/) (required; add QTDIR `<QtInstallFolder>\5.9.1\msvc2015_64\` environment variable if you do not want to use the Visual Studio Qt Plugin)
 * [Visual Studio Qt Plugin](https://marketplace.visualstudio.com/items?itemName=TheQtCompany.QtVisualStudioTools2015) (optional; see above)

 ### Linux
-* [Qt 5.10+](https://www.qt.io/download-open-source/)
+* [Qt 5.7+](https://www.qt.io/download-open-source/)
 * GCC 5.1+ or Clang 3.5.0+ ([not GCC 6.1](https://github.com/RPCS3/rpcs3/issues/1691))
 * Debian & Ubuntu: `sudo apt-get install cmake build-essential libasound2-dev libpulse-dev libopenal-dev libglew-dev zlib1g-dev libedit-dev libvulkan-dev libudev-dev git qt5-default`
 * Arch: `sudo pacman -S glew openal cmake llvm qt5-base`
 * Fedora: `sudo dnf install cmake glew glew-devel libatomic libudev-devel openal-devel qt5-devel vulkan-devel`
-* OpenSUSE: `sudo zypper install git cmake libasound2 libpulse-devel openal-soft-devel glew-devel zlib-devel libedit-devel vulkan-devel libudev-devel libqt5-qtbase-devel libevdev-devel`
 **If you have a NVIDIA GPU, you may need to install the libglvnd package.**

 ### MacOS
@@ -48,14 +47,14 @@ To initialize the repository don't forget to execute `git submodule update --ini
 ### Configuring Qt

 *If you're using Visual Studio 2017 without Qt plugin support (or simply dont want to use it):* 
-1) Add `QTDIR` environment variable and set it to e.g `<QtInstallFolder>\5.10.1\msvc2017_64\` </br>
+1) Add `QTDIR` environment variable and set it to `<QtInstallFolder>\5.9.2\msvc2017_64\` </br>


 Open `rpcs3.sln`


 *If you wish to use the Visual Studio plugin for Qt:* </br>
-1) Go to the Qt5 menu and edit Qt5 options. Add the path to your Qt installation with compiler e.g. `C:\Qt\5.10.1\msvc2017_64`. </br>
+1) Go to the Qt5 menu and edit Qt5 options. Add the path to your Qt installation with compiler e.g. `C:\Qt\5.9.2\msvc2015_64`. </br>
 2) While selecting the rpcs3qt project, go to Qt5->Project Setting and select the version you added. 

 ### Building the projects
@@ -101,9 +100,6 @@ This Builds RPCS3 with support for debugging PS3 games using gdb.
 - ```-DUSE_VULKAN=ON/OFF``` (default = *ON*)  
 This builds RPCS3 with Vulkan support.

- ```-DUSE_NATIVE_INSTRUCTIONS=ON/OFF``` (default = *ON*)  
-This builds rpcs3 with -march=native, which is useful for local builds, but not good for packages.
-
 ## License

 Most files are licensed under the terms of GNU GPLv2 License, see LICENSE file for details. Some files may be licensed differently, check appropriate file headers for details.
@@ -470,7 +470,7 @@ struct se_storage<T, 16, 16>

 	static inline v128 swap(const v128& src)
 	{
-		return v128::from64(se_storage<u64>::swap(src._u64[1]), se_storage<u64>::swap(src._u64[0]));
+		return v128::fromV(_mm_shuffle_epi8(src.vi, _mm_set_epi8(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15)));
 	}

 	static inline v128 to(const T& src)
@@ -202,12 +202,9 @@ void cfg::encode(YAML::Emitter& out, const cfg::_base& rhs)
 		out << YAML::EndMap;
 		return;
 	}
-	default:
-	{
-		out << rhs.to_string();
-		return;
-	}
 	}
+
+	out << rhs.to_string();
 }

 void cfg::decode(const YAML::Node& data, cfg::_base& rhs)
@@ -1034,7 +1034,7 @@ fs::file::file(const std::string& path, bs_t<open_mode> mode)
 				(fmt::throw_exception("Invalid whence (0x%x)" HERE, whence), 0);

 			const auto result = ::lseek(m_fd, offset, mode);
-
+			
 			if (result == -1)
 			{
 				g_tls_error = to_error(errno);
@@ -1258,12 +1258,7 @@ bool fs::dir::open(const std::string& path)
 			}

 			struct ::stat file_info;
-
-			if (::fstatat(::dirfd(m_dd), found->d_name, &file_info, 0) != 0)
-			{
-				//failed metadata (broken symlink?), ignore and skip to next file
-				return read(info);
-			}
+			verify("dir::read" HERE), ::fstatat(::dirfd(m_dd), found->d_name, &file_info, 0) == 0;

 			info.name = found->d_name;
 			info.is_directory = S_ISDIR(file_info.st_mode);
@@ -1363,7 +1358,7 @@ std::string fs::get_data_dir(const std::string& prefix, const std::string& locat

 			continue;
 		}
-
+		
 		buf.push_back(c);
 	}

@@ -13,7 +13,7 @@
 #include "Emu/Cell/SPUThread.h"

 #ifndef _WIN32
-#include "fcntl.h"
+#include"fcntl.h"
 #endif

 extern void ppu_set_breakpoint(u32 addr);
@@ -166,10 +166,9 @@ char GDBDebugServer::read_char()

 u8 GDBDebugServer::read_hexbyte()
 {
-	std::string s = "";
-	s += read_char();
-	s += read_char();
-	return hex_to_u8(s);
+	char buf[2];
+	read(buf, 2);
+	return static_cast<u8>(strtol(buf, nullptr, 16));
 }

 void GDBDebugServer::try_read_cmd(gdb_cmd & out_cmd)
@@ -177,7 +176,7 @@ void GDBDebugServer::try_read_cmd(gdb_cmd & out_cmd)
 	char c = read_char();
 	//interrupt
 	if (UNLIKELY(c == 0x03)) {
-		out_cmd.cmd = '\x03';
+		out_cmd.cmd = "\0x03";
 		out_cmd.data = "";
 		out_cmd.checksum = 0;
 		return;
@@ -224,7 +223,7 @@ void GDBDebugServer::try_read_cmd(gdb_cmd & out_cmd)
 	}
 	out_cmd.checksum = read_hexbyte();
 	if (out_cmd.checksum != checksum) {
-		throw wrong_checksum_exception("Wrong checksum for packet" HERE);
+		throw new wrong_checksum_exception("Wrong checksum for packet" HERE);
 	}
 }

@@ -366,7 +365,7 @@ std::string GDBDebugServer::get_reg(std::shared_ptr<ppu_thread> thread, u32 rid)
 		return std::string(8, 'x');
 	default:
 		if (rid > 70) return "";
-		return (rid > 31)
+		return (rid > 31) 
 			? u64_to_padded_hex(reinterpret_cast<u64&>(thread->fpr[rid - 32])) //fpr
 			: u64_to_padded_hex(thread->gpr[rid]); //gpr
 	}
@@ -428,25 +427,6 @@ bool GDBDebugServer::send_reason()
 	return send_cmd_ack("S05");
 }

-void GDBDebugServer::wait_with_interrupts() {
-	char c;
-	while (!paused) {
-		int result = recv(client_socket, &c, 1, 0);
-
-		if (result == SOCKET_ERROR) {
-			if (check_errno_again()) {
-				thread_ctrl::wait_for(50);
-				continue;
-			}
-
-			gdbDebugServer.error("Error during socket read");
-			fmt::throw_exception("Error during socket read" HERE);
-		} else if (c == 0x03) {
-			paused = true;
-		}
-	}
-}
-
 bool GDBDebugServer::cmd_extended_mode(gdb_cmd & cmd)
 {
 	return send_cmd_ack("OK");
@@ -473,25 +453,24 @@ bool GDBDebugServer::cmd_thread_info(gdb_cmd & cmd)
 		result += u64_to_padded_hex(static_cast<u64>(cpu.id));
 	};
 	idm::select<ppu_thread>(on_select);
-	//idm::select<RawSPUThread>(on_select);
-	//idm::select<SPUThread>(on_select);
+	idm::select<ARMv7Thread>(on_select);
+	idm::select<RawSPUThread>(on_select);
+	idm::select<SPUThread>(on_select);

 	//todo: this may exceed max command length
 	result = "m" + result + "l";
-
+	
 	return send_cmd_ack(result);;
 }

 bool GDBDebugServer::cmd_current_thread(gdb_cmd & cmd)
 {
-	return send_cmd_ack(selected_thread.expired() ? "" : ("QC" + u64_to_padded_hex(selected_thread.lock()->id)));
+	return send_cmd_ack(selected_thread.expired() ? "" : u64_to_padded_hex(selected_thread.lock()->id));
 }

 bool GDBDebugServer::cmd_read_register(gdb_cmd & cmd)
 {
-	if (!select_thread(general_ops_thread_id)) {
-		return send_cmd_ack("E02");
-	}
+	select_thread(general_ops_thread_id);
 	auto th = selected_thread.lock();
 	if (th->id_type() == 1) {
 		auto ppu = std::static_pointer_cast<ppu_thread>(th);
@@ -509,9 +488,7 @@ bool GDBDebugServer::cmd_read_register(gdb_cmd & cmd)

 bool GDBDebugServer::cmd_write_register(gdb_cmd & cmd)
 {
-	if (!select_thread(general_ops_thread_id)) {
-		return send_cmd_ack("E02");
-	}
+	select_thread(general_ops_thread_id);
 	auto th = selected_thread.lock();
 	if (th->id_type() == 1) {
 		auto ppu = std::static_pointer_cast<ppu_thread>(th);
@@ -540,7 +517,7 @@ bool GDBDebugServer::cmd_read_memory(gdb_cmd & cmd)
 	std::string result;
 	result.reserve(len * 2);
 	for (u32 i = 0; i < len; ++i) {
-		if (vm::check_addr(addr, 1, vm::page_info_t::page_readable)) {
+		if (vm::check_addr(addr + i)) {
 			result += to_hexbyte(vm::read8(addr + i));
 		} else {
 			break;
@@ -566,7 +543,7 @@ bool GDBDebugServer::cmd_write_memory(gdb_cmd & cmd)
 	u32 len = hex_to_u32(cmd.data.substr(s + 1, s2 - s - 1));
 	const char* data_ptr = (cmd.data.c_str()) + s2 + 1;
 	for (u32 i = 0; i < len; ++i) {
-		if (vm::check_addr(addr + i, 1, vm::page_info_t::page_writable)) {
+		if (vm::check_addr(addr + i)) {
 			u8 val;
 			int res = sscanf_s(data_ptr, "%02hhX", &val);
 			if (!res) {
@@ -657,31 +634,30 @@ bool GDBDebugServer::cmd_vcont(gdb_cmd & cmd)
 {
 	//todo: handle multiple actions and thread ids
 	this->from_breakpoint = false;
-	if (cmd.data[1] == 'c' || cmd.data[1] == 's') {
+	if (cmd.data[1] == 'c') {
 		select_thread(continue_ops_thread_id);
 		auto ppu = std::static_pointer_cast<ppu_thread>(selected_thread.lock());
-		paused = false;
-		if (cmd.data[1] == 's') {
-			ppu->state += cpu_flag::dbg_step;
-		}
 		ppu->state -= cpu_flag::dbg_pause;
-		//special case if app didn't start yet (only loaded)
-		if (!Emu.IsPaused() && !Emu.IsRunning()) {
-			Emu.Run();
+		if (Emu.IsPaused()) {
+			Emu.Resume();
 		}
+		thread_ctrl::wait();
+		//we are in all-stop mode
+		Emu.Pause();
+		return send_reason();
+	} else if (cmd.data[1] == 's') {
+		select_thread(continue_ops_thread_id);
+		auto ppu = std::static_pointer_cast<ppu_thread>(selected_thread.lock());
+		ppu->state += cpu_flag::dbg_step;
+		ppu->state -= cpu_flag::dbg_pause;
 		if (Emu.IsPaused()) {
 			Emu.Resume();
 		} else {
 			ppu->notify();
 		}
-		wait_with_interrupts();
+		thread_ctrl::wait();
 		//we are in all-stop mode
 		Emu.Pause();
-		select_thread(pausedBy);
-		// we have to remove dbg_pause from thread that paused execution, otherwise
-		// it will be paused forever (Emu.Resume only removes dbg_global_pause)
-		ppu = std::static_pointer_cast<ppu_thread>(selected_thread.lock());
-		ppu->state -= cpu_flag::dbg_pause;
 		return send_reason();
 	}
 	return send_cmd_ack("");
@@ -753,9 +729,7 @@ void GDBDebugServer::on_task()
 			return;
 		}
 		//stop immediately
-		if (Emu.IsRunning()) {
-			Emu.Pause();
-		}
+		Emu.Pause();

 		try {
 			char hostbuf[32];
@@ -794,7 +768,7 @@ void GDBDebugServer::on_task()
 				}
 			}
 		}
-		catch (std::runtime_error& e)
+		catch (std::runtime_error& e) 
 		{
 			if (client_socket) {
 				closesocket(client_socket);
@@ -831,15 +805,6 @@ void GDBDebugServer::on_stop()
 	named_thread::on_stop();
 }

-void GDBDebugServer::pause_from(cpu_thread* t) {
-	if (paused) {
-		return;
-	}
-	paused = true;
-	pausedBy = t->id;
-	notify();
-}
-
 u32 g_gdb_debugger_id = 0;

 #ifndef _WIN32
@@ -50,7 +50,7 @@ class GDBDebugServer : public named_thread {

 	//initialize server socket and start listening
 	void start_server();
-	//read at most cnt bytes to buf, returns number of bytes actually read
+	//read at most cnt bytes to buf, returns nubmer of bytes actually read
 	int read(void* buf, int cnt);
 	//reads one character
 	char read_char();
@@ -90,8 +90,6 @@ class GDBDebugServer : public named_thread {
 	//send reason of stop, returns false if sending response failed
 	bool send_reason();

-	void wait_with_interrupts();
-
 	//commands
 	bool cmd_extended_mode(gdb_cmd& cmd);
 	bool cmd_reason(gdb_cmd& cmd);
@@ -117,24 +115,17 @@ protected:
 	void on_exit() override final;

 public:
+	static const u32 id_base = 1;
+	static const u32 id_step = 1;
+	static const u32 id_count = 0x100000;
+
 	bool from_breakpoint = true;
 	bool stop = false;
-	bool paused = false;
-	u64 pausedBy;

 	virtual std::string get_name() const;
 	virtual void on_stop() override final;
-	void pause_from(cpu_thread* t);
 };

 extern u32 g_gdb_debugger_id;

-template <>
-struct id_manager::on_stop<GDBDebugServer> {
-	static inline void func(GDBDebugServer* ptr)
-	{
-		if (ptr) ptr->on_stop();
-	}
-};
-
 #endif
@@ -71,8 +71,6 @@ static void* s_next = s_memory;
 #ifdef _WIN32
 static std::deque<std::vector<RUNTIME_FUNCTION>> s_unwater;
 static std::vector<std::vector<RUNTIME_FUNCTION>> s_unwind; // .pdata
-#else
-static std::deque<std::tuple<u8*, u64, std::size_t>> s_unfire;
 #endif

 // Reset memory manager
@@ -89,30 +87,7 @@ extern void jit_finalize()

 	s_unwind.clear();
 #else
-	struct MemoryManager : llvm::RTDyldMemoryManager
-	{
-		u8* allocateCodeSection(std::uintptr_t size, uint align, uint sec_id, llvm::StringRef sec_name) override
-		{
-			return nullptr;
-		}
-
-		u8* allocateDataSection(std::uintptr_t size, uint align, uint sec_id, llvm::StringRef sec_name, bool is_ro) override
-		{
-			return nullptr;
-		}
-
-		bool finalizeMemory(std::string* = nullptr) override
-		{
-			return false;
-		}
-	} mem;
-
-	for (auto&& t : s_unfire)
-	{
-		mem.deregisterEHFrames(std::get<0>(t), std::get<1>(t), std::get<2>(t));
-	}
-
-	s_unfire.clear();
+	// TODO: unregister EH frames if necessary
 #endif

 	utils::memory_decommit(s_memory, s_memory_size);
@@ -196,7 +171,7 @@ struct MemoryManager : llvm::RTDyldMemoryManager
 		return {addr, llvm::JITSymbolFlags::Exported};
 	}

-	u8* allocateCodeSection(std::uintptr_t size, uint align, uint sec_id, llvm::StringRef sec_name) override
+	virtual u8* allocateCodeSection(std::uintptr_t size, uint align, uint sec_id, llvm::StringRef sec_name) override
 	{
 		// Lock memory manager
 		writer_lock lock(s_mutex);
@@ -217,7 +192,7 @@ struct MemoryManager : llvm::RTDyldMemoryManager
 		return (u8*)std::exchange(s_next, (void*)next);
 	}

-	u8* allocateDataSection(std::uintptr_t size, uint align, uint sec_id, llvm::StringRef sec_name, bool is_ro) override
+	virtual u8* allocateDataSection(std::uintptr_t size, uint align, uint sec_id, llvm::StringRef sec_name, bool is_ro) override
 	{
 		// Lock memory manager
 		writer_lock lock(s_mutex);
@@ -242,7 +217,7 @@ struct MemoryManager : llvm::RTDyldMemoryManager
 		return (u8*)std::exchange(s_next, (void*)next);
 	}

-	bool finalizeMemory(std::string* = nullptr) override
+	virtual bool finalizeMemory(std::string* = nullptr) override
 	{
 		// Lock memory manager
 		writer_lock lock(s_mutex);
@@ -259,7 +234,7 @@ struct MemoryManager : llvm::RTDyldMemoryManager
 		return false;
 	}

-	void registerEHFrames(u8* addr, u64 load_addr, std::size_t size) override
+	virtual void registerEHFrames(u8* addr, u64 load_addr, std::size_t size) override
 	{
 #ifdef _WIN32
 		// Lock memory manager
@@ -286,8 +261,6 @@ struct MemoryManager : llvm::RTDyldMemoryManager
 		{
 			s_unwind.emplace_back(std::move(pdata));
 		}
-#else
-		s_unfire.push_front(std::make_tuple(addr, load_addr, size));
 #endif

 		return RTDyldMemoryManager::registerEHFrames(addr, load_addr, size);
@@ -295,6 +268,9 @@ struct MemoryManager : llvm::RTDyldMemoryManager

 	virtual void deregisterEHFrames() override
 	{
+		LOG_ERROR(GENERAL, "deregisterEHFrames() called"); // Not expected
+
+		return RTDyldMemoryManager::deregisterEHFrames();
 	}
 };

@@ -308,7 +284,7 @@ struct EventListener : llvm::JITEventListener
 	{
 	}

-	void NotifyObjectEmitted(const llvm::object::ObjectFile& obj, const llvm::RuntimeDyld::LoadedObjectInfo& inf) override
+	virtual void NotifyObjectEmitted(const llvm::object::ObjectFile& obj, const llvm::RuntimeDyld::LoadedObjectInfo& inf) override
 	{
 #ifdef _WIN32
 		for (auto it = obj.section_begin(), end = obj.section_end(); it != end; ++it)
@@ -376,11 +352,11 @@ public:
 		LOG_SUCCESS(GENERAL, "LLVM: Created module: %s", module->getName().data());
 	}

-	static std::unique_ptr<llvm::WritableMemoryBuffer> load(const std::string& path)
+	static std::unique_ptr<llvm::MemoryBuffer> load(const std::string& path)
 	{
 		if (fs::file cached{path, fs::read})
 		{
-			auto buf = llvm::WritableMemoryBuffer::getNewUninitMemBuffer(cached.size());
+			auto buf = llvm::MemoryBuffer::getNewUninitMemBuffer(cached.size());
 			cached.read(const_cast<char*>(buf->getBufferStart()), buf->getBufferSize());
 			return buf;
 		}
@@ -404,7 +380,7 @@ public:
 };

 jit_compiler::jit_compiler(const std::unordered_map<std::string, u64>& _link, std::string _cpu)
-	: m_link(_link)
+	: m_link(std::move(_link))
 	, m_cpu(std::move(_cpu))
 {
 	if (m_cpu.empty())
@@ -45,7 +45,6 @@ void fmt_class_string<logs::level>::format(std::string& out, u64 arg)
 		case logs::level::warning: return "Warning";
 		case logs::level::notice: return "Notice";
 		case logs::level::trace: return "Trace";
-		case logs::level::_uninit: return unknown;
 		}

 		return unknown;
@@ -177,6 +176,7 @@ namespace logs
 	channel HLE("HLE");
 	channel PPU("PPU");
 	channel SPU("SPU");
+	channel ARMv7("ARMv7");

 	// Channel registry mutex
 	semaphore<> g_mutex;
@@ -588,7 +588,6 @@ void logs::file_listener::log(u64 stamp, const logs::message& msg, const std::st
 	case level::warning: text = u8"·W "; break;
 	case level::notice:  text = u8"·! "; break;
 	case level::trace:   text = u8"·T "; break;
-	case level::_uninit: text = u8"·  "; break;
 	}

 	// Print miscosecond timestamp
@@ -104,6 +104,7 @@ namespace logs
 	extern channel HLE;
 	extern channel PPU;
 	extern channel SPU;
+	extern channel ARMv7;

 	// Log level control: set all channels to level::notice
 	void reset();
@@ -24,12 +24,6 @@ inline void strcpy_trunc(char (&dst)[N], const char (&src)[N2])
 	dst[count] = '\0';
 }

-template <std::size_t N>
-inline bool ends_with(const std::string& src, const char (&end)[N])
-{
-	return src.size() >= N - 1 && src.compare(src.size() - (N - 1), N - 1, end, N - 1) == 0;
-}
-
 namespace fmt
 {
 	std::string replace_first(const std::string& src, const std::string& from, const std::string& to);
@@ -6,9 +6,7 @@
 #include "Emu/Cell/lv2/sys_mmapper.h"
 #include "Emu/Cell/lv2/sys_event.h"
 #include "Thread.h"
-#include "sysinfo.h"
 #include <typeinfo>
-#include <thread>

 #ifdef _WIN32
 #include <Windows.h>
@@ -21,7 +19,7 @@
 #include <mach/thread_act.h>
 #include <mach/thread_policy.h>
 #endif
-#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__OpenBSD__)
+#if defined(__DragonFly__) || defined(__FreeBSD__)
 #include <pthread_np.h>
 #define cpu_set_t cpuset_t
 #endif
@@ -90,7 +88,7 @@ enum x64_reg_t : u32
 	X64R_XMM13,
 	X64R_XMM14,
 	X64R_XMM15,
-
+	
 	X64R_AL,
 	X64R_CL,
 	X64R_DL,
@@ -99,7 +97,7 @@ enum x64_reg_t : u32
 	X64R_CH,
 	X64R_DH,
 	X64R_BH,
-
+	
 	X64_NOT_SET,
 	X64_IMM8,
 	X64_IMM16,
@@ -176,7 +174,7 @@ void decode_x64_reg_op(const u8* code, x64_op_t& out_op, x64_reg_t& out_reg, siz
 			{
 				LOG_ERROR(MEMORY, "decode_x64_reg_op(%016llxh): LOCK prefix found twice", (size_t)code - out_length);
 			}
-
+			
 			lock = true;
 			continue;
 		}
@@ -186,7 +184,7 @@ void decode_x64_reg_op(const u8* code, x64_op_t& out_op, x64_reg_t& out_reg, siz
 			{
 				LOG_ERROR(MEMORY, "decode_x64_reg_op(%016llxh): REPNE/REPNZ prefix found twice", (size_t)code - out_length);
 			}
-
+			
 			repne = true;
 			continue;
 		}
@@ -196,7 +194,7 @@ void decode_x64_reg_op(const u8* code, x64_op_t& out_op, x64_reg_t& out_reg, siz
 			{
 				LOG_ERROR(MEMORY, "decode_x64_reg_op(%016llxh): REP/REPE/REPZ prefix found twice", (size_t)code - out_length);
 			}
-
+			
 			repe = true;
 			continue;
 		}
@@ -225,7 +223,7 @@ void decode_x64_reg_op(const u8* code, x64_op_t& out_op, x64_reg_t& out_reg, siz
 			{
 				LOG_ERROR(MEMORY, "decode_x64_reg_op(%016llxh): operand-size override prefix found twice", (size_t)code - out_length);
 			}
-
+			
 			oso = true;
 			continue;
 		}
@@ -917,7 +915,7 @@ bool get_x64_reg_value(x64_context* context, x64_reg_t reg, size_t d_size, size_
 	else if (reg == X64_IMM32)
 	{
 		const s32 imm_value = *(s32*)(RIP(context) + i_size - 4);
-
+		
 		switch (d_size)
 		{
 		case 4: out_value = (u32)imm_value; return true;
@@ -965,8 +963,8 @@ bool put_x64_reg_value(x64_context* context, x64_reg_t reg, size_t d_size, u64 v
 		// save the value into x64 register
 		switch (d_size)
 		{
-		case 1: *X64REG(context, reg - X64R_RAX) = (value & 0xff) | (*X64REG(context, reg - X64R_RAX) & 0xffffff00); return true;
-		case 2: *X64REG(context, reg - X64R_RAX) = (value & 0xffff) | (*X64REG(context, reg - X64R_RAX) & 0xffff0000); return true;
+		case 1: *X64REG(context, reg - X64R_RAX) = value & 0xff | *X64REG(context, reg - X64R_RAX) & 0xffffff00; return true;
+		case 2: *X64REG(context, reg - X64R_RAX) = value & 0xffff | *X64REG(context, reg - X64R_RAX) & 0xffff0000; return true;
 		case 4: *X64REG(context, reg - X64R_RAX) = value & 0xffffffff; return true;
 		case 8: *X64REG(context, reg - X64R_RAX) = value; return true;
 		}
@@ -1254,7 +1252,7 @@ bool handle_access_violation(u32 addr, bool is_writing, x64_context* context)
 				}
 				if (entry.start_addr <= addr && addr <= addr + mem->size - 1)
 				{
-					// Place the page fault event onto table so that other functions [sys_mmapper_free_address and ppu pagefault funcs]
+					// Place the page fault event onto table so that other functions [sys_mmapper_free_address and ppu pagefault funcs] 
 					// know that this thread is page faulted and where.

 					auto pf_entries = fxm::get_always<page_fault_event_entries>();
@@ -1274,7 +1272,7 @@ bool handle_access_violation(u32 addr, bool is_writing, x64_context* context)
 						addr, data3 == SYS_MEMORY_PAGE_FAULT_CAUSE_READ_ONLY ? "writing read-only" : "using unmapped");

 					error_code sending_error = sys_event_port_send(entry.port_id, data1, data2, data3);
-
+					
 					// If we fail due to being busy, wait a bit and try again.
 					while (sending_error == CELL_EBUSY)
 					{
@@ -1282,7 +1280,7 @@ bool handle_access_violation(u32 addr, bool is_writing, x64_context* context)
 						thread_ctrl::wait_for(1000);
 						sending_error = sys_event_port_send(entry.port_id, data1, data2, data3);
 					}
-
+					
 					if (sending_error)
 					{
 						fmt::throw_exception("Unknown error %x while trying to pass page fault.", sending_error.value);
@@ -1295,7 +1293,6 @@ bool handle_access_violation(u32 addr, bool is_writing, x64_context* context)
 			}
 		}

-		vm::temporary_unlock(*cpu);
 		LOG_FATAL(MEMORY, "Access violation %s location 0x%x", is_writing ? "writing" : "reading", addr);
 		cpu->state += cpu_flag::dbg_pause;
 		cpu->check_state();
@@ -1550,8 +1547,6 @@ thread_local DECLARE(thread_ctrl::g_tls_this_thread) = nullptr;

 extern thread_local std::string(*g_tls_log_prefix)();

-DECLARE(thread_ctrl::g_native_core_layout) { native_core_arrangement::undefined };
-
 void thread_ctrl::start(const std::shared_ptr<thread_ctrl>& ctrl, task_stack task)
 {
 #ifdef _WIN32
@@ -1639,16 +1634,6 @@ void thread_ctrl::initialize()
 		}
 	}
 #endif
-
-#if defined(__APPLE__)
-	pthread_setname_np(m_name.substr(0, 15).c_str());
-#elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-	pthread_set_name_np(pthread_self(), m_name.c_str());
-#elif defined(__NetBSD__)
-	pthread_setname_np(pthread_self(), "%s", (void*)m_name.c_str());
-#elif !defined(_WIN32)
-	pthread_setname_np(pthread_self(), m_name.substr(0, 15).c_str());
-#endif
 }

 void thread_ctrl::finalize(std::exception_ptr eptr) noexcept
@@ -1718,7 +1703,7 @@ bool thread_ctrl::_wait_for(u64 usec)
 		}
 	}
 	_lock{_this->m_mutex};
-
+	
 	do
 	{
 		// Mutex is unlocked at the start and after the waiting
@@ -1868,100 +1853,6 @@ void thread_ctrl::test()
 	}
 }

-void thread_ctrl::detect_cpu_layout()
-{
-	if (!g_native_core_layout.compare_and_swap_test(native_core_arrangement::undefined, native_core_arrangement::generic))
-		return;
-
-	const auto system_id = utils::get_system_info();
-	if (system_id.find("Ryzen") != std::string::npos)
-	{
-		g_native_core_layout.store(native_core_arrangement::amd_ccx);
-	}
-	else if (system_id.find("i3") != std::string::npos || system_id.find("i7") != std::string::npos)
-	{
-		g_native_core_layout.store(native_core_arrangement::intel_ht);
-	}
-}
-
-u16 thread_ctrl::get_affinity_mask(thread_class group)
-{
-	detect_cpu_layout();
-
-	if (const auto thread_count = std::thread::hardware_concurrency())
-	{
-		const u16 all_cores_mask = thread_count < 16 ? (u16)(~(UINT16_MAX << thread_count)): UINT16_MAX;
-
-		switch (g_native_core_layout)
-		{
-		default:
-		case native_core_arrangement::generic:
-		{
-			return all_cores_mask;
-		}
-		case native_core_arrangement::amd_ccx:
-		{
-			u16 spu_mask, ppu_mask, rsx_mask, general;
-			if (thread_count >= 16)
-			{
-				// Threadripper, R7
-				// Assign threads 1-16
-				// It appears some windows code is bound to lower core addresses, binding 8-16 is alot faster than 0-7
-				ppu_mask = spu_mask = 0b1111111100000000;
-				rsx_mask = 0b11110000;
-				general = 0b00001111;
-			}
-			else if (thread_count == 12)
-			{
-				// 1600/2600 (x)
-				ppu_mask = spu_mask = 0b111111000000;
-				rsx_mask = 0b111000;
-				general = 0b000111;
-			}
-			else
-			{
-				// R5 & R3 don't seem to improve performance no matter how these are shuffled
-				ppu_mask = spu_mask = rsx_mask = general = 0b11111111;
-			}
-
-			switch (group)
-			{
-			default:
-			case thread_class::general:
-				return general = all_cores_mask;
-			case thread_class::rsx:
-				return rsx_mask;
-			case thread_class::ppu:
-				return ppu_mask;
-			case thread_class::spu:
-				return spu_mask;
-			}
-		}
-		case native_core_arrangement::intel_ht:
-		{
-			if (thread_count <= 4)
-			{
-				//i3 or worse
-				switch (group)
-				{
-				case thread_class::rsx:
-				case thread_class::ppu:
-					return (0b0101 & all_cores_mask);
-				case thread_class::spu:
-					return (0b1010 & all_cores_mask);
-				case thread_class::general:
-					return all_cores_mask;
-				}
-			}
-
-			return all_cores_mask;
-		}
-		}
-	}
-
-	return UINT16_MAX;
-}
-
 void thread_ctrl::set_native_priority(int priority)
 {
 #ifdef _WIN32
@@ -1995,31 +1886,24 @@ void thread_ctrl::set_native_priority(int priority)
 #endif
 }

-void thread_ctrl::set_thread_affinity_mask(u16 mask)
+void thread_ctrl::set_ideal_processor_core(int core)
 {
 #ifdef _WIN32
 	HANDLE _this_thread = GetCurrentThread();
-	SetThreadAffinityMask(_this_thread, (DWORD_PTR)mask);
+	SetThreadIdealProcessor(_this_thread, core);
 #elif __APPLE__
-	thread_affinity_policy_data_t policy = { static_cast<integer_t>(mask) };
+	thread_affinity_policy_data_t policy = { static_cast<integer_t>(core) };
 	thread_port_t mach_thread = pthread_mach_thread_np(pthread_self());
 	thread_policy_set(mach_thread, THREAD_AFFINITY_POLICY, (thread_policy_t)&policy, 1);
 #elif defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__)
 	cpu_set_t cs;
 	CPU_ZERO(&cs);
-
-	for (u32 core = 0; core < 16u; ++core)
-	{
-		if ((u32)mask & (1u << core))
-		{
-			CPU_SET(core, &cs);
-		}
-	}
-
+	CPU_SET(core, &cs);
 	pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cs);
 #endif
 }

+
 named_thread::named_thread()
 {
 }
@@ -16,23 +16,6 @@
 // Will report exception and call std::abort() if put in catch(...)
 [[noreturn]] void catch_all_exceptions();

-// Hardware core layout
-enum class native_core_arrangement : u32
-{
-	undefined,
-	generic,
-	intel_ht,
-	amd_ccx
-};
-
-enum class thread_class : u32
-{
-	general,
-	rsx,
-	spu,
-	ppu
-};
-
 // Simple list of void() functors
 class task_stack
 {
@@ -108,9 +91,6 @@ class thread_ctrl final
 	// Current thread
 	static thread_local thread_ctrl* g_tls_this_thread;

-	// Target cpu core layout
-	static atomic_t<native_core_arrangement> g_native_core_layout;
-
 	// Self pointer
 	std::shared_ptr<thread_ctrl> m_self;

@@ -254,17 +234,8 @@ public:
 		thread_ctrl::start(out, std::forward<F>(func));
 	}

-	// Detect layout
-	static void detect_cpu_layout();
-
-	// Returns a core affinity mask. Set whether to generate the high priority set or not
-	static u16 get_affinity_mask(thread_class group);
-
-	// Sets the native thread priority
 	static void set_native_priority(int priority);
-
-	// Sets the preferred affinity mask for this thread
-	static void set_thread_affinity_mask(u16 mask);
+	static void set_ideal_processor_core(int core);
 };

 class named_thread
@@ -32,23 +32,13 @@ void patch_engine::append(const std::string& patch)
 {
 	if (fs::file f{patch})
 	{
-		YAML::Node root;
-
-		try
-		{
-			root = YAML::Load(f.to_string());
-		}
-		catch (const std::exception& e)
-		{
-			LOG_FATAL(GENERAL, "Failed to load patch file %s\n%s thrown: %s", patch, typeid(e).name(), e.what());
-			return;
-		}
+		auto root = YAML::Load(f.to_string());

 		for (auto pair : root)
 		{
 			auto& name = pair.first.Scalar();
 			auto& data = m_map[name];
-
+			
 			for (auto patch : pair.second)
 			{
 				u64 type64 = 0;
@@ -101,7 +91,7 @@ void patch_engine::append(const std::string& patch)
 					break;
 				}
 				}
-
+				
 				data.emplace_back(info);
 			}
 		}
@@ -13,7 +13,7 @@ rem // A copy of the GPL 2.0 should have been included with the program.
 rem // If not, see http://www.gnu.org/licenses/

 rem // Official git repository and contact information can be found at
-rem // https://github.com/RPCS3/rpcs3 and https://rpcs3.net/.
+rem // https://github.com/RPCS3/rpcs3 and http://rpcs3.net/.

 setlocal ENABLEDELAYEDEXPANSION
 setlocal ENABLEEXTENSIONS
@@ -55,31 +55,33 @@ if errorlevel 1 (
 	goto done
 )

-rem // Get commit count from (unshallowed) HEAD
-for /F %%I IN ('call %GIT% rev-list HEAD --count') do set COMMIT_COUNT=%%I
+rem // Get commit count from HEAD by default
+for /F %%I IN ('call %GIT% rev-list HEAD --count') do set GIT_VERSION=%%I
+
+rem // If we're in AppVeyor and we're building for master: Get commit count from unshallowed upstream
+if defined APPVEYOR (
+	if not defined APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH (
+		call %GIT% remote add upstream https://github.com/RPCS3/RPCS3.git
+		call %GIT% fetch --unshallow upstream
+		for /F %%I IN ('call %GIT% rev-list --count upstream/master') do set GIT_VERSION=%%I
+	)
+)

-rem // If we're in AppVeyor, building a non-master, pull request artifact
 if defined APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH (
-
 	if "%APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH%"=="master" (
-		rem // If pull request comes from a master branch, GIT_BRANCH = username/branch in order to distinguish from upstream/master
 		for /f "tokens=1* delims=/" %%a in ("%APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME%") do set user=%%a
 		set "GIT_BRANCH=!user!/%APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH%"
 	) else (
-		rem // Otherwise, GIT_BRANCH=branch
 		set GIT_BRANCH=%APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH%
 	)
 	
-	rem // Make GIT_VERSION the last commit (shortened); Don't include commit count on non-master builds
-	for /F %%I IN ('call %GIT% rev-parse --short HEAD') do set GIT_VERSION=%%I
-	
 ) else (
-	rem // Get last commit (shortened) and concat after commit count in GIT_VERSION
-	for /F %%I IN ('call %GIT% rev-parse --short HEAD') do set GIT_VERSION=%COMMIT_COUNT%-%%I
-	
 	for /F %%I IN ('call %GIT% rev-parse --abbrev-ref HEAD') do set GIT_BRANCH=%%I
 )

+rem // Get last commit (shortened) and concat after commit count in GIT_VERSION
+for /F %%I IN ('call %GIT% rev-parse --short HEAD') do set GIT_VERSION=%GIT_VERSION%-%%I
+
 rem // Echo obtained GIT_VERSION for debug purposes if needed
 echo %GIT_VERSION%

@@ -64,7 +64,7 @@ void shared_mutex::imp_lock_shared(s64 _old)

 		if (value0 >= c_min)
 		{
-			return;
+			return;	
 		}

 		// Acquire writer lock
@@ -79,7 +79,7 @@ void shared_mutex::imp_lock_shared(s64 _old)
 		}

 		value1 += c_one - c_min;
-
+		
 		if (value1 > 0)
 		{
 			return;
@@ -109,7 +109,7 @@ void shared_mutex::imp_lock_shared(s64 _old)
 		{
 			return;
 		}
-
+		
 		imp_unlock_shared(value2);
 	}
 #endif
@@ -300,7 +300,7 @@ safe_writer_lock::safe_writer_lock(shared_mutex& mutex)

 		if (m_is_owned)
 		{
-			m_mutex.lock();
+			m_mutex.lock_shared();
 			g_tls_locks.emplace_back(&m_mutex);
 			return;
 		}
@@ -19,12 +19,6 @@ bool utils::has_avx()
 	return g_value;
 }

-bool utils::has_avx2()
-{
-	static const bool g_value = get_cpuid(0, 0)[0] >= 0x7 && get_cpuid(7, 0)[1] & 0x20;
-	return g_value;
-}
-
 bool utils::has_rtm()
 {
 	// Check RTM and MPX extensions in order to filter out TSX on Haswell CPUs
@@ -32,19 +26,6 @@ bool utils::has_rtm()
 	return g_value;
 }

-bool utils::has_512()
-{
-	// Check AVX512F, AVX512CD, AVX512DQ, AVX512BW, AVX512VL extensions (Skylake-X level support)
-	static const bool g_value = get_cpuid(0, 0)[0] >= 0x7 && (get_cpuid(7, 0)[1] & 0xd0030000) == 0xd0030000;
-	return g_value;
-}
-
-bool utils::has_xop()
-{
-	static const bool g_value = has_avx() && get_cpuid(0x80000001, 0)[2] & 0x800;
-	return g_value;
-}
-
 std::string utils::get_system_info()
 {
 	std::string result;
@@ -87,22 +68,7 @@ std::string utils::get_system_info()

 	if (has_avx())
 	{
-		result += " | AVX";
-
-		if (has_avx2())
-		{
-			result += '+';
-		}
-
-		if (has_512())
-		{
-			result += '+';
-		}
-
-		if (has_xop())
-		{
-			result += 'x';
-		}
+		result += " | AVX+";
 	}

 	if (has_rtm())
@@ -8,11 +8,11 @@ namespace utils
 	inline std::array<u32, 4> get_cpuid(u32 func, u32 subfunc)
 	{
 		int regs[4];
-#ifdef _MSC_VER
+#ifdef _MSC_VER 
 		__cpuidex(regs, func, subfunc);
-#else
+#else 
 		__asm__ volatile("cpuid" : "=a" (regs[0]), "=b" (regs[1]), "=c" (regs[2]), "=d" (regs[3]) : "a" (func), "c" (subfunc));
-#endif
+#endif 
 		return {0u+regs[0], 0u+regs[1], 0u+regs[2], 0u+regs[3]};
 	}

@@ -20,14 +20,8 @@ namespace utils

 	bool has_avx();

-	bool has_avx2();
-
 	bool has_rtm();

-	bool has_512();
-
-	bool has_xop();
-
 	inline bool transaction_enter()
 	{
 		while (true)
@@ -12,7 +12,6 @@
 #include <utility>

 #include "recursive_wrapper.hpp"
-#include "variant_visitor.hpp"

 // clang-format off
 // [[deprecated]] is only available in C++14, use this for the time being
@@ -850,22 +849,6 @@ namespace std {
 				return detail::binary_dispatcher<F, V, R, Types...>::apply(v0, v1, std::forward<F>(f));
 			}

-			// match
-			// unary
-			template <typename... Fs>
-			auto VARIANT_INLINE match(Fs&&... fs) const
-			-> decltype(variant::visit(*this, ::std::make_visitor(std::forward<Fs>(fs)...)))
-			{
-				return variant::visit(*this, ::std::make_visitor(std::forward<Fs>(fs)...));
-			}
-			// non-const
-			template <typename... Fs>
-			auto VARIANT_INLINE match(Fs&&... fs)
-			-> decltype(variant::visit(*this, ::std::make_visitor(std::forward<Fs>(fs)...)))
-			{
-				return variant::visit(*this, ::std::make_visitor(std::forward<Fs>(fs)...));
-			}
-
 			~variant() noexcept // no-throw destructor
 			{
 				helper_type::destroy(type_index, &data);
@@ -1,45 +0,0 @@
-#ifndef MAPBOX_UTIL_VARIANT_VISITOR_HPP
-#define MAPBOX_UTIL_VARIANT_VISITOR_HPP
-
-#include <utility>
-
-//namespace mapbox {
-//namespace util {
-namespace std {
-
-template <typename... Fns>
-struct visitor;
-
-template <typename Fn>
-struct visitor<Fn> : Fn
-{
-    using Fn::operator();
-
-    template<typename T>
-    visitor(T&& fn) : Fn(std::forward<T>(fn)) {}
-};
-
-template <typename Fn, typename... Fns>
-struct visitor<Fn, Fns...> : Fn, visitor<Fns...>
-{
-    using Fn::operator();
-    using visitor<Fns...>::operator();
-
-    template<typename T, typename... Ts>
-    visitor(T&& fn, Ts&&... fns)
-        : Fn(std::forward<T>(fn))
-        , visitor<Fns...>(std::forward<Ts>(fns)...) {}
-};
-
-template <typename... Fns>
-visitor<typename std::decay<Fns>::type...> make_visitor(Fns&&... fns)
-{
-    return visitor<typename std::decay<Fns>::type...>
-        (std::forward<Fns>(fns)...);
-}
-
-}
-//} // namespace util
-//} // namespace mapbox
-
-#endif // MAPBOX_UTIL_VARIANT_VISITOR_HPP
@@ -39,22 +39,18 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <NMakeBuildCommandLine>start /W /B pre-build.bat
-cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
+    <NMakeBuildCommandLine>cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
 msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Release /m</NMakeBuildCommandLine>
    <NMakeCleanCommandLine>cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
 msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Release /m</NMakeCleanCommandLine>
-    <NMakeReBuildCommandLine>start /W /B pre-build.bat
-cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
+    <NMakeReBuildCommandLine>cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
 msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Release /m
    </NMakeReBuildCommandLine>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <NMakeBuildCommandLine>start /W /B pre-build.bat
-cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
+    <NMakeBuildCommandLine>cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
 msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Debug /m</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>start /W /B pre-build.bat
-cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
+    <NMakeReBuildCommandLine>cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
 msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Debug /m</NMakeReBuildCommandLine>
    <NMakeCleanCommandLine>cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
 msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Debug /m</NMakeCleanCommandLine>
@@ -1,13 +0,0 @@
-@ECHO OFF
-
-REM Setting up dummy git helper
-MKDIR ..\Vulkan-LoaderAndValidationLayers\external\glslang\External\spirv-tools
-SET header="@ECHO off"
-SET content="ECHO unused"
-ECHO %header:"=% > git.bat
-ECHO %content:"=% >> git.bat
-COPY /Y git.bat ..\Vulkan-LoaderAndValidationLayers\external\glslang\External\spirv-tools\git.bat
-
-REM Set up gitignore
-SET ignored="*"
-ECHO %ignored:"=% > ..\Vulkan-LoaderAndValidationLayers\external\glslang\External\spirv-tools\.gitignore
@@ -1,106 +1,82 @@
+#---------------------------------#
+#      general configuration      #
+#---------------------------------#

-version: '{build}'
+# version format
+version: '0.0.4-{build}'

+#---------------------------------#
+#    environment configuration    #
+#---------------------------------#
+
+# Build worker image (VM template)
 image: Visual Studio 2017

+# clone directory
+clone_folder: c:\projects\rpcs3
+
+# set clone depth
+clone_depth: 3                    # clone entire repository history if not defined
+
+# environment variables
 environment:
-  QTDIR: C:\Qt\5.10\msvc2017_64
-  LLVMLIBS: https://drive.google.com/uc?export=download&id=0B8A6NaxhQAGRY2k3Q2Yya05lcm8
-  VULKAN: https://drive.google.com/uc?export=download&id=1A2eOMmCO714i0U7J0qI4aEMKnuWl8l_R
-  COMPATDB: https://rpcs3.net/compatibility?api=v1&export
+  QTDIR: C:\Qt\5.9\msvc2017_64

+# build cache to preserve files/folders between builds
 cache:
- llvmlibs.7z -> appveyor.yml
- vulkan.7z -> appveyor.yml
- compat_database.dat
+ - llvmlibs.7z -> appveyor.yml
+ - vulkan.7z -> appveyor.yml

+# scripts that run after cloning repository
 install:
- ps: | # set env vars for versioning
-    $env:COMM_TAG = $(git describe --tags $(git rev-list --tags --max-count=1))
-    $env:COMM_COUNT = $(git rev-list --count HEAD)
-    $env:COMM_HASH = $env:APPVEYOR_REPO_COMMIT.Substring(0,8)
-    
-    if ($env:APPVEYOR_PULL_REQUEST_NUMBER) {
-        $env:BUILD = "rpcs3-{0}-{1}_win64.7z" -f $env:COMM_TAG, $env:COMM_HASH
-        $env:AVVER = "{0}-{1}" -f $env:COMM_TAG.TrimStart("v"), $env:COMM_HASH
-    }
-    else {
-        $env:BUILD = "rpcs3-{0}-{1}-{2}_win64.7z" -f $env:COMM_TAG, $env:COMM_COUNT, $env:COMM_HASH
-        $env:AVVER = "{0}-{1}" -f $env:COMM_TAG.TrimStart("v"), $env:COMM_COUNT
-    }
+ - git submodule update --init 3rdparty/cereal 3rdparty/ffmpeg 3rdparty/GSL 3rdparty/hidapi 3rdparty/libpng 3rdparty/Optional 3rdparty/pugixml 3rdparty/zlib asmjit Utilities/yaml-cpp Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers

- ps: | # used for experimental build warnings for pr builds
-    $env:BRANCH = "{0}/{1}/#{2}" -f $env:APPVEYOR_REPO_NAME, `
-      $env:APPVEYOR_REPO_BRANCH, $env:APPVEYOR_PULL_REQUEST_NUMBER
-    $env:BRANCH = $env:BRANCH -replace "/#$"
-
- ps: | # misc global settings
-    $env:PATH += $env:QTDIR
-    [net.servicepointmanager]::securityprotocol = "tls12, tls11, tls"
-
- ps: | # update and init submodules
-    git submodule -q update --init `
-      3rdparty/cereal `
-      3rdparty/ffmpeg `
-      3rdparty/GSL `
-      3rdparty/hidapi `
-      3rdparty/libpng `
-      3rdparty/Optional `
-      3rdparty/pugixml `
-      3rdparty/zlib `
-      asmjit `
-      Utilities/yaml-cpp `
-      Vulkan/glslang `
-      Vulkan/Vulkan-LoaderAndValidationLayers
+#---------------------------------#
+#       build configuration       #
+#---------------------------------#

+# build platform, i.e. x86, x64, Any CPU. This setting is optional.
 platform: x64

+# build Configuration, i.e. Debug, Release, etc.
 configuration: Release - LLVM

 build:
-  parallel: true
-  project: rpcs3.sln
+  parallel: true                  # enable MSBuild parallel builds
+  project: rpcs3.sln              # path to Visual Studio solution or project
+  # MSBuild verbosity level
  verbosity: normal

+# scripts to run before build
 before_build:
- ps: | # fetch precompiled build dependencies
-    if (!(test-path llvmlibs.7z)) { irm $env:LLVMLIBS -outfile llvmlibs.7z }
-    if (!(test-path vulkan.7z)) { irm $env:VULKAN -outfile vulkan.7z }
-    7z x llvmlibs.7z -aos -o"." | out-null
-    7z x vulkan.7z -aos -o".\lib\$env:CONFIGURATION-$env:PLATFORM" | out-null
+ - set BRANCH=%APPVEYOR_REPO_NAME%/%APPVEYOR_REPO_BRANCH%/#%APPVEYOR_PULL_REQUEST_NUMBER%
+ - if "%APPVEYOR_PULL_REQUEST_NUMBER%"=="" (set BRANCH=%APPVEYOR_REPO_NAME%/%APPVEYOR_REPO_BRANCH%)
+ - set PATH=%PATH%;%QTDIR%
+ - if not exist llvmlibs.7z appveyor DownloadFile "https://drive.google.com/uc?export=download&id=0B8A6NaxhQAGRY2k3Q2Yya05lcm8" -FileName llvmlibs.7z
+ - 7z x llvmlibs.7z -aos -o%APPVEYOR_BUILD_FOLDER% > null
+ - if not exist vulkan.7z appveyor DownloadFile "https://drive.google.com/uc?export=download&id=0B8A6NaxhQAGRaHYxV3VOS2d0a0U" -FileName vulkan.7z
+ - 7z x vulkan.7z -aos -o"%APPVEYOR_BUILD_FOLDER%\lib\%CONFIGURATION%-%PLATFORM%" > null

-after_build:
- ps: | # remove unnecessary files
-    rm .\bin\rpcs3.exp, .\bin\rpcs3.lib, .\bin\rpcs3.pdb
+# scripts to run *after* solution is built and *before* automatic packaging occurs (web apps, NuGet packages, Azure Cloud Services)
+before_package:
+  - rm %APPVEYOR_BUILD_FOLDER%\bin\rpcs3.exp
+  - rm %APPVEYOR_BUILD_FOLDER%\bin\rpcs3.lib
+  - rm %APPVEYOR_BUILD_FOLDER%\bin\rpcs3.pdb
+  - set COMMIT_DATE=%APPVEYOR_REPO_COMMIT_TIMESTAMP:~0,10%
+  - set COMMIT_SHA=%APPVEYOR_REPO_COMMIT:~0,8%

- ps: | # prepare compatibility database for packaging
-    $db = irm $env:COMPATDB -erroraction silentlycontinue
-    if ($db -and $db.return_code -eq 0) {
-      $db | convertto-json -compress | out-file compat_database.dat -encoding utf8
-    }
-    copy-item compat_database.dat .\bin\GuiConfigs\compat_database.dat
-
- ps: | # package artifacts
-    7z a -m0=LZMA2 -mx9 $env:BUILD .\bin\*
-    7z a -m0=LZMA2 -mx9 openssl_win64.7z C:\OpenSSL-Win64\bin\libeay32.dll `
-      C:\OpenSSL-Win64\bin\ssleay32.dll
-
- ps: | # generate sha256 hashes
-    (get-filehash $env:BUILD -algorithm SHA256).Hash | out-file ("{0}.sha256" -f $env:BUILD) -encoding ascii
-    (get-filehash openssl_win64.7z -algorithm SHA256).Hash | out-file "openssl_win64.7z.sha256" -encoding ascii
+#---------------------------------#
+#       tests configuration       #
+#---------------------------------#

+# to disable automatic tests
 test: off

-artifacts:
- path: $(BUILD)
-  name: rpcs3
- path: $(BUILD).sha256
-  name: rpcs3 sha256 hash
- path: openssl_win64.7z
-  name: openssl
- path: openssl_win64.7z.sha256
-  name: openssl sha256 hash
+#---------------------------------#
+#      artifacts configuration    #
+#---------------------------------#

-on_finish: 
- ps: | # update appveyor build version, done last to prevent webhook breakage
-    update-appveyorbuild -version $env:AVVER
+# pushing entire folder as a zip archive
+artifacts:
+ - path: bin
+   name: 'rpcs3-v0.0.4-$(COMMIT_DATE)-$(COMMIT_SHA)_win64'
@@ -1,329 +0,0 @@
-/* 
-TheMitoSan Dark-Theme for RPCS3 
-Based on Kuroi (Dark) by Ani
-by themitosan @ twitter.com/themitosan
-Ani @ https://github.com/AniLeo
-(2017.11.14)
-*/
-
-/* Every widget */
-QWidget {
-	background-color: #131313;
-	color: #FFF;
-	alternate-background-color: #212121;
-}
-
-/* Mouse tooltips */
-QToolTip {
-	padding: 0.125em;
-	border: 0.0625em #444;
-	background-color: #222;
-	color: #FFF;
-}
-
-/* Table headers */
-QHeaderView::section {
-	background-color: #010101;
-	color: #ecf0f1;
-	padding-left: 0.25em;
-	border: 0.0525em solid #FFF;
-}
-
-/* Settings Dialog: Tabs */
-QTabBar::tab {
-	color: #ecf0f1;
-	border: 0.0625em solid #444;
-	border-bottom-style: none;
-	background-color: #353535;
-	padding-left: 1em;
-	padding-right: 1em;
-	padding-top: 0.25em;
-	padding-bottom: 0.25em;
-	margin-right: -0.125em;
-	border-top-left-radius: 0.25em;
-	border-top-right-radius: 0.25em;
-}
-QTabBar::tab:last {
-	margin-right: 0em;
-}
-QTabBar::tab:!selected {
-	color: #888;
-	border-bottom-style: solid;
-	margin-top: 0.1875em;
-	background-color: #111;
-}
-QTabBar::tab:hover {
-	background-color: #353535;
-	color: #FFF;
-}
-
-/* Checkboxes */
-QCheckBox::indicator {
-	border-radius: 0.125em;
-	border-top-right-radius: 0em;
-	border-bottom-left-radius: 0em;
-	border: 0.0625em solid #FFF;
-	width: 0.8em;
-	height: 0.8em;
-	margin-top: 0.0625em;
-}
-QCheckBox::indicator:checked {
-	background-color: #FFF; /* White */
-}
-QCheckBox::indicator:unchecked {
-	background-color: #000; /* Black */
-}
-QCheckBox::indicator::disabled {
-	background-color: #af4949; /* Red */
-}
-
-/* Radio Buttons */
-QRadioButton::indicator {
-	border: 0.0625em solid #FFF;
-	width: 0.8em;
-	height: 0.8em;
-	margin-top: 0.0625em;
-	border-radius: 0.270em;
-}
-QRadioButton::indicator:checked {
-	background-color: #FFF; /* Green */
-}
-QRadioButton::indicator:unchecked {
-	background-color: #000; /* Red */
-}
-QRadioButton::indicator::disabled {
-	background-color: #af4949; /* Gray */
-}
-
-/* Combo Boxes */
-QComboBox {
-	background-color: #404040;
-	color: #fff;
-	border: 0.0625em solid #1e1e1e;
-	border-radius: 0.25em;
-	padding-bottom: 0.125em;
-	padding-left: 0.25em;
-}
-QComboBox::disabled {
-	background-color: #252525;
-	color: #fff;
-}
-
-/* Group Boxes (Settings Dialog) */
-QGroupBox {
-	margin-top: 1em;
-	font-size: 8pt;
-	border: 0.05em solid #bdc3c7;
-	border-radius: 0.3em;
-}
-QGroupBox::title {
-	subcontrol-origin: margin;
-	subcontrol-position: top;
-	padding: 0.3em 0.5em 0.3em 0.5em;
-	color: #fff;
-}
-
-/* Buttons */
-QPushButton {
-	background-color: #404040;
-	color: #fff;
-}
-
-QPushButton::disabled {
-	background-color: #353535;
-	color: #FFF;
-}
-
-QPushButton::pressed {
-	background-color: #333; 
-}
-
-/* Log and Debugger borders */
-QTextEdit {
-	border: 0.05em solid #353535;
-}
-
-/* For dock buttons to be visible */
-QDockWidget::close-button, QDockWidget::float-button {
-	background-color: #bdc3c7;
-	border: 0.05em solid #000;
-	border-radius: 0.25em;
-	width: auto;
-}
-
-/* Disable ugly borders */
-QTabWidget::pane {
-	border: 0em solid #353535;
-}
-
-/* Top menu bar */
-QMenuBar::item:selected {
-	background: #454545;
-	border-radius: 0.25em;
-}
-QMenu::item {
-	padding-left: 1.5em;
-	padding-right: 0.75em;
-	padding-top: 0.25em;
-	padding-bottom: 0.25em;
-	border-radius: 0.25em;
-	margin-bottom: 0.125em;
-}
-QMenu::item:selected {
-	background: #444;
-	border: 0.05em solid #bdc3c7;
-	border-radius: 0.25em;
-}
-QMenu::item:disabled {
-	background-color: #313131;
-	color: #888888;
-	border-radius: 0.25em;
-}
-
-/* Libraries list */
-QListWidget::item:selected {
-	background-color: #3d3d3d;
-	color: #ecf0f1;
-	border-radius: 0.125em;
-}
-QListWidget::item:hover {
-	background-color: #4c4b4b;
-	color: #ecf0f1;
-	border-radius: 0.25em;
-}
-
-/* Pad Settings: Controller Image */
-QLabel#l_controller { 
-	color: #FFF;
-}
-
-/* Game Grid Font */
-QLabel#gamegrid_font {
-	font-weight: 600;
-	font-size: 8pt;
-	font-family: Lucida Grande;
-	color: #FFF;
-}
-
-/* Slider on toolbar */
-QWidget#sizeSliderContainer {
-	background: transparent;
-}
-
-/* Debug UI Settings buttons */
-QLabel#color_button {
-	background: transparent;
-}
-
-/* Seachbar on main toolbar */
-QLineEdit#mw_searchbar { 
-	margin-left: 0.7em; 
-	color: #ecf0f1;
-}
-
-/* Uniform colors in Toolbar */
-QToolButton {
-	background: transparent;
-	color: transparent;
-	border-radius: 0.125em;
-	padding: 0.09375em;
-	margin-left: 0.125em;
-	margin-top: 0.125em;
-	margin-bottom: 0.125em;
-	min-width: 0.063em;
-	width: auto;
-}
-QToolButton::disabled {
-	background-color: #353535;
-}
-QToolButton::hover {
-	background-color: #555;
-}
-
-/* Set Theme UI colors */
-QLabel#gamelist_icon_background_color {
-	color: transparent;
-}
-
-/* Set Windows Taskbar Thumbnail colors */
-QLabel#thumbnail_icon_color {
-	color: #262626;
-}
-
-/* Set Log colors */
-QTextEdit#log_frame {
-	background-color: #000; /* Black */
-}
-QLabel#log_level_always {
-	color: #00ffff; /* Cyan */
-}
-QLabel#log_level_fatal {
-	color: #ff00ff; /* Fuchsia */
-}
-QLabel#log_level_error {
-	color: #ff0000; /* Red */
-}
-QLabel#log_level_todo {
-	color: #ff6000; /* Orange */
-}
-QLabel#log_level_success {
-	color: #00ff00; /* Green */
-}
-QLabel#log_level_warning {
-	color: #ffff00; /* Yellow */
-}
-QLabel#log_level_notice {
-	color: #ffffff; /* White */
-}
-QLabel#log_level_trace {
-	color: #808080; /* Gray */
-}
-QLabel#log_stack {
-	color: #ffffff; /* White */
-}
-
-/* Set TTY colors */
-QTextEdit#tty_frame {
-	background-color: #000; /* Black */
-}
-QLabel#tty_text {
-	color: #fff; /* White */
-}
-
-/* RSX Debugger */
-QLabel#rsx_debugger_display_buffer {
-	background-color: #131313;
-}
-
-/* Kernel Explorer */
-QDialog#kernel_explorer {
-	background-color: #131313;
-}
-
-/* Memory Viewer */
-QDialog#memory_viewer {
-	background-color: #131313;
-	color: #FFF;
-}
-QLabel#memory_viewer_address_panel {
-	color: #00cbff; /* Font Color: Blue */
-	background-color: #131313;
-}
-QLabel#memory_viewer_hex_panel {
-	color: #FFF; /* Font Color: White */
-	background-color: #131313;
-}
-QLabel#memory_viewer_ascii_panel {
-	color: #FFF; /* Font Color: White */
-	background-color: #131313;
-}
-
-/* Debugger colors */
-QLabel#debugger_frame_breakpoint {
-	color: #000; /* Font Color: Black */
-	background-color: #ffff00; /* Yellow */
-}
-QLabel#debugger_frame_pc {
-	color: #000; /* Font Color: Black */
-	background-color: #00ff00; /* Green */
-}
@@ -241,7 +241,10 @@ QToolButton::hover {

 /* Set Theme UI colors */
 QLabel#gamelist_icon_background_color {
-	color: transparent;
+	background-color: #323232;
+}
+QLabel#gamelist_toolbar_icon_color {
+	background-color: #e3e3e3;
 }

 /* Set Windows Taskbar Thumbnail colors */
@@ -1,326 +0,0 @@
-/* 
-ModernBlue Theme for RPCS3 
-by themitosan @ twitter.com/themitosan
-(2017.12.12)
-*/
-
-/* Every widget */
-QWidget {
-	background-color: #232e3a;
-	color: #fff;
-	alternate-background-color: #141e28;
-}
-
-/* Mouse tooltips */
-QToolTip {
-	padding: 0.125em;
-	border: 0.0625em #444;
-	background-color: #181d24;
-	color: #fff;
-}
-
-/* Table headers */
-QHeaderView::section {
-	background-color: #333b44;
-	color: #ecf0f1;
-	padding-left: 0.25em;
-	border: 0.0425em solid #fff;
-}
-
-/* Settings Dialog: Tabs */
-QTabBar::tab {
-	color: #ecf0f1;
-	border: 0.0625em solid #feffff;
-	border-bottom-style: none;
-	background-color: #232e3a;
-	padding-left: 1em;
-	padding-right: 1em;
-	padding-top: 0.25em;
-	padding-bottom: 0.25em;
-	margin-right: -0.125em;
-	border-top-left-radius: 0.25em;
-	border-top-right-radius: 0.25em;
-}
-QTabBar::tab:last {
-	margin-right: 0em;
-}
-QTabBar::tab:!selected {
-	color: #666;
-	border-bottom-style: solid;
-	margin-top: 0.1875em;
-	background-color: #1b242f;
-}
-QTabBar::tab:hover {
-	background-color: #232e3a;
-	color: #fff;
-}
-
-/* Checkboxes */
-QCheckBox::indicator {
-	border-radius: 0.125em;
-	border-top-right-radius: 0em;
-	border-bottom-left-radius: 0em;
-	border: 0.0625em solid #fff;
-	width: 0.8em;
-	height: 0.8em;
-	margin-top: 0.0625em;
-}
-QCheckBox::indicator:checked {
-	background-color: #849ad2; /* Green */
-}
-QCheckBox::indicator:unchecked {
-	background-color: #203042; /* Red */
-}
-QCheckBox::indicator::disabled {
-	background-color: red; /* Gray */
-}
-
-/* Radio Buttons */
-QRadioButton::indicator {
-	border: 0.0625em solid #fff;
-	width: 0.8em;
-	height: 0.8em;
-	margin-top: 0.0625em;
-	border-radius: 0.270em;
-}
-QRadioButton::indicator:checked {
-	background-color: #849ad2; /* Green */
-}
-QRadioButton::indicator:unchecked {
-	background-color: #203042; /* Red */
-}
-QRadioButton::indicator::disabled {
-	background-color: red; /* Gray */
-}
-
-/* Combo Boxes */
-QComboBox {
-	background-color: #323c47;
-	color: #fff;
-	border: 0.0625em solid #ddd;
-	border-radius: 0.25em;
-	padding-bottom: 0.125em;
-	padding-left: 0.25em;
-}
-QComboBox::disabled {
-	background-color: #11182b;
-	color: #fff;
-}
-
-/* Group Boxes (Settings Dialog) */
-QGroupBox {
-	margin-top: 1em;
-	font-size: 8pt;
-	border: 0.05em solid #bdc3c7;
-	border-radius: 0.3em;
-}
-QGroupBox::title {
-	subcontrol-origin: margin;
-	subcontrol-position: top;
-	padding: 0.3em 0.5em 0.3em 0.5em;
-	color: #fff;
-}
-
-/* Buttons */
-QPushButton {
-	background-color: #46598b;
-	color: #fff; 
-}
-
-QPushButton::disabled {
-	background-color: #20283c;
-	color: #fff;
-}
-
-QPushButton::pressed {
-	background-color: #172038; 
-}
-
-/* Log and Debugger borders */
-QTextEdit {
-	border: 0.05em solid #ddd;
-}
-
-/* For dock buttons to be visible */
-QDockWidget::close-button, QDockWidget::float-button {
-	background-color: #bdc3c7;
-	border: 0.05em solid #777;
-	border-radius: 0.25em;
-}
-
-/* Disable ugly borders */
-QTabWidget::pane {
-	border: 0em solid #333b44;
-}
-
-/* Top menu bar */
-QMenuBar::item:selected {
-	background: #353e48;
-	border-radius: 0.25em;
-}
-QMenu::item {
-	padding-left: 1.5em;
-	padding-right: 0.75em;
-	padding-top: 0.25em;
-	padding-bottom: 0.25em;
-	border-radius: 0.25em;
-	margin-bottom: 0.125em;
-}
-QMenu::item:selected {
-	background: #354454;
-	border: 0.05em solid #bdc3c7;
-	border-radius: 0.25em;
-}
-QMenu::item:disabled {
-	background-color: #181d24;
-	color: #fff;
-	border-radius: 0.25em;
-}
-
-/* Libraries list */
-QListWidget::item:selected {
-	background-color: #3d3d3d;
-	color: #ecf0f1;
-	border-radius: 0.125em;
-}
-QListWidget::item:hover {
-	background-color: #4c4b4b;
-	color: #ecf0f1;
-	border-radius: 0.25em;
-}
-
-/* Pad Settings: Controller Image */
-QLabel#l_controller { 
-	color: #fff;
-}
-
-/* Game Grid Font */
-QLabel#gamegrid_font {
-	font-weight: 600;
-	font-size: 8pt;
-	font-family: Lucida Grande;
-	color: #fff;
-}
-
-/* Slider on toolbar */
-QWidget#sizeSliderContainer {
-	background: transparent;
-}
-
-/* Debug UI Settings buttons */
-QLabel#color_button {
-	background: transparent;
-}
-
-/* Seachbar on main toolbar */
-QLineEdit#mw_searchbar { 
-	margin-left: 0.7em; 
-	color: #ecf0f1;
-}
-
-/* Uniform colors in Toolbar */
-QToolButton {
-	background: transparent;
-	color: transparent;
-	border-radius: 0.125em;
-	padding: 0.09375em;
-	margin-left: 0.125em;
-	margin-top: 0.125em;
-	margin-bottom: 0.125em;
-	min-width: 0.063em;
-	width: auto;
-}
-QToolButton::disabled {
-	background-color: #11182b;
-}
-QToolButton::hover {
-	background-color: #3d475e;
-}
-
-/* Set Theme UI colors */
-QLabel#gamelist_icon_background_color {
-	color: transparent;
-}
-
-/* Set Windows Taskbar Thumbnail colors */
-QLabel#thumbnail_icon_color {
-	color: #262626;
-}
-
-/* Set Log colors */
-QTextEdit#log_frame {
-	background-color: #181d24; /* Black */
-}
-QLabel#log_level_always {
-	color: #74ffda; /* Cyan */
-}
-QLabel#log_level_fatal {
-	color: #ff35ff; /* Fuchsia */
-}
-QLabel#log_level_error {
-	color: #ff2424; /* Red */
-}
-QLabel#log_level_todo {
-	color: #ff8c46; /* Orange */
-}
-QLabel#log_level_success {
-	color: #7aff7a; /* Green */
-}
-QLabel#log_level_warning {
-	color: #f7ff74; /* Yellow */
-}
-QLabel#log_level_notice {
-	color: #fff; /* White */
-}
-QLabel#log_level_trace {
-	color: #808080; /* Gray */
-}
-QLabel#log_stack {
-	color: #fff; /* White */
-}
-
-/* Set TTY colors */
-QTextEdit#tty_frame {
-	background-color: #181d24; /* Black */
-}
-QLabel#tty_text {
-	color: #fff; /* White */
-}
-
-/* RSX Debugger */
-QLabel#rsx_debugger_display_buffer {
-	background-color: #181d24;
-}
-
-/* Kernel Explorer */
-QDialog#kernel_explorer {
-	background-color: #333b44;
-}
-
-/* Memory Viewer */
-QDialog#memory_viewer {
-	background-color: #333b44;
-	color: #fff;
-}
-QLabel#memory_viewer_address_panel {
-	color: #00cbff; /* Font Color: Blue */
-	background-color: #333b44;
-}
-QLabel#memory_viewer_hex_panel {
-	color: #fff; /* Font Color: Grey */
-	background-color: #333b44;
-}
-QLabel#memory_viewer_ascii_panel {
-	color: #fff; /* Font Color: Grey */
-	background-color: #333b44;
-}
-
-/* Debugger colors */
-QLabel#debugger_frame_breakpoint {
-	color: #000; /* Font Color: Black */
-	background-color: #333b44; /* Yellow */
-}
-QLabel#debugger_frame_pc {
-	color: #000; /* Font Color: Black */
-	background-color: #333b44; /* Green */
-}
@@ -1,440 +0,0 @@
-/*
-YoRHa Theme for RPCS3
-by Ani @ https://github.com/AniLeo
-r1 (2018.02.27)
-*/
-
-/*
-Color Scheme
-
- Pod Programs
-8c806a
-bd9d86
-c1b398
-eadfb1
-ebe4d2
-
- Light
-b3ac98
-aea993
-
- Dark
-4d4940
-*/
-
-
-/* Every widget */
-QWidget {
-	font-family: SCE-PS3 Rodin LATIN, Arial;
-	font-size: 9.00pt;
-
-	color: #292929;
-	background: transparent;
-	alternate-background-color: transparent;
-}
-
-
-/* Debugger: Sets font-family to default (any invalid value could be provided) */
-#debugger QListWidget, #debugger QTextEdit {
-	font-family: none;
-}
-
-
-/* Log+TTY: Use flat dark color background with default font for better readability */
-#log_frame, #tty_frame {
-	background: rgba(52, 49, 40, 0.9);
-	font-size: 8.50pt;
-	font-family: none;
-}
-
-
-/* Debugger: Restore original font size */
-#debugger QListWidget, #debugger QTextEdit {
-	font-size: 9.50pt;
-}
-
-
-/* LLE: Style QListWidget checkboxes (QListWidget) */
-#lleList::indicator {
-	border: 0.05em solid #4d4940;
-}
-#lleList::indicator::unchecked {
-	background-color: #b3ac98;
-}
-#lleList::indicator::checked {
-	background-color: #4d4940;
-}
-#lleList::indicator::disabled {
-	background-color: #828790;
-}
-#lleList::item::selected {
-	color: #4d4940;
-}
-
-
-/* Mouse Tooltips */
-QToolTip {
-	background-color: #b3ac98;
-	color: #4d4940;
-	border: 0.10em solid #4d4940;
-}
-
-
-/* CG Disasm: background-image doesn't work, use static color */
-QWidget#cg_disasm {
-	background: #b3ac98;
-}
-
-
-/* Main Window, Dialogs and Trophy Manager which isn't a dialog */
-QDialog, QWidget#trophy_manager, QMainWindow#main_window {
-	border-image: url("GuiConfigs/YoRHa-background.jpg");
-}
-
-
-/* Table headers */
-QHeaderView::section {
-	text-transform: uppercase;
-	background: #4d4940;
-	color: #b3ac98;
-	padding-left: 0.15em;
-	padding-top: 0.15em;
-	padding-bottom: 0.10em;
-	text-transform: uppercase;
-	border: none;
-}
-
-
-/* All other Tabs */
-QTabBar {
-	text-transform: uppercase;
-}
-
-QTabBar::tab {
-	background: transparent;
-	padding-left: 0.50em;
-	padding-right: 0.50em;
-	padding-top: 0.25em;
-	padding-bottom: 0.25em;
-	margin-right: 0.25em;
-}
-QTabBar::tab::selected {
-	background: #4d4940;
-	color: #aea993;
-	border-bottom-style: solid;
-}
-
-
-/* Settings Dialog: Tabs */
-QTabBar#tab_bar_settings {
-	border-bottom: 0.05em solid #4d4940;
-	text-transform: uppercase;
-}
-QTabBar::tab#tab_bar_settings {
-	background: transparent;
-	width: 5.20em;
-	padding-left: 0.50em;
-	padding-right: 0.50em;
-	padding-top: 0.65em;
-	padding-bottom: 0.65em;
-	margin-right: 0.25em;
-	font-size: 10.5pt;
-	font-weight: 550;
-}
-QTabBar::tab:last#tab_bar_settings {
-	margin-right: 0em;
-}
-QTabBar::tab:!selected:hover#tab_bar_settings {
-	background: transparent;
-	color: #4d4940;
-}
-QTabBar::tab::selected#tab_bar_settings {
-	background: #4d4940;
-	color: #aea993;
-	border-bottom-style: solid;
-	margin-top: 0.15em;
-}
-
-
-/* Checkboxes */
-QCheckBox::indicator {
-	border-radius: 0.1em;
-	border: 0.05em solid #4d4940;
-	margin-top: 0.05em;
-	width: 0.8em;
-	height: 0.8em;
-}
-QCheckBox::indicator:checked {
-	background-color: #4d4940; /* Dark */
-}
-QCheckBox::indicator:unchecked {
-	background-color: #b3ac98; /* Light */
-}
-QCheckBox::indicator::disabled {
-	background-color: #828790; /* Gray */
-}
-
-
-/* Radio Buttons */
-QRadioButton::indicator {
-	border-radius: 0.4em;
-	border: 0.05em solid #4d4940;
-	width: 0.8em;
-	height: 0.8em;
-}
-QRadioButton::indicator:checked {
-	background-color: #4d4940; /* Dark */
-}
-QRadioButton::indicator:unchecked {
-	background-color: #b3ac98; /* Light */
-}
-QRadioButton::indicator::disabled {
-	background-color: #828790; /* Gray */
-}
-
-
-/* Combo Boxes */
-QComboBox {
-	background: transparent;
-	color: #4d4940;
-	border: 0.05em solid #1e1e1e;
-	border-radius: 0.15em;
-	padding-bottom: 0.2em;
-	padding-left: 0.4em;
-}
-QComboBox QAbstractItemView {
-	background: #b3ac98;
-}
-QComboBox::disabled {
-	background: #828790;
-	color: #4d4940;
-}
-
-
-/* Group Boxes (Settings Dialog) */
-QGroupBox {
-	margin-top: 1em;
-	border: 0.05em solid #4d4940;
-	text-transform: uppercase;
-	font-size: 9.25pt;
-}
-QGroupBox::title {
-	subcontrol-origin: margin;
-	subcontrol-position: top;
-	padding: 0.3em 0.5em 0.3em 0.5em;
-	color: #4d4940;
-}
-
-
-/* Buttons */
-QPushButton {
-	background: #b3ac98;
-}
-QPushButton::disabled {
-	background: #828790;
-}
-
-
-/* QSpinBox (Settings -> Emulator -> width/height) */
-QSpinBox {
-	/* background: transparent; - This hits a weird bug in Qt where background flickers */
-	background-color: #b3ac98;
-	border: 0.05em solid #4d4940;
-	border-radius: 0.10em;
-}
-
-
-/* Styles Sliders */
-QSlider::groove:horizontal {
-	border: 0.10em solid #4d4940;
-	border-radius: 0.10em;
-}
-QSlider::handle:horizontal {
-	background: #4d4940;
-	width: 0.50em;
-}
-
-
-/* Log and Debugger borders */
-QTextEdit {
-	border: 0.05em solid #4d4940;
-}
-
-
-/* For dock buttons to be visible */
-QDockWidget {
-	background: transparent;
-	text-transform: uppercase;
-	color: #b3ac98;
-	font-weight: 500;
-}
-[floating="true"] {
-	border-image: url("GuiConfigs/YoRHa-background.jpg");
-}
-QDockWidget::title {
-	background: #4d4940;
-	padding-top: 0.2em;
-}
-QDockWidget::close-button, QDockWidget::float-button {
-	background-color: #b3ac98;
-}
-
-
-/* Disable ugly borders */
-QTabWidget::pane {
-	border: 0em solid #4d4940;
-}
-
-
-/* Top menu bar */
-QMenuBar {
-	height:1.50em;
-	text-transform: uppercase;
-}
-QMenuBar::item {
-	margin-right: 0.20em;
-	margin-left: 0.20em;
-	padding-left: 1.20em;
-	padding-right: 1.20em;
-}
-QMenuBar::item:selected {
-	background: #4d4940;
-	color: #aea993
-}
-
-
-QMenu {
-	background: #b3ac98;
-	color: #4d4940;
-	text-transform: uppercase;
-}
-QMenu::item {
-	padding-left: 1.5em;
-	padding-right: 0.75em;
-	padding-top: 0.25em;
-	padding-bottom: 0.25em;
-
-}
-QMenu::item:selected {
-	background: #4d4940;
-	color: #aea993;
-	border: 0.05em solid #4d4940;
-}
-QMenu::item:disabled {
-	background-color: #828790;
-	color: #4d4940;
-}
-
-
-/* Pad Settings: Controller Image */
-QLabel#l_controller {
-	color: #4d4940;
-}
-
-
-/* Game Grid Font */
-QLabel#gamegrid_font {
-	font-weight: 600;
-	color: #4d4940;
-	text-transform: uppercase;
-}
-
-
-/* Debug UI Settings buttons */
-QLabel#color_button {
-	background: transparent;
-}
-
-
-/* Searchbar on main Toolbar */
-QLineEdit#mw_searchbar {
-	margin-left: 0.7em;
-	color: #4d4940;
-	font-size: 10.25pt;
-}
-
-
-/* Uniform colors in Toolbar */
-QToolButton {
-	background: transparent;
-	color: transparent;
-}
-QToolButton::hover {
-	background-color: #b3ac98;
-}
-
-
-/* Set Theme UI colors */
-QLabel#gamelist_icon_background_color {
-	color: transparent;
-}
-
-
-/* Set Windows Taskbar Thumbnail colors */
-QLabel#thumbnail_icon_color {
-	color: #4d4940;
-}
-
-
-QLabel#log_level_always {
-	color: #00ffff; /* Cyan */
-}
-QLabel#log_level_fatal {
-	color: #ff00ff; /* Fuchsia */
-}
-QLabel#log_level_error {
-	color: #ff0000; /* Red */
-}
-QLabel#log_level_todo {
-	color: #ff6000; /* Orange */
-}
-QLabel#log_level_success {
-	color: #00ff00; /* Green */
-}
-QLabel#log_level_warning {
-	color: #ffff00; /* Yellow */
-}
-QLabel#log_level_notice {
-	color: #ffffff; /* White */
-}
-QLabel#log_level_trace {
-	color: #808080; /* Gray */
-}
-QLabel#log_stack {
-	color: #b3ac98; /* Light */
-}
-
-/* Set TTY colors */
-#tty_frame {
-	color: #b3ac98; /* Light */
-}
-
-
-/* Memory Viewer */
-QLabel#memory_viewer_address_panel {
-	color: #0000ff; /* Font Color: Blue */
-}
-QLabel#memory_viewer_hex_panel {
-	color: #4d4940; /* Font Color: Grey */
-}
-QLabel#memory_viewer_ascii_panel {
-	color: #4d4940; /* Font Color: Grey */
-}
-
-
-/* Debugger colors */
-QLabel#debugger_frame_breakpoint {
-	color: #000000; /* Font Color: Black */
-	background-color: #ffff00; /* Yellow */
-}
-QLabel#debugger_frame_pc {
-	color: #000000; /* Font Color: Black */
-	background-color: #00ff00; /* Green */
-}
-
-
-/* Trophy Notification Popup */
-QWidget#trophy_notification_frame {
-	background-color: #b3ac98;
-	color: #4d4940;
-}
@@ -1,7 +1,7 @@
 REM You need cmake and python to update the project files
 REM this script relies on CWD being the path that this script is in

-cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_EXTERNAL_POLLY_SOURCE_DIR=../polly -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=ON -DLLVM_INCLUDE_UTILS=ON -DWITH_POLLY=ON -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
+cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm

 RD /S /Q cmake
 RD /S /Q CMakeFiles
@@ -39,30 +39,30 @@
    <NMakePreprocessorDefinitions>
    </NMakePreprocessorDefinitions>
    <NMakeBuildCommandLine>
-      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_EXTERNAL_POLLY_SOURCE_DIR=../polly -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=ON -DLLVM_INCLUDE_UTILS=ON -DWITH_POLLY=ON -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
+      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
      msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Debug /m
    </NMakeBuildCommandLine>
    <NMakeReBuildCommandLine>
-      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_EXTERNAL_POLLY_SOURCE_DIR=../polly -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=ON -DLLVM_INCLUDE_UTILS=ON -DWITH_POLLY=ON -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
+      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
      msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Debug /m
    </NMakeReBuildCommandLine>
    <NMakeCleanCommandLine>
-      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_EXTERNAL_POLLY_SOURCE_DIR=../polly -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=ON -DLLVM_INCLUDE_UTILS=ON -DWITH_POLLY=ON -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
+      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
      msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Debug /m
    </NMakeCleanCommandLine>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <NMakePreprocessorDefinitions />
    <NMakeBuildCommandLine>
-      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_EXTERNAL_POLLY_SOURCE_DIR=../polly -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=ON -DLLVM_INCLUDE_UTILS=ON -DWITH_POLLY=ON -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
+      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
      msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Release /m
    </NMakeBuildCommandLine>
    <NMakeReBuildCommandLine>
-      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_EXTERNAL_POLLY_SOURCE_DIR=../polly -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=ON -DLLVM_INCLUDE_UTILS=ON -DWITH_POLLY=ON -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
+      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
      msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Release /m
    </NMakeReBuildCommandLine>
    <NMakeCleanCommandLine>
-      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_EXTERNAL_POLLY_SOURCE_DIR=../polly -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=ON -DLLVM_INCLUDE_UTILS=ON -DWITH_POLLY=ON -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
+      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DWITH_POLLY=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=8.1 ../llvm
      msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Release /m
    </NMakeCleanCommandLine>
  </PropertyGroup>
@@ -62,9 +62,6 @@ vcxproj_files = ["lib\Analysis\LLVMAnalysis.vcxproj",
                "lib\Transforms\Utils\LLVMTransformUtils.vcxproj",
                "lib\Transforms\Vectorize\LLVMVectorize.vcxproj",
                "include\llvm\IR\intrinsics_gen.vcxproj",
-                "tools\polly\lib\Polly.vcxproj",
-                "tools\polly\lib\External\PollyISL.vcxproj",
-                "tools\polly\lib\External\PollyPPCG.vcxproj",
                "utils\TableGen\llvm-tblgen.vcxproj",
                 ]

@@ -0,0 +1,65 @@
+#include "ps3emu_api.h"
+
+ps3emu_api::ps3emu_api(const std::string &path)
+{
+	load(path);
+}
+
+bool ps3emu_api::load(const std::string &path)
+{
+	if (!m_library.load(path))
+	{
+		return false;
+	}
+
+	bool is_no_errors = true;
+
+	if (!m_library.get(get_api_version, "ps3emu_api_get_api_version") || get_api_version() != ps3emu_api_version)
+	{
+		is_no_errors = false;
+	}
+
+	is_no_errors = is_no_errors && m_library.get(initialize, "ps3emu_api_initialize");
+	is_no_errors = is_no_errors && m_library.get(destroy, "ps3emu_api_destroy");
+
+	is_no_errors = is_no_errors && m_library.get(get_version_string, "ps3emu_api_get_version_string");
+	is_no_errors = is_no_errors && m_library.get(get_version_number, "ps3emu_api_get_version_number");
+	is_no_errors = is_no_errors && m_library.get(get_name_string, "ps3emu_api_get_name_string");
+
+	is_no_errors = is_no_errors && m_library.get(load_elf, "ps3emu_api_load_elf");
+
+	is_no_errors = is_no_errors && m_library.get(set_state, "ps3emu_api_set_state");
+	is_no_errors = is_no_errors && m_library.get(get_state, "ps3emu_api_get_state");
+
+	if (!is_no_errors)
+	{
+		close();
+		return false;
+	}
+
+	return true;
+}
+
+bool ps3emu_api::loaded() const
+{
+	return m_library.loaded();
+}
+
+void ps3emu_api::close()
+{
+	initialize = nullptr;
+	destroy = nullptr;
+	get_version_string = nullptr;
+	get_version_number = nullptr;
+	get_name_string = nullptr;
+	load_elf = nullptr;
+	set_state = nullptr;
+	get_state = nullptr;
+
+	m_library.close();
+}
+
+ps3emu_api::operator bool() const
+{
+	return loaded();
+}
@@ -0,0 +1,35 @@
+#pragma once
+
+#include <Utilities/dynamic_library.h>
+#include <string>
+#include "ps3emu_api_enums.h"
+#include "ps3emu_api_structs.h"
+
+class ps3emu_api
+{
+	utils::dynamic_library m_library;
+	
+public:
+	ps3emu_api() = default;
+	ps3emu_api(const std::string &path);
+
+	unsigned int(*get_api_version)() = nullptr;
+	ps3emu_api_error_code(*initialize)(const ps3emu_api_initialize_callbacks *callbacks) = nullptr;
+	ps3emu_api_error_code(*destroy)() = nullptr;
+
+	ps3emu_api_error_code(*get_version_string)(char *dest_buffer, int dest_buffer_size) = nullptr;
+	ps3emu_api_error_code(*get_version_number)(int *version_number) = nullptr;
+	ps3emu_api_error_code(*get_name_string)(char *dest_buffer, int dest_buffer_size) = nullptr;
+
+	ps3emu_api_error_code(*load_elf)(const char *path) = nullptr;
+
+	ps3emu_api_error_code(*set_state)(ps3emu_api_state state) = nullptr;
+	ps3emu_api_error_code(*get_state)(ps3emu_api_state *state) = nullptr;
+
+	bool load(const std::string &path);
+	bool loaded() const;
+	void close();
+	
+	explicit operator bool() const;
+};
+
@@ -9,8 +9,7 @@ function Controller() {
 }

 Controller.prototype.WelcomePageCallback = function() {
-    // Wait 10 seconds to load licenses and such.
-    gui.clickButton(buttons.NextButton, 10000);
+    gui.clickButton(buttons.NextButton);
 }

 Controller.prototype.CredentialsPageCallback = function() {
@@ -33,7 +32,8 @@ Controller.prototype.ComponentSelectionPageCallback = function() {
    var widget = gui.currentPageWidget();

    widget.deselectAll();
-    widget.selectComponent("qt.qt5." + installer.environmentVariable("QTVER") + ".gcc_64");
+    widget.selectComponent("qt.592.gcc_64");
+
    gui.clickButton(buttons.NextButton);
 }

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27130.2027
+VisualStudioVersion = 15.0.27004.2006
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asmjit", "asmjitsrc\asmjit.vcxproj", "{AC40FF01-426E-4838-A317-66354CEFAE88}"
 EndProject
@@ -3,46 +3,48 @@ cmake_minimum_required(VERSION 3.1)
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake_modules")
 set(RES_FILES "")
 set(CMAKE_CXX_STANDARD 14)
-include(CheckCXXCompilerFlag)
+include(CheckCCompilerFlag)

 # Qt section
-find_package(Qt5 5.10 COMPONENTS Widgets Network Qml)
-if(WIN32)
-	find_package(Qt5 5.10 COMPONENTS WinExtras REQUIRED)
-	set(RPCS3_QT_LIBS Qt5::Widgets Qt5::WinExtras Qt5::Network Qt5::Qml)
+find_package(Qt5 5.9 COMPONENTS Widgets)
+if (WIN32)
+    find_package(Qt5WinExtras REQUIRED)
+    set(RPCS3_QT_LIBS Qt5::Widgets Qt5::WinExtras)
+    include_directories(${Qt5Widgets_INCLUDE_DIRS} ${Qt5WinExtras_INCLUDE_DIRS})
 else()
-	find_package(Qt5 5.10 COMPONENTS DBus Gui)
-	if(Qt5DBus_FOUND)
-		set(RPCS3_QT_LIBS Qt5::Widgets Qt5::DBus Qt5::Network Qt5::Qml)
+	find_package(Qt5DBus)
+	if (Qt5DBus_FOUND)
+		set(RPCS3_QT_LIBS Qt5::Widgets Qt5::DBus)
 		add_definitions(-DHAVE_QTDBUS)
 	else()
-		set(RPCS3_QT_LIBS Qt5::Widgets Qt5::Network Qt5::Qml)
+		set(RPCS3_QT_LIBS Qt5::Widgets)
 	endif()
-	include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS})
+	include_directories(${Qt5Widgets_INCLUDE_DIRS})
 endif()

 # Let's make sure we have Qt before we continue
-if(NOT Qt5Widgets_FOUND)
-	if(Qt5Widgets_VERSION VERSION_LESS 5.10.0)
-		message("Minimum supported Qt5 version is 5.10.0! You have version ${Qt5Widgets_VERSION} installed, please upgrade!")
-		if("${CMAKE_SYSTEM}" MATCHES "Linux")
+if (NOT Qt5Widgets_FOUND)
+	if (Qt5Widgets_VERSION VERSION_LESS 5.9.0)
+		message("Minimum supported Qt5 version is 5.9! You have version ${Qt5Widgets_VERSION} installed, please upgrade!")
+		if ("${CMAKE_SYSTEM}" MATCHES "Linux")
 			message(FATAL_ERROR "Most distros do not provide an up-to-date version of Qt.
 If you're on Ubuntu or Linux Mint, there are PPAs you can use to install an up-to-date qt5 version.
-        https://launchpad.net/~beineri/+archive/ubuntu/opt-qt-5.10.1-xenial
-        https://launchpad.net/~beineri/+archive/ubuntu/opt-qt-5.10.1-trusty
+        https://launchpad.net/~beineri/+archive/ubuntu/opt-qt592-xenial
+        https://launchpad.net/~beineri/+archive/ubuntu/opt-qt592-trusty
 just make sure to run
-    source /opt/qt510/bin/qt510-env.sh
+    source /opt/qt59/bin/qt59-env.sh
 before re-running cmake")
-		elseif(WIN32)
+        elseif(WIN32)
 			message(FATAL_ERROR "You can download the latest version of Qt5 here: https://www.qt.io/download-open-source/")
 		else()
 			message(FATAL_ERROR "Look online for instructions on installing an up-to-date Qt5 on ${CMAKE_SYSTEM}.")
 		endif()
-	endif()
-
-	message("CMake was unable to find Qt5!")
-	if(WIN32)
-		message(FATAL_ERROR "Make sure the QTDIR env variable has been set properly. (for example C:\\Qt\\5.10.1\\msvc2017_64\\)")
+        
+    endif()
+    
+    message("CMake was unable to find Qt5!")
+    if (WIN32)
+		message(FATAL_ERROR "Make sure the QTDIR env variable has been set properly. (for example C:\\Qt\\5.9\\msvc2017_64\\)")
 	elseif("${CMAKE_SYSTEM}" MATCHES "Linux")
 		message(FATAL_ERROR "Make sure to install your distro's qt5 package!")
 	else()
@@ -55,16 +57,14 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)

 # To make UI files on cmake 3.7 or less work
-if(CMAKE_VERION VERSION_LESS 3.8)
-	set(CMAKE_INCLUDE_CURRENT_DIR ON)
-endif()
+set(CMAKE_INCLUDE_CURRENT_DIR ON)

-if(Qt5_POSITION_INDEPENDENT_CODE)
-	set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-	if(UNIX)
-		# Cotire needs this set for some reason
-		set(CMAKE_CXX_COMPILE_OPTIONS_PIE -fPIC)
-	endif()
+if (Qt5_POSITION_INDEPENDENT_CODE)
+    SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
+    if(UNIX)
+        # Cotire needs this set for some reason
+        SET(CMAKE_CXX_COMPILE_OPTIONS_PIE -fPIC)
+    endif()
 endif()

 include(cotire)
@@ -96,23 +96,19 @@ if(NOT MSVC)
 	if(NOT APPLE)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--exclude-libs,ALL")
 	endif()
-	
+
 	if(WIN32)
 		set(CMAKE_RC_COMPILER_INIT windres)
 		enable_language(RC)
 		set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>")
-
+		
 		# Workaround for mingw64 (MSYS2)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--allow-multiple-definition")
 	endif()
-
-	add_compile_options(-msse -msse2 -mcx16 -mrtm)
-
-	if(NOT DEFINED ENV{TRAVIS} AND USE_NATIVE_INSTRUCTIONS)
-		add_compile_options(-march=native)
-	endif()
-
-	if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+	
+	add_compile_options(-msse -msse2 -mcx16 -mssse3 -mrtm)
+	
+	if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 		# This fixes 'some' of the st11range issues. See issue #2516
 		if(APPLE)
 			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-image_base,0x10000 -Wl,-pagezero_size,0x10000")
@@ -120,13 +116,13 @@ if(NOT MSVC)
 			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -image-base=0x10000")
 		endif()
 	endif()
-
+	
 	# Some distros have the compilers set to use PIE by default, but RPCS3 doesn't work with PIE, so we need to disable it.
 	if(APPLE)
 		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-no_pie")
 	else()
-		CHECK_CXX_COMPILER_FLAG("-no-pie" HAS_NO_PIE)
-		CHECK_CXX_COMPILER_FLAG("-nopie" HAS_NOPIE)
+		CHECK_C_COMPILER_FLAG("-no-pie" HAS_NO_PIE)
+		CHECK_C_COMPILER_FLAG("-nopie" HAS_NOPIE)

 		if(HAS_NO_PIE)
 			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -no-pie")
@@ -134,11 +130,12 @@ if(NOT MSVC)
 			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -nopie")
 		endif()
 	endif()
-
+	
+	find_package(GLEW REQUIRED)
 	find_package(ZLIB REQUIRED)
 else()
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:throwingNew /D _CRT_SECURE_NO_DEPRECATE=1 /D _CRT_NON_CONFORMING_SWPRINTFS=1 /D _SCL_SECURE_NO_WARNINGS=1")
-
+	
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:libc.lib /NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libcd.lib /NODEFAULTLIB:libcmtd.lib /NODEFAULTLIB:msvcrtd.lib")
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /DYNAMICBASE:NO /BASE:0x10000 /FIXED")
 endif()
@@ -154,71 +151,44 @@ elseif(NOT MSVC AND NOT CMAKE_CXX_FLAGS MATCHES "LIBICONV_PLUG")
 endif()
 if(UNIX AND NOT APPLE)
 	set(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} "X11")
-	find_package(Wayland)
-	if (WAYLAND_FOUND)
-		include_directories(${WAYLAND_INCLUDE_DIR})
-		add_definitions(-DVK_USE_PLATFORM_WAYLAND_KHR)
-	endif()
 endif()

 if(NOT RPCS3_SRC_DIR)
-	set(RPCS3_SRC_DIR ${CMAKE_CURRENT_LIST_DIR})
-	message("-- Initializing RPCS3_SRC_DIR=${RPCS3_SRC_DIR}")
+  SET(RPCS3_SRC_DIR ${CMAKE_CURRENT_LIST_DIR})
+  Message("-- Initializing RPCS3_SRC_DIR=${RPCS3_SRC_DIR}")
 else()
-	message("-- Using Custom RPCS3_SRC_DIR=${RPCS3_SRC_DIR}")
+  Message("-- Using Custom RPCS3_SRC_DIR=${RPCS3_SRC_DIR}")
 endif()

 set(CMAKE_MODULE_PATH "${RPCS3_SRC_DIR}/cmake_modules")

 find_package(OpenGL REQUIRED)
 find_package(OpenAL REQUIRED)
-if(NOT WITHOUT_LLVM)
-	find_package(LLVM 6.0 CONFIG)
-	if(NOT LLVM_FOUND)
-		message("System LLVM was not found, LLVM will be built from the submodule.")
+if (NOT WITHOUT_LLVM)
+	find_package(LLVM 4.0 CONFIG)
+  if (NOT LLVM_FOUND)
+    message("System LLVM was not found, LLVM will be built from the submodule.")

-		set(LLVM_TARGETS_TO_BUILD "X86" CACHE INTERNAL "")
-		option(LLVM_BUILD_RUNTIME OFF)
-		option(LLVM_BUILD_TOOLS OFF)
-		option(LLVM_INCLUDE_DOCS OFF)
-		option(LLVM_INCLUDE_EXAMPLES OFF)
-		option(LLVM_INCLUDE_TESTS OFF)
-		option(LLVM_INCLUDE_TOOLS OFF)
-		option(LLVM_INCLUDE_UTILS OFF)
-		option(WITH_POLLY OFF)
+    set(LLVM_TARGETS_TO_BUILD "X86" CACHE INTERNAL "")
+    option(LLVM_BUILD_RUNTIME OFF)
+    option(LLVM_BUILD_TOOLS OFF)
+    option(LLVM_INCLUDE_DOCS OFF)
+    option(LLVM_INCLUDE_EXAMPLES OFF)
+    option(LLVM_INCLUDE_TESTS OFF)
+    option(LLVM_INCLUDE_TOOLS OFF)
+    option(LLVM_INCLUDE_UTILS OFF)
+    option(WITH_POLLY OFF)

-		# LLVM needs to be built out-of-tree
-		add_subdirectory(../llvm ../llvm_build)
-		set(LLVM_DIR "${CMAKE_CURRENT_BINARY_DIR}/../llvm_build/lib/cmake/llvm/")
+    # LLVM needs to be built out-of-tree
+    add_subdirectory(../llvm ../llvm_build)
+    set(LLVM_DIR "${CMAKE_CURRENT_BINARY_DIR}/../llvm_build/lib/cmake/llvm/")

-		# now tries to find LLVM again
-		find_package(LLVM 4.0 CONFIG)
-		if(NOT LLVM_FOUND)
-			message(WARNING "Couldn't build LLVM from the submodule. You might need to run `git submodule update --init`")
-		endif()
-	endif()
-endif()
-  
-# Now let's look for polly.
-find_package(Polly)
-if(Polly_FOUND)
-	add_definitions(-DPOLLY_AVAILABLE)
-endif()
-# Polly LLVM Compiler checks
-CHECK_C_COMPILER_FLAG("-mllvm -polly" HAS_POLLY)
-CHECK_C_COMPILER_FLAG("-mllvm -polly-target=hybrid" HAS_POLLY_HYBRID)
-CHECK_C_COMPILER_FLAG("-mllvm -polly-target=cpu" HAS_POLLY_CPU)
-
-if (HAS_POLLY)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mllvm -polly -mllvm -polly-parallel -lgomp -mllvm -polly-vectorizer=stripmine")
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mllvm -polly -mllvm -polly-parallel -lgomp -mllvm -polly-vectorizer=stripmine")
-	if(HAS_POLLY_HYBRID)
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mllvm -polly-target=hybrid")
-		set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -mllvm -polly-target=cpu")
-	elseif(HAS_POLLY_CPU)
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mllvm -polly-target=cpu")
-		set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -mllvm -polly-target=cpu")
-	endif()
+    # now tries to find LLVM again
+    find_package(LLVM 4.0 CONFIG)
+    if (NOT LLVM_FOUND)
+      message(WARNING "Couldn't build LLVM from the submodule. You might need to run `git submodule update --init`")
+    endif()
+  endif()
 endif()


@@ -229,17 +199,18 @@ elseif(WIN32)
 else()
 	set(PLATFORM_ARCH "linux/x86_64")
 	option(USE_ALSA "ALSA audio backend" ON)
-	option(USE_PULSE "PulseAudio audio backend" ON)
+  option(USE_PULSE "PulseAudio audio backend" ON)
 	option(USE_LIBEVDEV "libevdev-based joystick support" ON)
 	option(USE_VULKAN "Vulkan render backend" ON)
 endif()

 if(USE_ALSA)
-	find_package(ALSA)
+	find_package(PkgConfig)
+	pkg_check_modules(ALSA alsa)
 	if(ALSA_FOUND)
 		add_definitions(-DHAVE_ALSA)
 		include_directories(SYSTEM ${ALSA_INCLUDE_DIRS})
-		list(APPEND ADDITIONAL_LIBS ${ALSA_LIBRARIES})
+		list(APPEND ADDITIONAL_LIBS ${ALSA_LDFLAGS})
 	endif()
 endif()
 if(USE_PULSE)
@@ -265,9 +236,6 @@ if(NOT WIN32 AND USE_VULKAN)
 	if(VULKAN_FOUND)
 		add_definitions(-DHAVE_VULKAN)
 		list(APPEND ADDITIONAL_LIBS ${VULKAN_LIBRARY})
-		if(VULKAN_PREBUILT)
-			list(APPEND ADDITIONAL_LIBS glslang HLSL OGLCompiler SPIRV OSDependent)
-		endif()
 	else()
 		message("WARNING! USE_VULKAN was enabled, but libvulkan was not found. RPCS3 will be compiled without Vulkan support.")
 	endif()
@@ -294,9 +262,10 @@ else()
 endif()

 include_directories(
+${GLEW_INCLUDE_DIR}
+${ZLIB_INCLUDE_DIR}
 ${OPENAL_INCLUDE_DIR}
 ${LLVM_INCLUDE_DIRS}
-${Polly_INCLUDE_DIRS}
 "${RPCS3_SRC_DIR}/../3rdparty/pugixml/src"
 "${RPCS3_SRC_DIR}"
 "${RPCS3_SRC_DIR}/Loader"
@@ -323,17 +292,17 @@ if(WIN32)
 endif()

 if(NOT LLVM_FOUND)
-	message("LLVM 4.0 not found. RPCS3 will be compiled without LLVM support.")
+	Message("LLVM 4.0 not found. RPCS3 will be compiled without LLVM support.")
 else()
 	add_definitions(${LLVM_DEFINITIONS})
 	add_definitions(-DLLVM_AVAILABLE)
-	if(CMAKE_BUILD_TYPE STREQUAL "Release")
+	if (CMAKE_BUILD_TYPE STREQUAL "Release")
 		llvm_map_components_to_libnames(LLVM_LIBS core support executionengine object runtimedyld x86desc x86info scalaropts mcjit vectorize ipo x86codegen x86disassembler)
 	else()
 		llvm_map_components_to_libnames(LLVM_LIBS core support executionengine object runtimedyld x86desc x86info scalaropts mcjit vectorize ipo x86codegen x86disassembler mcdisassembler)
 	endif()

-	if(NOT MSVC)
+	if (NOT MSVC)
 		set_source_files_properties(${RPCS3_SRC_DIR}/../Utilities/JIT.cpp PROPERTIES COMPILE_FLAGS -fno-rtti)
 		set_source_files_properties(${RPCS3_SRC_DIR}/Emu/Cell/PPUTranslator.cpp PROPERTIES COMPILE_FLAGS -fno-rtti)
 	endif()
@@ -342,7 +311,6 @@ endif()
 link_directories(
 "${RPCS3_SRC_DIR}/../3rdparty/minidx12/"
 "${RPCS3_SRC_DIR}/../Vulkan"
-"${Polly_LIBRARY_DIRS}"
 )


@@ -353,7 +321,7 @@ if(NOT USE_SYSTEM_FFMPEG)
 endif()

 get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
-foreach (dir ${dirs})
+foreach(dir ${dirs})
 	message(STATUS "dir='${dir}'")
 endforeach()

@@ -365,7 +333,7 @@ RPCS3_SRC
 "${RPCS3_SRC_DIR}/../asmjit/src/asmjit/*.cpp"
 )

-if(NOT WIN32 AND VULKAN_FOUND)
+if (NOT WIN32 AND VULKAN_FOUND)
 # Compile glslang and SPIRV modules needed for glsl compilation
 	file(
 	GLOB_RECURSE
@@ -376,26 +344,26 @@ if(NOT WIN32 AND VULKAN_FOUND)
 	"${RPCS3_SRC_DIR}/../Vulkan/glslang/OGLCompilersDLL/*.cpp"
 	"${RPCS3_SRC_DIR}/../Vulkan/glslang/SPIRV/*.cpp"
 	)
-
-	set(RPCS3_SRC ${RPCS3_SRC} ${UNIX_GLSLANG})
+	
+	set (RPCS3_SRC ${RPCS3_SRC} ${UNIX_GLSLANG})
 endif()

 #File exclusion section

 if(NOT WIN32 AND NOT VULKAN_FOUND)
-	set(EXCLUDE_FILES "/RSX/VK/")
+	set (EXCLUDE_FILES "/RSX/VK/")
 endif()

 # Ignore autogenerated moc_* files if present
-set(EXCLUDE_FILES ${EXCLUDE_FILES} "moc_")
-set(EXCLUDE_FILES ${EXCLUDE_FILES} "rpcs3_automoc")
-set(EXCLUDE_FILES ${EXCLUDE_FILES} "qrc_resources.cpp")
+set (EXCLUDE_FILES ${EXCLUDE_FILES} "moc_")
+set (EXCLUDE_FILES ${EXCLUDE_FILES} "rpcs3_automoc")
+set (EXCLUDE_FILES ${EXCLUDE_FILES} "qrc_resources.cpp")

 foreach (TMP_PATH ${RPCS3_SRC})
 	foreach (EXCLUDE_PATH ${EXCLUDE_FILES})
-		string(FIND ${TMP_PATH} ${EXCLUDE_PATH} EXCLUDE_FILE_FOUND)
-		if(NOT ${EXCLUDE_FILE_FOUND} EQUAL -1)
-			list(REMOVE_ITEM RPCS3_SRC ${TMP_PATH})
+		string (FIND ${TMP_PATH} ${EXCLUDE_PATH} EXCLUDE_FILE_FOUND)
+		if (NOT ${EXCLUDE_FILE_FOUND} EQUAL -1)
+			list (REMOVE_ITEM RPCS3_SRC ${TMP_PATH})
 		endif ()
 	endforeach(EXCLUDE_PATH)
 endforeach(TMP_PATH)
@@ -404,33 +372,24 @@ endforeach(TMP_PATH)
 file(GLOB_RECURSE TMP_MOC "${RPCS3_SRC_DIR}/moc_*.cpp" "${RPCS3_SRC_DIR}/rpcs3_automoc.cpp" "${RPCS3_SRC_DIR}/qrc_resources.cpp")
 set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${TMP_MOC}")

-if(WIN32)
-	add_executable(rpcs3 WIN32 ${RPCS3_SRC} ${RES_FILES} resources.qrc)
+if (WIN32)
+    add_executable(rpcs3 WIN32 ${RPCS3_SRC} ${RES_FILES} resources.qrc)
 else()
-	add_executable(rpcs3 ${RPCS3_SRC} ${RES_FILES} resources.qrc)
+    add_executable(rpcs3 ${RPCS3_SRC} ${RES_FILES} resources.qrc)
 endif()

 add_dependencies(rpcs3 GitVersion)

-if(NOT MSVC)
-	find_package(GLEW 1.13.0 REQUIRED)
-	target_link_libraries(rpcs3 GLEW::GLEW)
-endif()
-
-if(Polly_FOUND)
-    target_link_libraries(rpcs3 Polly PollyISL PollyPPCG)
-endif()
-
 if(WIN32)
-	target_link_libraries(rpcs3 ws2_32.lib Winmm.lib Psapi.lib gdi32.lib VKstatic.1 glslang OSDependent OGLCompiler SPIRV HLSL setupapi.lib hidapi-hid Shlwapi.lib)
+	target_link_libraries(rpcs3 ws2_32.lib Winmm.lib Psapi.lib VKstatic.1 glslang OSDependent OGLCompiler SPIRV HLSL setupapi.lib hidapi-hid Shlwapi.lib)
 	if(NOT MSVC)
-		target_link_libraries(rpcs3 ${OPENGL_LIBRARIES} opengl32.lib glu32.lib libpthread)
+		target_link_libraries(rpcs3  ${OPENGL_LIBRARIES} ${GLEW_LIBRARY} opengl32.lib glu32.lib libpthread)
 	else()
-		target_link_libraries(rpcs3 dxgi.lib d2d1.lib dwrite.lib)
+		target_link_libraries(rpcs3  dxgi.lib d2d1.lib dwrite.lib)
 	endif()
-	target_link_libraries(rpcs3 avformat.lib avcodec.lib avutil.lib swscale.lib png16_static ${OPENAL_LIBRARY} ${ADDITIONAL_LIBS})
+	target_link_libraries(rpcs3  avformat.lib avcodec.lib avutil.lib swresample.lib swscale.lib png16_static ${OPENAL_LIBRARY} ${ADDITIONAL_LIBS})
 else()
-	target_link_libraries(rpcs3 ${OPENAL_LIBRARY} ${OPENGL_LIBRARIES})
+	target_link_libraries(rpcs3 ${OPENAL_LIBRARY} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES})
 	if(APPLE)
 		target_link_libraries(rpcs3 hidapi-mac "-framework CoreFoundation" "-framework IOKit")
 	elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
@@ -441,57 +400,50 @@ else()
 	if(VULKAN_FOUND)
 		target_link_libraries(rpcs3 ${VULKAN_LIBRARIES})
 	endif()
-	target_link_libraries(rpcs3 ${CMAKE_DL_LIBS} -lpthread ZLIB::ZLIB ${ADDITIONAL_LIBS})
-	if(USE_SYSTEM_FFMPEG)
+	target_link_libraries(rpcs3 ${CMAKE_DL_LIBS} -lpthread ${ZLIB_LIBRARIES} ${ADDITIONAL_LIBS})
+	if (USE_SYSTEM_FFMPEG)
 		link_libraries(${FFMPEG_LIBRARY_DIR})
-		target_link_libraries(rpcs3 libavformat.so libavcodec.so libavutil.so libswscale.so)
+		target_link_libraries(rpcs3  libavformat.so libavcodec.so libavutil.so libswresample.so libswscale.so)
 	else()
-		target_link_libraries(rpcs3 libavformat.a libavcodec.a libavutil.a libswscale.a)
+		target_link_libraries(rpcs3  libavformat.a libavcodec.a libavutil.a libswresample.a libswscale.a)
 	endif()
-	if(USE_SYSTEM_LIBPNG)
-		target_link_libraries(rpcs3 ${PNG_LIBRARIES})
+	if (USE_SYSTEM_LIBPNG)
+		target_link_libraries(rpcs3  ${PNG_LIBRARIES})
 	else()
-		target_link_libraries(rpcs3 png16_static)
+		target_link_libraries(rpcs3  png16_static)
 	endif()
 endif()

 # For some reason GCC 7 requires manually linking with -latomic
-if(CMAKE_COMPILER_IS_GNUCXX AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 7))
+if (CMAKE_COMPILER_IS_GNUCC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 7))
 	target_link_libraries(rpcs3 -latomic)
 endif()

 if(LLVM_FOUND)
-	target_link_libraries(rpcs3 ${LLVM_LIBS})
+	target_link_libraries(rpcs3  ${LLVM_LIBS})
 endif()

 target_link_libraries(rpcs3 ${RPCS3_QT_LIBS})

 set_target_properties(rpcs3 PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "${RPCS3_SRC_DIR}/stdafx.h")

-if(MSVC)
-	# Under Windows, some QT DLLs need to be in the same directory of the compiled
-	# RPCS3 binary, so call the windeployqt tool that will take care of copying
-	# them from the local QT installation at the end of the build.
-	if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-		add_custom_command(TARGET rpcs3 POST_BUILD
-			COMMAND $ENV{QTDIR}/bin/windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --debug ${CMAKE_BINARY_DIR}/bin
-		)
-	else()
-		add_custom_command(TARGET rpcs3 POST_BUILD
-			COMMAND $ENV{QTDIR}/bin/windeployqt --no-angle --no-opengl-sw --no-svg --no-translations ${CMAKE_BINARY_DIR}/bin
-		)
-	endif()
+if (MSVC)
+  # Under Windows, some QT DLLs need to be in the same directory of the compiled
+  # RPCS3 binary, so call the windeployqt tool that will take care of copying
+  # them from the local QT installation at the end of the build.
+  if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+    add_custom_command(TARGET rpcs3 POST_BUILD
+      COMMAND $ENV{QTDIR}/bin/windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --debug ${CMAKE_BINARY_DIR}/bin
+      )
+  else()
+    add_custom_command(TARGET rpcs3 POST_BUILD
+      COMMAND $ENV{QTDIR}/bin/windeployqt --no-angle --no-opengl-sw --no-svg --no-translations ${CMAKE_BINARY_DIR}/bin
+      )
+  endif()
 endif()

 cotire(rpcs3)

-if (UNIX)
-# Copy icons to executable directory
-add_custom_command(TARGET rpcs3 POST_BUILD
-                   COMMAND ${CMAKE_COMMAND} -E copy_directory
-                       ${CMAKE_SOURCE_DIR}/bin/Icons $<TARGET_FILE_DIR:rpcs3>/Icons)
-endif()
-                       
 # Unix installation
 if(UNIX AND NOT APPLE)
 	# Install the binary
@@ -503,9 +455,4 @@ if(UNIX AND NOT APPLE)
 		DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/apps)
 	install(FILES rpcs3.desktop
 		DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
-    # Install other files
-    install(DIRECTORY ../bin/Icons
-		DESTINATION ${CMAKE_INSTALL_PREFIX}/share/rpcs3)
-    install(DIRECTORY ../bin/GuiConfigs
-		DESTINATION ${CMAKE_INSTALL_PREFIX}/share/rpcs3)
 endif()
@@ -82,8 +82,6 @@ ALSAThread::ALSAThread()
 	if (!check(snd_pcm_sw_params_current(s_tls_handle, s_tls_sw_params), "snd_pcm_sw_params_current"))
 		return;

-	period_frames *= g_cfg.audio.startt;
-
 	if (!check(snd_pcm_sw_params_set_start_threshold(s_tls_handle, s_tls_sw_params, period_frames), "snd_pcm_sw_params_set_start_threshold"))
 		return;

@@ -121,7 +121,7 @@ void XAudio2Thread::xa27_open()
 		return;
 	}

-	s_tls_source_voice->SetVolume(g_cfg.audio.downmix_to_2ch ? 1.0f : 4.0f);
+	s_tls_source_voice->SetVolume(g_cfg.audio.downmix_to_2ch ? 1.0 : 4.0);
 }

 void XAudio2Thread::xa27_add(const void* src, int size)
@@ -101,7 +101,7 @@ bool cpu_thread::check_state()
 {
 #ifdef WITH_GDB_DEBUGGER
 	if (test(state, cpu_flag::dbg_pause)) {
-		fxm::get<GDBDebugServer>()->pause_from(this);
+		fxm::get<GDBDebugServer>()->notify();
 	}
 #endif

@@ -1,13 +1 @@
-#ifdef LLVM_AVAILABLE
-
 #include "CPUTranslator.h"
-
-cpu_translator::cpu_translator(llvm::LLVMContext& context, llvm::Module* module, bool is_be)
-    : m_context(context)
-	, m_module(module)
-	, m_is_be(is_be)
-{
-
-}
-
-#endif
@@ -1,894 +1 @@
 #pragma once
-
-#ifdef LLVM_AVAILABLE
-
-#include "restore_new.h"
-#ifdef _MSC_VER
-#pragma warning(push, 0)
-#endif
-#include "llvm/IR/LLVMContext.h"
-#include "llvm/IR/IRBuilder.h"
-#include "llvm/IR/Module.h"
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-#include "define_new_memleakdetect.h"
-
-#include "../Utilities/types.h"
-#include "../Utilities/StrFmt.h"
-#include "../Utilities/BEType.h"
-#include "../Utilities/BitField.h"
-
-#include <unordered_map>
-#include <map>
-#include <unordered_set>
-#include <set>
-#include <array>
-#include <vector>
-
-template <typename T = void>
-struct llvm_value_t
-{
-	static_assert(std::is_same<T, void>::value, "llvm_value_t<> error: unknown type");
-
-	using type = void;
-	using base = llvm_value_t;
-	static constexpr uint esize      = 0;
-	static constexpr bool is_int     = false;
-	static constexpr bool is_sint    = false;
-	static constexpr bool is_uint    = false;
-	static constexpr bool is_float   = false;
-	static constexpr uint is_vector  = false;
-	static constexpr uint is_pointer = false;
-
-	static llvm::Type* get_type(llvm::LLVMContext& context)
-	{
-		return llvm::Type::getVoidTy(context);
-	}
-
-	llvm::Value* eval(llvm::IRBuilder<>* ir) const
-	{
-		return value;
-	}
-
-	llvm::Value* value;
-
-	// llvm_value_t() = default;
-
-	// llvm_value_t(llvm::Value* value)
-	// 	: value(value)
-	// {
-	// }
-};
-
-template <>
-struct llvm_value_t<bool> : llvm_value_t<void>
-{
-	using type = bool;
-	using base = llvm_value_t<void>;
-	using base::base;
-
-	static constexpr uint esize  = 1;
-	static constexpr uint is_int = true;
-
-	static llvm::Type* get_type(llvm::LLVMContext& context)
-	{
-		return llvm::Type::getInt1Ty(context);
-	}
-};
-
-template <>
-struct llvm_value_t<char> : llvm_value_t<void>
-{
-	using type = char;
-	using base = llvm_value_t<void>;
-	using base::base;
-
-	static constexpr uint esize  = 8;
-	static constexpr bool is_int = true;
-
-	static llvm::Type* get_type(llvm::LLVMContext& context)
-	{
-		return llvm::Type::getInt8Ty(context);
-	}
-};
-
-template <>
-struct llvm_value_t<s8> : llvm_value_t<char>
-{
-	using type = s8;
-	using base = llvm_value_t<char>;
-	using base::base;
-
-	static constexpr bool is_sint = true;
-};
-
-template <>
-struct llvm_value_t<u8> : llvm_value_t<char>
-{
-	using type = u8;
-	using base = llvm_value_t<char>;
-	using base::base;
-
-	static constexpr bool is_uint = true;
-};
-
-template <>
-struct llvm_value_t<s16> : llvm_value_t<s8>
-{
-	using type = s16;
-	using base = llvm_value_t<s8>;
-	using base::base;
-
-	static constexpr uint esize = 16;
-
-	static llvm::Type* get_type(llvm::LLVMContext& context)
-	{
-		return llvm::Type::getInt16Ty(context);
-	}
-};
-
-template <>
-struct llvm_value_t<u16> : llvm_value_t<s16>
-{
-	using type = u16;
-	using base = llvm_value_t<s16>;
-	using base::base;
-
-	static constexpr bool is_sint = false;
-	static constexpr bool is_uint = true;
-};
-
-template <>
-struct llvm_value_t<s32> : llvm_value_t<s8>
-{
-	using type = s32;
-	using base = llvm_value_t<s8>;
-	using base::base;
-
-	static constexpr uint esize = 32;
-
-	static llvm::Type* get_type(llvm::LLVMContext& context)
-	{
-		return llvm::Type::getInt32Ty(context);
-	}
-};
-
-template <>
-struct llvm_value_t<u32> : llvm_value_t<s32>
-{
-	using type = u32;
-	using base = llvm_value_t<s32>;
-	using base::base;
-
-	static constexpr bool is_sint = false;
-	static constexpr bool is_uint = true;
-};
-
-template <>
-struct llvm_value_t<s64> : llvm_value_t<s8>
-{
-	using type = s64;
-	using base = llvm_value_t<s8>;
-	using base::base;
-
-	static constexpr uint esize = 64;
-
-	static llvm::Type* get_type(llvm::LLVMContext& context)
-	{
-		return llvm::Type::getInt64Ty(context);
-	}
-};
-
-template <>
-struct llvm_value_t<u64> : llvm_value_t<s64>
-{
-	using type = u64;
-	using base = llvm_value_t<s64>;
-	using base::base;
-
-	static constexpr bool is_sint = false;
-	static constexpr bool is_uint = true;
-};
-
-template <>
-struct llvm_value_t<s128> : llvm_value_t<s8>
-{
-	using type = s128;
-	using base = llvm_value_t<s8>;
-	using base::base;
-
-	static constexpr uint esize = 128;
-
-	static llvm::Type* get_type(llvm::LLVMContext& context)
-	{
-		return llvm::Type::getIntNTy(context, 128);
-	}
-};
-
-template <>
-struct llvm_value_t<u128> : llvm_value_t<s128>
-{
-	using type = u128;
-	using base = llvm_value_t<s128>;
-	using base::base;
-
-	static constexpr bool is_sint = false;
-	static constexpr bool is_uint = true;
-};
-
-template <>
-struct llvm_value_t<f32> : llvm_value_t<void>
-{
-	using type = f32;
-	using base = llvm_value_t<void>;
-	using base::base;
-
-	static constexpr uint esize    = 32;
-	static constexpr bool is_float = true;
-
-	static llvm::Type* get_type(llvm::LLVMContext& context)
-	{
-		return llvm::Type::getFloatTy(context);
-	}
-};
-
-template <>
-struct llvm_value_t<f64> : llvm_value_t<void>
-{
-	using type = f64;
-	using base = llvm_value_t<void>;
-	using base::base;
-
-	static constexpr uint esize    = 64;
-	static constexpr bool is_float = true;
-
-	static llvm::Type* get_type(llvm::LLVMContext& context)
-	{
-		return llvm::Type::getDoubleTy(context);
-	}
-};
-
-template <typename T>
-struct llvm_value_t<T*> : llvm_value_t<T>
-{
-	static_assert(!std::is_void<T>::value, "llvm_value_t<> error: invalid pointer to void type");
-
-	using type = T*;
-	using base = llvm_value_t<T>;
-	using base::base;
-
-	static constexpr uint is_pointer = llvm_value_t<T>::is_pointer + 1;
-
-	static llvm::Type* get_type(llvm::LLVMContext& context)
-	{
-		return llvm_value_t<T>::get_type(context)->getPointerTo();
-	}
-};
-
-template <typename T, uint N>
-struct llvm_value_t<T[N]> : llvm_value_t<T>
-{
-	static_assert(!llvm_value_t<T>::is_vector, "llvm_value_t<> error: invalid multidimensional vector");
-	static_assert(!llvm_value_t<T>::is_pointer, "llvm_value_t<>: vector of pointers is not allowed");
-
-	using type = T[N];
-	using base = llvm_value_t<T>;
-	using base::base;
-
-	static constexpr uint is_vector  = N;
-	static constexpr uint is_pointer = 0;
-
-	static llvm::Type* get_type(llvm::LLVMContext& context)
-	{
-		return llvm::VectorType::get(llvm_value_t<T>::get_type(context), N);
-	}
-};
-
-template <typename T, typename A1, typename A2>
-struct llvm_add_t
-{
-	using type = T;
-
-	A1 a1;
-	A2 a2;
-
-	static_assert(llvm_value_t<T>::is_sint || llvm_value_t<T>::is_uint || llvm_value_t<T>::is_float, "llvm_add_t<>: invalid type");
-
-	llvm::Value* eval(llvm::IRBuilder<>* ir) const
-	{
-		const auto v1 = a1.eval(ir);
-		const auto v2 = a2.eval(ir);
-
-		if (llvm_value_t<T>::is_int)
-		{
-			return ir->CreateAdd(v1, v2);
-		}
-
-		if (llvm_value_t<T>::is_float)
-		{
-			return ir->CreateFAdd(v1, v2);
-		}
-	}
-};
-
-template <typename T1, typename T2, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<std::is_same<typename T1::type, typename T2::type>::value>>
-inline llvm_add_t<typename T1::type, T1, T2> operator +(T1 a1, T2 a2)
-{
-	return {a1, a2};
-}
-
-template <typename T, typename A1, typename A2>
-struct llvm_sub_t
-{
-	using type = T;
-
-	A1 a1;
-	A2 a2;
-
-	static_assert(llvm_value_t<T>::is_sint || llvm_value_t<T>::is_uint || llvm_value_t<T>::is_float, "llvm_sub_t<>: invalid type");
-
-	llvm::Value* eval(llvm::IRBuilder<>* ir) const
-	{
-		const auto v1 = a1.eval(ir);
-		const auto v2 = a2.eval(ir);
-
-		if (llvm_value_t<T>::is_int)
-		{
-			return ir->CreateSub(v1, v2);
-		}
-
-		if (llvm_value_t<T>::is_float)
-		{
-			return ir->CreateFSub(v1, v2);
-		}
-	}
-};
-
-template <typename T1, typename T2, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<std::is_same<typename T1::type, typename T2::type>::value>>
-inline llvm_sub_t<typename T1::type, T1, T2> operator -(T1 a1, T2 a2)
-{
-	return {a1, a2};
-}
-
-template <typename T, typename A1, typename A2>
-struct llvm_mul_t
-{
-	using type = T;
-
-	A1 a1;
-	A2 a2;
-
-	static_assert(llvm_value_t<T>::is_sint || llvm_value_t<T>::is_uint || llvm_value_t<T>::is_float, "llvm_mul_t<>: invalid type");
-
-	llvm::Value* eval(llvm::IRBuilder<>* ir) const
-	{
-		const auto v1 = a1.eval(ir);
-		const auto v2 = a2.eval(ir);
-
-		if (llvm_value_t<T>::is_int)
-		{
-			return ir->CreateMul(v1, v2);
-		}
-
-		if (llvm_value_t<T>::is_float)
-		{
-			return ir->CreateFMul(v1, v2);
-		}
-	}
-};
-
-template <typename T1, typename T2, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<std::is_same<typename T1::type, typename T2::type>::value>>
-inline llvm_mul_t<typename T1::type, T1, T2> operator *(T1 a1, T2 a2)
-{
-	return {a1, a2};
-}
-
-template <typename T, typename A1, typename A2>
-struct llvm_div_t
-{
-	using type = T;
-
-	A1 a1;
-	A2 a2;
-
-	static_assert(llvm_value_t<T>::is_sint || llvm_value_t<T>::is_uint || llvm_value_t<T>::is_float, "llvm_div_t<>: invalid type");
-
-	llvm::Value* eval(llvm::IRBuilder<>* ir) const
-	{
-		const auto v1 = a1.eval(ir);
-		const auto v2 = a2.eval(ir);
-
-		if (llvm_value_t<T>::is_sint)
-		{
-			return ir->CreateSDiv(v1, v2);
-		}
-
-		if (llvm_value_t<T>::is_uint)
-		{
-			return ir->CreateUDiv(v1, v2);
-		}
-
-		if (llvm_value_t<T>::is_float)
-		{
-			return ir->CreateFDiv(v1, v2);
-		}
-	}
-};
-
-template <typename T1, typename T2, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<std::is_same<typename T1::type, typename T2::type>::value>>
-inline llvm_div_t<typename T1::type, T1, T2> operator /(T1 a1, T2 a2)
-{
-	return {a1, a2};
-}
-
-template <typename T, typename A1>
-struct llvm_neg_t
-{
-	using type = T;
-
-	A1 a1;
-
-	static_assert(llvm_value_t<T>::is_sint || llvm_value_t<T>::is_uint || llvm_value_t<T>::is_float, "llvm_neg_t<>: invalid type");
-
-	llvm::Value* eval(llvm::IRBuilder<>* ir) const
-	{
-		const auto v1 = a1.eval(ir);
-
-		if (llvm_value_t<T>::is_int)
-		{
-			return ir->CreateNeg(v1);
-		}
-
-		if (llvm_value_t<T>::is_float)
-		{
-			return ir->CreateFNeg(v1);
-		}
-	}
-};
-
-template <typename T1, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<llvm_value_t<typename T1::type>::esize>>
-inline llvm_neg_t<typename T1::type, T1> operator -(T1 a1)
-{
-	return {a1};
-}
-
-// Constant int helper
-struct llvm_int_t
-{
-	u64 value;
-
-	u64 eval(llvm::IRBuilder<>*) const
-	{
-		return value;
-	}
-};
-
-template <typename T, typename A1, typename A2>
-struct llvm_shl_t
-{
-	using type = T;
-
-	A1 a1;
-	A2 a2;
-
-	static_assert(llvm_value_t<T>::is_sint || llvm_value_t<T>::is_uint, "llvm_shl_t<>: invalid type");
-
-	llvm::Value* eval(llvm::IRBuilder<>* ir) const
-	{
-		const auto v1 = a1.eval(ir);
-		const auto v2 = a2.eval(ir);
-
-		if (llvm_value_t<T>::is_sint)
-		{
-			return ir->CreateShl(v1, v2);
-		}
-
-		if (llvm_value_t<T>::is_uint)
-		{
-			return ir->CreateShl(v1, v2);
-		}
-	}
-};
-
-template <typename T1, typename T2, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<std::is_same<typename T1::type, typename T2::type>::value>>
-inline llvm_shl_t<typename T1::type, T1, T2> operator <<(T1 a1, T2 a2)
-{
-	return {a1, a2};
-}
-
-template <typename T1, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<llvm_value_t<typename T1::type>::is_int>>
-inline llvm_shl_t<typename T1::type, T1, llvm_int_t> operator <<(T1 a1, u64 a2)
-{
-	return {a1, llvm_int_t{a2}};
-}
-
-template <typename T, typename A1, typename A2>
-struct llvm_shr_t
-{
-	using type = T;
-
-	A1 a1;
-	A2 a2;
-
-	static_assert(llvm_value_t<T>::is_sint || llvm_value_t<T>::is_uint, "llvm_shr_t<>: invalid type");
-
-	llvm::Value* eval(llvm::IRBuilder<>* ir) const
-	{
-		const auto v1 = a1.eval(ir);
-		const auto v2 = a2.eval(ir);
-
-		if (llvm_value_t<T>::is_sint)
-		{
-			return ir->CreateAShr(v1, v2);
-		}
-
-		if (llvm_value_t<T>::is_uint)
-		{
-			return ir->CreateLShr(v1, v2);
-		}
-	}
-};
-
-template <typename T1, typename T2, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<std::is_same<typename T1::type, typename T2::type>::value>>
-inline llvm_shr_t<typename T1::type, T1, T2> operator >>(T1 a1, T2 a2)
-{
-	return {a1, a2};
-}
-
-template <typename T1, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<llvm_value_t<typename T1::type>::is_int>>
-inline llvm_shr_t<typename T1::type, T1, llvm_int_t> operator >>(T1 a1, u64 a2)
-{
-	return {a1, llvm_int_t{a2}};
-}
-
-template <typename T, typename A1, typename A2>
-struct llvm_and_t
-{
-	using type = T;
-
-	A1 a1;
-	A2 a2;
-
-	static_assert(llvm_value_t<T>::is_int, "llvm_and_t<>: invalid type");
-
-	llvm::Value* eval(llvm::IRBuilder<>* ir) const
-	{
-		const auto v1 = a1.eval(ir);
-		const auto v2 = a2.eval(ir);
-
-		if (llvm_value_t<T>::is_int)
-		{
-			return ir->CreateAnd(v1, v2);
-		}
-	}
-};
-
-template <typename T1, typename T2, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<std::is_same<typename T1::type, typename T2::type>::value>>
-inline llvm_and_t<typename T1::type, T1, T2> operator &(T1 a1, T2 a2)
-{
-	return {a1, a2};
-}
-
-template <typename T1, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<llvm_value_t<typename T1::type>::is_int>>
-inline llvm_and_t<typename T1::type, T1, llvm_int_t> operator &(T1 a1, u64 a2)
-{
-	return {a1, llvm_int_t{a2}};
-}
-
-template <typename T, typename A1, typename A2>
-struct llvm_or_t
-{
-	using type = T;
-
-	A1 a1;
-	A2 a2;
-
-	static_assert(llvm_value_t<T>::is_int, "llvm_or_t<>: invalid type");
-
-	llvm::Value* eval(llvm::IRBuilder<>* ir) const
-	{
-		const auto v1 = a1.eval(ir);
-		const auto v2 = a2.eval(ir);
-
-		if (llvm_value_t<T>::is_int)
-		{
-			return ir->CreateOr(v1, v2);
-		}
-	}
-};
-
-template <typename T1, typename T2, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<std::is_same<typename T1::type, typename T2::type>::value>>
-inline llvm_or_t<typename T1::type, T1, T2> operator |(T1 a1, T2 a2)
-{
-	return {a1, a2};
-}
-
-template <typename T1, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<llvm_value_t<typename T1::type>::is_int>>
-inline llvm_or_t<typename T1::type, T1, llvm_int_t> operator |(T1 a1, u64 a2)
-{
-	return {a1, llvm_int_t{a2}};
-}
-
-template <typename T, typename A1, typename A2>
-struct llvm_xor_t
-{
-	using type = T;
-
-	A1 a1;
-	A2 a2;
-
-	static_assert(llvm_value_t<T>::is_int, "llvm_xor_t<>: invalid type");
-
-	llvm::Value* eval(llvm::IRBuilder<>* ir) const
-	{
-		const auto v1 = a1.eval(ir);
-		const auto v2 = a2.eval(ir);
-
-		if (llvm_value_t<T>::is_int)
-		{
-			return ir->CreateXor(v1, v2);
-		}
-	}
-};
-
-template <typename T1, typename T2, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<std::is_same<typename T1::type, typename T2::type>::value>>
-inline llvm_xor_t<typename T1::type, T1, T2> operator ^(T1 a1, T2 a2)
-{
-	return {a1, a2};
-}
-
-template <typename T1, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<llvm_value_t<typename T1::type>::is_int>>
-inline llvm_xor_t<typename T1::type, T1, llvm_int_t> operator ^(T1 a1, u64 a2)
-{
-	return {a1, llvm_int_t{a2}};
-}
-
-template <typename T, typename A1>
-struct llvm_not_t
-{
-	using type = T;
-
-	A1 a1;
-
-	static_assert(llvm_value_t<T>::is_int, "llvm_not_t<>: invalid type");
-
-	llvm::Value* eval(llvm::IRBuilder<>* ir) const
-	{
-		const auto v1 = a1.eval(ir);
-
-		if (llvm_value_t<T>::is_int)
-		{
-			return ir->CreateNot(v1);
-		}
-	}
-};
-
-template <typename T1, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<llvm_value_t<typename T1::type>::is_int>>
-inline llvm_not_t<typename T1::type, T1> operator ~(T1 a1)
-{
-	return {a1};
-}
-
-template <typename T, typename A1, typename A2, llvm::CmpInst::Predicate UPred>
-struct llvm_icmp_t
-{
-	using type = std::conditional_t<llvm_value_t<T>::is_vector, bool[llvm_value_t<T>::is_vector], bool>;
-
-	A1 a1;
-	A2 a2;
-
-	static_assert(llvm_value_t<T>::is_int, "llvm_eq_t<>: invalid type");
-
-	// Convert unsigned comparison predicate to signed if necessary
-	static constexpr llvm::CmpInst::Predicate pred = llvm_value_t<T>::is_uint ? UPred :
-		UPred == llvm::ICmpInst::ICMP_UGT ? llvm::ICmpInst::ICMP_SGT :
-		UPred == llvm::ICmpInst::ICMP_UGE ? llvm::ICmpInst::ICMP_SGE :
-		UPred == llvm::ICmpInst::ICMP_ULT ? llvm::ICmpInst::ICMP_SLT :
-		UPred == llvm::ICmpInst::ICMP_ULE ? llvm::ICmpInst::ICMP_SLE : UPred;
-
-	static inline llvm::Value* icmp(llvm::IRBuilder<>* ir, llvm::Value* lhs, llvm::Value* rhs)
-	{
-		return ir->CreateICmp(pred, lhs, rhs);
-	}
-
-	static inline llvm::Value* icmp(llvm::IRBuilder<>* ir, llvm::Value* lhs, u64 value)
-	{
-		return ir->CreateICmp(pred, lhs, llvm::ConstantInt::get(llvm_value_t<T>::get_type(ir->getContext()), value, llvm_value_t<T>::is_sint));
-	}
-
-	llvm::Value* eval(llvm::IRBuilder<>* ir) const
-	{
-		const auto v1 = a1.eval(ir);
-		const auto v2 = a2.eval(ir);
-
-		if (llvm_value_t<T>::is_int)
-		{
-			return icmp(ir, v1, v2);
-		}
-	}
-};
-
-template <typename T1, typename T2, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<std::is_same<typename T1::type, typename T2::type>::value>>
-inline llvm_icmp_t<typename T1::type, T1, T2, llvm::ICmpInst::ICMP_EQ> operator ==(T1 a1, T2 a2)
-{
-	return {a1, a2};
-}
-
-template <typename T1, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<llvm_value_t<typename T1::type>::is_int>>
-inline llvm_icmp_t<typename T1::type, T1, llvm_int_t, llvm::ICmpInst::ICMP_EQ> operator ==(T1 a1, u64 a2)
-{
-	return {a1, llvm_int_t{a2}};
-}
-
-template <typename T1, typename T2, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<std::is_same<typename T1::type, typename T2::type>::value>>
-inline llvm_icmp_t<typename T1::type, T1, T2, llvm::ICmpInst::ICMP_NE> operator !=(T1 a1, T2 a2)
-{
-	return {a1, a2};
-}
-
-template <typename T1, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<llvm_value_t<typename T1::type>::is_int>>
-inline llvm_icmp_t<typename T1::type, T1, llvm_int_t, llvm::ICmpInst::ICMP_NE> operator !=(T1 a1, u64 a2)
-{
-	return {a1, llvm_int_t{a2}};
-}
-
-template <typename T1, typename T2, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<std::is_same<typename T1::type, typename T2::type>::value>>
-inline llvm_icmp_t<typename T1::type, T1, T2, llvm::ICmpInst::ICMP_UGT> operator >(T1 a1, T2 a2)
-{
-	return {a1, a2};
-}
-
-template <typename T1, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<llvm_value_t<typename T1::type>::is_int>>
-inline llvm_icmp_t<typename T1::type, T1, llvm_int_t, llvm::ICmpInst::ICMP_UGT> operator >(T1 a1, u64 a2)
-{
-	return {a1, llvm_int_t{a2}};
-}
-
-template <typename T1, typename T2, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<std::is_same<typename T1::type, typename T2::type>::value>>
-inline llvm_icmp_t<typename T1::type, T1, T2, llvm::ICmpInst::ICMP_UGE> operator >=(T1 a1, T2 a2)
-{
-	return {a1, a2};
-}
-
-template <typename T1, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<llvm_value_t<typename T1::type>::is_int>>
-inline llvm_icmp_t<typename T1::type, T1, llvm_int_t, llvm::ICmpInst::ICMP_UGE> operator >=(T1 a1, u64 a2)
-{
-	return {a1, llvm_int_t{a2}};
-}
-
-template <typename T1, typename T2, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<std::is_same<typename T1::type, typename T2::type>::value>>
-inline llvm_icmp_t<typename T1::type, T1, T2, llvm::ICmpInst::ICMP_ULT> operator <(T1 a1, T2 a2)
-{
-	return {a1, a2};
-}
-
-template <typename T1, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<llvm_value_t<typename T1::type>::is_int>>
-inline llvm_icmp_t<typename T1::type, T1, llvm_int_t, llvm::ICmpInst::ICMP_ULT> operator <(T1 a1, u64 a2)
-{
-	return {a1, llvm_int_t{a2}};
-}
-
-template <typename T1, typename T2, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<std::is_same<typename T1::type, typename T2::type>::value>>
-inline llvm_icmp_t<typename T1::type, T1, T2, llvm::ICmpInst::ICMP_ULE> operator <=(T1 a1, T2 a2)
-{
-	return {a1, a2};
-}
-
-template <typename T1, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<llvm_value_t<typename T1::type>::is_int>>
-inline llvm_icmp_t<typename T1::type, T1, llvm_int_t, llvm::ICmpInst::ICMP_ULE> operator <=(T1 a1, u64 a2)
-{
-	return {a1, llvm_int_t{a2}};
-}
-
-class cpu_translator
-{
-protected:
-	cpu_translator(llvm::LLVMContext& context, llvm::Module* module, bool is_be);
-
-	// LLVM context
-	llvm::LLVMContext& m_context;
-
-	// Module to which all generated code is output to
-	llvm::Module* const m_module;
-
-	// Endianness, affects vector element numbering (TODO)
-	const bool m_is_be;
-
-	// IR builder
-	llvm::IRBuilder<>* m_ir;
-
-public:
-	// Convert a C++ type to an LLVM type (TODO: remove)
-	template <typename T>
-	llvm::Type* GetType()
-	{
-		return llvm_value_t<T>::get_type(m_context);
-	}
-
-	template <typename T>
-	llvm::Type* get_type()
-	{
-		return llvm_value_t<T>::get_type(m_context);
-	}
-
-	template <typename T>
-	using value_t = llvm_value_t<T>;
-
-	template <typename T>
-	auto eval(T expr)
-	{
-		value_t<typename T::type> result;
-		result.value = expr.eval(m_ir);
-		return result;
-	}
-
-	template <typename T, typename T2>
-	value_t<T> bitcast(T2 expr)
-	{
-		value_t<T> result;
-		result.value = m_ir->CreateBitCast(expr.eval(m_ir), result.get_type(m_context));
-		return result;
-	}
-
-	template <typename T, typename T2>
-	value_t<T> trunc(T2 expr)
-	{
-		value_t<T> result;
-		result.value = m_ir->CreateTrunc(expr.eval(m_ir), result.get_type(m_context));
-		return result;
-	}
-
-	template <typename T, typename T2>
-	value_t<T> sext(T2 expr)
-	{
-		value_t<T> result;
-		result.value = m_ir->CreateSExt(expr.eval(m_ir), result.get_type(m_context));
-		return result;
-	}
-
-	template <typename T, typename T2>
-	value_t<T> zext(T2 expr)
-	{
-		value_t<T> result;
-		result.value = m_ir->CreateZExt(expr.eval(m_ir), result.get_type(m_context));
-		return result;
-	}
-
-	// Get unsigned addition carry into the sign bit (s = a + b)
-	template <typename T>
-	static inline auto ucarry(T a, T b, T s)
-	{
-		return ((a ^ b) & ~s) | (a & b);
-	}
-
-	// Get signed addition overflow into the sign bit (s = a + b)
-	template <typename T>
-	static inline auto scarry(T a, T b, T s)
-	{
-		return (b ^ s) & ~(a ^ b);
-	}
-
-	// Get signed subtraction overflow into the sign bit (d = a - b)
-	template <typename T>
-	static inline auto sborrow(T a, T b, T d)
-	{
-		return (a ^ b) & (a ^ d);
-	}
-
-	// Bitwise select (c ? a : b)
-	template <typename T>
-	static inline auto merge(T c, T a, T b)
-	{
-		return (a & c) | (b & ~c);
-	}
-
-	// Average: (a + b + 1) >> 1
-	template <typename T>
-	static inline auto avg(T a, T b)
-	{
-		return (a >> 1) + (b >> 1) + ((a | b) & 1);
-	}
-};
-
-#endif
@@ -3,7 +3,6 @@
 #include "Emu/Memory/vm.h"
 #include "Emu/Cell/SPUThread.h"
 #include "Emu/Cell/lv2/sys_sync.h"
-#include "Emu/System.h"
 #include "MFC.h"

 const bool s_use_rtm = utils::has_rtm();
@@ -51,13 +50,6 @@ void fmt_class_string<MFC>::format(std::string& out, u64 arg)
 		case MFC_BARRIER_CMD: return "BARRIER";
 		case MFC_EIEIO_CMD: return "EIEIO";
 		case MFC_SYNC_CMD: return "SYNC";
-
-		case MFC_BARRIER_MASK:
-		case MFC_FENCE_MASK:
-		case MFC_LIST_MASK:
-		case MFC_START_MASK:
-		case MFC_RESULT_MASK:
-			break;
 		}

 		return unknown;
@@ -143,142 +135,107 @@ void mfc_thread::cpu_task()

 			if (queue_size)
 			{
-				u32 fence_mask = 0; // Using this instead of stall_mask to avoid a possible race condition
-				u32 barrier_mask = 0;
-				bool first = true;
-				for (u32 i = 0; i < spu.mfc_queue.size(); i++, first = false)
+				auto& cmd = spu.mfc_queue[0];
+
+				if ((cmd.cmd & ~(MFC_BARRIER_MASK | MFC_FENCE_MASK)) == MFC_PUTQLLUC_CMD)
 				{
-					auto& cmd = spu.mfc_queue[i];
+					auto& data = vm::ps3::_ref<decltype(spu.rdata)>(cmd.eal);
+					const auto to_write = spu._ref<decltype(spu.rdata)>(cmd.lsa & 0x3ffff);

-					// this check all revolves around a potential 'stalled list' in the queue as its the one thing that can cause out of order mfc list execution currently
-					// a list with barrier hard blocks that tag until it's been dealt with
-					// and a new command that has a fence cant be executed until the stalled list has been dealt with
-					if ((cmd.size != 0) && ((barrier_mask & (1u << cmd.tag)) || ((cmd.cmd & MFC_FENCE_MASK) && ((1 << cmd.tag) & fence_mask))))
-						continue;
+					cmd.size = 0;
+					no_updates = 0;

-					if ((cmd.cmd & ~(MFC_BARRIER_MASK | MFC_FENCE_MASK)) == MFC_PUTQLLUC_CMD)
+					vm::reservation_acquire(cmd.eal, 128);
+
+					// Store unconditionally
+					if (s_use_rtm && utils::transaction_enter())
 					{
-						auto& data = vm::_ref<decltype(spu.rdata)>(cmd.eal);
-						const auto to_write = spu._ref<decltype(spu.rdata)>(cmd.lsa & 0x3ffff);
+						if (!vm::reader_lock{vm::try_to_lock})
+						{
+							_xabort(0);
+						}

-						cmd.size = 0;
+						data = to_write;
+						vm::reservation_update(cmd.eal, 128);
+						vm::notify(cmd.eal, 128);
+						_xend();
+					}
+					else
+					{
+						vm::writer_lock lock(0);
+						data = to_write;
+						vm::reservation_update(cmd.eal, 128);
+						vm::notify(cmd.eal, 128);
+					}
+				}
+				else if (cmd.cmd & MFC_LIST_MASK)
+				{
+					struct list_element
+					{
+						be_t<u16> sb; // Stall-and-Notify bit (0x8000)
+						be_t<u16> ts; // List Transfer Size
+						be_t<u32> ea; // External Address Low
+					};
+
+					if (cmd.size && (spu.ch_stall_mask & (1u << cmd.tag)) == 0)
+					{
+						cmd.lsa &= 0x3fff0;
+
+						const list_element item = spu._ref<list_element>(cmd.eal & 0x3fff8);
+
+						const u32 size = item.ts;
+						const u32 addr = item.ea;
+
+						if (size)
+						{
+							spu_mfc_cmd transfer;
+							transfer.eal = addr;
+							transfer.eah = 0;
+							transfer.lsa = cmd.lsa | (addr & 0xf);
+							transfer.tag = cmd.tag;
+							transfer.cmd = MFC(cmd.cmd & ~MFC_LIST_MASK);
+							transfer.size = size;
+
+							spu.do_dma_transfer(transfer);
+							cmd.lsa += std::max<u32>(size, 16);
+						}
+
+						cmd.eal += 8;
+						cmd.size -= 8;
 						no_updates = 0;

-						vm::reservation_acquire(cmd.eal, 128);
-
-						// Store unconditionally
-						if (s_use_rtm && utils::transaction_enter())
+						if (item.sb & 0x8000)
 						{
-							if (!vm::reader_lock{ vm::try_to_lock })
+							spu.ch_stall_stat.push_or(spu, 1 << cmd.tag);
+
+							const u32 evt = spu.ch_event_stat.fetch_or(SPU_EVENT_SN);
+
+							if (evt & SPU_EVENT_WAITING)
 							{
-								_xabort(0);
+								spu.notify();
 							}
-
-							data = to_write;
-							vm::reservation_update(cmd.eal, 128);
-							vm::notify(cmd.eal, 128);
-							_xend();
-						}
-						else
-						{
-							vm::writer_lock lock(0);
-							data = to_write;
-							vm::reservation_update(cmd.eal, 128);
-							vm::notify(cmd.eal, 128);
-						}
-					}
-					else if (cmd.cmd & MFC_LIST_MASK && LIKELY(cmd.cmd != MFC_SYNC_CMD))
-					{
-						struct list_element
-						{
-							be_t<u16> sb; // Stall-and-Notify bit (0x8000)
-							be_t<u16> ts; // List Transfer Size
-							be_t<u32> ea; // External Address Low
-						};
-
-						if (cmd.size && (spu.ch_stall_mask & (1u << cmd.tag)) == 0)
-						{
-							cmd.lsa &= 0x3fff0;
-
-							// try to get the whole list done in one go
-							while (cmd.size != 0)
+							else if (evt & SPU_EVENT_INTR_ENABLED)
 							{
-								const list_element item = spu._ref<list_element>(cmd.eal & 0x3fff8);
-
-								const u32 size = item.ts;
-								const u32 addr = item.ea;
-
-								if (size)
-								{
-									spu_mfc_cmd transfer;
-									transfer.eal = addr;
-									transfer.eah = 0;
-									transfer.lsa = cmd.lsa | (addr & 0xf);
-									transfer.tag = cmd.tag;
-									transfer.cmd = MFC(cmd.cmd & ~MFC_LIST_MASK);
-									transfer.size = size;
-
-									spu.do_dma_transfer(transfer);
-									cmd.lsa += std::max<u32>(size, 16);
-								}
-
-								cmd.eal += 8;
-								cmd.size -= 8;
-								no_updates = 0;
-
-								// dont stall for last 'item' in list
-								if ((item.sb & 0x8000) && (cmd.size != 0))
-								{
-									spu.ch_stall_mask |= (1 << cmd.tag);
-									spu.ch_stall_stat.push_or(spu, 1 << cmd.tag);
-
-									const u32 evt = spu.ch_event_stat.fetch_or(SPU_EVENT_SN);
-
-									if (evt & SPU_EVENT_WAITING)
-									{
-										spu.notify();
-									}
-									break;
-								}
+								spu.state += cpu_flag::suspend;
 							}
 						}
+					}
+				}
+				else if (LIKELY(cmd.size))
+				{
+					spu.do_dma_transfer(cmd);
+					cmd.size = 0;
+				}
+				else if (UNLIKELY((cmd.cmd & ~0xc) == MFC_BARRIER_CMD))
+				{
+					// TODO (MFC_BARRIER_CMD, MFC_EIEIO_CMD, MFC_SYNC_CMD)
+					_mm_mfence();
+				}

-						if (cmd.size != 0 && (cmd.cmd & MFC_BARRIER_MASK))
-							barrier_mask |= (1 << cmd.tag);
-						else if (cmd.size != 0)
-							fence_mask |= (1 << cmd.tag);
-					}
-					else if (UNLIKELY((cmd.cmd & ~0xc) == MFC_BARRIER_CMD))
-					{
-						// Raw barrier commands / sync commands are tag agnostic and hard sync the mfc list
-						// Need to gaurentee everything ahead of it has processed before this
-						if (first)
-							cmd.size = 0;
-						else
-							break;
-					}
-					else if (LIKELY(cmd.size))
-					{
-						spu.do_dma_transfer(cmd);
-						cmd.size = 0;
-					}
-					if (!cmd.size && first)
-					{
-						spu.mfc_queue.end_pop();
-						no_updates = 0;
-						break;
-					}
-					else if (!cmd.size && i == 1)
-					{
-						// nasty hack, shoving stalled list down one
-						// this *works* from the idea that the only thing that could have been passed over in position 0 is a stalled list
-						// todo: this can still create a situation where we say the mfc queue is full when its actually not, which will cause a rough deadlock between spu and mfc
-						// which will causes a situation where the spu is waiting for the queue to open up but hasnt signaled the stall yet
-						spu.mfc_queue[1] = spu.mfc_queue[0];
-						spu.mfc_queue.end_pop();
-						no_updates = 0;
-						break;
-					}
+				if (!cmd.size)
+				{
+					spu.mfc_queue.end_pop();
+					no_updates = 0;
 				}
 			}

@@ -288,21 +245,26 @@ void mfc_thread::cpu_task()
 			{
 				// Mask incomplete transfers
 				u32 completed = spu.ch_tag_mask;
+
+				for (u32 i = 0; i < spu.mfc_queue.size(); i++)
 				{
-					for (u32 i = 0; i < spu.mfc_queue.size(); i++)
+					const auto& _cmd = spu.mfc_queue[i];
+
+					if (_cmd.size)
 					{
-						const auto& _cmd = spu.mfc_queue[i];
-						if (_cmd.size)
+						if (spu.ch_tag_upd == 1)
+						{
 							completed &= ~(1u << _cmd.tag);
+						}
+						else
+						{
+							completed = 0;
+							break;
+						}
 					}
 				}

-				if (completed && spu.ch_tag_upd.compare_and_swap_test(1, 0))
-				{
-					spu.ch_tag_stat.push(spu, completed);
-					no_updates = 0;
-				}
-				else if (spu.ch_tag_mask == completed && spu.ch_tag_upd.compare_and_swap_test(2, 0))
+				if (completed && spu.ch_tag_upd.exchange(0))
 				{
 					spu.ch_tag_stat.push(spu, completed);
 					no_updates = 0;
@@ -311,6 +273,7 @@ void mfc_thread::cpu_task()

 			test_state();
 		}
+
 		if (no_updates++)
 		{
 			if (no_updates >= 3)
@@ -376,12 +339,3 @@ void mfc_thread::add_spu(spu_ptr _spu)

 	run();
 }
-
-void mfc_thread::on_spawn()
-{
-	if (g_cfg.core.thread_scheduler_enabled)
-	{
-		// Bind to same set with the SPUs
-		thread_ctrl::set_thread_affinity_mask(thread_ctrl::get_affinity_mask(thread_class::spu));
-	}
-}
@@ -113,6 +113,4 @@ public:
 	virtual void cpu_task() override;

 	virtual void add_spu(spu_ptr _spu);
-
-	virtual void on_spawn() override;
 };
@@ -1,6 +1,6 @@
 #pragma once

-
+namespace vm { using namespace ps3; }

 // Error Codes
 enum
@@ -308,7 +308,7 @@ enum CellAdecChannel : s32
 	CELL_ADEC_CH_3_4,
 	CELL_ADEC_CH_3_4_LFE,
 	CELL_ADEC_CH_RESERVED3,
-};
+};	

 // Sampling Rate
 enum CellAdecSampleRate : s32
@@ -532,13 +532,13 @@ struct CellAdecParamM4Aac

 	union
 	{
-		struct
+		struct 
 		{
 			be_t<u32> programNumber;
 		}
 		adifConfig;

-		struct
+		struct 
 		{
 			be_t<s32> samplingFreqIndex; // MPEG4AAC_SamplingFreq
 			be_t<u32> profile; // LC profile (1)
@@ -683,10 +683,10 @@ struct CellAdecParamAc3
 	AC3_WordSize wordSize;
 	AC3_OutputMode outputMode;
 	AC3_LFE outLfeOn;
-
+	
 	be_t<float> drcCutScaleFactor;
 	be_t<float> drcBoostScaleFactor;
-
+	
 	AC3_CompressionMode compressionMode;
 	AC3_InputChannel numberOfChannels;
 	AC3_StereoMode stereoMode;
@@ -1,6 +1,6 @@
 #pragma once

-
+namespace vm { using namespace ps3; }

 // Return Codes
 enum
@@ -1,6 +1,6 @@
 #pragma once

-
+namespace vm { using namespace ps3; }

 // Return Codes
 enum
@@ -2,7 +2,7 @@

 #include "Utilities/Thread.h"

-
+namespace vm { using namespace ps3; }

 // Error codes
 enum CellAudioError : u32
@@ -32,7 +32,7 @@ enum
 	CELL_AUDIO_BLOCK_SAMPLES           = 256,
 	CELL_AUDIO_CREATEEVENTFLAG_SPU     = 0x00000001,
 	CELL_AUDIO_EVENT_HEADPHONE         = 1,
-	CELL_AUDIO_EVENT_MIX               = 0,
+	CELL_AUDIO_EVENT_MIX               = 0, 
 	CELL_AUDIO_EVENTFLAG_BEFOREMIX     = 0x80000000,
 	CELL_AUDIO_EVENTFLAG_DECIMATE_2    = 0x08000000,
 	CELL_AUDIO_EVENTFLAG_DECIMATE_4    = 0x10000000,
@@ -40,7 +40,7 @@ enum
 	CELL_AUDIO_EVENTFLAG_NOMIX         = 0x40000000,
 	CELL_AUDIO_MAX_PORT                = 4,
 	CELL_AUDIO_MAX_PORT_2              = 8,
-	CELL_AUDIO_MISC_ACCVOL_ALLDEVICE   = 0x0000ffffUL,
+	CELL_AUDIO_MISC_ACCVOL_ALLDEVICE   = 0x0000ffffUL, 
 	CELL_AUDIO_PERSONAL_DEVICE_PRIMARY = 0x8000,
 	CELL_AUDIO_PORT_2CH                = 2,
 	CELL_AUDIO_PORT_8CH                = 8,
@@ -51,7 +51,7 @@ enum
 	CELL_AUDIO_PORTATTR_OUT_PERSONAL_1 = 0x0000000002000000ULL,
 	CELL_AUDIO_PORTATTR_OUT_PERSONAL_2 = 0x0000000004000000ULL,
 	CELL_AUDIO_PORTATTR_OUT_PERSONAL_3 = 0x0000000008000000ULL,
-	CELL_AUDIO_PORTATTR_OUT_SECONDARY  = 0x0000000000000001ULL,
+	CELL_AUDIO_PORTATTR_OUT_SECONDARY  = 0x0000000000000001ULL, 
 	CELL_AUDIO_STATUS_CLOSE            = 0x1010,
 	CELL_AUDIO_STATUS_READY            = 1,
 	CELL_AUDIO_STATUS_RUN              = 2,
@@ -59,15 +59,15 @@ enum

 //libaudio datatypes
 struct CellAudioPortParam
-{
+{ 
 	be_t<u64> nChannel;
 	be_t<u64> nBlock;
 	be_t<u64> attr;
 	be_t<float> level;
-};
+}; 

 struct CellAudioPortConfig
-{
+{ 
 	vm::bptr<u64> readIndexAddr;
 	be_t<u32> status;
 	be_t<u64> nChannel;
@@ -115,7 +115,7 @@ struct audio_port
 		float inc;
 	};

-	float level;
+	float level;	
 	atomic_t<level_set_t> level_set;
 };

@@ -1,6 +1,6 @@
 #pragma once

-
+namespace vm { using namespace ps3; }

 // Error codes
 enum
@@ -191,17 +191,13 @@ s32 cellAudioOutGetDeviceInfo(u32 audioOut, u32 deviceIndex, vm::ptr<CellAudioOu
 	if (deviceIndex) return CELL_AUDIO_OUT_ERROR_DEVICE_NOT_FOUND;

 	info->portType = CELL_AUDIO_OUT_PORT_HDMI;
-	info->availableModeCount = 2;
+	info->availableModeCount = 1;
 	info->state = CELL_AUDIO_OUT_DEVICE_STATE_AVAILABLE;
 	info->latency = 1000;
 	info->availableModes[0].type = CELL_AUDIO_OUT_CODING_TYPE_LPCM;
 	info->availableModes[0].channel = CELL_AUDIO_OUT_CHNUM_8;
 	info->availableModes[0].fs = CELL_AUDIO_OUT_FS_48KHZ;
 	info->availableModes[0].layout = CELL_AUDIO_OUT_SPEAKER_LAYOUT_8CH_LREClrxy;
-	info->availableModes[1].type = CELL_AUDIO_OUT_CODING_TYPE_LPCM;
-	info->availableModes[1].channel = CELL_AUDIO_OUT_CHNUM_2;
-	info->availableModes[1].fs = CELL_AUDIO_OUT_FS_48KHZ;
-	info->availableModes[1].layout = CELL_AUDIO_OUT_SPEAKER_LAYOUT_2CH;

 	return CELL_OK;
 }
@@ -1,6 +1,6 @@
 #pragma once

-
+namespace vm { using namespace ps3; }

 // Error codes
 enum
@@ -4,7 +4,7 @@

 #include "cellBgdl.h"

-
+namespace vm { using namespace ps3; }

 logs::channel cellBGDL("cellBGDL");

@@ -30,5 +30,5 @@ struct CellBGDLInfo
 	be_t<u64> received_size;
 	be_t<u64> content_size;
 	be_t<s32> state; // CellBGDLState
-	vm::bptr<void> reserved;
+	vm::ps3::bptr<void> reserved;
 };
@@ -1,26 +1,12 @@
 #include "stdafx.h"
+#include "Emu/IdManager.h"
+#include "Emu/System.h"
+#include "Emu/Cell/PPUModule.h"
+
 #include "cellCamera.h"

-#include "Emu/Cell/PPUModule.h"
-#include "Emu/Cell/lv2/sys_event.h"
-#include "Emu/IdManager.h"
-#include "Emu/Io/PadHandler.h"
-#include "Emu/System.h"
-
-#include <thread>
-
 logs::channel cellCamera("cellCamera");

-// **************
-// * Prototypes *
-// **************
-
-s32 cellCameraSetAttribute(s32 dev_num, s32 attrib, u32 arg1, u32 arg2);
-
-// ************************
-// * HLE helper functions *
-// ************************
-
 template <>
 void fmt_class_string<camera_handler>::format(std::string& out, u64 arg)
 {
@@ -111,130 +97,73 @@ static const char* get_camera_attr_name(s32 value)
 	return nullptr;
 }

-static bool check_dev_num(u32 dev_num)
+// Custom struct to keep track of cameras
+struct camera_t
 {
-	return dev_num == 0;
-}
-
-/**
- * \brief Sets read mode attribute (used for deciding how image data is passed to games)
- *		  Also sends it to the camera thread
- *	      NOTE: thread-safe (uses camera_thread::mutex)
- * \param dev_num Device number (always 0)
- * \param read_mode Either CELL_CAMERA_READ_FUNCCALL or CELL_CAMERA_READ_DIRECT
- * \return CELL error code or CELL_OK
- */
-u32 set_and_send_read_mode(s32 dev_num, const s32 read_mode)
-{
-	if (read_mode == CELL_CAMERA_READ_FUNCCALL ||
-		read_mode == CELL_CAMERA_READ_DIRECT)
+	struct attr_t
 	{
-		if (const auto status = cellCameraSetAttribute(dev_num, CELL_CAMERA_READMODE, read_mode, 0))
-		{
-			return status;
-		}
-	}
-	else
-	{
-		cellCamera.error("Unknown read mode set: %d", read_mode);
-	}
+		u32 v1, v2;
+	};

-	// Send read mode to camera thread
-	const auto g_camera = fxm::get<camera_thread>();
-
-	g_camera->read_mode.exchange(read_mode);
-
-	return CELL_OK;
-}
-
-std::pair<u32, u32> get_video_resolution(const CellCameraInfoEx& info)
-{
-	std::pair<u32, u32> res;
-	switch (info.resolution)
-	{
-	case CELL_CAMERA_VGA: return{ 640, 480 };
-	case CELL_CAMERA_QVGA: return { 320, 240 };
-	case CELL_CAMERA_WGA: return{ 640, 360 };
-	case CELL_CAMERA_SPECIFIED_WIDTH_HEIGHT: return{ info.width, info.height };
-	case CELL_CAMERA_RESOLUTION_UNKNOWN:
-	default: return{ 0, 0 };
-	}
-}
-
-u32 get_video_buffer_size(const CellCameraInfoEx& info)
-{
-	u32 width, height;
-	std::tie(width, height) = get_video_resolution(info);
-
-	const auto bpp = 4;
-	return width * height * bpp;
-}
-
-// ************************
-// * cellCamera functions *
-// ************************
+	attr_t attr[500]{};
+};

 s32 cellCameraInit()
 {
-	cellCamera.todo("cellCameraInit()");
+	cellCamera.warning("cellCameraInit()");

 	if (g_cfg.io.camera == camera_handler::null)
 	{
 		return CELL_CAMERA_ERROR_DEVICE_NOT_FOUND;
 	}

-	// Start camera thread
-	const auto g_camera = fxm::make<camera_thread>();
+	const auto camera = fxm::make<camera_t>();

-	if (!g_camera)
+	if (!camera)
 	{
 		return CELL_CAMERA_ERROR_ALREADY_INIT;
 	}

-	semaphore_lock lock(g_camera->mutex);
-
 	switch (g_cfg.io.camera_type)
 	{
 	case fake_camera_type::eyetoy:
 	{
-		g_camera->attr[CELL_CAMERA_SATURATION] = { 164 };
-		g_camera->attr[CELL_CAMERA_BRIGHTNESS] = { 96 };
-		g_camera->attr[CELL_CAMERA_AEC] = { 1 };
-		g_camera->attr[CELL_CAMERA_AGC] = { 1 };
-		g_camera->attr[CELL_CAMERA_AWB] = { 1 };
-		g_camera->attr[CELL_CAMERA_ABC] = { 0 };
-		g_camera->attr[CELL_CAMERA_LED] = { 1 };
-		g_camera->attr[CELL_CAMERA_QS] = { 0 };
-		g_camera->attr[CELL_CAMERA_NONZEROCOEFFS] = { 32, 32 };
-		g_camera->attr[CELL_CAMERA_YUVFLAG] = { 0 };
-		g_camera->attr[CELL_CAMERA_BACKLIGHTCOMP] = { 0 };
-		g_camera->attr[CELL_CAMERA_MIRRORFLAG] = { 1 };
-		g_camera->attr[CELL_CAMERA_422FLAG] = { 1 };
-		g_camera->attr[CELL_CAMERA_USBLOAD] = { 4 };
+		camera->attr[CELL_CAMERA_SATURATION] = { 164 };
+		camera->attr[CELL_CAMERA_BRIGHTNESS] = { 96 };
+		camera->attr[CELL_CAMERA_AEC] = { 1 };
+		camera->attr[CELL_CAMERA_AGC] = { 1 };
+		camera->attr[CELL_CAMERA_AWB] = { 1 };
+		camera->attr[CELL_CAMERA_ABC] = { 0 };
+		camera->attr[CELL_CAMERA_LED] = { 1 };
+		camera->attr[CELL_CAMERA_QS] = { 0 };
+		camera->attr[CELL_CAMERA_NONZEROCOEFFS] = { 32, 32 };
+		camera->attr[CELL_CAMERA_YUVFLAG] = { 0 };
+		camera->attr[CELL_CAMERA_BACKLIGHTCOMP] = { 0 };
+		camera->attr[CELL_CAMERA_MIRRORFLAG] = { 1 };
+		camera->attr[CELL_CAMERA_422FLAG] = { 1 };
+		camera->attr[CELL_CAMERA_USBLOAD] = { 4 };
 		break;
 	}

 	case fake_camera_type::eyetoy2:
 	{
-		g_camera->attr[CELL_CAMERA_SATURATION] = { 64 };
-		g_camera->attr[CELL_CAMERA_BRIGHTNESS] = { 8 };
-		g_camera->attr[CELL_CAMERA_AEC] = { 1 };
-		g_camera->attr[CELL_CAMERA_AGC] = { 1 };
-		g_camera->attr[CELL_CAMERA_AWB] = { 1 };
-		g_camera->attr[CELL_CAMERA_LED] = { 1 };
-		g_camera->attr[CELL_CAMERA_BACKLIGHTCOMP] = { 0 };
-		g_camera->attr[CELL_CAMERA_MIRRORFLAG] = { 1 };
-		g_camera->attr[CELL_CAMERA_GAMMA] = { 1 };
-		g_camera->attr[CELL_CAMERA_AGCLIMIT] = { 4 };
-		g_camera->attr[CELL_CAMERA_DENOISE] = { 0 };
-		g_camera->attr[CELL_CAMERA_FRAMERATEADJUST] = { 0 };
-		g_camera->attr[CELL_CAMERA_PIXELOUTLIERFILTER] = { 1 };
-		g_camera->attr[CELL_CAMERA_AGCLOW] = { 48 };
-		g_camera->attr[CELL_CAMERA_AGCHIGH] = { 64 };
+		camera->attr[CELL_CAMERA_SATURATION] = { 64 };
+		camera->attr[CELL_CAMERA_BRIGHTNESS] = { 8 };
+		camera->attr[CELL_CAMERA_AEC] = { 1 };
+		camera->attr[CELL_CAMERA_AGC] = { 1 };
+		camera->attr[CELL_CAMERA_AWB] = { 1 };
+		camera->attr[CELL_CAMERA_LED] = { 1 };
+		camera->attr[CELL_CAMERA_BACKLIGHTCOMP] = { 0 };
+		camera->attr[CELL_CAMERA_MIRRORFLAG] = { 1 };
+		camera->attr[CELL_CAMERA_GAMMA] = { 1 };
+		camera->attr[CELL_CAMERA_AGCLIMIT] = { 4 };
+		camera->attr[CELL_CAMERA_DENOISE] = { 0 };
+		camera->attr[CELL_CAMERA_FRAMERATEADJUST] = { 0 };
+		camera->attr[CELL_CAMERA_PIXELOUTLIERFILTER] = { 1 };
+		camera->attr[CELL_CAMERA_AGCLOW] = { 48 };
+		camera->attr[CELL_CAMERA_AGCHIGH] = { 64 };
 		break;
 	}
-	default:
-		cellCamera.todo("Trying to init cellCamera with un-researched camera type.");
 	}

 	// TODO: Some other default attributes? Need to check the actual behaviour on a real PS3.
@@ -244,9 +173,9 @@ s32 cellCameraInit()

 s32 cellCameraEnd()
 {
-	cellCamera.todo("cellCameraEnd()");
+	cellCamera.warning("cellCameraEnd()");

-	if (!fxm::remove<camera_thread>())
+	if (!fxm::remove<camera_t>())
 	{
 		return CELL_CAMERA_ERROR_NOT_INIT;
 	}
@@ -254,7 +183,7 @@ s32 cellCameraEnd()
 	return CELL_OK;
 }

-s32 cellCameraOpen() // seems unused
+s32 cellCameraOpen()
 {
 	UNIMPLEMENTED_FUNC(cellCamera);
 	return CELL_OK;
@@ -262,63 +191,13 @@ s32 cellCameraOpen() // seems unused

 s32 cellCameraOpenEx(s32 dev_num, vm::ptr<CellCameraInfoEx> info)
 {
-	cellCamera.todo("cellCameraOpenEx(dev_num=%d, type=*0x%x)", dev_num, info);
-
-	const auto g_camera = fxm::get<camera_thread>();
-
-	if (!g_camera)
-	{
-		return CELL_CAMERA_ERROR_NOT_INIT;
-	}
-
-	s32 read_mode = info->read_mode;
-
-	u32 status = set_and_send_read_mode(dev_num, read_mode);
-	if (status != CELL_OK)
-	{
-		return status;
-	}
-
-	status = cellCameraSetAttribute(dev_num, CELL_CAMERA_GAMEPID, status, 0); // yup, that's what libGem does
-	if (status != CELL_OK)
-	{
-		return status;
-	}
-
-	const auto vbuf_size = get_video_buffer_size(*info);
-
-	if (info->read_mode == CELL_CAMERA_READ_FUNCCALL && !info->buffer)
-	{
-		info->buffer = vm::cast(vm::alloc(vbuf_size, vm::memory_location_t::main));
-		info->bytesize = vbuf_size;
-	}
-
-	std::tie(info->width, info->height) = get_video_resolution(*info);
-
-	semaphore_lock lock(g_camera->mutex);
-
-	g_camera->is_open = true;
-	g_camera->info = *info;
-
+	UNIMPLEMENTED_FUNC(cellCamera);
 	return CELL_OK;
 }

 s32 cellCameraClose(s32 dev_num)
 {
-	cellCamera.todo("cellCameraClose(dev_num=%d)", dev_num);
-
-	const auto g_camera = fxm::get<camera_thread>();
-
-	if (!g_camera)
-	{
-		return CELL_CAMERA_ERROR_NOT_INIT;
-	}
-
-	semaphore_lock lock(g_camera->mutex);
-
-	vm::dealloc(g_camera->info.buffer.addr(), vm::memory_location_t::main);
-	g_camera->is_open = false;
-
+	UNIMPLEMENTED_FUNC(cellCamera);
 	return CELL_OK;
 }

@@ -330,20 +209,15 @@ s32 cellCameraGetDeviceGUID(s32 dev_num, vm::ptr<u32> guid)

 s32 cellCameraGetType(s32 dev_num, vm::ptr<s32> type)
 {
-	cellCamera.todo("cellCameraGetType(dev_num=%d, type=*0x%x)", dev_num, type);
+	cellCamera.warning("cellCameraGetType(dev_num=%d, type=*0x%x)", dev_num, type);

-	const auto g_camera = fxm::get<camera_thread>();
+	const auto camera = fxm::get<camera_t>();

-	if (!g_camera)
+	if (!camera)
 	{
 		return CELL_CAMERA_ERROR_NOT_INIT;
 	}

-	if (!check_dev_num(dev_num) || !type )
-	{
-		return CELL_CAMERA_ERROR_PARAM;
-	}
-
 	switch (g_cfg.io.camera_type)
 	{
 	case fake_camera_type::unknown: *type = CELL_CAMERA_TYPE_UNKNOWN; break;
@@ -358,80 +232,42 @@ s32 cellCameraGetType(s32 dev_num, vm::ptr<s32> type)
 s32 cellCameraIsAvailable(s32 dev_num)
 {
 	cellCamera.todo("cellCameraIsAvailable(dev_num=%d)", dev_num);
-
-	const auto g_camera = fxm::get<camera_thread>();
-
-	if (!g_camera || !check_dev_num(dev_num))
-	{
-		return false;
-	}
-
-	return true;
+	return CELL_OK;
 }

 s32 cellCameraIsAttached(s32 dev_num)
 {
-	cellCamera.todo("cellCameraIsAttached(dev_num=%d)", dev_num);
+	cellCamera.warning("cellCameraIsAttached(dev_num=%d)", dev_num);

-	if (g_cfg.io.camera == camera_handler::null)
+	if (g_cfg.io.camera == camera_handler::fake)
 	{
-		return false;
+		return 1;
 	}

-	const auto g_camera = fxm::get<camera_thread>();
-
-	semaphore_lock lock(g_camera->mutex);
-
-	bool is_attached = g_camera->is_attached;
-
-	// "attach" camera here
-	if (!is_attached)
-	{
-		g_camera->send_attach_state(true);
-		is_attached = g_camera->is_attached;
-	}
-
-	return is_attached;
+	return 0; // It's not CELL_OK lol
 }

 s32 cellCameraIsOpen(s32 dev_num)
 {
 	cellCamera.todo("cellCameraIsOpen(dev_num=%d)", dev_num);
-
-	if (g_cfg.io.camera == camera_handler::null)
-	{
-		return false;
-	}
-
-	const auto g_camera = fxm::get<camera_thread>();
-
-	bool is_open = g_camera->is_open;
-	return is_open;
+	return CELL_OK;
 }

 s32 cellCameraIsStarted(s32 dev_num)
 {
 	cellCamera.todo("cellCameraIsStarted(dev_num=%d)", dev_num);
-
-	if (g_cfg.io.camera == camera_handler::null)
-	{
-		return false;
-	}
-
-	const auto g_camera = fxm::get<camera_thread>();
-
-	bool is_streaming = g_camera->is_streaming;
-	return is_streaming;
+	return CELL_OK;
 }

 s32 cellCameraGetAttribute(s32 dev_num, s32 attrib, vm::ptr<u32> arg1, vm::ptr<u32> arg2)
 {
+	cellCamera.warning("cellCameraGetAttribute(dev_num=%d, attrib=%d, arg1=*0x%x, arg2=*0x%x)", dev_num, attrib, arg1, arg2);
+
 	const auto attr_name = get_camera_attr_name(attrib);
-	cellCamera.todo("cellCameraGetAttribute: get attrib %s to: 0x%x - 0x%x)", attr_name ? attr_name : "(invalid)", arg1, arg2);

-	const auto g_camera = fxm::get<camera_thread>();
+	const auto camera = fxm::get<camera_t>();

-	if (!g_camera)
+	if (!camera)
 	{
 		return CELL_CAMERA_ERROR_NOT_INIT;
 	}
@@ -441,30 +277,21 @@ s32 cellCameraGetAttribute(s32 dev_num, s32 attrib, vm::ptr<u32> arg1, vm::ptr<u
 		return CELL_CAMERA_ERROR_PARAM;
 	}

-	cellCamera.todo("cellCameraGetAttribute: get attrib %s arg1: %d arg2: %d", attr_name, arg1, arg2);
-
-	semaphore_lock lock(g_camera->mutex);
-
-	if (arg1)
-	{
-		*arg1 = g_camera->attr[attrib].v1;
-	}
-	if (arg2)
-	{
-		*arg2 = g_camera->attr[attrib].v2;
-	}
+	*arg1 = camera->attr[attrib].v1;
+	*arg2 = camera->attr[attrib].v2;

 	return CELL_OK;
 }

 s32 cellCameraSetAttribute(s32 dev_num, s32 attrib, u32 arg1, u32 arg2)
 {
+	cellCamera.warning("cellCameraSetAttribute(dev_num=%d, attrib=%d, arg1=%d, arg2=%d)", dev_num, attrib, arg1, arg2);
+
 	const auto attr_name = get_camera_attr_name(attrib);
-	cellCamera.todo("cellCameraSetAttribute: set attrib %s to: %d - %d)", attr_name ? attr_name : "(invalid)", arg1, arg2);

-	const auto g_camera = fxm::get<camera_thread>();
+	const auto camera = fxm::get<camera_t>();

-	if (!g_camera)
+	if (!camera)
 	{
 		return CELL_CAMERA_ERROR_NOT_INIT;
 	}
@@ -474,45 +301,15 @@ s32 cellCameraSetAttribute(s32 dev_num, s32 attrib, u32 arg1, u32 arg2)
 		return CELL_CAMERA_ERROR_PARAM;
 	}

-	semaphore_lock lock(g_camera->mutex);
-	g_camera->attr[attrib] = { arg1, arg2 };
+	camera->attr[attrib] = { arg1, arg2 };

 	return CELL_OK;
 }

 s32 cellCameraGetBufferSize(s32 dev_num, vm::ptr<CellCameraInfoEx> info)
 {
-	cellCamera.todo("cellCameraGetBufferSize(dev_num=%d, info=*0x%x)", dev_num, info);
-
-	const auto g_camera = fxm::get<camera_thread>();
-
-	if (!g_camera)
-	{
-		return CELL_CAMERA_ERROR_NOT_INIT;
-	}
-
-	// TODO: a bunch of arg checks. here's one
-	if (!cellCameraIsAttached(dev_num))
-	{
-		return CELL_CAMERA_ERROR_DEVICE_NOT_FOUND;
-	}
-
-	const auto read_mode = info->read_mode;
-
-	u32 status = set_and_send_read_mode(dev_num, read_mode);
-	if (status != CELL_OK)
-	{
-		return status;
-	}
-
-	semaphore_lock lock(g_camera->mutex);
-
-	info->bytesize = get_video_buffer_size(g_camera->info);
-	info->buffer = g_camera->info.buffer;
-
-	g_camera->info = *info;
-
-	return info->bytesize;
+	UNIMPLEMENTED_FUNC(cellCamera);
+	return CELL_OK;
 }

 s32 cellCameraGetBufferInfo()
@@ -523,24 +320,7 @@ s32 cellCameraGetBufferInfo()

 s32 cellCameraGetBufferInfoEx(s32 dev_num, vm::ptr<CellCameraInfoEx> info)
 {
-	cellCamera.todo("cellCameraReadEx(dev_num=%d, read=0x%x)", dev_num, info);
-
-	const auto g_camera = fxm::get<camera_thread>();
-
-	if (!g_camera)
-	{
-		return CELL_CAMERA_ERROR_NOT_INIT;
-	}
-
-	if (!info)
-	{
-		return CELL_CAMERA_ERROR_PARAM;
-	}
-
-	semaphore_lock lock(g_camera->mutex);
-
-	*info = g_camera->info;
-
+	UNIMPLEMENTED_FUNC(cellCamera);
 	return CELL_OK;
 }

@@ -571,21 +351,12 @@ s32 cellCameraSetExtensionUnit(s32 dev_num, u16 value, u16 length, vm::ptr<u8> d
 s32 cellCameraReset(s32 dev_num)
 {
 	UNIMPLEMENTED_FUNC(cellCamera);
-
 	return CELL_OK;
 }

 s32 cellCameraStart(s32 dev_num)
 {
-	cellCamera.todo("cellCameraStart(dev_num=%d", dev_num);
-
-	const auto g_camera = fxm::get<camera_thread>();
-
-	semaphore_lock lock(g_camera->mutex);
-
-	g_camera->timer.Start();
-	g_camera->is_streaming = true;
-
+	UNIMPLEMENTED_FUNC(cellCamera);
 	return CELL_OK;
 }

@@ -597,46 +368,19 @@ s32 cellCameraRead(s32 dev_num, vm::ptr<u32> frame_num, vm::ptr<u32> bytes_read)

 s32 cellCameraReadEx(s32 dev_num, vm::ptr<CellCameraReadEx> read)
 {
-	cellCamera.todo("cellCameraReadEx(dev_num=%d, read=0x%x)", dev_num, read);
-
-	const auto g_camera = fxm::get<camera_thread>();
-
-	if (!g_camera)
-	{
-		return CELL_CAMERA_ERROR_NOT_INIT;
-	}
-
-	semaphore_lock lock(g_camera->mutex);
-
-	read->timestamp = g_camera->timer.GetElapsedTimeInMicroSec();
-	read->frame = g_camera->frame_num;
-	read->bytesread = g_camera->is_streaming ?
-		get_video_buffer_size(g_camera->info) : 0;
-
-	auto shared_data = fxm::get_always<gem_camera_shared>();
-
-	shared_data->frame_timestamp.exchange(read->timestamp);
-
+	UNIMPLEMENTED_FUNC(cellCamera);
 	return CELL_OK;
 }

 s32 cellCameraReadComplete(s32 dev_num, u32 bufnum, u32 arg2)
 {
-	cellCamera.todo("cellCameraReadComplete(dev_num=%d, bufnum=%d, arg2=%d)", dev_num, bufnum, arg2);
-	return cellCameraSetAttribute(dev_num, CELL_CAMERA_READFINISH, bufnum, arg2);
+	UNIMPLEMENTED_FUNC(cellCamera);
+	return CELL_OK;
 }

 s32 cellCameraStop(s32 dev_num)
 {
-	cellCamera.todo("cellCameraStop(dev_num=%d", dev_num);
-
-	const auto g_camera = fxm::get<camera_thread>();
-
-	semaphore_lock lock(g_camera->mutex);
-
-	g_camera->is_streaming = false;
-	g_camera->timer.Stop();
-
+	UNIMPLEMENTED_FUNC(cellCamera);
 	return CELL_OK;
 }

@@ -654,43 +398,13 @@ s32 cellCameraRemoveNotifyEventQueue(u64 key)

 s32 cellCameraSetNotifyEventQueue2(u64 key, u64 source, u64 flag)
 {
-	cellCamera.todo("cellCameraSetNotifyEventQueue2(key=0x%x, source=%d, flag=%d)", key, source, flag);
-
-	const auto g_camera = fxm::get<camera_thread>();
-
-	if (!g_camera)
-	{
-		return CELL_CAMERA_ERROR_NOT_INIT;
-	}
-	{
-		semaphore_lock lock_data_map(g_camera->mutex_notify_data_map);
-
-		g_camera->notify_data_map[key] = { source, flag };
-	}
-	{
-		semaphore_lock lock(g_camera->mutex);
-
-		// send ATTACH event if necessary - HACKY
-		g_camera->send_attach_state(true);
-	}
+	UNIMPLEMENTED_FUNC(cellCamera);
 	return CELL_OK;
 }

 s32 cellCameraRemoveNotifyEventQueue2(u64 key)
 {
-	cellCamera.todo("cellCameraRemoveNotifyEventQueue2(key=0x%x", key);
-
-	const auto g_camera = fxm::get<camera_thread>();
-
-	if (!g_camera)
-	{
-		return CELL_CAMERA_ERROR_NOT_INIT;
-	}
-
-	semaphore_lock lock(g_camera->mutex_notify_data_map);
-
-	g_camera->notify_data_map.erase(key);
-
+	UNIMPLEMENTED_FUNC(cellCamera);
 	return CELL_OK;
 }

@@ -731,114 +445,3 @@ DECLARE(ppu_module_manager::cellCamera)("cellCamera", []()
 	REG_FUNC(cellCamera, cellCameraSetNotifyEventQueue2);
 	REG_FUNC(cellCamera, cellCameraRemoveNotifyEventQueue2);
 });
-
-void camera_thread::on_task()
-{
-	while (fxm::check<camera_thread>() && !Emu.IsStopped())
-	{
-		std::chrono::steady_clock::time_point frame_start = std::chrono::steady_clock::now();
-
-		if (Emu.IsPaused())
-		{
-			std::this_thread::sleep_for(1ms); // hack
-			continue;
-		}
-
-		semaphore_lock lock(mutex_notify_data_map);
-
-		for (auto const& notify_data_entry : notify_data_map)
-		{
-			const auto& key = notify_data_entry.first;
-			const auto& evt_data = notify_data_entry.second;
-
-			// handle FRAME_UPDATE
-			if (is_streaming &&
-				evt_data.flag & CELL_CAMERA_EFLAG_FRAME_UPDATE &&
-				info.framerate != 0)
-			{
-				if (auto queue = lv2_event_queue::find(key))
-				{
-					u64 data2{ 0 };
-					u64 data3{ 0 };
-
-					switch (read_mode.load())
-					{
-					case CELL_CAMERA_READ_FUNCCALL:
-					{
-						data2 = 0;	// device id (always 0)
-						data3 = 0;	// unused
-						break;
-					}
-					case CELL_CAMERA_READ_DIRECT:
-					{
-						const u64 image_data_size = static_cast<u64>(info.bytesize);
-						const u64 buffer_number = 0;
-						const u64 camera_id = 0;
-
-						data2 = image_data_size << 32 | buffer_number << 16 | camera_id;
-						data3 = timer.GetElapsedTimeInMicroSec();	// timestamp
-						break;
-					}
-					default:
-					{
-						cellCamera.error("Unknown read mode set: %d. This should never happen.", read_mode.load());
-						return;
-					}
-					}
-
-					const auto send_status = queue->send(evt_data.source, CELL_CAMERA_FRAME_UPDATE, data2, data3);
-					if (LIKELY(send_status))
-					{
-						++frame_num;
-					}
-				}
-			}
-
-		}
-
-		const std::chrono::microseconds frame_target_time{ static_cast<u32>(1000000.0 / info.framerate) };
-
-		std::chrono::steady_clock::time_point now = std::chrono::steady_clock::now();
-
-		std::chrono::microseconds frame_processing_time = std::chrono::duration_cast<std::chrono::microseconds>(now - frame_start);
-
-		if (frame_processing_time < frame_target_time)
-		{
-			std::chrono::microseconds frame_idle_time = frame_target_time - frame_processing_time;
-			std::this_thread::sleep_for(frame_idle_time);
-		}
-	}
-}
-
-void camera_thread::on_init(const std::shared_ptr<void>& _this)
-{
-	named_thread::on_init(_this);
-}
-
-void camera_thread::send_attach_state(bool attached)
-{
-	semaphore_lock lock(mutex_notify_data_map);
-
-	if (!notify_data_map.empty())
-	{
-		for (auto const& notify_data_entry : notify_data_map)
-		{
-			const auto& key = notify_data_entry.first;
-			const auto& evt_data = notify_data_entry.second;
-
-			if (auto queue = lv2_event_queue::find(key))
-			{
-				const auto send_result = queue->send(evt_data.source, attached ? CELL_CAMERA_ATTACH : CELL_CAMERA_DETACH, 0, 0);
-				if (LIKELY(send_result))
-				{
-					is_attached = attached;
-				}
-			}
-		}
-	}
-	else
-	{
-		// We're not expected to send any events for attaching/detaching
-		is_attached = attached;
-	}
-}
@@ -1,12 +1,6 @@
 #pragma once

-#include "Utilities/Timer.h"
-#include "Emu/Cell/lv2/sys_memory.h"
-#include "Utilities/sema.h"
-#include "Utilities/Thread.h"
-
-#include <map>
-
+namespace vm { using namespace ps3; }

 // Error Codes
 enum
@@ -26,7 +20,7 @@ enum
 	CELL_CAMERA_ERROR_FATAL              = 0x8014080f,
 };

-// Event masks
+// Event types
 enum
 {
 	CELL_CAMERA_EFLAG_FRAME_UPDATE = 0x00000001,
@@ -37,26 +31,6 @@ enum
 	CELL_CAMERA_EFLAG_RESET        = 0x00000020,
 };

-// Event types
-enum
-{
-	CELL_CAMERA_DETACH       = 0,
-	CELL_CAMERA_ATTACH       = 1,
-	CELL_CAMERA_FRAME_UPDATE = 2,
-	CELL_CAMERA_OPEN         = 3,
-	CELL_CAMERA_CLOSE        = 4,
-	CELL_CAMERA_START        = 5,
-	CELL_CAMERA_STOP         = 6,
-	CELL_CAMERA_RESET        = 7
-};
-
-// Read mode
-enum
-{
-	CELL_CAMERA_READ_FUNCCALL = 0,
-	CELL_CAMERA_READ_DIRECT   = 1,
-};
-
 // Colormatching
 enum
 {
@@ -312,14 +286,14 @@ enum CellCameraAttribute : s32

 struct CellCameraInfoEx
 {
-	be_t<s32> format;     // CellCameraFormat
+	be_t<s32> format; // CellCameraFormat
 	be_t<s32> resolution; // CellCameraResolution
 	be_t<s32> framerate;

 	vm::bptr<u8> buffer;
 	be_t<s32> bytesize;
-	be_t<s32> width;    // only used if resolution == CELL_CAMERA_SPECIFIED_WIDTH_HEIGHT
-	be_t<s32> height;   // likewise
+	be_t<s32> width;
+	be_t<s32> height;
 	be_t<s32> dev_num;
 	be_t<s32> guid;

@@ -337,52 +311,3 @@ struct CellCameraReadEx
 	be_t<s64> timestamp;
 	vm::bptr<u8> pbuf;
 };
-
-class camera_thread final : public named_thread
-{
-private:
-	struct notify_event_data
-	{
-		u64 source;
-		u64 flag;
-	};
-
-	void on_task() override;
-
-	std::string get_name() const override { return "Camera Thread"; }
-
-public:
-	void on_init(const std::shared_ptr<void>&) override;
-	void send_attach_state(bool attached);
-
-	std::map<u64, notify_event_data> notify_data_map;
-
-	semaphore<> mutex;
-	semaphore<> mutex_notify_data_map;
-	Timer timer;
-
-	atomic_t<u8> read_mode;
-	atomic_t<bool> is_streaming;
-	atomic_t<bool> is_attached;
-	atomic_t<bool> is_open;
-
-	CellCameraInfoEx info;
-
-	struct attr_t
-	{
-		u32 v1, v2;
-	};
-	attr_t attr[500]{};
-
-	lv2_memory_container container;
-	atomic_t<u32> frame_num;
-
-	camera_thread() : read_mode(CELL_CAMERA_READ_FUNCCALL) {}
-	~camera_thread() = default;
-};
-
-/// Shared data between cellGem and cellCamera
-struct gem_camera_shared
-{
-	atomic_t<s64> frame_timestamp;    // latest read timestamp from cellCamera (cellCameraRead(Ex))
-};
@@ -1,6 +1,6 @@
 #pragma once

-
+namespace vm { using namespace ps3; }

 // libCelp8Enc = 0x806140a1 - 0x806140bf

@@ -19,9 +19,9 @@ enum
 enum
 {
 	CELL_CELP8ENC_FS_8kHz = 1,
-
+	
 	CELL_CELP8ENC_EXCITATION_MODE_MPE = 0,
-
+	
 	CELL_CELP8ENC_MPE_CONFIG_0 = 0,
 	CELL_CELP8ENC_MPE_CONFIG_2 = 2,
 	CELL_CELP8ENC_MPE_CONFIG_6 = 6,
@@ -32,6 +32,6 @@ enum
 	CELL_CELP8ENC_MPE_CONFIG_21 = 21,
 	CELL_CELP8ENC_MPE_CONFIG_24 = 24,
 	CELL_CELP8ENC_MPE_CONFIG_26 = 26,
-
+	
 	CELL_CELP8ENC_WORD_SZ_FLOAT,
 };
@@ -1,6 +1,6 @@
 #pragma once

-
+namespace vm { using namespace ps3; }

 // libCelpEnc = 0x80614001 - 0x806140ff

@@ -19,14 +19,14 @@ enum
 enum
 {
 	CELL_CELPENC_FS_16kHz = 2,
-
+	
 	CELL_CELPENC_EXCITATION_MODE_RPE = 1,
-
+	
 	CELL_CELPENC_RPE_CONFIG_0,
 	CELL_CELPENC_RPE_CONFIG_1,
 	CELL_CELPENC_RPE_CONFIG_2,
 	CELL_CELPENC_RPE_CONFIG_3,
-
+	
 	CELL_CELPENC_WORD_SZ_INI16_LE,
 	CELL_CELPENC_WORD_SZ_FLOAT,
 };
@@ -1,18 +1,11 @@
 #include "stdafx.h"
 #include "Emu/System.h"
 #include "Emu/Cell/PPUModule.h"
-#include "cellSysutil.h"
-

+namespace vm { using namespace ps3; }

 logs::channel cellCrossController("cellCrossController");

-enum
-{
-	CELL_CROSS_CONTROLLER_STATUS_INITIALIZED = 1,
-	CELL_CROSS_CONTROLLER_STATUS_FINALIZED = 2
-};
-
 struct CellCrossControllerParam
 {
 	vm::bcptr<char> pPackageFileName;
@@ -33,15 +26,6 @@ using CellCrossControllerCallback = void(s32 status, s32 errorCode, vm::ptr<void
 s32 cellCrossControllerInitialize(vm::cptr<CellCrossControllerParam> pParam, vm::cptr<CellCrossControllerPackageInfo> pPkgInfo, vm::ptr<CellCrossControllerCallback> cb, vm::ptr<void> userdata) // LittleBigPlanet 2 and 3
 {
 	cellCrossController.todo("cellCrossControllerInitialize(pParam=*0x%x, pPkgInfo=*0x%x, cb=*0x%x, userdata=*0x%x)", pParam, pPkgInfo, cb, userdata);
-
-	sysutil_register_cb([=](ppu_thread& ppu) -> s32
-	{
-		cb(ppu, CELL_CROSS_CONTROLLER_STATUS_INITIALIZED, CELL_OK, vm::null, userdata);
-		cb(ppu, CELL_CROSS_CONTROLLER_STATUS_FINALIZED, CELL_OK, vm::null, userdata);
-
-		return CELL_OK;
-	});
-
 	return CELL_OK;
 }

@@ -1,6 +1,6 @@
 #pragma once

-
+namespace vm { using namespace ps3; }

 // libDaisy = 0x80410501 - 0x804105ff

@@ -35,7 +35,7 @@ enum
 	CELL_DAISY_MIN_ENTRY_SIZE = 16,
 	CELL_DAISY_MAX_ENTRY_SIZE = (16*1024),
 	CELL_DAISY_MAX_DMA_TAG = 31,
-
+	
 	// CELL_DAISY_ENTRY_SIZE(x)
 	// CELL_DAISY_EA_ATOMIC(x)
 	// CELL_DAISY_EA_DMA(x)
@@ -48,35 +48,35 @@ enum
 	// Queue IO
 	DAISY_OUTPUT,
 	DAISY_INPUT,
-
+	
 	// Block Mode
 	DAISY_NOT_STALL = 0,
 	DAISY_STALL = 1,
-
+	
 	// Queue Status
 	DAISY_PTR_UNAVAILABLE = 0x40000001,
 	DAISY_PTR_TERMINATED = 0x40000002,
-
+	
 	// Buffer Mode
 	DAISY_COPY = 0,
 	DAISY_REFERENCE = 1,
-
+	
 	// Constructor Mode
 	DAISY_NO_PARAMETER = 0,
 	DAISY_PARAMETER = 1,
-
+	
 	// Glue Mode
 	DAISY_ONE_PORT = 1,
 	DAISY_TWO_PORT = 2,
-
+	
 	// Queue Mode
 	DAISY_IN_ORDER,
 	DAISY_OUT_OF_ORDER,
-
+	
 	// Buffer Type
 	DAISY_BUFFER_TYPE_REMOTE = 1,
 	DAISY_BUFFER_TYPE_LOCAL = 2,
-
+	
 	// Queue Control Type
 	DAISY_QCTL_TYPE_ATOMIC = 1,
 	DAISY_QCTL_TYPE_LOCAL = 2,
@@ -1,6 +1,6 @@
 #pragma once

-
+namespace vm { using namespace ps3; }

 // Error Codes
 enum
@@ -156,7 +156,7 @@ struct CellDmuxEsMsg
 	be_t<u64> supplementalInfo;
 };

-struct CellDmuxType
+struct CellDmuxType 
 {
 	be_t<s32> streamType; // CellDmuxStreamType
 	be_t<u32> reserved[2];
@@ -223,7 +223,7 @@ using CellDmuxCbMsg = u32(u32 demuxerHandle, vm::ptr<CellDmuxMsg> demuxerMsg, u3

 struct CellDmuxCb
 {
-	vm::bptr<CellDmuxCbMsg> cbMsgFunc;
+	vm::bptr<CellDmuxCbMsg> cbMsgFunc; 
 	be_t<u32> cbArg;
 };

@@ -1,6 +1,6 @@
 #pragma once

-
+namespace vm { using namespace ps3; }

 // Return Codes
 enum CellFiberError : u32
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx.h"
 #include "Emu/System.h"
 #include "Emu/Cell/PPUModule.h"

@@ -1,6 +1,6 @@
 #pragma once

-
+namespace vm { using namespace ps3; }

 // Error codes
 enum
@@ -2,7 +2,7 @@

 #include "cellFont.h"

-
+namespace vm { using namespace ps3; }

 struct CellFontLibraryConfigFT
 {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Zangetsu38	8340bcb07a	hack bleach	2017-11-27 22:45:19 +01:00
Zangetsu38	ea84a6588b	Update Project to Visual Studio 2017.	2017-11-27 22:45:19 +01:00
Zangetsu38	babaf8b91e	Update LLVM 5.0	2017-11-27 22:37:52 +01:00
Zion Nimchuk	3fbc60f7d4	Initial LLVM 5 port	2017-11-27 22:36:32 +01:00