Update LLVM 5.0

Initial LLVM 5 port
Update Project to Visual Studio 2017.
2017-07-10 19:00:54 +02:00 · 2017-07-10 19:00:54 +02:00 · 2017-07-10 19:00:54 +02:00 · 2017-07-10 19:00:51 +02:00 · 2017-07-10 19:00:51 +02:00 · 2017-07-10 19:00:51 +02:00
435 changed files with 16043 additions and 35258 deletions
@@ -1,24 +0,0 @@
-<!---
-
-THIS IS NOT A SUPPORT FORUM, FOR SUPPORT GO TO:
-https://forums.rpcs3.net
-or our discord:
-https://discord.me/RPCS3
-
-PLEASE READ THE GUIDELINES BEFORE OPENING AN ISSUE:
-https://github.com/RPCS3/rpcs3/blob/master/CONTRIBUTING.md
-
-====================================================
-
-When submitting an issue, please check the following:
-
- You have read the above.
- You have provided the version (commit hash) of RPCS3 you are using.
- You have provided sufficient detail for the issue to be reproduced.
- You have provided system specs.
- Please also provide:
-  - For crashes, a backtrace.
-  - For graphical issues, comparison screenshots with real hardware.
-
-Remember that the GitHub Issue Tracker is not the place to ask for support or to submit Game Compatibility reports. You must use our forums for that.
--->
@@ -41,10 +41,7 @@
 /Vulkan/Vulkan-build
 /Vulkan/glslang-build

-# Themes
-!/bin/GuiConfigs/
-/bin/GuiConfigs/*.ini
-
+/wxWidgets/lib
 /bin/rpcs3.ini
 /bin/rpcs3.ipdb
 /bin/rpcs3.iobj
@@ -59,6 +56,7 @@ rpcs3/git-version.h

 # Visual Studio Files
 .vs/*
+*.ipch
 *.vspx
 *.psess
 *.VC.*
@@ -74,7 +72,6 @@ rpcs3/git-version.h
 !/bin/dev_hdd0/game/
 /bin/dev_hdd0/game/*
 !/bin/dev_hdd0/game/TEST12345/
-/bin/dev_hdd0/disc/*

 # Ignore other system generated files
 bin/dev_hdd0/*.txt
@@ -96,4 +93,3 @@ rpcs3/rpcs3_*_cotire.cmake
 moc_*.cpp
 qrc_resources.cpp
 rpcs3_automoc.cpp
-ui_*.h
@@ -8,13 +8,15 @@
 [submodule "llvm"]
 	path = llvm
 	url = https://github.com/llvm-mirror/llvm
-	branch = release_40
+[submodule "rsx_program_decompiler"]
+	path = rsx_program_decompiler
+	url = https://github.com/RPCS3/rsx_program_decompiler
 [submodule "GSL"]
 	path = 3rdparty/GSL
 	url = https://github.com/Microsoft/GSL.git
 [submodule "libpng"]
 	path = 3rdparty/libpng
-	url = https://github.com/RPCS3/libpng
+	url = https://github.com/Zangetsu38/libpng
 	ignore = dirty
 [submodule "Vulkan/glslang"]
 	path = Vulkan/glslang
@@ -31,13 +33,13 @@
 [submodule "3rdparty/cereal"]
 	path = 3rdparty/cereal
 	url = https://github.com/USCiLab/cereal.git
+[submodule "rsx-debugger"]
+	path = rsx-debugger
+	url = https://github.com/RPCS3/rsx-debugger.git
 [submodule "3rdparty/zlib"]
 	path = 3rdparty/zlib
 	url = https://github.com/madler/zlib
 [submodule "3rdparty/hidapi"]
 	path = 3rdparty/hidapi
-	url = https://github.com/RPCS3/hidapi
-	branch = master
-[submodule "3rdparty/Optional"]
-	path = 3rdparty/Optional
-	url = https://github.com/akrzemi1/Optional.git
+	url = https://github.com/Zangetsu38/hidapi
+	branch = master
@@ -1,5 +1,6 @@
 language: cpp
 sudo: required
+dist: trusty

 os:
  - linux
@@ -16,10 +17,23 @@ cache:
  directories:
    - $HOME/hombebrew_cache

+env:
+  global:
+    - secure: BXyNziNYFLqLtY6Q58BDEUpRJr81HUtHpxf2Sr646bDcbG0Rf2rb2utqHZJ1Om926WdH7RqHuoVti4dr2X1lh4nHMkLD7MrIrfIkNN5T9aZdk19uw9IyMtz/cXon7/wqVo24tVqtBI0UghFxKii/GTDJEvRKgfpPp1e1vKSNGa4=
+    # Which Travis environment to run Coverity on
+    - coverity_scan_run_condition='"$TRAVIS_OS_NAME" = linux -a "$CC" = gcc'
+    # Test mode is for testing if it's working with Coverity. Change to true if testing, to avoid reaching the quota.
+    - coverity_scan_script_test_mode=false
+
 matrix:
  exclude:
    - os: osx
      compiler: gcc
+  include:
+    - os: linux
+      compiler: clang
+      env: WITHOUT_LLVM="yes"
+  

 git:
  submodules: false
@@ -30,58 +44,54 @@ before_install:
    fi;    
  - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" = "g++" ]; then
      export CXX="g++-5" CC="gcc-5" CXXFLAGS="-Wno-format-security";
+      export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01';
    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 ;
+      sudo add-apt-repository ppa:beineri/opt-qt59-trusty -y;
+      sudo apt-get update;
+      sudo apt-get install qt59base -y --allow-unauthenticated;
    fi;
-
+  # Add coverall for C++ so coverall.io could be triggered. Even it should be --coverage and gcov.
  # Install updated libglew-dev since the version provided by trusty is outdated
  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+      pip install --user cpp-coveralls requests[security];
      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;
+      wget http://mirrors.kernel.org/ubuntu/pool/universe/v/vulkan/libvulkan-dev_1.0.21.0+dfsg1-1~16.04.1_amd64.deb;
+      wget http://mirrors.kernel.org/ubuntu/pool/universe/v/vulkan/libvulkan1_1.0.21.0+dfsg1-1~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.21.0+dfsg1-1~16.04.1_amd64.deb libvulkan-dev_1.0.21.0+dfsg1-1~16.04.1_amd64.deb;
    else
-      brew update;
+      brew update; brew update;
      brew install ccache glew llvm40;
    fi;

 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
+  - git submodule update --init asmjit 3rdparty/ffmpeg 3rdparty/pugixml 3rdparty/GSL 3rdparty/libpng Utilities/yaml-cpp 3rdparty/cereal 3rdparty/hidapi Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers
+  - source /opt/qt59/bin/qt59-env.sh
  - 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";
+  - if [ -z "$WITHOUT_LLVM" ]; then
+      cmake .. -DCMAKE_INSTALL_PREFIX=/usr;
    else
-      export CXXFLAGS="$CXXFLAGS -DBRANCH=$TRAVIS_REPO_SLUG/$TRAVIS_BRANCH/#$TRAVIS_PULL_REQUEST";
+      cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DWITHOUT_LLVM=ON;
    fi;
-  - cmake .. -DCMAKE_INSTALL_PREFIX=/usr;
  - make -j 3
  - # AppImage generation
-  - 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;
+  - if [ "$TRAVIS_BRANCH" = "master" ] && [ "$CC" = "clang-4.0" ] && [ "$TRAVIS_PULL_REQUEST" = false ]; then
+      export LD_LIBRARY_PATH=${PWD}/3rdparty/libpng:/opt/qt59/lib/:$LD_LIBRARY_PATH ;
      make DESTDIR=appdir install ; find appdir/ ;
      find ../bin ;
      wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" ; 
      chmod a+x linuxdeployqt*.AppImage ;
-      export PATH=~/Qt/5.9.2/gcc_64/bin/:${PATH} ;
-      ./linuxdeployqt*.AppImage --appimage-extract ;
+      unset QTDIR; unset QT_PLUGIN_PATH ;
      ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -bundle-non-qt-libs ;
-      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 ;
+      ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -appimage ;
      find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq ;
-      curl ${UPLOAD_URL}${TRAVIS_COMMIT:0:7}-${TRAVIS_BUILD_NUMBER}_linux64 --upload-file ./RPCS3*.AppImage;
+      zip -r9 rpcs3.zip ./RPCS3*.AppImage; 
+      if [ -z "$WITHOUT_LLVM" ]; then
+        export LLVM="-LLVM";
+      fi;
+      curl ${UPLOAD_URL}${TRAVIS_COMMIT:0:7}-${TRAVIS_BUILD_NUMBER}${LLVM}_linux64 --upload-file rpcs3.zip; 
   fi;

 script:
@@ -89,15 +99,14 @@ script:
  #- 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";
+  #- if [ "$COVERITY_SCAN_BRANCH" != 1 ]; then make -j 3; fi

 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.
    packages:
-      - binutils
      - cmake
      - libasound2-dev
      - libopenal-dev
@@ -115,8 +124,16 @@ addons:
      - libstdc++-5-dev
      - lib32stdc++6
      - zlib1g-dev
-      # We need to install qt 5.9.2 manually because the version trusty provides is too old.
+      # We need to install qt 5.8 manually because the version trusty provides is too old.
      #- qtbase5-dev
      - libudev-dev
-      - libevdev-dev
-      - libpulse-dev
+  coverity_scan:
+    project:
+      name: $TRAVIS_REPO_SLUG
+      description: "PS3 emulator/debugger"
+    notification_email: nekotekina@gmail.com
+    build_command: "make -j 3"
+    branch_pattern: coverity_scan
+
+after_success:
+  - if [ "$COVERITY_SCAN_BRANCH" != 1 ] && [ "$TRAVIS_OS_NAME" = linux ]; then coveralls --extension .c --extension .cpp --extension .h; fi
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0.2)
+cmake_minimum_required(VERSION 2.8.12)

 option(WITH_GDB "WITH_GDB" OFF)
 option(WITHOUT_LLVM "WITHOUT_LLVM" OFF)
@@ -1,6 +1,6 @@
 # Getting Started

-Before getting started using the emulator, read the [Quickstart Guide](https://rpcs3.net/quickstart) and the [FAQ](https://rpcs3.net/faq). After reading those, if you need support, visit our [Forums](https://forums.rpcs3.net). 
+Before getting started using the emulator, read the [Quickstart Guide](https://rpcs3.net/quickstart) and the [FAQ](https://rpcs3.net/faq). After reading those, if you need support, visit our [Forums](http://www.emunewz.net/forum/forumdisplay.php?fid=172). 

 # Issue Reporting

@@ -13,7 +13,7 @@ Before getting started using the emulator, read the [Quickstart Guide](https://r
 - Use understandable English. It doesn't need to be perfect, but clear enough to understand your message.
 - While reporting issues, don't forget to include details about your system (OS, CPU, GPU, etc.), as well as the RPCS3.log file.

-Submitting your test results for Commercial Games must be done on our forums. Please read the [Game Compatibility](https://github.com/RPCS3/rpcs3/wiki/Game-Compatibility) wiki page before doing so.
+Submitting your test results for Commercial Games must be done on our forums' [Commercial Games](http://www.emunewz.net/forum/forumdisplay.php?fid=193) section. If there's already a thread for the game you want to report post in it, otherwise please make a new thread following the [Guidelines for submitting new games](http://www.emunewz.net/forum/showthread.php?tid=174376).

 # Contributing

@@ -3,13 +3,14 @@ RPCS3

 [![Build Status](https://travis-ci.org/RPCS3/rpcs3.svg?branch=master)](https://travis-ci.org/RPCS3/rpcs3)
 [![Build status](https://ci.appveyor.com/api/projects/status/411c4clmiohtx7eo/branch/master?svg=true)](https://ci.appveyor.com/project/rpcs3/rpcs3/branch/master)
+[![Coverity Status](https://img.shields.io/coverity/scan/3960.svg)](https://scan.coverity.com/projects/3960)

 The world's first open-source PlayStation 3 emulator/debugger written in C++ for Windows and Linux.

 You can find some basic information in our [**website**](https://rpcs3.net/). 
-For discussion about this emulator and PS3 emulation please visit our [**forums**](https://forums.rpcs3.net) and our [**Discord server**](https://discord.me/RPCS3).
+For discussion about this emulator and PS3 emulation please visit our [**forums**](http://www.emunewz.net/forum/forumdisplay.php?fid=172) and our [**Discord server**](https://discord.me/RPCS3).

-[**Support Lead Developers Nekotekina and kd-11 on Patreon**](https://www.patreon.com/Nekotekina)
+[**Support Lead Developer Nekotekina on Patreon**](https://www.patreon.com/Nekotekina)


 ## Development
@@ -20,25 +21,24 @@ If you want to contribute please take a look at the [Coding Style](https://githu
 ## Dependencies

 ### Windows
-* [Visual Studio 2015](https://www.visualstudio.com/vs/older-downloads/)
-* [Visual C++ Redistributable Packages for Visual Studio 2015](http://www.microsoft.com/en-us/download/details.aspx?id=48145)
+* [Visual Studio 2017](https://www.visualstudio.com/downloads/)
+* [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.8+](https://www.qt.io/download-open-source/) (required; add QTDIR `<QtInstallFolder>\5.8\msvc2015_64\` environment variable if you do not want to use the Visual Studio Qt Plugin)
+* [Qt 5.9+](https://www.qt.io/download-open-source/) (required; add QTDIR `<QtInstallFolder>\5.9\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.7+](https://www.qt.io/download-open-source/)
+* [Qt 5.9+](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 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 qt5-devel vulkan-devel glew glew-devel`
-**If you have a NVIDIA GPU, you may need to install the libglvnd package.**
+* Fedora: `sudo dnf install cmake qt5-devel vulkan-devel libGLEW`

-### MacOS
-MacOS is not supported at this moment because it doesn't meet system requirements (OpenGL 4.3)
+### Mac OSX 
+Mac OSX is not supported at this moment because it doesn't meet system requirements (OpenGL 4.3)
 * Xcode 6+ (tested with Xcode 6.4)
-* Install with Homebrew: `brew install glew llvm qt cmake`
+* Install with Homebrew: `brew install glew`


 ## Building on Windows:
@@ -47,7 +47,7 @@ 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 `<QtInstallFolder>\5.8\msvc2015_64\` </br>
+1) Add `QTDIR` environment variable and set it to `<QtInstallFolder>\5.9\msvc2017_64\` </br>

 *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.8\msvc2015_64`. </br>
@@ -58,39 +58,27 @@ To initialize the repository don't forget to execute `git submodule update --ini
 2) Press *BUILD* > *Build Solution* or *Rebuild Solution*. </br>


-## Building on Linux & Mac OS:
+## Building on Linux & Mac OSX:

 1) `git clone https://github.com/RPCS3/rpcs3.git` </br>
 2) `cd rpcs3/` </br>
 3) `git submodule update --init` </br>
-4) `cd ../ && mkdir rpcs3_build && cd rpcs3_build`
-4) `cmake ../rpcs3/ && make GitVersion && make` </br>
+4) `cmake CMakeLists.txt && make GitVersion && make` </br>
 5) Run RPCS3 with `./bin/rpcs3` </br>

-If you are on MacOS and want to build with brew llvm and qt don't forget to add the following environment variables
-
- * `LLVM_DIR=/usr/local/opt/llvm/` (or wherever llvm was installed).
- * `Qt5_DIR=/usr/local/opt/qt/lib/cmake/Qt5` (or wherever qt was installed).
+If you are on OSX and want to build with llvm don't forget to add `-DLLVM_DIR=...` (or wherever llvm brew was installed) to cmake invocation.

 When using GDB, configure it to ignore SIGSEGV signal (`handle SIGSEGV nostop noprint`).


-## CMake Build Options (Linux & Mac OS)
+## CMake Build Options (Linux & Mac OSX)

- ```-DUSE_SYSTEM_LIBPNG=ON/OFF``` (default = *OFF*)  
+- ```-DUSE_SYSTEM_LIBPNG=ON/OFF``` (default = *OFF*) </br>
 Build against the shared libpng instead of using the builtin one. libpng 1.6+ highly recommended. Try this option if you get version conflict errors or only see black game icons.

- ```-DUSE_SYSTEM_FFMPEG=ON/OFF``` (default = *OFF*)  
+- ```-DUSE_SYSTEM_FFMPEG=ON/OFF``` (default = *OFF*) </br>
 Build against the shared ffmpeg libraries instead of using the builtin patched version. Try this if the builtin version breaks the OpenGL renderer for you.

- ```-DWITHOUT_LLVM=ON/OFF``` (default = *OFF*)  
-This forces RPCS3 to build without LLVM, not recommended.
-
- ```-DWITH_GDB=ON/OFF``` (default = *OFF*)  
-This Builds RPCS3 with support for debugging PS3 games using gdb.
-
- ```-DUSE_VULKAN=ON/OFF``` (default = *ON*)  
-This builds RPCS3 with Vulkan support.

 ## License

@@ -3,8 +3,6 @@

 #include "yaml-cpp/yaml.h"

-#include <typeinfo>
-
 namespace cfg
 {
 	logs::channel cfg("CFG");
@@ -50,11 +48,6 @@ namespace cfg
 	static void decode(const YAML::Node& data, class _base& rhs);
 }

-std::vector<std::string> cfg::make_int_range(s64 min, s64 max)
-{
-	return {std::to_string(min), std::to_string(max)};
-}
-
 bool cfg::try_to_int64(s64* out, const std::string& value, s64 min, s64 max)
 {
 	// TODO: this could be rewritten without exceptions (but it should be as safe as possible and provide logs)
@@ -89,8 +82,6 @@ bool cfg::try_to_int64(s64* out, const std::string& value, s64 min, s64 max)

 bool cfg::try_to_enum_value(u64* out, decltype(&fmt_class_string<int>::format) func, const std::string& value)
 {
-	u64 max = -1;
-
 	for (u64 i = 0;; i++)
 	{
 		std::string var;
@@ -108,8 +99,6 @@ bool cfg::try_to_enum_value(u64* out, decltype(&fmt_class_string<int>::format) f
 		{
 			break;
 		}
-
-		max = i;
 	}

 	try
@@ -119,22 +108,14 @@ bool cfg::try_to_enum_value(u64* out, decltype(&fmt_class_string<int>::format) f

 		if (pos != value.size())
 		{
-			if (out) cfg.error("cfg::try_to_enum_value('%s'): unexpected characters (pos=%zu)", value, pos);
-			return false;
-		}
-
-		if (val > max)
-		{
-			if (out) cfg.error("cfg::try_to_enum_value('%s'): out of bounds(0..%u)", value, max);
 			return false;
 		}

 		if (out) *out = val;
 		return true;
 	}
-	catch (const std::exception& e)
+	catch (...)
 	{
-		if (out) cfg.error("cfg::try_to_enum_value('%s'): invalid enum value: %s", value, e.what());
 		return false;
 	}
 }
@@ -287,19 +268,14 @@ std::string cfg::node::to_string() const
 	YAML::Emitter out;
 	cfg::encode(out, *this);

-	return {out.c_str(), out.size()};
+	return{ out.c_str(), out.size() };
 }

-bool cfg::node::from_string(const std::string& value) try
+bool cfg::node::from_string(const std::string& value)
 {
 	cfg::decode(YAML::Load(value), *this);
 	return true;
 }
-catch (const std::exception& e)
-{
-	cfg.fatal("%s thrown: %s", typeid(e).name(), e.what());
-	return false;
-}

 void cfg::node::from_default()
 {
@@ -12,9 +12,6 @@

 namespace cfg
 {
-	// Format min and max values
-	std::vector<std::string> make_int_range(s64 min, s64 max);
-
 	// Convert string to signed integer
 	bool try_to_int64(s64* out, const std::string& value, s64 min, s64 max);

@@ -252,11 +249,6 @@ namespace cfg

 			return false;
 		}
-
-		std::vector<std::string> to_list() const override
-		{
-			return make_int_range(Min, Max);
-		}
 	};

 	// Alias for 32 bit int
@@ -8,7 +8,6 @@
 #include <algorithm>
 #include <cstring>
 #include <cerrno>
-#include <typeinfo>

 using namespace std::literals::string_literals;

@@ -94,9 +93,6 @@ static fs::error to_error(DWORD e)
 	case ERROR_NEGATIVE_SEEK: return fs::error::inval;
 	case ERROR_DIRECTORY: return fs::error::inval;
 	case ERROR_INVALID_NAME: return fs::error::inval;
-	case ERROR_SHARING_VIOLATION: return fs::error::acces;
-	case ERROR_DIR_NOT_EMPTY: return fs::error::notempty;
-	case ERROR_NOT_READY: return fs::error::noent;
 	default: fmt::throw_exception("Unknown Win32 error: %u.", e);
 	}
 }
@@ -131,7 +127,6 @@ static fs::error to_error(int e)
 	case EEXIST: return fs::error::exist;
 	case EINVAL: return fs::error::inval;
 	case EACCES: return fs::error::acces;
-	case ENOTEMPTY: return fs::error::notempty;
 	default: fmt::throw_exception("Unknown system error: %d.", e);
 	}
 }
@@ -514,7 +509,7 @@ bool fs::remove_dir(const std::string& path)
 #endif
 }

-bool fs::rename(const std::string& from, const std::string& to, bool overwrite)
+bool fs::rename(const std::string& from, const std::string& to)
 {
 	const auto device = get_virtual_device(from);

@@ -529,43 +524,14 @@ bool fs::rename(const std::string& from, const std::string& to, bool overwrite)
 	}

 #ifdef _WIN32
-	const auto ws1 = to_wchar(from);
-	const auto ws2 = to_wchar(to);
-
-	if (!MoveFileExW(ws1.get(), ws2.get(), overwrite ? MOVEFILE_REPLACE_EXISTING : 0))
+	if (!MoveFileW(to_wchar(from).get(), to_wchar(to).get()))
 	{
-		DWORD error1 = GetLastError();
-
-		if (overwrite && error1 == ERROR_ACCESS_DENIED && is_dir(from) && is_dir(to))
-		{
-			if (RemoveDirectoryW(ws2.get()))
-			{
-				if (MoveFileW(ws1.get(), ws2.get()))
-				{
-					return true;
-				}
-
-				error1 = GetLastError();
-				CreateDirectoryW(ws2.get(), NULL); // TODO
-			}
-			else
-			{
-				error1 = GetLastError();
-			}
-		}
-
-		g_tls_error = to_error(error1);
+		g_tls_error = to_error(GetLastError());
 		return false;
 	}

 	return true;
 #else
-	if (!overwrite && exists(to))
-	{
-		g_tls_error = fs::error::exist;
-		return false;
-	}
-
 	if (::rename(from.c_str(), to.c_str()) != 0)
 	{
 		g_tls_error = to_error(errno);
@@ -679,17 +645,18 @@ bool fs::truncate_file(const std::string& path, u64 length)

 #ifdef _WIN32
 	// Open the file
-	const auto handle = CreateFileW(to_wchar(path).get(), GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+	const auto handle = CreateFileW(to_wchar(path).get(), GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
 	if (handle == INVALID_HANDLE_VALUE)
 	{
 		g_tls_error = to_error(GetLastError());
 		return false;
 	}

-	FILE_END_OF_FILE_INFO _eof;
-	_eof.EndOfFile.QuadPart = length;
+	LARGE_INTEGER distance;
+	distance.QuadPart = length;

-	if (!SetFileInformationByHandle(handle, FileEndOfFileInfo, &_eof, sizeof(_eof)))
+	// Seek and truncate
+	if (!SetFilePointerEx(handle, distance, NULL, FILE_BEGIN) || !SetEndOfFile(handle))
 	{
 		g_tls_error = to_error(GetLastError());
 		CloseHandle(handle);
@@ -718,7 +685,7 @@ bool fs::utime(const std::string& path, s64 atime, s64 mtime)

 #ifdef _WIN32
 	// Open the file
-	const auto handle = CreateFileW(to_wchar(path).get(), FILE_WRITE_ATTRIBUTES, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+	const auto handle = CreateFileW(to_wchar(path).get(), FILE_WRITE_ATTRIBUTES, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
 	if (handle == INVALID_HANDLE_VALUE)
 	{
 		g_tls_error = to_error(GetLastError());
@@ -797,13 +764,7 @@ fs::file::file(const std::string& path, bs_t<open_mode> mode)
 		disp = test(mode & fs::trunc) ? TRUNCATE_EXISTING : OPEN_EXISTING;
 	}

-	DWORD share = FILE_SHARE_READ;
-	if (!test(mode & fs::unshare))
-	{
-		share |= FILE_SHARE_WRITE | FILE_SHARE_DELETE;
-	}
-
-	const HANDLE handle = CreateFileW(to_wchar(path).get(), access, share, NULL, disp, FILE_ATTRIBUTE_NORMAL, NULL);
+	const HANDLE handle = CreateFileW(to_wchar(path).get(), access, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, disp, FILE_ATTRIBUTE_NORMAL, NULL);

 	if (handle == INVALID_HANDLE_VALUE)
 	{
@@ -811,7 +772,7 @@ fs::file::file(const std::string& path, bs_t<open_mode> mode)
 		return;
 	}

-	class windows_file final : public file_base, public get_native_handle
+	class windows_file final : public file_base
 	{
 		const HANDLE m_handle;

@@ -849,15 +810,23 @@ fs::file::file(const std::string& path, bs_t<open_mode> mode)

 		bool trunc(u64 length) override
 		{
-			FILE_END_OF_FILE_INFO _eof;
-			_eof.EndOfFile.QuadPart = length;
+			LARGE_INTEGER old, pos;

-			if (!SetFileInformationByHandle(m_handle, FileEndOfFileInfo, &_eof, sizeof(_eof)))
+			pos.QuadPart = 0;
+			if (!SetFilePointerEx(m_handle, pos, &old, FILE_CURRENT)) // get old position
 			{
 				g_tls_error = to_error(GetLastError());
 				return false;
 			}

+			pos.QuadPart = length;
+			if (!SetFilePointerEx(m_handle, pos, NULL, FILE_BEGIN)) // set new position
+			{
+				g_tls_error = to_error(GetLastError());
+				return false;
+			}
+
+			verify("file::trunc" HERE), SetEndOfFile(m_handle), SetFilePointerEx(m_handle, old, NULL, FILE_BEGIN);
 			return true;
 		}

@@ -910,11 +879,6 @@ fs::file::file(const std::string& path, bs_t<open_mode> mode)

 			return size.QuadPart;
 		}
-
-		native_handle get() override
-		{
-			return m_handle;
-		}
 	};

 	m_file = std::make_unique<windows_file>(handle);
@@ -938,7 +902,7 @@ fs::file::file(const std::string& path, bs_t<open_mode> mode)
 		return;
 	}

-	class unix_file final : public file_base, public get_native_handle
+	class unix_file final : public file_base
 	{
 		const int m_fd;

@@ -1027,11 +991,6 @@ fs::file::file(const std::string& path, bs_t<open_mode> mode)

 			return file_info.st_size;
 		}
-
-		native_handle get() override
-		{
-			return m_fd;
-		}
 	};

 	m_file = std::make_unique<unix_file>(fd);
@@ -1107,20 +1066,6 @@ fs::file::file(const void* ptr, std::size_t size)
 	m_file = std::make_unique<memory_stream>(ptr, size);
 }

-fs::native_handle fs::file::get_handle() const
-{
-	if (auto getter = dynamic_cast<get_native_handle*>(m_file.get()))
-	{
-		return getter->get();
-	}
-
-#ifdef _WIN32
-	return INVALID_HANDLE_VALUE;
-#else
-	return -1;
-#endif
-}
-
 void fs::dir::xnull() const
 {
 	fmt::throw_exception<std::logic_error>("fs::dir is null");
@@ -1453,7 +1398,6 @@ void fmt_class_string<fs::error>::format(std::string& out, u64 arg)
 		case fs::error::noent: return "Not found";
 		case fs::error::exist: return "Already exists";
 		case fs::error::acces: return "Access violation";
-		case fs::error::notempty: return "Not empty";
 		}

 		return unknown;
@@ -10,12 +10,6 @@

 namespace fs
 {
-#ifdef _WIN32
-	using native_handle = void*;
-#else
-	using native_handle = int;
-#endif
-
 	// File open mode flags
 	enum class open_mode : u32
 	{
@@ -25,7 +19,6 @@ namespace fs
 		create,
 		trunc,
 		excl,
-		unshare,

 		__bitset_enum_max
 	};
@@ -36,7 +29,6 @@ namespace fs
 	constexpr auto create  = +open_mode::create; // Create file if it doesn't exist
 	constexpr auto trunc   = +open_mode::trunc; // Clear opened file if it's not empty
 	constexpr auto excl    = +open_mode::excl; // Failure if the file already exists (used with `create`)
-	constexpr auto unshare = +open_mode::unshare; // Prevent opening the file twice

 	constexpr auto rewrite = open_mode::write + open_mode::create + open_mode::trunc;

@@ -63,12 +55,6 @@ namespace fs
 		s64 ctime;
 	};

-	// Native handle getter
-	struct get_native_handle
-	{
-		virtual native_handle get() = 0;
-	};
-
 	// File handle base
 	struct file_base
 	{
@@ -159,7 +145,7 @@ namespace fs
 	bool create_path(const std::string& path);

 	// Rename (move) file or directory
-	bool rename(const std::string& from, const std::string& to, bool overwrite);
+	bool rename(const std::string& from, const std::string& to);

 	// Copy file contents
 	bool copy_file(const std::string& from, const std::string& to, bool overwrite);
@@ -361,9 +347,6 @@ namespace fs
 			if (seek(0), !read(result)) xfail();
 			return result;
 		}
-
-		// Get native handle if available
-		native_handle get_handle() const;
 	};

 	class dir final
@@ -502,7 +485,6 @@ namespace fs
 		noent,
 		exist,
 		acces,
-		notempty,
 	};

 	// Error code returned
@@ -12,7 +12,6 @@
 #include "File.h"
 #include "Log.h"
 #include "mutex.h"
-#include "sysinfo.h"
 #include "VirtualMemory.h"

 #ifdef _MSC_VER
@@ -90,13 +89,13 @@ extern void jit_finalize()
 // Helper class
 struct MemoryManager : llvm::RTDyldMemoryManager
 {
-	std::unordered_map<std::string, u64>& m_link;
+	std::unordered_map<std::string, std::uintptr_t>& m_link;

 	std::array<u8, 16>* m_tramps{};

 	u8* m_code_addr{}; // TODO

-	MemoryManager(std::unordered_map<std::string, u64>& table)
+	MemoryManager(std::unordered_map<std::string, std::uintptr_t>& table)
 		: m_link(table)
 	{
 	}
@@ -258,11 +257,11 @@ struct MemoryManager : llvm::RTDyldMemoryManager
 		return RTDyldMemoryManager::registerEHFrames(addr, load_addr, size);
 	}

-	virtual void deregisterEHFrames(u8* addr, u64 load_addr, std::size_t size) override
+	virtual void deregisterEHFrames() override
 	{
 		LOG_ERROR(GENERAL, "deregisterEHFrames() called"); // Not expected

-		return RTDyldMemoryManager::deregisterEHFrames(addr, load_addr, size);
+		return RTDyldMemoryManager::deregisterEHFrames();
 	}
 };

@@ -344,54 +343,32 @@ public:
 		LOG_SUCCESS(GENERAL, "LLVM: Created module: %s", module->getName().data());
 	}

-	static std::unique_ptr<llvm::MemoryBuffer> load(const std::string& path)
+	std::unique_ptr<llvm::MemoryBuffer> getObject(const llvm::Module* module) override
 	{
-		if (fs::file cached{path, fs::read})
+		std::string name = m_path;
+		name.append(module->getName());
+
+		if (fs::file cached{name, fs::read})
 		{
 			auto buf = llvm::MemoryBuffer::getNewUninitMemBuffer(cached.size());
 			cached.read(const_cast<char*>(buf->getBufferStart()), buf->getBufferSize());
-			return buf;
-		}
-
-		return nullptr;
-	}
-
-	std::unique_ptr<llvm::MemoryBuffer> getObject(const llvm::Module* module) override
-	{
-		std::string path = m_path;
-		path.append(module->getName());
-
-		if (auto buf = load(path))
-		{
 			LOG_SUCCESS(GENERAL, "LLVM: Loaded module: %s", module->getName().data());
 			return buf;
 		}
-
-		return nullptr;
+		else
+		{
+			return nullptr;
+		}
 	}
 };

-jit_compiler::jit_compiler(const std::unordered_map<std::string, u64>& _link, std::string _cpu)
+jit_compiler::jit_compiler(const std::unordered_map<std::string, std::uintptr_t>& _link, std::string _cpu)
 	: m_link(std::move(_link))
 	, m_cpu(std::move(_cpu))
 {
 	if (m_cpu.empty())
 	{
 		m_cpu = llvm::sys::getHostCPUName();
-
-		if (m_cpu == "sandybridge" ||
-			m_cpu == "ivybridge" ||
-			m_cpu == "haswell" ||
-			m_cpu == "broadwell" ||
-			m_cpu == "skylake" ||
-			m_cpu == "skylake-avx512" ||
-			m_cpu == "cannonlake")
-		{
-			if (!utils::has_avx())
-			{
-				m_cpu = "nehalem";
-			}
-		}
 	}

 	std::string result;
@@ -453,11 +430,6 @@ void jit_compiler::add(std::unique_ptr<llvm::Module> module, const std::string&
 	}
 }

-void jit_compiler::add(const std::string& path)
-{
-	m_engine->addObjectFile(std::move(llvm::object::ObjectFile::createObjectFile(*ObjectCache::load(path)).get()));
-}
-
 void jit_compiler::fin()
 {
 	m_engine->finalizeObject();
@@ -49,12 +49,9 @@ public:
 		return m_context;
 	}

-	// Add module (path to obj cache dir)
+	// Add module
 	void add(std::unique_ptr<llvm::Module> module, const std::string& path);

-	// Add object (path to obj file)
-	void add(const std::string& path);
-
 	// Finalize
 	void fin();

@@ -0,0 +1,23 @@
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
@@ -1,265 +0,0 @@
-/*
- * Lightweight URL & URI parser (RFC 1738, RFC 3986)
- * https://github.com/corporateshark/LUrlParser
- * 
- * The MIT License (MIT)
- * 
- * Copyright (C) 2015 Sergey Kosarevsky (sk@linderdaum.com)
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include "LUrlParser.h"
-
-#include <algorithm>
-#include <cstring>
-#include <stdlib.h>
-
-// check if the scheme name is valid
-static bool IsSchemeValid( const std::string& SchemeName )
-{
-	for ( auto c : SchemeName  )
-	{
-		if ( !isalpha( c ) && c != '+' && c != '-' && c != '.' ) return false;
-	}
-
-	return true;
-}
-
-bool LUrlParser::clParseURL::GetPort( int* OutPort ) const
-{
-	if ( !IsValid() ) { return false; }
-
-	int Port = atoi( m_Port.c_str() );
-
-	if ( Port <= 0 || Port > 65535 ) { return false; }
-
-	if ( OutPort ) { *OutPort = Port; }
-
-	return true;
-}
-
-// based on RFC 1738 and RFC 3986
-LUrlParser::clParseURL LUrlParser::clParseURL::ParseURL( const std::string& URL )
-{
-	LUrlParser::clParseURL Result;
-
-	const char* CurrentString = URL.c_str();
-
-	/*
-	 *	<scheme>:<scheme-specific-part>
-	 *	<scheme> := [a-z\+\-\.]+
-	 *	For resiliency, programs interpreting URLs should treat upper case letters as equivalent to lower case in scheme names
-	 */
-
-	// try to read scheme
-	{
-		const char* LocalString = strchr( CurrentString, ':' );
-
-		if ( !LocalString )
-		{
-			return clParseURL( LUrlParserError_NoUrlCharacter );
-		}
-
-		// save the scheme name
-		Result.m_Scheme = std::string( CurrentString, LocalString - CurrentString );
-
-		if ( !IsSchemeValid( Result.m_Scheme ) )
-		{
-			return clParseURL( LUrlParserError_InvalidSchemeName );
-		}
-
-		// scheme should be lowercase
-		std::transform( Result.m_Scheme.begin(), Result.m_Scheme.end(), Result.m_Scheme.begin(), ::tolower );
-
-		// skip ':'
-		CurrentString = LocalString+1;
-	}
-
-	/*
-	 *	//<user>:<password>@<host>:<port>/<url-path>
-	 *	any ":", "@" and "/" must be normalized
-	 */
-
-	// skip "//"
-	if ( *CurrentString++ != '/' ) return clParseURL( LUrlParserError_NoDoubleSlash );
-	if ( *CurrentString++ != '/' ) return clParseURL( LUrlParserError_NoDoubleSlash );
-
-	// check if the user name and password are specified
-	bool bHasUserName = false;
-
-	const char* LocalString = CurrentString;
-
-	while ( *LocalString )
-	{
-		if ( *LocalString == '@' )
-		{
-			// user name and password are specified
-			bHasUserName = true;
-			break;
-		}
-		else if ( *LocalString == '/' )
-		{
-			// end of <host>:<port> specification
-			bHasUserName = false;
-			break;
-		}
-
-		LocalString++;
-	}
-
-	// user name and password
-	LocalString = CurrentString;
-
-	if ( bHasUserName )
-	{
-		// read user name
-		while ( *LocalString && *LocalString != ':' && *LocalString != '@' ) LocalString++;
-
-		Result.m_UserName = std::string( CurrentString, LocalString - CurrentString );
-
-		// proceed with the current pointer
-		CurrentString = LocalString;
-
-		if ( *CurrentString == ':' )
-		{
-			// skip ':'
-			CurrentString++;
-
-			// read password
-			LocalString = CurrentString;
-
-			while ( *LocalString && *LocalString != '@' ) LocalString++;
-
-			Result.m_Password = std::string( CurrentString, LocalString - CurrentString );
-
-			CurrentString = LocalString;
-		}
-
-		// skip '@'
-		if ( *CurrentString != '@' )
-		{
-			return clParseURL( LUrlParserError_NoAtSign );
-		}
-
-		CurrentString++;
-	}
-
-	bool bHasBracket = ( *CurrentString == '[' );
-
-	// go ahead, read the host name
-	LocalString = CurrentString;
-
-	while ( *LocalString )
-	{
-		if ( bHasBracket && *LocalString == ']' )
-		{
-			// end of IPv6 address
-			LocalString++;
-			break;
-		}
-		else if ( !bHasBracket && ( *LocalString == ':' || *LocalString == '/' ) )
-		{
-			// port number is specified
-			break;
-		}
-
-		LocalString++;
-	}
-
-	Result.m_Host = std::string( CurrentString, LocalString - CurrentString );
-
-	CurrentString = LocalString;
-
-	// is port number specified?
-	if ( *CurrentString == ':' )
-	{
-		CurrentString++;
-
-		// read port number
-		LocalString = CurrentString;
-
-		while ( *LocalString && *LocalString != '/' ) LocalString++;
-
-		Result.m_Port = std::string( CurrentString, LocalString - CurrentString );
-
-		CurrentString = LocalString;
-	}
-
-	// end of string
-	if ( !*CurrentString )
-	{
-		Result.m_ErrorCode = LUrlParserError_Ok;
-
-		return Result;
-	}
-
-	// skip '/'
-	if ( *CurrentString != '/' )
-	{
-		return clParseURL( LUrlParserError_NoSlash );
-	}
-
-	CurrentString++;
-
-	// parse the path
-	LocalString = CurrentString;
-
-	while ( *LocalString && *LocalString != '#' && *LocalString != '?' ) LocalString++;
-
-	Result.m_Path = std::string( CurrentString, LocalString - CurrentString );
-
-	CurrentString = LocalString;
-
-	// check for query
-	if ( *CurrentString == '?' )
-	{
-		// skip '?'
-		CurrentString++;
-
-		// read query
-		LocalString = CurrentString;
-
-		while ( *LocalString && *LocalString != '#' ) LocalString++;
-
-		Result.m_Query = std::string( CurrentString, LocalString - CurrentString );
-
-		CurrentString = LocalString;
-	}
-
-	// check for fragment
-	if ( *CurrentString == '#' )
-	{
-		// skip '#'
-		CurrentString++;
-
-		// read fragment
-		LocalString = CurrentString;
-
-		while ( *LocalString ) LocalString++;
-
-		Result.m_Fragment = std::string( CurrentString, LocalString - CurrentString );
-
-		CurrentString = LocalString;
-	}
-
-	Result.m_ErrorCode = LUrlParserError_Ok;
-
-	return Result;
-}
@@ -1,78 +0,0 @@
-/*
- * Lightweight URL & URI parser (RFC 1738, RFC 3986)
- * https://github.com/corporateshark/LUrlParser
- * 
- * The MIT License (MIT)
- * 
- * Copyright (C) 2015 Sergey Kosarevsky (sk@linderdaum.com)
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#pragma once
-
-#include <string>
-
-namespace LUrlParser
-{
-	enum LUrlParserError
-	{
-		LUrlParserError_Ok = 0,
-		LUrlParserError_Uninitialized = 1,
-		LUrlParserError_NoUrlCharacter = 2,
-		LUrlParserError_InvalidSchemeName = 3,
-		LUrlParserError_NoDoubleSlash = 4,
-		LUrlParserError_NoAtSign = 5,
-		LUrlParserError_UnexpectedEndOfLine = 6,
-		LUrlParserError_NoSlash = 7,
-	};
-
-	class clParseURL
-	{
-	public:
-		LUrlParserError m_ErrorCode;
-		std::string m_Scheme;
-		std::string m_Host;
-		std::string m_Port;
-		std::string m_Path;
-		std::string m_Query;
-		std::string m_Fragment;
-		std::string m_UserName;
-		std::string m_Password;
-
-		clParseURL()
-			: m_ErrorCode( LUrlParserError_Uninitialized )
-		{}
-
-		/// return 'true' if the parsing was successful
-		bool IsValid() const { return m_ErrorCode == LUrlParserError_Ok; }
-
-		/// helper to convert the port number to int, return 'true' if the port is valid (within the 0..65535 range)
-		bool GetPort( int* OutPort ) const;
-
-		/// parse the URL
-		static clParseURL ParseURL( const std::string& URL );
-
-	private:
-		explicit clParseURL( LUrlParserError ErrorCode )
-			: m_ErrorCode( ErrorCode )
-		{}
-	};
-
-} // namespace LUrlParser
@@ -3,21 +3,16 @@
 #include "StrFmt.h"
 #include "sema.h"

-#include "Utilities/sysinfo.h"
 #include "rpcs3_version.h"
 #include <string>
 #include <unordered_map>

 #ifdef _WIN32
-#define NOMINMAX
 #include <Windows.h>
 #else
 #include <chrono>
-#include <sys/mman.h>
 #endif

-#include <zlib.h>
-
 static std::string empty_string()
 {
 	return {};
@@ -49,71 +44,32 @@ void fmt_class_string<logs::level>::format(std::string& out, u64 arg)

 namespace logs
 {
-	constexpr std::size_t s_log_size = 128 * 1024 * 1024;
-	constexpr std::size_t s_log_size_s = s_log_size / 2;
-	constexpr std::size_t s_log_size_t = s_log_size / 4 + s_log_size_s;
-	constexpr std::size_t s_log_size_e = s_log_size / 8 + s_log_size_t;
-	constexpr std::size_t s_log_size_f = s_log_size / 16 + s_log_size_e;
-
 	class file_writer
 	{
+		// Could be memory-mapped file
 		fs::file m_file;
-		std::string m_name;
-
-#ifdef _WIN32
-		::HANDLE m_fmap;
-#endif
-		atomic_t<std::size_t> m_pos{0};
-		std::size_t m_size{0};
-		uchar* m_fptr{};

 	public:
 		file_writer(const std::string& name);

-		virtual ~file_writer();
+		virtual ~file_writer() = default;

 		// Append raw data
-		void log(logs::level sev, const char* text, std::size_t size);
-	};
-
-	struct channel_info
-	{
-		channel* pointer = nullptr;
-		level enabled = level::notice;
-
-		void set_level(level value)
-		{
-			enabled = value;
-
-			if (pointer)
-			{
-				pointer->enabled = value;
-			}
-		}
-	};
-
-	struct stored_message
-	{
-		message m;
-		u64 stamp;
-		std::string prefix;
-		std::string text;
+		void log(const char* text, std::size_t size);
 	};

 	struct file_listener : public file_writer, public listener
 	{
-		file_listener(const std::string& name);
-
-		virtual ~file_listener() = default;
+		file_listener(const std::string& name)
+			: file_writer(name)
+			, listener()
+		{
+			const std::string& start = fmt::format("\xEF\xBB\xBF" "RPCS3 v%s\n", rpcs3::version.to_string());
+			file_writer::log(start.data(), start.size());
+		}

 		// Encode level, current thread name, channel name and write log message
 		virtual void log(u64 stamp, const message& msg, const std::string& prefix, const std::string& text) override;
-
-		// Channel registry
-		std::unordered_map<std::string, channel_info> channels;
-
-		// Messages for delayed listener initialization
-		std::vector<stored_message> messages;
 	};

 	static file_listener* get_logger()
@@ -165,17 +121,33 @@ namespace logs
 	channel SPU("SPU");
 	channel ARMv7("ARMv7");

+	struct channel_info
+	{
+		channel* pointer = nullptr;
+		level enabled = level::notice;
+
+		void set_level(level value)
+		{
+			enabled = value;
+
+			if (pointer)
+			{
+				pointer->enabled = value;
+			}
+		}
+	};
+
 	// Channel registry mutex
 	semaphore<> g_mutex;

-	// Must be set to true in main()
-	atomic_t<bool> g_init{false};
+	// Channel registry
+	std::unordered_map<std::string, channel_info> g_channels;

 	void reset()
 	{
 		semaphore_lock lock(g_mutex);

-		for (auto&& pair : get_logger()->channels)
+		for (auto&& pair : g_channels)
 		{
 			pair.second.set_level(level::notice);
 		}
@@ -185,18 +157,7 @@ namespace logs
 	{
 		semaphore_lock lock(g_mutex);

-		get_logger()->channels[ch_name].set_level(value);
-	}
-
-	// Must be called in main() to stop accumulating messages in g_messages
-	void set_init()
-	{
-		if (!g_init)
-		{
-			semaphore_lock lock(g_mutex);
-			get_logger()->messages.clear();
-			g_init = true;
-		}
+		g_channels[ch_name].set_level(value);
 	}
 }

@@ -209,19 +170,11 @@ void logs::listener::add(logs::listener* _new)
 	// Get first (main) listener
 	listener* lis = get_logger();

-	semaphore_lock lock(g_mutex);
-
 	// Install new listener at the end of linked list
 	while (lis->m_next || !lis->m_next.compare_and_swap_test(nullptr, _new))
 	{
 		lis = lis->m_next;
 	}
-
-	// Send initial messages
-	for (const auto& msg : get_logger()->messages)
-	{
-		_new->log(msg.stamp, msg.m, msg.prefix, msg.text);
-	}
 }

 void logs::message::broadcast(const char* fmt, const fmt_type_info* sup, const u64* args)
@@ -234,7 +187,7 @@ void logs::message::broadcast(const char* fmt, const fmt_type_info* sup, const u
 	{
 		semaphore_lock lock(g_mutex);

-		auto& info = get_logger()->channels[ch->name];
+		auto& info = g_channels[ch->name];

 		if (info.pointer && info.pointer != ch)
 		{
@@ -254,30 +207,13 @@ void logs::message::broadcast(const char* fmt, const fmt_type_info* sup, const u
 	}

 	// Get text
-	thread_local std::string text; text.clear();
+	std::string text;
 	fmt::raw_append(text, fmt, sup, args);
 	std::string prefix = g_tls_log_prefix();

 	// Get first (main) listener
 	listener* lis = get_logger();
-
-	if (!g_init)
-	{
-		semaphore_lock lock(g_mutex);
-
-		if (!g_init)
-		{
-			while (lis)
-			{
-				lis->log(stamp, *this, prefix, text);
-				lis = lis->m_next;
-			}
-
-			// Store message additionally
-			get_logger()->messages.emplace_back(stored_message{*this, stamp, std::move(prefix), text});
-		}
-	}
-
+	
 	// Send message to all listeners
 	while (lis)
 	{
@@ -289,30 +225,13 @@ void logs::message::broadcast(const char* fmt, const fmt_type_info* sup, const u
 [[noreturn]] extern void catch_all_exceptions();

 logs::file_writer::file_writer(const std::string& name)
-	: m_name(name)
 {
 	try
 	{
-		if (!m_file.open(fs::get_config_dir() + name, fs::read + fs::write + fs::create + fs::trunc + fs::unshare))
+		if (!m_file.open(fs::get_config_dir() + name, fs::rewrite + fs::append))
 		{
-			fmt::throw_exception("Can't create file %s (error %s)", name, fs::g_tls_error);
+			fmt::throw_exception("Can't create log file %s (error %s)", name, fs::g_tls_error);
 		}
-
-#ifdef _WIN32
-		m_fmap = CreateFileMappingW(m_file.get_handle(), 0, PAGE_READWRITE, s_log_size >> 32, s_log_size & 0xffffffff, 0);
-		m_fptr = m_fmap ? (uchar*)MapViewOfFile(m_fmap, FILE_MAP_WRITE, 0, 0, 0) : nullptr;
-#else
-		m_file.trunc(s_log_size);
-		m_fptr = (uchar*)::mmap(0, s_log_size, PROT_READ | PROT_WRITE, MAP_SHARED, m_file.get_handle(), 0);
-#endif
-
-		verify(name.c_str()), m_fptr;
-		std::memset(m_fptr, '\n', s_log_size);
-
-		// Rotate backups (TODO)
-		fs::remove_file(fs::get_config_dir() + name + "1.gz");
-		fs::create_dir(fs::get_config_dir() + "old_logs");
-		fs::rename(fs::get_config_dir() + m_name + ".gz", fs::get_config_dir() + "old_logs/" + m_name + ".gz", true);
 	}
 	catch (...)
 	{
@@ -320,91 +239,14 @@ logs::file_writer::file_writer(const std::string& name)
 	}
 }

-logs::file_writer::~file_writer()
+void logs::file_writer::log(const char* text, std::size_t size)
 {
-	if (m_size == 0)
-	{
-		m_size = std::min<std::size_t>(+m_pos, s_log_size);
-	}
-
-	// Compress
-	z_stream zs{};
-	if (deflateInit2(&zs, 9, Z_DEFLATED, 16 + 15, 9, Z_DEFAULT_STRATEGY) == Z_OK)
-	{
-		auto buf = std::make_unique<uchar[]>(s_log_size);
-		zs.avail_in  = ::narrow<u32>(m_size);
-		zs.avail_out = s_log_size;
-		zs.next_in   = m_fptr;
-		zs.next_out  = buf.get();
-
-		if (deflate(&zs, Z_FINISH) != Z_STREAM_ERROR)
-		{
-			fs::file(fs::get_config_dir() + m_name + ".gz", fs::rewrite).write(buf.get(), zs.total_out);
-		}
-
-		if (deflateEnd(&zs) != Z_OK)
-		{
-		}
-	}
-
-#ifdef _WIN32
-	UnmapViewOfFile(m_fptr);
-	CloseHandle(m_fmap);
-#else
-	::munmap(m_fptr, s_log_size);
-#endif
-	m_file.trunc(m_size);
-}
-
-void logs::file_writer::log(logs::level sev, const char* text, std::size_t size)
-{
-	// Adaptive log limit
-	const auto lim =
-		sev >= logs::level::success ? s_log_size_s :
-		sev == logs::level::todo ? s_log_size_t :
-		sev == logs::level::error ? s_log_size_e : s_log_size_f;
-
-	if (m_pos >= lim)
-	{
-		return;
-	}
-
-	// Acquire memory
-	const auto pos = m_pos.fetch_add(size);
-
-	// Write if possible
-	if (pos + size <= s_log_size)
-	{
-		std::memcpy(m_fptr + pos, text, size);
-	}
-	else if (pos <= s_log_size)
-	{
-		m_size = pos;
-	}
-}
-
-logs::file_listener::file_listener(const std::string& name)
-	: file_writer(name)
-	, listener()
-{
-	// Write UTF-8 BOM
-	file_writer::log(logs::level::always, "\xEF\xBB\xBF", 3);
-
-	// Write initial message
-	stored_message ver;
-	ver.m.ch  = nullptr;
-	ver.m.sev = level::always;
-	ver.stamp = 0;
-	ver.text = fmt::format("RPCS3 v%s | %s\n%s", rpcs3::version.to_string(), rpcs3::get_branch(), utils::get_system_info());
-
-	file_writer::log(logs::level::always, ver.text.data(), ver.text.size());
-	file_writer::log(logs::level::always, "\n", 1);
-	messages.emplace_back(std::move(ver));
+	m_file.write(text, size);
 }

 void logs::file_listener::log(u64 stamp, const logs::message& msg, const std::string& prefix, const std::string& _text)
 {
-	thread_local std::string text;
+	std::string text; text.reserve(prefix.size() + _text.size() + 200);

 	// Used character: U+00B7 (Middle Dot)
 	switch (msg.sev)
@@ -432,8 +274,8 @@ void logs::file_listener::log(u64 stamp, const logs::message& msg, const std::st
 		text += prefix;
 		text += "} ";
 	}
-
-	if (msg.ch && '\0' != *msg.ch->name)
+	
+	if ('\0' != *msg.ch->name)
 	{
 		text += msg.ch->name;
 		text += msg.sev == level::todo ? " TODO: " : ": ";
@@ -442,9 +284,9 @@ void logs::file_listener::log(u64 stamp, const logs::message& msg, const std::st
 	{
 		text += "TODO: ";
 	}
-
+	
 	text += _text;
 	text += '\n';

-	file_writer::log(msg.sev, text.data(), text.size());
+	file_writer::log(text.data(), text.size());
 }
@@ -0,0 +1,98 @@
+#pragma once
+
+class MTProgressDialog : public wxDialog
+{
+	wxGauge** m_gauge;
+	wxStaticText** m_msg;
+
+	wxArrayLong m_maximum;
+	const u8 m_cores;
+
+	static const uint layout = 16;
+	static const uint maxdial = 65536;
+	wxArrayInt m_lastupdate;
+
+public:
+	MTProgressDialog(wxWindow* parent, const wxSize& size, const wxString& title,
+			const wxString& msg, const wxArrayLong& maximum, const u8 cores)
+		: wxDialog(parent, wxID_ANY, title, wxDefaultPosition)
+		, m_maximum(maximum)
+		, m_cores(cores)
+	{
+		wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL);
+
+		m_gauge = new wxGauge*[m_cores];
+		m_msg = new wxStaticText*[m_cores];
+
+		m_lastupdate.SetCount(cores);
+
+		for(uint i=0; i<m_cores; ++i)
+		{
+			m_lastupdate[i] = -1;
+
+			m_msg[i] = new wxStaticText(this, wxID_ANY, msg);
+			sizer->Add(m_msg[i], 0, wxLEFT | wxTOP, layout);
+
+			m_gauge[i] = new wxGauge(this, wxID_ANY, maxdial,
+									  wxDefaultPosition, wxDefaultSize,
+									  wxGA_HORIZONTAL );
+
+			sizer->Add(m_gauge[i], 0, wxLEFT | wxRIGHT | wxTOP | wxEXPAND, layout);
+			m_gauge[i]->SetValue(0);
+
+			sizer->AddSpacer(5);
+		}
+
+		SetSizerAndFit(sizer);
+		if(size != wxDefaultSize)
+		{
+			SetSize(size);
+		}
+		else
+		{
+			wxSize ws;
+			ws.x = 400;
+			ws.y = GetSize().y + 8;
+			SetSize(ws);
+		}
+
+		m_maximum.SetCount(m_cores);
+
+		Show();
+	}
+
+	void Update(const u8 thread_id, const u64 value, const wxString& msg)
+	{
+		if(thread_id > m_cores) return;
+
+		const int curupdate = (int)(((double)value/(double)m_maximum[thread_id])*1000);
+		if(curupdate == m_lastupdate[thread_id]) return;
+		m_lastupdate[thread_id] = curupdate;
+
+		m_msg[thread_id]->SetLabel(msg);
+
+		if(value >= (u32)m_maximum[thread_id]) return;
+		m_gauge[thread_id]->SetValue(((double)value / (double)m_maximum[thread_id]) * maxdial);
+	}
+
+	const u32 GetMaxValue(const uint thread_id) const
+	{
+		if(thread_id > m_cores) return 0;
+		return m_maximum[thread_id];
+	}
+
+	void SetMaxFor(const uint thread_id, const u64 val)
+	{
+		if(thread_id > m_cores) return;
+		m_maximum[thread_id] = val;
+		m_lastupdate[thread_id] = 0;
+	}
+
+	virtual void Close(bool force = false)
+	{
+		m_lastupdate.Empty();
+		m_maximum.Empty();
+
+		wxDialog::Close(force);
+	}
+};
@@ -257,8 +257,8 @@ struct fmt::cfmt_src

 	void skip(std::size_t extra)
 	{
-		sup += extra + 1;
-		args += extra + 1;
+		++sup += extra;
+		++args += extra;
 	}

 	std::size_t fmt_string(std::string& out, std::size_t extra) const
@@ -3,10 +3,7 @@
 #include "Emu/System.h"
 #include "Emu/IdManager.h"
 #include "Emu/Cell/RawSPUThread.h"
-#include "Emu/Cell/lv2/sys_mmapper.h"
-#include "Emu/Cell/lv2/sys_event.h"
 #include "Thread.h"
-#include <typeinfo>

 #ifdef _WIN32
 #include <Windows.h>
@@ -33,25 +30,13 @@ thread_local u64 g_tls_fault_spu = 0;

 static void report_fatal_error(const std::string& msg)
 {
-	static semaphore<> g_report_only_once;
-
-	g_report_only_once.wait();
-
 	std::string _msg = msg + "\n"
-		"HOW TO REPORT ERRORS: https://github.com/RPCS3/rpcs3/wiki/How-to-ask-for-Support\n"
+		"HOW TO REPORT ERRORS: Check the FAQ, README, other sources.\n"
 		"Please, don't send incorrect reports. Thanks for understanding.\n";

 #ifdef _WIN32
-	_msg += "\nPress Yes or Enter to visit the URL above immediately.";
-	const std::size_t buf_size = _msg.size() + 1;
-	const int size = static_cast<int>(buf_size);
-	std::unique_ptr<wchar_t[]> buffer(new wchar_t[buf_size]);
-	MultiByteToWideChar(CP_UTF8, 0, _msg.c_str(), size, buffer.get(), size);
-
-	if (MessageBoxW(0, buffer.get(), L"Fatal error", MB_ICONERROR | MB_YESNO) == IDYES)
-	{
-		ShellExecuteW(0, L"open", L"https://github.com/RPCS3/rpcs3/wiki/How-to-ask-for-Support", 0, 0, SW_SHOWNORMAL);
-	}
+	_msg += "Press (Ctrl+C) to copy this message.";
+	MessageBoxA(0, _msg.c_str(), "Fatal error", MB_ICONERROR); // TODO: unicode message
 #else
 	std::printf("Fatal error: \n%s", _msg.c_str());
 #endif
@@ -1251,7 +1236,7 @@ bool handle_access_violation(u32 addr, bool is_writing, x64_context* context)
 		return true;
 	}

-	if (vm::check_addr(addr, std::max<std::size_t>(1, d_size), vm::page_allocated | (is_writing ? vm::page_writable : vm::page_readable)))
+	if (vm::check_addr(addr, std::max<std::size_t>(1, d_size)))
 	{
 		if (cpu)
 		{
@@ -1261,60 +1246,9 @@ bool handle_access_violation(u32 addr, bool is_writing, x64_context* context)
 		return true;
 	}

+	// TODO: allow recovering from a page fault as a feature of PS3 virtual memory
 	if (cpu)
 	{
-		if (fxm::check<page_fault_notification_entries>())
-		{
-			for (const auto& entry : fxm::get<page_fault_notification_entries>()->entries)
-			{
-				auto mem = vm::get(vm::any, entry.start_addr);
-				if (!mem)
-				{
-					continue;
-				}
-				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] 
-					// know that this thread is page faulted and where.
-
-					auto pf_entries = fxm::get_always<page_fault_event_entries>();
-					{
-						semaphore_lock pf_lock(pf_entries->pf_mutex);
-						page_fault_event pf_event{ cpu->id, addr };
-						pf_entries->events.emplace_back(pf_event);
-					}
-
-					// Now, we notify the game that a page fault occurred so it can rectify it.
-					// Note, for data3, were the memory readable AND we got a page fault, it must be due to a write violation since reads are allowed.
-					be_t<u64> data1 = addr;
-					be_t<u64> data2 = (SYS_MEMORY_PAGE_FAULT_TYPE_PPU_THREAD << 32) + cpu->id; // TODO: fix hack for now that assumes PPU thread always.
-					be_t<u64> data3 = vm::check_addr(addr, a_size, vm::page_readable) ? SYS_MEMORY_PAGE_FAULT_CAUSE_READ_ONLY : SYS_MEMORY_PAGE_FAULT_CAUSE_NON_MAPPED;
-
-					LOG_ERROR(MEMORY, "Page_fault %s location 0x%x because of %s memory", is_writing ? "writing" : "reading",
-						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)
-					{
-						lv2_obj::sleep(*cpu, 1000);
-						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);
-					}
-
-					lv2_obj::sleep(*cpu);
-					thread_ctrl::wait();
-					return true;
-				}
-			}
-		}
-
 		LOG_FATAL(MEMORY, "Access violation %s location 0x%x", is_writing ? "writing" : "reading", addr);
 		cpu->state += cpu_flag::dbg_pause;
 		cpu->check_state();
@@ -1479,6 +1413,13 @@ static LONG exception_filter(PEXCEPTION_POINTERS pExp)

 	msg += fmt::format("RPCS3 image base: %p.\n", GetModuleHandle(NULL));

+	if (pExp->ExceptionRecord->ExceptionCode == EXCEPTION_ILLEGAL_INSTRUCTION)
+	{
+		msg += "\n"
+			"Illegal instruction exception occured.\n"
+			"Note that your CPU must support SSSE3 extension.\n";
+	}
+
 	// TODO: print registers and the callstack

 	// Report fatal error
@@ -1884,30 +1825,20 @@ void thread_ctrl::set_native_priority(int priority)
 	HANDLE _this_thread = GetCurrentThread();
 	INT native_priority = THREAD_PRIORITY_NORMAL;

-	if (priority > 0)
+	switch (priority)
+	{
+	default:
+	case 0:
+		break;
+	case 1:
 		native_priority = THREAD_PRIORITY_ABOVE_NORMAL;
-	if (priority < 0)
+		break;
+	case -1:
 		native_priority = THREAD_PRIORITY_BELOW_NORMAL;
-
-	if (!SetThreadPriority(_this_thread, native_priority))
-	{
-		LOG_ERROR(GENERAL, "SetThreadPriority() failed: 0x%x", GetLastError());
+		break;
 	}
-#else
-	int policy;
-	struct sched_param param;

-	pthread_getschedparam(pthread_self(), &policy, &param);
-
-	if (priority > 0)
-		param.sched_priority = sched_get_priority_max(policy);
-	if (priority < 0)
-		param.sched_priority = sched_get_priority_min(policy);
-
-	if (int err = pthread_setschedparam(pthread_self(), policy, &param))
-	{
-		LOG_ERROR(GENERAL, "pthraed_setschedparam() failed: %d", err);
-	}
+	SetThreadPriority(_this_thread, native_priority);
 #endif
 }

@@ -70,7 +70,7 @@ namespace utils
 	void memory_decommit(void* pointer, std::size_t size)
 	{
 #ifdef _WIN32
-		verify(HERE), ::VirtualFree(pointer, size, MEM_DECOMMIT);
+		verify(HERE), ::VirtualFree(pointer, 0, MEM_DECOMMIT);
 #else
 		verify(HERE), ::mmap(pointer, size, PROT_NONE, MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0);
 #endif
@@ -10,18 +10,13 @@ void fmt_class_string<patch_type>::format(std::string& out, u64 arg)
 	{
 		switch (value)
 		{
-		case patch_type::load: return "load";
 		case patch_type::byte: return "byte";
 		case patch_type::le16: return "le16";
 		case patch_type::le32: return "le32";
 		case patch_type::le64: return "le64";
-		case patch_type::bef32: return "bef32";
-		case patch_type::bef64: return "bef64";
 		case patch_type::be16: return "be16";
 		case patch_type::be32: return "be32";
 		case patch_type::be64: return "be64";
-		case patch_type::lef32: return "lef32";
-		case patch_type::lef64: return "lef64";
 		}

 		return unknown;
@@ -44,67 +39,23 @@ void patch_engine::append(const std::string& patch)
 				u64 type64 = 0;
 				cfg::try_to_enum_value(&type64, &fmt_class_string<patch_type>::format, patch[0].Scalar());

-				struct patch info{};
+				struct patch info;
 				info.type   = static_cast<patch_type>(type64);
-				info.offset = patch[1].as<u32>(0);
-
-				switch (info.type)
-				{
-				case patch_type::load:
-				{
-					// Special syntax: copy named sequence (must be loaded before)
-					const auto found = m_map.find(patch[1].Scalar());
-
-					if (found != m_map.end())
-					{
-						// Address modifier (optional)
-						const u32 mod = patch[2].as<u32>(0);
-
-						for (const auto& rd : found->second)
-						{
-							info = rd;
-							info.offset += mod;
-							data.emplace_back(info);
-						}
-
-						continue;
-					}
-
-					// TODO: error
-					break;
-				}
-				case patch_type::bef32:
-				case patch_type::lef32:
-				{
-					info.value_as<f32>() = patch[2].as<f32>();
-					break;
-				}
-				case patch_type::bef64:
-				case patch_type::lef64:
-				{
-					info.value_as<f64>() = patch[2].as<f64>();
-					break;
-				}
-				default:
-				{
-					info.value = patch[2].as<u64>();
-					break;
-				}
-				}
-				
+				info.offset = patch[1].as<u32>();
+				info.value  = patch[2].as<u64>();
 				data.emplace_back(info);
 			}
 		}
 	}
 }

-std::size_t patch_engine::apply(const std::string& name, u8* dst) const
+void patch_engine::apply(const std::string& name, u8* dst) const
 {
 	const auto found = m_map.find(name);

 	if (found == m_map.cend())
 	{
-		return 0;
+		return;
 	}

 	// Apply modifications sequentially
@@ -114,11 +65,6 @@ std::size_t patch_engine::apply(const std::string& name, u8* dst) const

 		switch (p.type)
 		{
-		case patch_type::load:
-		{
-			// Invalid in this context
-			break;
-		}
 		case patch_type::byte:
 		{
 			*ptr = static_cast<u8>(p.value);
@@ -130,13 +76,11 @@ std::size_t patch_engine::apply(const std::string& name, u8* dst) const
 			break;
 		}
 		case patch_type::le32:
-		case patch_type::lef32:
 		{
 			*reinterpret_cast<le_t<u32, 1>*>(ptr) = static_cast<u32>(p.value);
 			break;
 		}
 		case patch_type::le64:
-		case patch_type::lef64:
 		{
 			*reinterpret_cast<le_t<u64, 1>*>(ptr) = static_cast<u64>(p.value);
 			break;
@@ -147,19 +91,15 @@ std::size_t patch_engine::apply(const std::string& name, u8* dst) const
 			break;
 		}
 		case patch_type::be32:
-		case patch_type::bef32:
 		{
 			*reinterpret_cast<be_t<u32, 1>*>(ptr) = static_cast<u32>(p.value);
 			break;
 		}
 		case patch_type::be64:
-		case patch_type::bef64:
 		{
 			*reinterpret_cast<be_t<u64, 1>*>(ptr) = static_cast<u64>(p.value);
 			break;
 		}
 		}
 	}
-
-	return found->second.size();
 }
@@ -7,18 +7,13 @@

 enum class patch_type
 {
-	load,
 	byte,
 	le16,
 	le32,
 	le64,
-	lef32,
-	lef64,
 	be16,
 	be32,
 	be64,
-	bef32,
-	bef64,
 };

 class patch_engine
@@ -28,12 +23,6 @@ class patch_engine
 		patch_type type;
 		u32 offset;
 		u64 value;
-
-		template <typename T>
-		T& value_as()
-		{
-			return *reinterpret_cast<T*>(reinterpret_cast<char*>(&value));
-		}
 	};

 	// Database
@@ -43,6 +32,6 @@ public:
 	// Load from file
 	void append(const std::string& path);

-	// Apply patch (returns the number of entries applied)
-	std::size_t apply(const std::string& name, u8* dst) const;
+	// Apply patch
+	void apply(const std::string& name, u8* dst) const;
 };
@@ -0,0 +1,10 @@
+Copyright (C) 2011-2012 Andrzej Krzemienski
+
+Distributed under the Boost Software License, Version 1.0
+(see accompanying file LICENSE_1_0.txt or a copy at
+http://www.boost.org/LICENSE_1_0.txt)
+
+The idea and interface is based on Boost.Optional library
+authored by Fernando Luis Cacciola Carballal
+
+Home at https://github.com/akrzemi1/Optional
@@ -731,9 +731,9 @@ struct area_base
 	{
 		return{ x1 * size.width, y1 * size.height, x2 * size.width, y2 * size.height };
 	}
-	constexpr area_base operator * (const f32& value) const
+	constexpr area_base operator * (const T& value) const
 	{
-		return{ (T)(x1 * value), (T)(y1 * value), (T)(x2 * value), (T)(y2 * value) };
+		return{ x1 * value, y1 * value, x2 * value, y2 * value };
 	}

 	template<typename NT>
@@ -16,7 +16,6 @@ rem // Official git repository and contact information can be found at
 rem // https://github.com/RPCS3/rpcs3 and http://rpcs3.net/.

 setlocal ENABLEDELAYEDEXPANSION
-setlocal ENABLEEXTENSIONS

 set GIT_VERSION_FILE=%~p0..\rpcs3\git-version.h
 if not defined GIT (
@@ -48,43 +47,15 @@ if errorlevel 1 (
 	echo // This is a generated file. > "%GIT_VERSION_FILE%"
 	echo. >> "%GIT_VERSION_FILE%"
 	echo #define RPCS3_GIT_VERSION "unknown" >> "%GIT_VERSION_FILE%"
-	echo #define RPCS3_GIT_BRANCH "unknown" >> "%GIT_VERSION_FILE%"
 	echo. >> "%GIT_VERSION_FILE%"
 	echo // If you don't want this file to update/recompile, change to 1. >> "%GIT_VERSION_FILE%"
 	echo #define RPCS3_GIT_VERSION_NO_UPDATE 0 >> "%GIT_VERSION_FILE%"
 	goto done
 )

-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
-	)
-)
-
-if defined APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH (
-	if "%APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH%"=="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 (
-		set GIT_BRANCH=%APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH%
-	)
-	
-) else (
-	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%
-
 rem // Don't modify the file if it already has the current version.
 if exist "%GIT_VERSION_FILE%" (
 	findstr /C:"%GIT_VERSION%" "%GIT_VERSION_FILE%" > NUL
@@ -96,7 +67,6 @@ if exist "%GIT_VERSION_FILE%" (
 echo // This is a generated file. > "%GIT_VERSION_FILE%"
 echo. >> "%GIT_VERSION_FILE%"
 echo #define RPCS3_GIT_VERSION "%GIT_VERSION%" >> "%GIT_VERSION_FILE%"
-echo #define RPCS3_GIT_BRANCH ^"%GIT_BRANCH%^" >> "%GIT_VERSION_FILE%"
 echo. >> "%GIT_VERSION_FILE%"
 echo // If you don't want this file to update/recompile, change to 1. >> "%GIT_VERSION_FILE%"
 echo #define RPCS3_GIT_VERSION_NO_UPDATE 0 >> "%GIT_VERSION_FILE%"
@@ -1,27 +0,0 @@
-#pragma once
-#include <stdint.h>
-
-namespace rpcs3
-{
-	template<typename T>
-	static size_t hash_base(T value)
-	{
-		return static_cast<size_t>(value);
-	}
-
-	template<typename T>
-	static size_t hash_struct(const T& value)
-	{
-		// FNV 64-bit
-		size_t result = 14695981039346656037ull;
-		const unsigned char *bytes = reinterpret_cast<const unsigned char*>(&value);
-
-		for (size_t n = 0; n < sizeof(T); ++n)
-		{
-			result ^= bytes[n];
-			result *= 1099511628211ull;
-		}
-
-		return result;
-	}
-}
@@ -1,12 +1,7 @@
 #include "mutex.h"
 #include "sync.h"

-#include <climits>
-#include <vector>
-#include <algorithm>
-
-// TLS variable for tracking owned mutexes
-thread_local std::vector<shared_mutex*> g_tls_locks;
+#include <limits.h>

 void shared_mutex::imp_lock_shared(s64 _old)
 {
@@ -222,14 +217,12 @@ void shared_mutex::imp_unlock(s64 _old)

 void shared_mutex::imp_lock_upgrade()
 {
-	// TODO
 	unlock_shared();
 	lock();
 }

 void shared_mutex::imp_lock_degrade()
 {
-	// TODO
 	unlock();
 	lock_shared();
 }
@@ -257,78 +250,3 @@ bool shared_mutex::try_lock_degrade()
 	// TODO
 	return m_value.compare_and_swap_test(0, c_one - c_min);
 }
-
-safe_reader_lock::safe_reader_lock(shared_mutex& mutex)
-	: m_mutex(mutex)
-	, m_is_owned(false)
-{
-	if (std::count(g_tls_locks.cbegin(), g_tls_locks.cend(), &m_mutex) == 0)
-	{
-		m_is_owned = true;
-
-		if (m_is_owned)
-		{
-			m_mutex.lock_shared();
-			g_tls_locks.emplace_back(&m_mutex);
-			return;
-		}
-
-		// TODO: order locks
-	}
-}
-
-safe_reader_lock::~safe_reader_lock()
-{
-	if (m_is_owned)
-	{
-		m_mutex.unlock_shared();
-		g_tls_locks.erase(std::remove(g_tls_locks.begin(), g_tls_locks.end(), &m_mutex), g_tls_locks.cend());
-		return;
-	}
-
-	// TODO: order locks
-}
-
-safe_writer_lock::safe_writer_lock(shared_mutex& mutex)
-	: m_mutex(mutex)
-	, m_is_owned(false)
-	, m_is_upgraded(false)
-{
-	if (std::count(g_tls_locks.cbegin(), g_tls_locks.cend(), &m_mutex) == 0)
-	{
-		m_is_owned = true;
-
-		if (m_is_owned)
-		{
-			m_mutex.lock_shared();
-			g_tls_locks.emplace_back(&m_mutex);
-			return;
-		}
-
-		// TODO: order locks
-	}
-
-	if (m_mutex.is_reading())
-	{
-		m_is_upgraded = true;
-		m_mutex.lock_upgrade();
-	}
-}
-
-safe_writer_lock::~safe_writer_lock()
-{
-	if (m_is_upgraded)
-	{
-		m_mutex.lock_degrade();
-		return;
-	}
-
-	if (m_is_owned)
-	{
-		m_mutex.unlock();
-		g_tls_locks.erase(std::remove(g_tls_locks.begin(), g_tls_locks.end(), &m_mutex), g_tls_locks.cend());
-		return;
-	}
-
-	// TODO: order locks
-}
@@ -95,11 +95,6 @@ public:
 			imp_lock_degrade();
 		}
 	}
-
-	bool is_reading() const
-	{
-		return (m_value.load() % c_one) != 0;
-	}
 };

 // Simplified shared (reader) lock implementation.
@@ -176,56 +171,3 @@ public:
 		unlock();
 	}
 };
-
-// Safe reader lock. Can be recursive above other safe locks (reader or writer).
-class safe_reader_lock final
-{
-	shared_mutex& m_mutex;
-	bool m_is_owned;
-
-	void lock()
-	{
-		m_mutex.lock_shared();
-	}
-
-	void unlock()
-	{
-		m_mutex.unlock_shared();
-	}
-
-	friend class cond_variable;
-
-public:
-	safe_reader_lock(const safe_reader_lock&) = delete;
-
-	explicit safe_reader_lock(shared_mutex& mutex);
-
-	~safe_reader_lock();
-};
-
-// Safe writer lock. Can be recursive above other safe locks. Performs upgrade and degrade operations above existing reader lock if necessary.
-class safe_writer_lock final
-{
-	shared_mutex& m_mutex;
-	bool m_is_owned;
-	bool m_is_upgraded;
-
-	void lock()
-	{
-		m_mutex.lock();
-	}
-
-	void unlock()
-	{
-		m_mutex.unlock();
-	}
-
-	friend class cond_variable;
-
-public:
-	safe_writer_lock(const safe_writer_lock&) = delete;
-
-	explicit safe_writer_lock(shared_mutex& mutex);
-
-	~safe_writer_lock();
-};
@@ -61,9 +61,10 @@ rXmlDocument::rXmlDocument() : handle()
 {
 }

-void rXmlDocument::Read(const std::string& data)
+void rXmlDocument::Load(const std::string & path)
 {
-	handle.load_buffer(data.data(), data.size());
+	// TODO: Unsure of use of c_str.
+	handle.load_file(path.c_str());
 }

 std::shared_ptr<rXmlNode> rXmlDocument::GetRoot()
@@ -24,7 +24,7 @@ struct rXmlDocument
 	rXmlDocument();
 	rXmlDocument(const rXmlDocument& other) = delete;
 	rXmlDocument &operator=(const rXmlDocument& other) = delete;
-	void Read(const std::string& data);
+	void Load(const std::string & path);
 	std::shared_ptr<rXmlNode> GetRoot();

 	pugi::xml_document handle;
@@ -1,61 +0,0 @@
-#include "sysinfo.h"
-#include "StrFmt.h"
-
-#ifdef _WIN32
-#include "windows.h"
-#else
-#include <unistd.h>
-#endif
-
-std::string utils::get_system_info()
-{
-	std::string result;
-	std::string brand;
-
-	if (get_cpuid(0x80000000, 0)[0] >= 0x80000004)
-	{
-		for (u32 i = 0; i < 3; i++)
-		{
-			brand.append(reinterpret_cast<const char*>(get_cpuid(0x80000002 + i, 0).data()), 16);
-		}
-	}
-	else
-	{
-		brand = "Unknown CPU";
-	}
-
-	brand.erase(0, brand.find_first_not_of(' '));
-	brand.erase(brand.find_last_not_of(' ') + 1);
-
-	while (auto found = brand.find("  ") + 1)
-	{
-		brand.erase(brand.begin() + found);
-	}
-
-#ifdef _WIN32
-	::SYSTEM_INFO sysInfo;
-	::GetNativeSystemInfo(&sysInfo);
-	::MEMORYSTATUSEX memInfo;
-	memInfo.dwLength = sizeof(memInfo);
-	::GlobalMemoryStatusEx(&memInfo);
-	const u32 num_proc = sysInfo.dwNumberOfProcessors;
-	const u64 mem_total = memInfo.ullTotalPhys;
-#else
-	const u32 num_proc = ::sysconf(_SC_NPROCESSORS_ONLN);
-	const u64 mem_total = ::sysconf(_SC_PHYS_PAGES) * ::sysconf(_SC_PAGE_SIZE);
-#endif
-
-	fmt::append(result, "%s | %d Threads | %.2f GiB RAM", brand, num_proc, mem_total / (1024.0f * 1024 * 1024));
-
-	if (has_avx())
-	{
-		result += " | AVX";
-	}
-
-	if (has_rtm())
-	{
-		result += " | TSX";
-	}
-
-	return result;
-}
@@ -1,54 +0,0 @@
-#pragma once
-
-#include "types.h"
-#include <string>
-
-namespace utils
-{
-	inline std::array<u32, 4> get_cpuid(u32 func, u32 subfunc)
-	{
-		int regs[4];
-#ifdef _MSC_VER 
-		__cpuidex(regs, func, subfunc);
-#else 
-		__asm__ volatile("cpuid" : "=a" (regs[0]), "=b" (regs[1]), "=c" (regs[2]), "=d" (regs[3]) : "a" (func), "c" (subfunc));
-#endif 
-		return {0u+regs[0], 0u+regs[1], 0u+regs[2], 0u+regs[3]};
-	}
-
-	inline bool has_ssse3()
-	{
-		return get_cpuid(0, 0)[0] >= 0x1 && get_cpuid(1, 0)[2] & 0x200;
-	}
-
-	inline bool has_avx()
-	{
-		return get_cpuid(0, 0)[0] >= 0x1 && get_cpuid(1, 0)[2] & 0x10000000;
-	}
-
-	inline bool has_rtm()
-	{
-		// Check RTM and MPX extensions in order to filter out TSX on Haswell CPUs
-		return get_cpuid(0, 0)[0] >= 0x7 && (get_cpuid(7, 0)[1] & 0x4800) == 0x4800;
-	}
-
-	inline bool transaction_enter()
-	{
-		while (true)
-		{
-			const auto status = _xbegin();
-
-			if (status == _XBEGIN_STARTED)
-			{
-				return true;
-			}
-
-			if (!(status & _XABORT_RETRY))
-			{
-				return false;
-			}
-		}
-	}
-
-	std::string get_system_info();
-}
@@ -32,6 +32,7 @@
 #define SAFE_BUFFERS
 #define NEVER_INLINE __attribute__((noinline))
 #define FORCE_INLINE __attribute__((always_inline)) inline
+#define thread_local __thread
 #endif

 #define CHECK_SIZE(type, size) static_assert(sizeof(type) == size, "Invalid " #type " type size")
@@ -48,7 +49,7 @@
 #define CONCATENATE_DETAIL(x, y) x ## y
 #define CONCATENATE(x, y) CONCATENATE_DETAIL(x, y)

-#define STRINGIZE_DETAIL(x) #x ""
+#define STRINGIZE_DETAIL(x) #x
 #define STRINGIZE(x) STRINGIZE_DETAIL(x)

 #define HERE "\n(in file " __FILE__ ":" STRINGIZE(__LINE__) ")"
@@ -534,26 +535,6 @@ inline u64 cntlz64(u64 arg, bool nonzero = false)
 #endif
 }

-inline u32 cnttz32(u32 arg, bool nonzero = false)
-{
-#ifdef _MSC_VER
-	ulong res;
-	return _BitScanForward(&res, arg) || nonzero ? res : 32;
-#else
-	return arg || nonzero ? __builtin_ctzll(arg) : 32;
-#endif
-}
-
-inline u64 cnttz64(u64 arg, bool nonzero = false)
-{
-#ifdef _MSC_VER
-	ulong res;
-	return _BitScanForward64(&res, arg) || nonzero ? res : 64;
-#else
-	return arg || nonzero ? __builtin_ctzll(arg) : 64;
-#endif
-}
-
 // Helper function, used by ""_u16, ""_u32, ""_u64
 constexpr u8 to_u8(char c)
 {
@@ -938,7 +919,7 @@ struct error_code
 	error_code() = default;

 	// Implementation must be provided specially
-	static s32 error_report(const fmt_type_info* sup, u64 arg, const fmt_type_info* sup2, u64 arg2);
+	static s32 error_report(const fmt_type_info* sup, u64 arg);

 	// Helper type
 	enum class not_an_error : s32
@@ -959,7 +940,7 @@ struct error_code

 	// Not an error constructor
 	template<typename ET, typename = decltype(ET::__not_an_error)>
-	error_code(const ET& value, std::nullptr_t = nullptr)
+	error_code(const ET& value, int = 0)
 		: value(static_cast<s32>(value))
 	{
 	}
@@ -967,14 +948,7 @@ struct error_code
 	// Error constructor
 	template<typename ET, typename = std::enable_if_t<is_error<ET>::value>>
 	error_code(const ET& value)
-		: value(error_report(fmt::get_type_info<fmt_unveil_t<ET>>(), fmt_unveil<ET>::get(value), nullptr, 0))
-	{
-	}
-
-	// Error constructor (2 args)
-	template<typename ET, typename T2, typename = std::enable_if_t<is_error<ET>::value>>
-	error_code(const ET& value, const T2& value2)
-		: value(error_report(fmt::get_type_info<fmt_unveil_t<ET>>(), fmt_unveil<ET>::get(value), fmt::get_type_info<fmt_unveil_t<T2>>(), fmt_unveil<T2>::get(value2)))
+		: value(error_report(fmt::get_type_info<fmt_unveil_t<ET>>(), fmt_unveil<ET>::get(value)))
 	{
 	}

@@ -19,7 +19,7 @@
  <PropertyGroup Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
@@ -19,12 +19,12 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Makefile</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Makefile</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
@@ -39,20 +39,20 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <NMakeBuildCommandLine>cmake -G "Visual Studio 14 2015 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 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
+    <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>cmake -G "Visual Studio 14 2015 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>cmake -G "Visual Studio 14 2015 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>cmake -G "Visual Studio 14 2015 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 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" -DBUILD_TESTS=OFF -DBUILD_DEMOS=OFF -DBUILD_LAYERS=OFF -DBUILD_VKJSON=OFF ../Vulkan-LoaderAndValidationLayers
+    <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>
  </PropertyGroup>
  <ItemDefinitionGroup>
@@ -19,12 +19,12 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Makefile</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Makefile</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
@@ -39,24 +39,24 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <NMakeBuildCommandLine>cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
+    <NMakeBuildCommandLine>cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
 msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Release /m</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
+    <NMakeReBuildCommandLine>cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
 msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Release /m</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
+    <NMakeCleanCommandLine>cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
 msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Release /m</NMakeCleanCommandLine>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
    <NMakeBuildCommandLine>
-      cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
+      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
      msbuild.exe ALL_BUILD.vcxproj /t:build /p:Configuration=Debug /m
    </NMakeBuildCommandLine>
    <NMakeReBuildCommandLine>
-      cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
+      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
      msbuild.exe ALL_BUILD.vcxproj /t:rebuild /p:Configuration=Debug /m
    </NMakeReBuildCommandLine>
    <NMakeCleanCommandLine>
-      cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
+      cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_CONFIGURATION_TYPES="Debug;Release" ../glslang
      msbuild.exe ALL_BUILD.vcxproj /t:clean /p:Configuration=Debug /m
    </NMakeCleanCommandLine>
  </PropertyGroup>
@@ -1,82 +1,41 @@
-#---------------------------------#
-#      general configuration      #
-#---------------------------------#
+version: '0.0.2-{build}'

-# version format
-version: '0.0.4-{build}'
+os: Visual Studio 2017
+platform: x64
+clone_folder: C:\rpcs3
+clone_depth: 3
+test: off

-#---------------------------------#
-#    environment configuration    #
-#---------------------------------#
+configuration:
+# Release
+ - ReleaseLLVM

-# Build worker image (VM template)
-image: Visual Studio 2015
+before_build:
+ - ps: $env:Date="$(git show -s --date=short --format='%ad')"
+ - git submodule update --init 3rdparty/ffmpeg 3rdparty/pugixml asmjit 3rdparty/GSL 3rdparty/libpng Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers Utilities/yaml-cpp 3rdparty/cereal 3rdparty/zlib 3rdparty/hidapi
+ - 7z x zlib.7z -aos -oC:\rpcs3\ > null
+ - 7z x vulkan.7z -aos -oC:\rpcs3\Vulkan > null
+ - if %configuration%==Release (cmake -G "Visual Studio 15 Win64" -DZLIB_ROOT=C:/rpcs3/zlib/ -DVULKAN_PREBUILT=ON)
+   else (7z x llvmlibs.7z -aos -oC:\rpcs3 > null && cmake -G "Visual Studio 15 Win64" -DLLVM_DIR=C:/rpcs3/llvm_build/lib/cmake/llvm -DZLIB_ROOT=C:/rpcs3/zlib/ -DVULKAN_PREBUILT=ON)

-# clone directory
-clone_folder: c:\projects\rpcs3
+build_script:
+ - cmake --build . --config Release -- /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"

-# set clone depth
-clone_depth: 3                    # clone entire repository history if not defined
+install:
+ - if not exist llvmlibs.7z appveyor DownloadFile "https://drive.google.com/uc?export=download&id=0B8A6NaxhQAGRY2k3Q2Yya05lcm8" -FileName llvmlibs.7z
+ - if not exist vulkan.7z appveyor DownloadFile "https://drive.google.com/uc?export=download&id=0B8A6NaxhQAGRaHYxV3VOS2d0a0U" -FileName vulkan.7z
+ - if not exist zlib.7z appveyor DownloadFile "https://drive.google.com/uc?export=download&id=0B-HVE3xvheVFX05lRFdnZlh5aUU" -FileName zlib.7z
+ - set QTDIR=C:\Qt\5.9\msvc2017_64
+ - set OPENALDIR=C:\rpcs3\3rdparty\OpenAL
+ - set PATH=C:\Program Files (x86)\MSBuild\15.0\Bin;%QTDIR%;%PATH%
+ - set COMMIT_SHA=%APPVEYOR_REPO_COMMIT:~0,8%

-# environment variables
-environment:
-  QTDIR: C:\Qt\5.9.1\msvc2015_64
+artifacts:
+ - path: bin
+   name: 'rpcs3-v0.0.2-$(Date)-$(COMMIT_SHA)_win64'
+   type: zip

-# build cache to preserve files/folders between builds
 cache:
 - llvmlibs.7z -> appveyor.yml
 - vulkan.7z -> appveyor.yml
-
-# scripts that run after cloning repository
-install:
- - 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
-
-#---------------------------------#
-#       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                  # 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:
- - 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
-
-# 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%
-
-#---------------------------------#
-#       tests configuration       #
-#---------------------------------#
-
-# to disable automatic tests
-test: off
-
-#---------------------------------#
-#      artifacts configuration    #
-#---------------------------------#
-
-# pushing entire folder as a zip archive
-artifacts:
- - path: bin
-   name: 'rpcs3-v0.0.4-$(COMMIT_DATE)-$(COMMIT_SHA)_win64'
+ - zlib.7z -> appveyor.yml
@@ -93,7 +93,7 @@
  <PropertyGroup Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
@@ -1,330 +0,0 @@
-/* 
-Kuroi (Dark) Theme for RPCS3 
-by Ani @ https://github.com/AniLeo
-r1 (2017.08.15)
-*/
-
-/* 
-Color Scheme
-(Darker to Lighter)
-  
-  Black 
-   > 292929
-   > 323232
-   > 333333
-   > 3d3d3d
-   > 404040
-   > 444444
-   
-  Light Grey
-   > 828790
-   > bdc3c7
-   > ecf0f1
-   
-   > b1b1b1
-   > 7f8c8d
-   
-  Green
-   > 2ecc71
-   
-  Red
-   > e74c3c
-*/
-
-/* Every widget */
-QWidget {
-	background-color: #323232;
-	color: #bdc3c7;
-	alternate-background-color: #3d3d3d;
-}
-
-/* Mouse tooltips */
-QToolTip {
-	border: 0.05em solid #323232;
-	background-color: #323232;
-	color: #ecf0f1;
-}
-
-/* Table headers */
-QHeaderView::section {
-	background-color: #323232;
-	color: #ecf0f1;
-	padding-left: 0.2em;
-	border: 0.05em solid #323232;
-}
-
-/* Settings Dialog: Tabs */
-QTabBar::tab {
-	color: #ecf0f1;
-	border: 0.05em solid #444;
-	border-bottom-style: none;
-	background-color: #333333;
-	padding-left: 0.9em;
-	padding-right: 0.9em;
-	padding-top: 0.2em;
-	padding-bottom: 0.2em;
-	margin-right: -0.2em;
-}
-QTabBar::tab:last {
-	margin-right: 0em;
-}
-QTabBar::tab:!selected {
-	color: #b1b1b1;
-	border-bottom-style: solid;
-	margin-top: 0.15em;
-	background-color: #292929;
-}
-QTabBar::tab:hover {
-	background-color: #333333;
-	color: #ecf0f1;
-}
-
-/* Checkboxes */
-QCheckBox::indicator {
-	border-radius: 0.1em;
-	border: 0.05em solid #ecf0f1;
-	margin-top: 0.05em;
-	width: 0.8em;
-	height: 0.8em;
-}
-QCheckBox::indicator:checked {
-	background-color: #2ecc71; /* Green */
-}
-QCheckBox::indicator:unchecked {
-	background-color: #e74c3c; /* Red */
-}
-QCheckBox::indicator::disabled {
-	background-color: #7f8c8d; /* Gray */
-}
-
-/* Radio Buttons */
-QRadioButton::indicator {
-  border-radius: 0.4em; 
-  border: 0.05em solid;  
-  border-color: white; 
-  width: 0.8em; 
-  height: 0.8em; 
-}
-QRadioButton::indicator:checked {
-	background-color: #2ecc71; /* Green */
-}
-QRadioButton::indicator:unchecked {
-	background-color: #e74c3c; /* Red */
-}
-QRadioButton::indicator::disabled {
-	background-color: #7f8c8d; /* Gray */
-}
-
-/* Combo Boxes */
-QComboBox {
-	background-color: #404040;
-	color: #fff;
-	border: 0.05em solid #1e1e1e;
-	border-radius: 0.15em;
-	padding-bottom: 0.2em;
-	padding-left: 0.4em;
-}
-QComboBox::disabled {
-	background-color: #828790;
-	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;
-}
-QPushButton::disabled {
-	background-color: #444444;
-	color: #828790;
-}
-
-/* Log and Debugger borders */
-QTextEdit {
-	border: 0.05em solid #828790;
-}
-
-/* For dock buttons to be visible */
-QDockWidget::close-button, QDockWidget::float-button {
-	background-color: #bdc3c7;
-	border: 0.05em solid #000;
-	border-radius: 0.3em;
-}
-
-/* Disable ugly borders */
-QTabWidget::pane {
-	border: 0em solid #828790;
-}
-
-/* Top menu bar */
-QMenuBar::item:selected {
-	background: #444444;
-}
-QMenu::item {
-	padding-left: 1.5em;
-	padding-right: 0.75em;
-	padding-top: 0.25em;
-	padding-bottom: 0.25em;
-}
-QMenu::item:selected {
-	background: #444444;
-	border: 0.05em solid #bdc3c7;
-}
-QMenu::item:disabled {
-	background-color: #444444;
-	color: #828790;
-}
-
-/* Libraries list */
-QListWidget::item:selected {
-	background-color: #3d3d3d;
-	color: #ecf0f1;
-}
-QListWidget::item:hover {
-	background-color: #4c4b4b;
-	color: #ecf0f1;
-}
-
-/* Pad Settings: Controller Image */
-QLabel#l_controller { 
-	color: #bdc3c7;
-}
-
-/* Game Grid Font */
-QLabel#gamegrid_font {
-	font-weight: 600;
-	font-size: 8pt;
-	font-family: Lucida Grande;
-	color: #ecf0f1;
-}
-
-/* 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;
-}
-QToolButton::disabled {
-	background-color: #828790;
-}
-QToolButton::hover {
-	background-color: #444444;
-}
-
-/* Set Theme UI colors */
-QLabel#gamelist_icon_background_color {
-	background-color: #323232;
-}
-QLabel#gamelist_toolbar_icon_color {
-	background-color: #e3e3e3;
-}
-
-/* Set Windows Taskbar Thumbnail colors */
-QLabel#thumbnail_icon_color {
-	color: #444444;
-}
-
-/* Set Log colors */
-QTextEdit#log_frame {
-	background-color: #000000; /* 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: #000000; /* Black */
-}
-QLabel#tty_text {
-	color: #ffffff; /* White */
-}
-
-/* RSX Debugger */
-QLabel#rsx_debugger_display_buffer {
-	background-color: #323232;
-}
-
-/* Kernel Explorer */
-QDialog#kernel_explorer {
-	background-color: #323232;
-}
-
-/* Memory Viewer */
-QDialog#memory_viewer {
-	background-color: #323232;
-}
-QLabel#memory_viewer_address_panel {
-	color: #00cbff; /* Font Color: Blue */
-	background-color: #323232;
-}
-QLabel#memory_viewer_hex_panel {
-	color: #bdc3c7; /* Font Color: Grey */
-	background-color: #323232;
-}
-QLabel#memory_viewer_ascii_panel {
-	color: #bdc3c7; /* Font Color: Grey */
-	background-color: #323232;
-}
-
-/* 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 */
-}
@@ -0,0 +1 @@
+make_fself compiled.elf EBOOT.BIN
@@ -18,12 +18,12 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>Makefile</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>Makefile</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
@@ -39,30 +39,30 @@
    <NMakePreprocessorDefinitions>
    </NMakePreprocessorDefinitions>
    <NMakeBuildCommandLine>
-      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
+      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 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
+      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 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
+      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 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
+      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 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
+      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 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
+      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>
@@ -1,60 +0,0 @@
-// http://stackoverflow.com/a/34032216/78204
-
-function Controller() {
-    installer.autoRejectMessageBoxes();
-    installer.setMessageBoxAutomaticAnswer("OverwriteTargetDirectory", QMessageBox.Yes);
-    installer.installationFinished.connect(function() {
-        gui.clickButton(buttons.NextButton);
-    })
-}
-
-Controller.prototype.WelcomePageCallback = function() {
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.CredentialsPageCallback = function() {
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.IntroductionPageCallback = function() {
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.TargetDirectoryPageCallback = function()
-{
-    gui.currentPageWidget().TargetDirectoryLineEdit.setText(installer.value("HomeDir") + "/Qt");
-    //gui.currentPageWidget().TargetDirectoryLineEdit.setText(installer.value("InstallerDirPath") + "/Qt");
-    //gui.currentPageWidget().TargetDirectoryLineEdit.setText("/scratch/Qt");
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.ComponentSelectionPageCallback = function() {
-    var widget = gui.currentPageWidget();
-
-    widget.deselectAll();
-    widget.selectComponent("qt.592.gcc_64");
-
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.LicenseAgreementPageCallback = function() {
-    gui.currentPageWidget().AcceptLicenseRadioButton.setChecked(true);
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.StartMenuDirectoryPageCallback = function() {
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.ReadyForInstallationPageCallback = function()
-{
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.FinishedPageCallback = function() {
-var checkBoxForm = gui.currentPageWidget().LaunchQtCreatorCheckBoxForm
-if (checkBoxForm && checkBoxForm.launchQtCreatorCheckBox) {
-    checkBoxForm.launchQtCreatorCheckBox.checked = false;
-}
-    gui.clickButton(buttons.FinishButton);
-}
@@ -20,14 +20,14 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
    <UseOfMfc>false</UseOfMfc>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
    <UseOfMfc>false</UseOfMfc>
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26430.13
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asmjit", "asmjitsrc\asmjit.vcxproj", "{AC40FF01-426E-4838-A317-66354CEFAE88}"
 EndProject
@@ -3,34 +3,27 @@ cmake_minimum_required(VERSION 3.0.2)
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake_modules")
 set(RES_FILES "")
 set(CMAKE_CXX_STANDARD 14)
-include(CheckCCompilerFlag)

 # Qt section
-find_package(Qt5 5.7 COMPONENTS Widgets)
+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(Qt5DBus)
-	if (Qt5DBus_FOUND)
-		set(RPCS3_QT_LIBS Qt5::Widgets Qt5::DBus)
-		add_definitions(-DHAVE_QTDBUS)
-	else()
-		set(RPCS3_QT_LIBS Qt5::Widgets)
-	endif()
-	include_directories(${Qt5Widgets_INCLUDE_DIRS})
+    set(RPCS3_QT_LIBS Qt5::Widgets)
+    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.7.0)
-		message("Minimum supported Qt5 version is 5.7! You have version ${Qt5Widgets_VERSION} installed, please upgrade!")
+	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-qt592-xenial
-        https://launchpad.net/~beineri/+archive/ubuntu/opt-qt592-trusty
+        https://launchpad.net/~beineri/+archive/ubuntu/opt-qt59-xenial
+        https://launchpad.net/~beineri/+archive/ubuntu/opt-qt59-trusty
 just make sure to run
    source /opt/qt59/bin/qt59-env.sh
 before re-running cmake")
@@ -44,7 +37,7 @@ before re-running cmake")
    
    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.8\\msvc2017_64\\)")
+		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()
@@ -91,12 +84,10 @@ else()
 endif()

 if(NOT MSVC)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions")
-	# This hides our LLVM from mesa's LLVM, otherwise we get some unresolvable conflicts.
-	if(NOT APPLE)
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--exclude-libs,ALL")
+	if($ENV{CI})
+		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O1") # fix for travis gcc OoM crash. Might be fixed with the move to containers.
 	endif()
-
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions")
 	if(WIN32)
 		set(CMAKE_RC_COMPILER_INIT windres)
 		enable_language(RC)
@@ -106,29 +97,11 @@ if(NOT MSVC)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--allow-multiple-definition")
 	endif()
 	
-	add_compile_options(-msse -msse2 -mcx16 -mssse3 -mrtm)
+	add_compile_options(-msse -msse2 -mcx16 -mssse3)
 	
 	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")
-		else()
-			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_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")
-		elseif(HAS_NOPIE)
-			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -nopie")
-		endif()
+		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -image-base=0x10000")
 	endif()
 	
 	find_package(GLEW REQUIRED)
@@ -140,17 +113,15 @@ else()
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS /DYNAMICBASE:NO /BASE:0x10000 /FIXED")
 endif()

-set(ADDITIONAL_LIBS "")
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 	#on some Linux distros shm_unlink and similar functions are in librt only
-	set(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} "rt")
+	set(ADDITIONAL_LIBS "rt" "X11" "asound")
 elseif(NOT MSVC AND NOT CMAKE_CXX_FLAGS MATCHES "LIBICONV_PLUG")
 	#it seems like glibc includes the iconv functions we use but other libc
 	#implementations like the one on OSX don't seem implement them
-	set(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} "iconv")
-endif()
-if(UNIX AND NOT APPLE)
-	set(ADDITIONAL_LIBS ${ADDITIONAL_LIBS} "X11")
+	set(ADDITIONAL_LIBS "iconv")
+else()
+	set(ADDITIONAL_LIBS "")
 endif()

 if(NOT RPCS3_SRC_DIR)
@@ -166,29 +137,6 @@ find_package(OpenGL REQUIRED)
 find_package(OpenAL REQUIRED)
 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)
-
-    # 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()


@@ -198,47 +146,6 @@ elseif(WIN32)
 	set(PLATFORM_ARCH "Windows/x86_64")
 else()
 	set(PLATFORM_ARCH "linux/x86_64")
-	option(USE_ALSA "ALSA 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(PkgConfig)
-	pkg_check_modules(ALSA alsa)
-	if(ALSA_FOUND)
-		add_definitions(-DHAVE_ALSA)
-		include_directories(SYSTEM ${ALSA_INCLUDE_DIRS})
-		list(APPEND ADDITIONAL_LIBS ${ALSA_LDFLAGS})
-	endif()
-endif()
-if(USE_PULSE)
-	find_package(PkgConfig)
-	pkg_check_modules(PULSE libpulse-simple)
-	if(PULSE_FOUND)
-		add_definitions(-DHAVE_PULSE)
-		include_directories(SYSTEM ${PULSE_INCLUDE_DIRS})
-		list(APPEND ADDITIONAL_LIBS ${PULSE_LDFLAGS})
-	endif()
-endif()
-if(USE_LIBEVDEV)
-	find_package(PkgConfig)
-	pkg_check_modules(LIBEVDEV libevdev)
-	if(LIBEVDEV_FOUND)
-		add_definitions(-DHAVE_LIBEVDEV)
-		include_directories(SYSTEM ${LIBEVDEV_INCLUDE_DIRS})
-		list(APPEND ADDITIONAL_LIBS ${LIBEVDEV_LDFLAGS})
-	endif()
-endif()
-if(NOT WIN32 AND USE_VULKAN)
-	find_package(Vulkan)
-	if(VULKAN_FOUND)
-		add_definitions(-DHAVE_VULKAN)
-		list(APPEND ADDITIONAL_LIBS ${VULKAN_LIBRARY})
-	else()
-		message("WARNING! USE_VULKAN was enabled, but libvulkan was not found. RPCS3 will be compiled without Vulkan support.")
-	endif()
 endif()

 # Select the version of libpng to use, default is builtin
@@ -282,7 +189,6 @@ ${LLVM_INCLUDE_DIRS}
 "${RPCS3_SRC_DIR}/../3rdparty/GL"
 "${RPCS3_SRC_DIR}/../3rdparty/stblib"
 "${RPCS3_SRC_DIR}/../3rdparty/cereal/include"
-"${RPCS3_SRC_DIR}/../3rdparty/Optional"
 )

 if(WIN32)
@@ -296,10 +202,16 @@ if(NOT LLVM_FOUND)
 else()
 	add_definitions(${LLVM_DEFINITIONS})
 	add_definitions(-DLLVM_AVAILABLE)
-	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)
+	
+	#Use static linking for windows binary but always dynamic on *nix
+	if (WIN32)
+		if (CMAKE_BUILD_TYPE STREQUAL "Release")
+			llvm_map_components_to_libnames(LLVM_LIBS mcjit vectorize ipo x86codegen x86disassembler)
+		else()
+			llvm_map_components_to_libnames(LLVM_LIBS mcjit vectorize ipo x86codegen x86disassembler mcdisassembler)
+		endif()
 	else()
-		llvm_map_components_to_libnames(LLVM_LIBS core support executionengine object runtimedyld x86desc x86info scalaropts mcjit vectorize ipo x86codegen x86disassembler mcdisassembler)
+		set(LLVM_LIBS LLVM)
 	endif()

 	if (NOT MSVC)
@@ -333,7 +245,7 @@ RPCS3_SRC
 "${RPCS3_SRC_DIR}/../asmjit/src/asmjit/*.cpp"
 )

-if (NOT WIN32 AND VULKAN_FOUND)
+if (NOT WIN32 AND "${CMAKE_SYSTEM}" MATCHES "Linux")
 # Compile glslang and SPIRV modules needed for glsl compilation
 	file(
 	GLOB_RECURSE
@@ -342,6 +254,7 @@ if (NOT WIN32 AND VULKAN_FOUND)
 	"${RPCS3_SRC_DIR}/../Vulkan/glslang/glslang/MachineIndependent/*.cpp"
 	"${RPCS3_SRC_DIR}/../Vulkan/glslang/glslang/OSDependent/Unix/*.cpp"
 	"${RPCS3_SRC_DIR}/../Vulkan/glslang/OGLCompilersDLL/*.cpp"
+	"${RPCS3_SRC_DIR}/../Vulkan/glslang/hlsl/*.cpp"
 	"${RPCS3_SRC_DIR}/../Vulkan/glslang/SPIRV/*.cpp"
 	)
 	
@@ -350,14 +263,17 @@ endif()

 #File exclusion section

-if(NOT WIN32 AND NOT VULKAN_FOUND)
+#Ignore vulkan if not on windows or linux
+if(NOT WIN32 AND NOT "${CMAKE_SYSTEM}" MATCHES "Linux")
 	set (EXCLUDE_FILES "/RSX/VK/")
 endif()

+# The Gui folder contains wxWidgets stuff, which we no longer want.
+set (EXCLUDE_FILES ${EXCLUDE_FILES} "/Gui/")
+
 # 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")

 foreach (TMP_PATH ${RPCS3_SRC})
 	foreach (EXCLUDE_PATH ${EXCLUDE_FILES})
@@ -369,7 +285,7 @@ foreach (TMP_PATH ${RPCS3_SRC})
 endforeach(TMP_PATH)

 # Remove the Qt moc files as part of clean, they are compiled when generating automoc
-file(GLOB_RECURSE TMP_MOC "${RPCS3_SRC_DIR}/moc_*.cpp" "${RPCS3_SRC_DIR}/rpcs3_automoc.cpp" "${RPCS3_SRC_DIR}/qrc_resources.cpp")
+file(GLOB_RECURSE TMP_MOC "${RPCS3_SRC_DIR}/moc_*.cpp" "${RPCS3_SRC_DIR}/rpcs3_automoc.cpp")
 set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${TMP_MOC}")

 if (WIN32)
@@ -390,16 +306,11 @@ if(WIN32)
 	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} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES})
-	if(APPLE)
-		target_link_libraries(rpcs3 hidapi-mac "-framework CoreFoundation" "-framework IOKit")
-	elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-		target_link_libraries(rpcs3 hidapi-hidraw udev)
+	if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+		target_link_libraries(rpcs3 hidapi-hidraw udev vulkan)
 	else()
 		target_link_libraries(rpcs3 hidapi-libusb usb)
 	endif()
-	if(VULKAN_FOUND)
-		target_link_libraries(rpcs3 ${VULKAN_LIBRARIES})
-	endif()
 	target_link_libraries(rpcs3 ${CMAKE_DL_LIBS} -lpthread ${ZLIB_LIBRARIES} ${ADDITIONAL_LIBS})
 	if (USE_SYSTEM_FFMPEG)
 		link_libraries(${FFMPEG_LIBRARY_DIR})
@@ -427,21 +338,6 @@ 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()
-endif()
-
 cotire(rpcs3)

 # Unix installation
@@ -150,8 +150,8 @@ s64 decrypt_block(const fs::file* in, u8* out, EDAT_HEADER *edat, NPD_HEADER *np
 	const int metadata_section_size = ((edat->flags & EDAT_COMPRESSED_FLAG) != 0 || (edat->flags & EDAT_FLAG_0x20) != 0) ? 0x20 : 0x10;
 	const int metadata_offset = 0x100;

-	std::unique_ptr<u8[]> enc_data;
-	std::unique_ptr<u8[]> dec_data;
+	std::unique_ptr<u8> enc_data;
+	std::unique_ptr<u8> dec_data;
 	u8 hash[0x10] = { 0 };
 	u8 key_result[0x10] = { 0 };
 	u8 hash_result[0x14] = { 0 };
@@ -315,7 +315,7 @@ int decrypt_data(const fs::file* in, const fs::file* out, EDAT_HEADER *edat, NPD
 {
 	const int total_blocks = (int)((edat->file_size + edat->block_size - 1) / edat->block_size);
 	u64 size_left = (int)edat->file_size;
-	std::unique_ptr<u8[]> data(new u8[edat->block_size]);
+	std::unique_ptr<u8> data(new u8[edat->block_size]);

 	for (int i = 0; i < total_blocks; i++)
 	{
@@ -427,8 +427,8 @@ int check_data(unsigned char *key, EDAT_HEADER *edat, NPD_HEADER *npd, const fs:

 	long bytes_read = 0;
 	long bytes_to_read = metadata_size;
-	std::unique_ptr<u8[]> metadata(new u8[metadata_size]);
-	std::unique_ptr<u8[]> empty_metadata(new u8[metadata_size]);
+	std::unique_ptr<u8> metadata(new u8[metadata_size]);
+	std::unique_ptr<u8> empty_metadata(new u8[metadata_size]);

 	while (bytes_to_read > 0)
 	{
@@ -487,7 +487,7 @@ int check_data(unsigned char *key, EDAT_HEADER *edat, NPD_HEADER *npd, const fs:
 			if ((edat->flags & EDAT_FLAG_0x20) != 0) //Sony failed again, they used buffer from 0x100 with half size of real metadata.
 			{
 				int metadata_buf_size = block_num * 0x10;
-				std::unique_ptr<u8[]> metadata_buf(new u8[metadata_buf_size]);
+				std::unique_ptr<u8> metadata_buf(new u8[metadata_buf_size]);
 				f->seek(file_offset + metadata_offset);
 				f->read(metadata_buf.get(), metadata_buf_size);
 				sha1(metadata_buf.get(), metadata_buf_size, signature_hash);
@@ -516,7 +516,7 @@ int check_data(unsigned char *key, EDAT_HEADER *edat, NPD_HEADER *npd, const fs:
 		{
 			// Setup header signature hash.
 			memset(signature_hash, 0, 20);
-			std::unique_ptr<u8[]> header_buf(new u8[0xD8]);
+			std::unique_ptr<u8> header_buf(new u8[0xD8]);
 			f->seek(file_offset);
 			f->read(header_buf.get(), 0xD8);
 			sha1(header_buf.get(), 0xD8, signature_hash );
@@ -577,7 +577,7 @@ int validate_npd_hashes(const char* file_name, const u8* klicensee, NPD_HEADER *
 	int dev_hash_result = 0;

 	const int file_name_length = (int) strlen(file_name);
-	std::unique_ptr<u8[]> buf(new u8[0x30 + file_name_length]);
+	std::unique_ptr<u8> buf(new u8[0x30 + file_name_length]);
 	
 	// Build the title buffer (content_id + file_name).
 	memcpy(buf.get(), npd->content_id, 0x30);
@@ -3,78 +3,19 @@
 #include "aes.h"
 #include "sha1.h"
 #include "key_vault.h"
-#include "Utilities/StrFmt.h"
-#include "Emu/VFS.h"
 #include "unpkg.h"

-bool pkg_install(const fs::file& pkg_f, const std::string& dir, atomic_t<double>& sync, const std::string& pkg_filepath)
+bool pkg_install(const fs::file& pkg_f, const std::string& dir, atomic_t<double>& sync)
 {
 	const std::size_t BUF_SIZE = 8192 * 1024; // 8 MB
-	std::vector<fs::file> filelist;
-	u32 cur_file=0;
-
-	fs::file original_file(pkg_filepath);
-	original_file.seek(pkg_f.pos());
-
-	filelist.push_back(std::move(original_file));

 	// Save current file offset (probably zero)
 	const u64 start_offset = pkg_f.pos();
-	u64 cur_offset = start_offset;
-	u64 cur_file_offset = start_offset;

 	// Get basic PKG information
 	PKGHeader header;

-	auto archive_seek = [&](const s64 new_offset, const fs::seek_mode damode = fs::seek_set)
-	{
-		if(damode == fs::seek_set) cur_offset = new_offset;
-		else if (damode == fs::seek_cur) cur_offset += new_offset;
-
-		u64 _offset = 0;
-		for (u32 i = 0; i < filelist.size(); i++)
-		{
-			if (cur_offset < (_offset + filelist[i].size()))
-			{
-				cur_file = i;
-				cur_file_offset = cur_offset - _offset;
-				filelist[i].seek(cur_file_offset);
-				break;
-			}
-			_offset += filelist[i].size();
-		}
-	};
-
-	auto archive_read = [&](const void *data_ptr, const u64 num_bytes)
-	{
-		u64 num_bytes_left = filelist[cur_file].size() - cur_file_offset;
-		//check if it continues in another file
-		if (num_bytes > num_bytes_left)
-		{
-			filelist[cur_file].read((u8 *)data_ptr, num_bytes_left);
-			if ((cur_file + 1) < filelist.size()) cur_file++;
-			else
-			{
-				cur_offset += num_bytes_left;
-				cur_file_offset = filelist[cur_file].size();
-				return num_bytes_left;
-			}
-			u64 num_read = filelist[cur_file].read((u8 *)data_ptr + num_bytes_left, num_bytes - num_bytes_left);
-			cur_offset += (num_read + num_bytes_left);
-			cur_file_offset = num_read;
-			return (num_read+num_bytes_left);
-		}
-
-		u64 num_read = filelist[cur_file].read((u8 *)data_ptr, num_bytes);
-
-		cur_offset += num_read;
-		cur_file_offset += num_read;
-
-		return num_read;
-	};
-
-
-	if (archive_read(&header, sizeof(header)) != sizeof(header))
+	if (!pkg_f.read(header))
 	{
 		LOG_ERROR(LOADER, "PKG file is too short!");
 		return false;
@@ -110,29 +51,8 @@ bool pkg_install(const fs::file& pkg_f, const std::string& dir, atomic_t<double>

 	if (header.pkg_size > pkg_f.size())
 	{
-		//Check if multi-files pkg
-		if (pkg_filepath.length() < 7 || pkg_filepath.substr(pkg_filepath.length() - 7).compare("_00.pkg") != 0)
-		{
-			LOG_ERROR(LOADER, "PKG file size mismatch (pkg_size=0x%llx)", header.pkg_size);
-			return false;
-		}
-
-		std::string name_wo_number = pkg_filepath.substr(0, pkg_filepath.length() - 7);
-		u64 cursize = pkg_f.size();
-		while (cursize != header.pkg_size)
-		{
-			std::string archive_filename = fmt::format("%s_%02d.pkg", name_wo_number, filelist.size());
-
-			fs::file archive_file(archive_filename);
-			if (!archive_file)
-			{
-				LOG_ERROR(LOADER, "Missing part of the multi-files pkg: %s", archive_filename);
-				return false;
-			}
-
-			cursize += archive_file.size();
-			filelist.push_back(std::move(archive_file));
-		}
+		LOG_ERROR(LOADER, "PKG file size mismatch (pkg_size=0x%llx)", header.pkg_size);
+		return false;
 	}

 	if (header.data_size + header.data_offset > header.pkg_size)
@@ -144,7 +64,7 @@ bool pkg_install(const fs::file& pkg_f, const std::string& dir, atomic_t<double>
 	be_t<u32> drm_type{0};
 	be_t<u32> content_type{0};

-	archive_seek(header.pkg_info_off);
+	pkg_f.seek(header.pkg_info_off);

 	for (u32 i = 0; i < header.pkg_info_num; i++)
 	{
@@ -154,7 +74,7 @@ bool pkg_install(const fs::file& pkg_f, const std::string& dir, atomic_t<double>
 			be_t<u32> size;
 		} packet;
 		
-		archive_read(&packet, sizeof(packet));
+		pkg_f.read(packet);

 		// TODO
 		switch (+packet.id)
@@ -163,7 +83,7 @@ bool pkg_install(const fs::file& pkg_f, const std::string& dir, atomic_t<double>
 		{
 			if (packet.size == sizeof(drm_type))
 			{
-				archive_read(&drm_type, sizeof(drm_type));
+				pkg_f.read(drm_type);
 				continue;
 			}

@@ -173,7 +93,7 @@ bool pkg_install(const fs::file& pkg_f, const std::string& dir, atomic_t<double>
 		{
 			if (packet.size == sizeof(content_type))
 			{
-				archive_read(&content_type, sizeof(content_type));
+				pkg_f.read(content_type);
 				continue;
 			}

@@ -181,7 +101,7 @@ bool pkg_install(const fs::file& pkg_f, const std::string& dir, atomic_t<double>
 		}
 		}

-		archive_seek(packet.size, fs::seek_cur);
+		pkg_f.seek(packet.size, fs::seek_cur);
 	}

 	// Allocate buffer with BUF_SIZE size or more if required
@@ -190,10 +110,10 @@ bool pkg_install(const fs::file& pkg_f, const std::string& dir, atomic_t<double>
 	// Define decryption subfunction (`psp` arg selects the key for specific block)
 	auto decrypt = [&](u64 offset, u64 size, const uchar* key) -> u64
 	{
-		archive_seek(start_offset + header.data_offset + offset);
+		pkg_f.seek(start_offset + header.data_offset + offset);

 		// Read the data and set available size
-		const u64 read = archive_read(buf.get(), size);
+		const u64 read = pkg_f.read(buf.get(), size);

 		// Get block count
 		const u64 blocks = (read + 15) / 16;
@@ -286,7 +206,7 @@ bool pkg_install(const fs::file& pkg_f, const std::string& dir, atomic_t<double>

 		decrypt(entry.name_offset, entry.name_size, is_psp ? PKG_AES_KEY2 : dec_key.data());

-		std::string name{reinterpret_cast<char*>(buf.get()), entry.name_size};
+		const std::string name(reinterpret_cast<char*>(buf.get()), entry.name_size);

 		LOG_NOTICE(LOADER, "Entry 0x%08x: %s", entry.type, name);

@@ -304,17 +224,11 @@ bool pkg_install(const fs::file& pkg_f, const std::string& dir, atomic_t<double>
 		case 0x15:
 		case 0x16:
 		{
-			const std::string path = dir + vfs::escape(name);
+			const std::string path = dir + name;

 			const bool did_overwrite = fs::is_file(path);

-			if (did_overwrite && (entry.type & PKG_FILE_ENTRY_OVERWRITE) == 0)
-			{
-				LOG_NOTICE(LOADER, "Didn't overwrite %s", name);
-				break;
-			}
-
-			if (fs::file out{path, fs::rewrite})
+			if (fs::file out{ path, fs::rewrite })
 			{
 				for (u64 pos = 0; pos < entry.file_size; pos += BUF_SIZE)
 				{
@@ -359,7 +273,7 @@ bool pkg_install(const fs::file& pkg_f, const std::string& dir, atomic_t<double>
 		case PKG_FILE_ENTRY_FOLDER:
 		case 0x12:
 		{
-			const std::string path = dir + vfs::escape(name);
+			const std::string path = dir + name;

 			if (fs::create_dir(path))
 			{
@@ -57,4 +57,4 @@ struct PKGEntry
 	be_t<u32> pad;          // Padding (zeros)
 };

-bool pkg_install(const class fs::file& pkg_f, const std::string& dir, atomic_t<double>&, const std::string& pkg_filepath);
+bool pkg_install(const class fs::file& pkg_f, const std::string& dir, atomic_t<double>&);
@@ -118,7 +118,7 @@ void aesecb128_encrypt(unsigned char *key, unsigned char *in, unsigned char *out

 bool hmac_hash_compare(unsigned char *key, int key_len, unsigned char *in, int in_len, unsigned char *hash, int hash_len)
 {
-	std::unique_ptr<u8[]> out(new u8[key_len]);
+	std::unique_ptr<u8> out(new u8[key_len]);

 	sha1_hmac(key, key_len, in, in_len, out.get());

@@ -132,7 +132,7 @@ void hmac_hash_forge(unsigned char *key, int key_len, unsigned char *in, int in_

 bool cmac_hash_compare(unsigned char *key, int key_len, unsigned char *in, int in_len, unsigned char *hash, int hash_len)
 {
-	std::unique_ptr<u8[]> out(new u8[key_len]);
+	std::unique_ptr<u8> out(new u8[key_len]);

 	aes_context ctx;
 	aes_setkey_enc(&ctx, key, 128);
@@ -31,7 +31,7 @@
  <PropertyGroup Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Label="ExtensionSettings">
@@ -50,8 +50,6 @@ OpenALThread::OpenALThread()
 	{
 		m_format = g_cfg.audio.convert_to_u16 ? AL_FORMAT_71CHN16 : AL_FORMAT_71CHN32;
 	}
-
-	m_buffers = std::make_unique<ALuint[]>(g_cfg.audio.frames);
 }

 OpenALThread::~OpenALThread()
@@ -85,7 +83,7 @@ void OpenALThread::Close()
 	if (alIsSource(m_source))
 		alDeleteSources(1, &m_source);

-	alDeleteBuffers(g_cfg.audio.frames, m_buffers.get());
+	alDeleteBuffers(g_al_buffers_count, m_buffers);
 	checkForAlError("alDeleteBuffers");
 }

@@ -100,7 +98,7 @@ void OpenALThread::Open(const void* src, int size)
 	alGenSources(1, &m_source);
 	checkForAlError("alGenSources");

-	alGenBuffers(g_cfg.audio.frames, m_buffers.get());
+	alGenBuffers(g_al_buffers_count, m_buffers);
 	checkForAlError("alGenBuffers");

 	alSourcei(m_source, AL_LOOPING, AL_FALSE);
@@ -108,13 +106,13 @@ void OpenALThread::Open(const void* src, int size)

 	m_buffer_size = size;

-	for (int i = 0; i < g_cfg.audio.frames; ++i)
+	for (uint i = 0; i<g_al_buffers_count; ++i)
 	{
 		alBufferData(m_buffers[i], m_format, src, m_buffer_size, 48000);
 		checkForAlError("alBufferData");
 	}

-	alSourceQueueBuffers(m_source, g_cfg.audio.frames, m_buffers.get());
+	alSourceQueueBuffers(m_source, g_al_buffers_count, m_buffers);
 	checkForAlError("alSourceQueueBuffers");
 	Play();
 }
@@ -2,14 +2,15 @@

 #include "Emu/Audio/AudioThread.h"
 #include "3rdparty/OpenAL/include/alext.h"
-#include <memory>

 class OpenALThread : public AudioThread
 {
 private:
+	static const uint g_al_buffers_count = 24;
+
 	ALint m_format;
 	ALuint m_source;
-	std::unique_ptr<ALuint[]> m_buffers;
+	ALuint m_buffers[g_al_buffers_count];
 	ALsizei m_buffer_size;

 public:
@@ -4,7 +4,7 @@

 #include "ALSAThread.h"

-#ifdef HAVE_ALSA
+#ifdef __linux__

 #include <alsa/asoundlib.h>

@@ -59,7 +59,7 @@ ALSAThread::ALSAThread()
 	if (!check(snd_pcm_hw_params_set_channels(s_tls_handle, hw_params, g_cfg.audio.downmix_to_2ch ? 2 : 8), "snd_pcm_hw_params_set_channels"))
 		return;

-	if (!check(snd_pcm_hw_params_set_buffer_size(s_tls_handle, hw_params, g_cfg.audio.frames * 256), "snd_pcm_hw_params_set_buffer_size"))
+	if (!check(snd_pcm_hw_params_set_buffer_size(s_tls_handle, hw_params, 8 * 256), "snd_pcm_hw_params_set_buffer_size"))
 		return;

 	if (!check(snd_pcm_hw_params_set_period_size(s_tls_handle, hw_params, 256, 0), "snd_pcm_hw_params_set_period_size"))
@@ -1,6 +1,6 @@
 #pragma once

-#ifdef HAVE_ALSA
+#ifdef __linux__

 #include "Emu/Audio/AudioThread.h"

@@ -1,60 +0,0 @@
-#include "Emu/System.h"
-#include "PulseThread.h"
-
-#ifdef HAVE_PULSE
-
-#include <pulse/simple.h>
-#include <pulse/error.h>
-
-PulseThread::PulseThread()
-{
-}
-
-PulseThread::~PulseThread()
-{
-	this->Close();
-}
-
-void PulseThread::Play()
-{
-}
-
-void PulseThread::Close()
-{
-	if(this->connection) {
-		pa_simple_free(this->connection);
-		this->connection = nullptr;
-	}
-}
-
-void PulseThread::Stop()
-{
-}
-
-void PulseThread::Open(const void* src, int size)
-{
-	pa_sample_spec ss;
-	ss.format = g_cfg.audio.convert_to_u16 ? PA_SAMPLE_S16LE : PA_SAMPLE_FLOAT32LE;
-	ss.channels = g_cfg.audio.downmix_to_2ch ? 2 : 8;
-	ss.rate = 48000;
-
-	int err;
-	this->connection = pa_simple_new(NULL, "RPCS3", PA_STREAM_PLAYBACK, NULL, "Game", &ss, NULL, NULL, &err);
-	if(!this->connection) {
-		fprintf(stderr, "PulseAudio: Failed to initialize audio: %s\n", pa_strerror(err));
-	}
-
-	this->AddData(src, size);
-}
-
-void PulseThread::AddData(const void* src, int size)
-{
-	if(this->connection) {
-		int err;
-		if(pa_simple_write(this->connection, src, size, &err) < 0) {
-			fprintf(stderr, "PulseAudio: Failed to write audio stream: %s\n", pa_strerror(err));
-		}
-	}
-}
-
-#endif
@@ -1,23 +0,0 @@
-#pragma once
-
-#ifdef HAVE_PULSE
-#include <pulse/simple.h>
-#include "Emu/Audio/AudioThread.h"
-
-class PulseThread : public AudioThread
-{
-public:
-	PulseThread();
-	virtual ~PulseThread() override;
-
-	virtual void Play() override;
-	virtual void Open(const void* src, int size) override;
-	virtual void Close() override;
-	virtual void Stop() override;
-	virtual void AddData(const void* src, int size) override;
-
-private:
-	pa_simple *connection = nullptr;
-};
-
-#endif
@@ -4,7 +4,6 @@
 #include "CPUThread.h"
 #include "Emu/IdManager.h"
 #include "Utilities/GDBDebugServer.h"
-#include <typeinfo>

 #ifdef _WIN32
 #include <Windows.h>
@@ -1,12 +1,9 @@
 #include "stdafx.h"
-#include "Utilities/sysinfo.h"
 #include "Emu/Memory/vm.h"
 #include "Emu/Cell/SPUThread.h"
 #include "Emu/Cell/lv2/sys_sync.h"
 #include "MFC.h"

-const bool s_use_rtm = utils::has_rtm();
-
 template <>
 void fmt_class_string<MFC>::format(std::string& out, u64 arg)
 {
@@ -148,25 +145,10 @@ void mfc_thread::cpu_task()
 					vm::reservation_acquire(cmd.eal, 128);

 					// Store unconditionally
-					if (s_use_rtm && utils::transaction_enter())
-					{
-						if (!vm::reader_lock{vm::try_to_lock})
-						{
-							_xabort(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);
-					}
+					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)
 				{
@@ -195,12 +195,6 @@ s32 cellAtracGetInternalErrorInfo(vm::ptr<CellAtracHandle> pHandle, vm::ptr<s32>
 	return CELL_OK;
 }

-s32 cellAtracGetSamplingRate()
-{
-	UNIMPLEMENTED_FUNC(cellAtrac);
-	return CELL_OK;
-}
-
 DECLARE(ppu_module_manager::cellAtrac)("cellAtrac", []()
 {
 	REG_FUNC(cellAtrac, cellAtracSetDataAndGetMemSize);
@@ -233,6 +227,4 @@ DECLARE(ppu_module_manager::cellAtrac)("cellAtrac", []()
 	REG_FUNC(cellAtrac, cellAtracResetPlayPosition);

 	REG_FUNC(cellAtrac, cellAtracGetInternalErrorInfo);
-
-	REG_FUNC(cellAtrac, cellAtracGetSamplingRate);
 });
@@ -203,12 +203,6 @@ s32 cellAtracMultiGetInternalErrorInfo(vm::ptr<CellAtracMultiHandle> pHandle, vm
 	return CELL_OK;
 }

-s32 cellAtracMultiGetSamplingRate()
-{
-	UNIMPLEMENTED_FUNC(cellAtracMulti);
-	return CELL_OK;
-}
-
 DECLARE(ppu_module_manager::cellAtracMulti)("cellAtracMulti", []()
 {
 	REG_FUNC(cellAtracMulti, cellAtracMultiSetDataAndGetMemSize);
@@ -242,6 +236,4 @@ DECLARE(ppu_module_manager::cellAtracMulti)("cellAtracMulti", []()
 	REG_FUNC(cellAtracMulti, cellAtracMultiResetPlayPosition);

 	REG_FUNC(cellAtracMulti, cellAtracMultiGetInternalErrorInfo);
-
-	REG_FUNC(cellAtracMulti, cellAtracMultiGetSamplingRate);
 });
@@ -12,34 +12,6 @@

 logs::channel cellAudio("cellAudio");

-template <>
-void fmt_class_string<CellAudioError>::format(std::string& out, u64 arg)
-{
-	format_enum(out, arg, [](CellAudioError value)
-	{
-		switch (value)
-		{
-		STR_CASE(CELL_AUDIO_ERROR_ALREADY_INIT);
-		STR_CASE(CELL_AUDIO_ERROR_AUDIOSYSTEM);
-		STR_CASE(CELL_AUDIO_ERROR_NOT_INIT);
-		STR_CASE(CELL_AUDIO_ERROR_PARAM);
-		STR_CASE(CELL_AUDIO_ERROR_PORT_FULL);
-		STR_CASE(CELL_AUDIO_ERROR_PORT_ALREADY_RUN);
-		STR_CASE(CELL_AUDIO_ERROR_PORT_NOT_OPEN);
-		STR_CASE(CELL_AUDIO_ERROR_PORT_NOT_RUN);
-		STR_CASE(CELL_AUDIO_ERROR_TRANS_EVENT);
-		STR_CASE(CELL_AUDIO_ERROR_PORT_OPEN);
-		STR_CASE(CELL_AUDIO_ERROR_SHAREDMEMORY);
-		STR_CASE(CELL_AUDIO_ERROR_MUTEX);
-		STR_CASE(CELL_AUDIO_ERROR_EVENT_QUEUE);
-		STR_CASE(CELL_AUDIO_ERROR_AUDIOSYSTEM_NOT_FOUND);
-		STR_CASE(CELL_AUDIO_ERROR_TAG_NOT_FOUND);
-		}
-
-		return unknown;
-	});
-}
-
 void audio_config::on_init(const std::shared_ptr<void>& _this)
 {
 	m_buffer.set(vm::alloc(AUDIO_PORT_OFFSET * AUDIO_PORT_COUNT, vm::main));
@@ -57,8 +29,6 @@ void audio_config::on_init(const std::shared_ptr<void>& _this)

 void audio_config::on_task()
 {
-	thread_ctrl::set_native_priority(1);
-
 	AudioDumper m_dump(g_cfg.audio.dump_to_file ? 2 : 0); // Init AudioDumper for 2 channels if enabled

 	float buf2ch[2 * BUFFER_SIZE]{}; // intermediate buffer for 2 channels
@@ -339,12 +309,12 @@ void audio_config::on_task()
 		case 8: m_dump.WriteData(&buf8ch, sizeof(buf8ch)); break; // write file data (8 ch)
 		}

-		cellAudio.trace("Audio perf: (access=%d, AddData=%d, events=%d, dump=%d)",
-			stamp1 - stamp0, stamp2 - stamp1, stamp3 - stamp2, get_system_time() - stamp3);
+		cellAudio.trace("Audio perf: start=%d (access=%d, AddData=%d, events=%d, dump=%d)",
+			time_pos, stamp1 - stamp0, stamp2 - stamp1, stamp3 - stamp2, get_system_time() - stamp3);
 	}
 }

-error_code cellAudioInit()
+s32 cellAudioInit()
 {
 	cellAudio.warning("cellAudioInit()");

@@ -359,7 +329,7 @@ error_code cellAudioInit()
 	return CELL_OK;
 }

-error_code cellAudioQuit()
+s32 cellAudioQuit()
 {
 	cellAudio.warning("cellAudioQuit()");

@@ -374,7 +344,7 @@ error_code cellAudioQuit()
 	return CELL_OK;
 }

-error_code cellAudioPortOpen(vm::ptr<CellAudioPortParam> audioParam, vm::ptr<u32> portNum)
+s32 cellAudioPortOpen(vm::ptr<CellAudioPortParam> audioParam, vm::ptr<u32> portNum)
 {
 	cellAudio.warning("cellAudioPortOpen(audioParam=*0x%x, portNum=*0x%x)", audioParam, portNum);

@@ -474,7 +444,7 @@ error_code cellAudioPortOpen(vm::ptr<CellAudioPortParam> audioParam, vm::ptr<u32
 	return CELL_OK;
 }

-error_code cellAudioGetPortConfig(u32 portNum, vm::ptr<CellAudioPortConfig> portConfig)
+s32 cellAudioGetPortConfig(u32 portNum, vm::ptr<CellAudioPortConfig> portConfig)
 {
 	cellAudio.warning("cellAudioGetPortConfig(portNum=%d, portConfig=*0x%x)", portNum, portConfig);

@@ -509,7 +479,7 @@ error_code cellAudioGetPortConfig(u32 portNum, vm::ptr<CellAudioPortConfig> port
 	return CELL_OK;
 }

-error_code cellAudioPortStart(u32 portNum)
+s32 cellAudioPortStart(u32 portNum)
 {
 	cellAudio.warning("cellAudioPortStart(portNum=%d)", portNum);

@@ -534,7 +504,7 @@ error_code cellAudioPortStart(u32 portNum)
 	}
 }

-error_code cellAudioPortClose(u32 portNum)
+s32 cellAudioPortClose(u32 portNum)
 {
 	cellAudio.warning("cellAudioPortClose(portNum=%d)", portNum);

@@ -559,7 +529,7 @@ error_code cellAudioPortClose(u32 portNum)
 	}
 }

-error_code cellAudioPortStop(u32 portNum)
+s32 cellAudioPortStop(u32 portNum)
 {
 	cellAudio.warning("cellAudioPortStop(portNum=%d)", portNum);

@@ -584,7 +554,7 @@ error_code cellAudioPortStop(u32 portNum)
 	}
 }

-error_code cellAudioGetPortTimestamp(u32 portNum, u64 tag, vm::ptr<u64> stamp)
+s32 cellAudioGetPortTimestamp(u32 portNum, u64 tag, vm::ptr<u64> stamp)
 {
 	cellAudio.trace("cellAudioGetPortTimestamp(portNum=%d, tag=0x%llx, stamp=*0x%x)", portNum, tag, stamp);

@@ -614,7 +584,7 @@ error_code cellAudioGetPortTimestamp(u32 portNum, u64 tag, vm::ptr<u64> stamp)
 	return CELL_OK;
 }

-error_code cellAudioGetPortBlockTag(u32 portNum, u64 blockNo, vm::ptr<u64> tag)
+s32 cellAudioGetPortBlockTag(u32 portNum, u64 blockNo, vm::ptr<u64> tag)
 {
 	cellAudio.trace("cellAudioGetPortBlockTag(portNum=%d, blockNo=0x%llx, tag=*0x%x)", portNum, blockNo, tag);

@@ -657,7 +627,7 @@ error_code cellAudioGetPortBlockTag(u32 portNum, u64 blockNo, vm::ptr<u64> tag)
 	return CELL_OK;
 }

-error_code cellAudioSetPortLevel(u32 portNum, float level)
+s32 cellAudioSetPortLevel(u32 portNum, float level)
 {
 	cellAudio.trace("cellAudioSetPortLevel(portNum=%d, level=%f)", portNum, level);

@@ -692,7 +662,7 @@ error_code cellAudioSetPortLevel(u32 portNum, float level)
 	return CELL_OK;
 }

-error_code cellAudioCreateNotifyEventQueue(vm::ptr<u32> id, vm::ptr<u64> key)
+s32 cellAudioCreateNotifyEventQueue(vm::ptr<u32> id, vm::ptr<u64> key)
 {
 	cellAudio.warning("cellAudioCreateNotifyEventQueue(id=*0x%x, key=*0x%x)", id, key);

@@ -723,7 +693,7 @@ error_code cellAudioCreateNotifyEventQueue(vm::ptr<u32> id, vm::ptr<u64> key)
 	return CELL_AUDIO_ERROR_EVENT_QUEUE;
 }

-error_code cellAudioCreateNotifyEventQueueEx(vm::ptr<u32> id, vm::ptr<u64> key, u32 iFlags)
+s32 cellAudioCreateNotifyEventQueueEx(vm::ptr<u32> id, vm::ptr<u64> key, u32 iFlags)
 {
 	cellAudio.todo("cellAudioCreateNotifyEventQueueEx(id=*0x%x, key=*0x%x, iFlags=0x%x)", id, key, iFlags);

@@ -737,7 +707,7 @@ error_code cellAudioCreateNotifyEventQueueEx(vm::ptr<u32> id, vm::ptr<u64> key,
 	return CELL_AUDIO_ERROR_EVENT_QUEUE;
 }

-error_code cellAudioSetNotifyEventQueue(u64 key)
+s32 cellAudioSetNotifyEventQueue(u64 key)
 {
 	cellAudio.warning("cellAudioSetNotifyEventQueue(key=0x%llx)", key);

@@ -763,7 +733,7 @@ error_code cellAudioSetNotifyEventQueue(u64 key)
 	return CELL_OK;
 }

-error_code cellAudioSetNotifyEventQueueEx(u64 key, u32 iFlags)
+s32 cellAudioSetNotifyEventQueueEx(u64 key, u32 iFlags)
 {
 	cellAudio.todo("cellAudioSetNotifyEventQueueEx(key=0x%llx, iFlags=0x%x)", key, iFlags);

@@ -772,7 +742,7 @@ error_code cellAudioSetNotifyEventQueueEx(u64 key, u32 iFlags)
 	return CELL_OK;
 }

-error_code cellAudioRemoveNotifyEventQueue(u64 key)
+s32 cellAudioRemoveNotifyEventQueue(u64 key)
 {
 	cellAudio.warning("cellAudioRemoveNotifyEventQueue(key=0x%llx)", key);

@@ -798,7 +768,7 @@ error_code cellAudioRemoveNotifyEventQueue(u64 key)
 	return CELL_AUDIO_ERROR_TRANS_EVENT;
 }

-error_code cellAudioRemoveNotifyEventQueueEx(u64 key, u32 iFlags)
+s32 cellAudioRemoveNotifyEventQueueEx(u64 key, u32 iFlags)
 {
 	cellAudio.todo("cellAudioRemoveNotifyEventQueueEx(key=0x%llx, iFlags=0x%x)", key, iFlags);

@@ -807,7 +777,7 @@ error_code cellAudioRemoveNotifyEventQueueEx(u64 key, u32 iFlags)
 	return CELL_OK;
 }

-error_code cellAudioAddData(u32 portNum, vm::ptr<float> src, u32 samples, float volume)
+s32 cellAudioAddData(u32 portNum, vm::ptr<float> src, u32 samples, float volume)
 {
 	cellAudio.trace("cellAudioAddData(portNum=%d, src=*0x%x, samples=%d, volume=%f)", portNum, src, samples, volume);

@@ -842,7 +812,7 @@ error_code cellAudioAddData(u32 portNum, vm::ptr<float> src, u32 samples, float
 	return CELL_OK;
 }

-error_code cellAudioAdd2chData(u32 portNum, vm::ptr<float> src, u32 samples, float volume)
+s32 cellAudioAdd2chData(u32 portNum, vm::ptr<float> src, u32 samples, float volume)
 {
 	cellAudio.trace("cellAudioAdd2chData(portNum=%d, src=*0x%x, samples=%d, volume=%f)", portNum, src, samples, volume);

@@ -911,7 +881,7 @@ error_code cellAudioAdd2chData(u32 portNum, vm::ptr<float> src, u32 samples, flo
 	return CELL_OK;
 }

-error_code cellAudioAdd6chData(u32 portNum, vm::ptr<float> src, float volume)
+s32 cellAudioAdd6chData(u32 portNum, vm::ptr<float> src, float volume)
 {
 	cellAudio.trace("cellAudioAdd6chData(portNum=%d, src=*0x%x, volume=%f)", portNum, src, volume);

@@ -965,25 +935,25 @@ error_code cellAudioAdd6chData(u32 portNum, vm::ptr<float> src, float volume)
 	return CELL_OK;
 }

-error_code cellAudioMiscSetAccessoryVolume(u32 devNum, float volume)
+s32 cellAudioMiscSetAccessoryVolume(u32 devNum, float volume)
 {
 	cellAudio.todo("cellAudioMiscSetAccessoryVolume(devNum=%d, volume=%f)", devNum, volume);
 	return CELL_OK;
 }

-error_code cellAudioSendAck(u64 data3)
+s32 cellAudioSendAck(u64 data3)
 {
 	cellAudio.todo("cellAudioSendAck(data3=0x%llx)", data3);
 	return CELL_OK;
 }

-error_code cellAudioSetPersonalDevice(s32 iPersonalStream, s32 iDevice)
+s32 cellAudioSetPersonalDevice(s32 iPersonalStream, s32 iDevice)
 {
 	cellAudio.todo("cellAudioSetPersonalDevice(iPersonalStream=%d, iDevice=%d)", iPersonalStream, iDevice);
 	return CELL_OK;
 }

-error_code cellAudioUnsetPersonalDevice(s32 iPersonalStream)
+s32 cellAudioUnsetPersonalDevice(s32 iPersonalStream)
 {
 	cellAudio.todo("cellAudioUnsetPersonalDevice(iPersonalStream=%d)", iPersonalStream);
 	return CELL_OK;
@@ -5,7 +5,7 @@
 namespace vm { using namespace ps3; }

 // Error codes
-enum CellAudioError : u32
+enum
 {
 	CELL_AUDIO_ERROR_ALREADY_INIT               = 0x80310701,
 	CELL_AUDIO_ERROR_AUDIOSYSTEM                = 0x80310702,
@@ -11,39 +11,39 @@ logs::channel cellAvconfExt("cellAvconfExt");

 vm::gvar<f32> g_gamma; // TODO

-s32 cellAudioOutUnregisterDevice(u32 deviceNumber)
+s32 cellAudioOutUnregisterDevice()
 {
-	cellAvconfExt.todo("cellAudioOutUnregisterDevice(deviceNumber=0x%x)", deviceNumber);
+	UNIMPLEMENTED_FUNC(cellAvconfExt); 
 	return CELL_OK;
 }

-s32 cellAudioOutGetDeviceInfo2(u32 deviceNumber, u32 deviceIndex, vm::ptr<CellAudioOutDeviceInfo2> info)
+s32 cellAudioOutGetDeviceInfo2()
 {
-	cellAvconfExt.todo("cellAudioOutGetDeviceInfo2(deviceNumber=0x%x, deviceIndex=0x%x, info=*0x%x)", deviceNumber, deviceIndex, info);
+	UNIMPLEMENTED_FUNC(cellAvconfExt); 
 	return CELL_OK;
 }

 s32 cellVideoOutSetXVColor()
 {
-	UNIMPLEMENTED_FUNC(cellAvconfExt);
+	UNIMPLEMENTED_FUNC(cellAvconfExt); 
 	return CELL_OK;
 }

 s32 cellVideoOutSetupDisplay()
 {
-	UNIMPLEMENTED_FUNC(cellAvconfExt);
+	UNIMPLEMENTED_FUNC(cellAvconfExt); 
 	return CELL_OK;
 }

-s32 cellAudioInGetDeviceInfo(u32 deviceNumber, u32 deviceIndex, vm::ptr<CellAudioInDeviceInfo> info)
+s32 cellAudioInGetDeviceInfo()
 {
-	cellAvconfExt.todo("cellAudioInGetDeviceInfo(deviceNumber=0x%x, deviceIndex=0x%x, info=*0x%x)", deviceNumber, deviceIndex, info);
+	UNIMPLEMENTED_FUNC(cellAvconfExt); 
 	return CELL_OK;
 }

-s32 cellVideoOutConvertCursorColor(u32 videoOut, s32 displaybuffer_format, f32 gamma, s32 source_buffer_format, vm::ptr<void> src_addr, vm::ptr<u32> dest_addr, s32 num)
+s32 cellVideoOutConvertCursorColor()
 {
-	cellAvconfExt.todo("cellVideoOutConvertCursorColor(videoOut=%d, displaybuffer_format=0x%x, gamma=0x%x, source_buffer_format=0x%x, src_addr=*0x%x, dest_addr=*0x%x, num=0x%x)", videoOut, displaybuffer_format, gamma, source_buffer_format, src_addr, dest_addr, num);
+	UNIMPLEMENTED_FUNC(cellAvconfExt); 
 	return CELL_OK;
 }

@@ -61,16 +61,16 @@ s32 cellVideoOutGetGamma(u32 videoOut, vm::ptr<f32> gamma)
 	return CELL_OK;
 }

-s32 cellAudioInGetAvailableDeviceInfo(u32 count, vm::ptr<CellAudioInDeviceInfo> info)
+s32 cellAudioInGetAvailableDeviceInfo()
 {
-	cellAvconfExt.todo("cellAudioInGetAvailableDeviceInfo(count=0x%x, info=*0x%x)", count, info);
-	return 0; // number of available devices
+	UNIMPLEMENTED_FUNC(cellAvconfExt); 
+	return CELL_OK;
 }

-s32 cellAudioOutGetAvailableDeviceInfo(u32 count, vm::ptr<CellAudioOutDeviceInfo2> info)
+s32 cellAudioOutGetAvailableDeviceInfo()
 {
-	cellAvconfExt.todo("cellAudioOutGetAvailableDeviceInfo(count=0x%x, info=*0x%x)", count, info);
-	return 0; // number of available devices
+	UNIMPLEMENTED_FUNC(cellAvconfExt); 
+	return CELL_OK;
 }

 s32 cellVideoOutSetGamma(u32 videoOut, f32 gamma)
@@ -92,37 +92,37 @@ s32 cellVideoOutSetGamma(u32 videoOut, f32 gamma)
 	return CELL_OK;
 }

-s32 cellAudioOutRegisterDevice(u64 deviceType, vm::cptr<char> name, vm::ptr<CellAudioOutRegistrationOption> option, vm::ptr<CellAudioOutDeviceConfiguration> config)
+s32 cellAudioOutRegisterDevice()
 {
-	cellAvconfExt.todo("cellAudioOutRegisterDevice(deviceType=0x%llx, name=%s, option=*0x%x, config=*0x%x)", deviceType, name, option, config);
-	return 0; // device number
-}
-
-s32 cellAudioOutSetDeviceMode(u32 deviceMode)
-{
-	cellAvconfExt.todo("cellAudioOutSetDeviceMode(deviceMode=0x%x)", deviceMode);
+	UNIMPLEMENTED_FUNC(cellAvconfExt); 
 	return CELL_OK;
 }

-s32 cellAudioInSetDeviceMode(u32 deviceMode)
+s32 cellAudioOutSetDeviceMode()
 {
-	cellAvconfExt.todo("cellAudioInSetDeviceMode(deviceMode=0x%x)", deviceMode);
+	UNIMPLEMENTED_FUNC(cellAvconfExt); 
 	return CELL_OK;
 }

-s32 cellAudioInRegisterDevice(u64 deviceType, vm::cptr<char> name, vm::ptr<CellAudioInRegistrationOption> option, vm::ptr<CellAudioInDeviceConfiguration> config)
+s32 cellAudioInSetDeviceMode()
 {
-	cellAvconfExt.todo("cellAudioInRegisterDevice(deviceType=0x%llx, name=%s, option=*0x%x, config=*0x%x)", deviceType, name, option, config);
-	return 0; // device number
-}
-
-s32 cellAudioInUnregisterDevice(u32 deviceNumber)
-{
-	cellAvconfExt.todo("cellAudioInUnregisterDevice(deviceNumber=0x%x)", deviceNumber);
+	UNIMPLEMENTED_FUNC(cellAvconfExt); 
 	return CELL_OK;
 }

-s32 cellVideoOutGetScreenSize(u32 videoOut, vm::ptr<f32> screenSize)
+s32 cellAudioInRegisterDevice()
+{
+	UNIMPLEMENTED_FUNC(cellAvconfExt); 
+	return CELL_OK;
+}
+
+s32 cellAudioInUnregisterDevice()
+{
+	UNIMPLEMENTED_FUNC(cellAvconfExt); 
+	return CELL_OK;
+}
+
+s32 cellVideoOutGetScreenSize(u32 videoOut, vm::ptr<float> screenSize)
 {
 	cellAvconfExt.warning("cellVideoOutGetScreenSize(videoOut=%d, screenSize=*0x%x)", videoOut, screenSize);

@@ -143,16 +143,10 @@ s32 cellVideoOutGetScreenSize(u32 videoOut, vm::ptr<f32> screenSize)
 	return CELL_VIDEO_OUT_ERROR_VALUE_IS_NOT_SET;
 }

-s32 cellVideoOutSetCopyControl(u32 videoOut, u32 control)
-{
-	cellAvconfExt.todo("cellVideoOutSetCopyControl(videoOut=%d, control=0x%x)", videoOut, control);
-	return CELL_OK;
-}
-

 DECLARE(ppu_module_manager::cellAvconfExt)("cellSysutilAvconfExt", []()
 {
-	REG_VAR(cellSysutilAvconfExt, g_gamma).flag(MFF_HIDDEN).init = []
+	REG_VNID(cellSysutilAvconfExt, 0x00000000u, g_gamma).init = []
 	{
 		// Test
 		*g_gamma = 1.0f;
@@ -174,5 +168,4 @@ DECLARE(ppu_module_manager::cellAvconfExt)("cellSysutilAvconfExt", []()
 	REG_FUNC(cellSysutilAvconfExt, cellAudioInRegisterDevice);
 	REG_FUNC(cellSysutilAvconfExt, cellAudioInUnregisterDevice);
 	REG_FUNC(cellSysutilAvconfExt, cellVideoOutGetScreenSize);
-	REG_FUNC(cellSysutilAvconfExt, cellVideoOutSetCopyControl);
 });
@@ -2,35 +2,16 @@
 #include "Emu/System.h"
 #include "Emu/Cell/PPUModule.h"

-namespace vm { using namespace ps3; }
-
 logs::channel cellCrossController("cellCrossController");

-struct CellCrossControllerParam
+s32 cellCrossController_37E1F502() // LittleBigPlanet 2 and 3
 {
-	vm::bcptr<char> pPackageFileName;
-	vm::bcptr<char> pSignatureFileName;
-	vm::bcptr<char> pIconFileName;
-	vm::bptr<void> option;
-};
-
-struct CellCrossControllerPackageInfo
-{
-	vm::bcptr<char> pTitle;
-	vm::bcptr<char> pTitleId;
-	vm::bcptr<char> pAppVer;
-};
-
-using CellCrossControllerCallback = void(s32 status, s32 errorCode, vm::ptr<void> option, vm::ptr<void> userdata);
-
-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);
+	cellCrossController.todo("cellCrossController_37E1F502");
 	return CELL_OK;
 }


 DECLARE(ppu_module_manager::cellCrossController)("cellCrossController", []()
 {
-	REG_FUNC(cellCrossController, cellCrossControllerInitialize);
+	REG_FNID(cellCrossController, 0x37E1F502, cellCrossController_37E1F502);
 });
@@ -1035,22 +1035,22 @@ DECLARE(ppu_module_manager::cellFs)("sys_fs", []()
 	REG_FUNC(sys_fs, cellFsChangeFileSizeWithoutAllocation);
 	REG_FUNC(sys_fs, cellFsChmod);
 	REG_FUNC(sys_fs, cellFsChown);
-	REG_FUNC(sys_fs, cellFsClose).flag(MFF_PERFECT);
-	REG_FUNC(sys_fs, cellFsClosedir).flag(MFF_PERFECT);
+	REG_FUNC(sys_fs, cellFsClose).flags = MFF_PERFECT;
+	REG_FUNC(sys_fs, cellFsClosedir).flags = MFF_PERFECT;
 	REG_FUNC(sys_fs, cellFsFcntl);
 	REG_FUNC(sys_fs, cellFsFdatasync);
-	REG_FUNC(sys_fs, cellFsFGetBlockSize).flag(MFF_PERFECT);
+	REG_FUNC(sys_fs, cellFsFGetBlockSize).flags = MFF_PERFECT;
 	REG_FUNC(sys_fs, cellFsFGetBlockSize2);
 	REG_FUNC(sys_fs, cellFsFstat).flags = MFF_PERFECT;
 	REG_FUNC(sys_fs, cellFsFsync);
-	REG_FUNC(sys_fs, cellFsFtruncate).flag(MFF_PERFECT);
+	REG_FUNC(sys_fs, cellFsFtruncate).flags = MFF_PERFECT;
 	REG_FUNC(sys_fs, cellFsGetBlockSize);
 	REG_FUNC(sys_fs, cellFsGetBlockSize2);
 	REG_FUNC(sys_fs, cellFsGetDirectoryEntries);
 	REG_FUNC(sys_fs, cellFsGetFreeSize);
 	REG_FUNC(sys_fs, cellFsGetPath);
 	REG_FUNC(sys_fs, cellFsLink);
-	REG_FUNC(sys_fs, cellFsLseek).flag(MFF_PERFECT);
+	REG_FUNC(sys_fs, cellFsLseek).flags = MFF_PERFECT;
 	REG_FUNC(sys_fs, cellFsLsnGetCDA);
 	REG_FUNC(sys_fs, cellFsLsnGetCDASize);
 	REG_FUNC(sys_fs, cellFsLsnLock);
@@ -1063,8 +1063,8 @@ DECLARE(ppu_module_manager::cellFs)("sys_fs", []()
 	REG_FUNC(sys_fs, cellFsOpen);
 	REG_FUNC(sys_fs, cellFsOpen2);
 	REG_FUNC(sys_fs, cellFsOpendir);
-	REG_FUNC(sys_fs, cellFsRead).flag(MFF_PERFECT);
-	REG_FUNC(sys_fs, cellFsReaddir).flag(MFF_PERFECT);
+	REG_FUNC(sys_fs, cellFsRead).flags = MFF_PERFECT;
+	REG_FUNC(sys_fs, cellFsReaddir).flags = MFF_PERFECT;
 	REG_FUNC(sys_fs, cellFsReadWithOffset);
 	REG_FUNC(sys_fs, cellFsRegisterConversionCallback);
 	REG_FUNC(sys_fs, cellFsRename);
@@ -1095,6 +1095,6 @@ DECLARE(ppu_module_manager::cellFs)("sys_fs", []()
 	REG_FUNC(sys_fs, cellFsUnlink);
 	REG_FUNC(sys_fs, cellFsUnregisterL10nCallbacks);
 	REG_FUNC(sys_fs, cellFsUtime);
-	REG_FUNC(sys_fs, cellFsWrite).flag(MFF_PERFECT);
+	REG_FUNC(sys_fs, cellFsWrite).flags = MFF_PERFECT;
 	REG_FUNC(sys_fs, cellFsWriteWithOffset);
 });
@@ -80,13 +80,14 @@ struct content_permission final
 	// SFO file
 	psf::registry sfo;

-	// Temporary directory path
-	std::string temp;
+	// True if temporary directory is created and must be moved or deleted
+	bool is_temporary = false;

 	template <typename Dir, typename Sfo>
-	content_permission(Dir&& dir, Sfo&& sfo)
+	content_permission(Dir&& dir, Sfo&& sfo, bool is_temp = false)
 		: dir(std::forward<Dir>(dir))
 		, sfo(std::forward<Sfo>(sfo))
+		, is_temporary(is_temp)
 	{
 	}

@@ -94,9 +95,9 @@ struct content_permission final
 	{
 		try
 		{
-			if (!temp.empty())
+			if (is_temporary)
 			{
-				fs::remove_all(temp);
+				fs::remove_all(vfs::get("/dev_hdd1/game/" + dir));
 			}
 		}
 		catch (...)
@@ -182,14 +183,13 @@ s32 cellHddGameGetSizeKB(vm::ptr<u32> size)
 {
 	cellGame.warning("cellHddGameGetSizeKB(size=*0x%x)", size);

-	const std::string local_dir = vfs::get("/dev_hdd0/game/" + Emu.GetTitleID());
-
+	const std::string& local_dir = vfs::get("/dev_hdd0/game/" + Emu.GetTitleID());
 	if (!fs::is_dir(local_dir))
 	{
 		return CELL_HDDGAME_ERROR_FAILURE;
 	}

-	*size = ::narrow<u32>(fs::get_dir_size(local_dir) / 1024);
+	*size = (u32)(fs::get_dir_size(local_dir)/1024);

 	return CELL_OK;
 }
@@ -209,16 +209,16 @@ s32 cellGameDataGetSizeKB(vm::ptr<u32> size)
 {
 	cellGame.warning("cellGameDataGetSizeKB(size=*0x%x)", size);

-	const std::string local_dir = vfs::get("/dev_hdd0/game/" + Emu.GetTitleID());
-
+	const std::string& local_dir = vfs::get("/dev_hdd0/game/" + Emu.GetTitleID());
 	if (!fs::is_dir(local_dir))
 	{
 		return CELL_GAMEDATA_ERROR_FAILURE;
 	}

-	*size = ::narrow<u32>(fs::get_dir_size(local_dir) / 1024);
+	*size = (u32)(fs::get_dir_size(local_dir)/1024);

 	return CELL_OK;
+
 }

 s32 cellGameDataSetSystemVer()
@@ -262,7 +262,7 @@ error_code cellGameBootCheck(vm::ptr<u32> type, vm::ptr<u32> attributes, vm::ptr
 			return CELL_GAME_ERROR_BUSY;
 		}
 	}
-	else if (category == "AP" || category == "AV" || category == "HG" || category == "AT" || category == "AM" || category == "SF")
+	else if (category == "AP" || category == "AV" || category == "HG")
 	{
 		*type = CELL_GAME_GAMETYPE_HDD;
 		*attributes = 0; // TODO
@@ -383,7 +383,7 @@ error_code cellGameContentPermit(vm::ptr<char[CELL_GAME_PATH_MAX]> contentInfoPa

 	const std::string dir = prm->dir.empty() ? "/dev_bdvd/PS3_GAME"s : "/dev_hdd0/game/" + prm->dir;

-	if (!prm->temp.empty())
+	if (prm->is_temporary)
 	{
 		// Make temporary directory persistent
 		const auto vdir = vfs::get(dir);
@@ -393,7 +393,7 @@ error_code cellGameContentPermit(vm::ptr<char[CELL_GAME_PATH_MAX]> contentInfoPa
 			fmt::throw_exception("cellGameContentPermit(): epic fail: directory '%s' already exists", dir);
 		}

-		if (fs::rename(prm->temp, vdir, false))
+		if (fs::rename(vfs::get("/dev_hdd1/game/" + prm->dir), vdir))
 		{
 			cellGame.success("cellGameContentPermit(): directory '%s' has been created", dir);
 		}
@@ -406,7 +406,7 @@ error_code cellGameContentPermit(vm::ptr<char[CELL_GAME_PATH_MAX]> contentInfoPa
 		psf::save_object(fs::file(vdir + "/PARAM.SFO", fs::rewrite), prm->sfo);

 		// Disable deletion
-		prm->temp.clear();
+		prm->is_temporary = false;
 	}

 	strcpy_trunc(*contentInfoPath, dir);
@@ -570,8 +570,8 @@ error_code cellGameCreateGameData(vm::ptr<CellGameSetInitParams> init, vm::ptr<c
 	strcpy_trunc(*tmp_contentInfoPath, tmp_contentInfo);
 	strcpy_trunc(*tmp_usrdirPath, tmp_usrdir);

-	prm->temp = vfs::get(tmp_contentInfo);
 	cellGame.success("cellGameCreateGameData(): temporary directory '%s' has been created", tmp_contentInfo);
+	prm->is_temporary = true;

 	// Initial PARAM.SFO parameters (overwrite)
 	prm->sfo =
@@ -659,11 +659,6 @@ error_code cellGameGetParamString(s32 id, vm::ptr<char> buf, u32 bufsize)
 {
 	cellGame.warning("cellGameGetParamString(id=%d, buf=*0x%x, bufsize=%d)", id, buf, bufsize);

-	if (!buf || bufsize == 0)
-	{
-		return CELL_GAME_ERROR_PARAM;
-	}
-
 	const auto prm = fxm::get<content_permission>();

 	if (!prm)
@@ -690,11 +685,6 @@ error_code cellGameSetParamString(s32 id, vm::cptr<char> buf)
 {
 	cellGame.warning("cellGameSetParamString(id=%d, buf=*0x%x)", id, buf);

-	if (!buf)
-	{
-		return CELL_GAME_ERROR_PARAM;
-	}
-
 	const auto prm = fxm::get<content_permission>();

 	if (!prm)
@@ -724,10 +714,9 @@ error_code cellGameSetParamString(s32 id, vm::cptr<char> buf)
 	return CELL_OK;
 }

-error_code cellGameGetSizeKB(vm::ptr<s32> size)
+s32 cellGameGetSizeKB(vm::ptr<s32> size)
 {
 	cellGame.warning("cellGameGetSizeKB(size=*0x%x)", size);
-
 	const auto prm = fxm::get<content_permission>();

 	if (!prm)
@@ -735,14 +724,13 @@ error_code cellGameGetSizeKB(vm::ptr<s32> size)
 		return CELL_GAME_ERROR_FAILURE;
 	}

-	const std::string local_dir = !prm->temp.empty() ? prm->temp : vfs::get("/dev_hdd0/game/" + prm->dir);
-
+	const std::string& local_dir = prm->is_temporary? vfs::get("/dev_hdd1/game/"s + prm->dir) : vfs::get("/dev_hdd0/game/"s + prm->dir);		//should we check the temporary folder?
 	if (!fs::is_dir(local_dir))
 	{
-		return CELL_GAME_ERROR_ACCESS_ERROR;
+		return CELL_GAME_ERROR_FAILURE;
 	}

-	*size = ::narrow<u32>(fs::get_dir_size(local_dir) / 1024);
+	*size = (u32)(fs::get_dir_size(local_dir)/1024);

 	return CELL_OK;
 }
@@ -5,15 +5,14 @@

 logs::channel cellGameExec("cellGameExec");

-s32 cellGameSetExitParam(u32 execdata)
+s32 cellGameSetExitParam()
 {
-	cellGameExec.todo("cellGameSetExitParam(execdata=0x%x)", execdata);
-	return CELL_OK;
+	fmt::throw_exception("Unimplemented" HERE);
 }

 s32 cellGameGetHomeDataExportPath(vm::ptr<char> exportPath)
 {
-	cellGameExec.warning("cellGameGetHomeDataExportPath(exportPath=*0x%x)", exportPath);
+	cellGameExec.warning("cellGameGetHomeDataExportPath(exportPath=0x%x)", exportPath);

 	// TODO: PlayStation home is defunct.

@@ -22,17 +21,12 @@ s32 cellGameGetHomeDataExportPath(vm::ptr<char> exportPath)

 s32 cellGameGetHomePath()
 {
-	UNIMPLEMENTED_FUNC(cellGameExec);
-	return CELL_OK;
+	fmt::throw_exception("Unimplemented" HERE);
 }

-s32 cellGameGetHomeDataImportPath(vm::ptr<char> importPath)
+s32 cellGameGetHomeDataImportPath()
 {
-	cellGameExec.warning("cellGameGetHomeDataImportPath(importPath=*0x%x)", importPath);
-
-	// TODO: PlayStation home is defunct.
-
-	return CELL_GAME_ERROR_NOAPP;
+	fmt::throw_exception("Unimplemented" HERE);
 }

 s32 cellGameGetHomeLaunchOptionPath(vm::ptr<char> commonPath, vm::ptr<char> personalPath)
@@ -43,9 +37,9 @@ s32 cellGameGetHomeLaunchOptionPath(vm::ptr<char> commonPath, vm::ptr<char> pers
 	return CELL_GAME_ERROR_NOAPP;
 }

-s32 cellGameGetBootGameInfo(vm::ptr<u32> type, vm::ptr<char> dirName, vm::ptr<u32> execdata)
+s32 cellGameGetBootGameInfo(vm::ptr<u32> type, vm::ptr<char> dirName, vm::ptr<u32> execData)
 {
-	cellGameExec.todo("cellGameGetBootGameInfo(type=*0x%x, dirName=%s, execdata=*0x%x)", type, dirName, execdata);
+	cellGameExec.todo("cellGameGetBootGameInfo(type=*0x%x, dirName=%s, execData=*0x%x)", type, dirName, execData);

 	// TODO: Support more boot types
 	*type = CELL_GAME_GAMETYPE_SYS;
@@ -26,19 +26,16 @@ const u32 tiled_pitches[] = {
 	0x00010000
 };

-struct CellGcmSysConfig {
-	u32 zculls_addr;
-	vm::ptr<CellGcmDisplayInfo> gcm_buffers{ vm::null };
-	u32 tiles_addr;
-	u32 ctxt_addr;
-	CellGcmConfig current_config;
-	CellGcmContextData current_context;
-	gcmInfo gcm_info;
-};
-
-u64 system_mode = 0;
 u32 local_size = 0;
 u32 local_addr = 0;
+u64 system_mode = 0;
+
+CellGcmConfig current_config;
+CellGcmContextData current_context;
+gcmInfo gcm_info;
+
+u32 map_offset_addr = 0;
+u32 map_offset_pos = 0;

 // Auxiliary functions

@@ -85,12 +82,7 @@ void InitOffsetTable()
 u32 cellGcmGetLabelAddress(u8 index)
 {
 	cellGcmSys.trace("cellGcmGetLabelAddress(index=%d)", index);
-	const auto m_config = fxm::get<CellGcmSysConfig>();
-
-	if (!m_config)
-		return 0;
-
-	return m_config->gcm_info.label_addr + 0x10 * index;
+	return gcm_info.label_addr + 0x10 * index;
 }

 vm::ptr<CellGcmReportData> cellGcmGetReportDataAddressLocation(u32 index, u32 location)
@@ -102,7 +94,7 @@ vm::ptr<CellGcmReportData> cellGcmGetReportDataAddressLocation(u32 index, u32 lo
 			cellGcmSys.error("cellGcmGetReportDataAddressLocation: Wrong local index (%d)", index);
 			return vm::null;
 		}
-		return vm::ptr<CellGcmReportData>::make(0x40301400 + index * 0x10);
+		return vm::ptr<CellGcmReportData>::make(0xC0000000 + index * 0x10);
 	}

 	if (location == CELL_GCM_LOCATION_MAIN) {
@@ -125,7 +117,7 @@ u64 cellGcmGetTimeStamp(u32 index)
 		cellGcmSys.error("cellGcmGetTimeStamp: Wrong local index (%d)", index);
 		return 0;
 	}
-	return vm::read64(0x40301400 + index * 0x10);
+	return vm::read64(0xC0000000 + index * 0x10);
 }

 u32 cellGcmGetCurrentField()
@@ -152,7 +144,7 @@ u32 cellGcmGetNotifyDataAddress(u32 index)
 */
 vm::ptr<CellGcmReportData> _cellGcmFunc12()
 {
-	return vm::ptr<CellGcmReportData>::make(0x40301400); // TODO
+	return vm::ptr<CellGcmReportData>::make(0xC0000000); // TODO
 }

 u32 cellGcmGetReport(u32 type, u32 index)
@@ -180,7 +172,7 @@ u32 cellGcmGetReportDataAddress(u32 index)
 		cellGcmSys.error("cellGcmGetReportDataAddress: Wrong local index (%d)", index);
 		return 0;
 	}
-	return 0x40301400 + index * 0x10;
+	return 0xC0000000 + index * 0x10;
 }

 u32 cellGcmGetReportDataLocation(u32 index, u32 location)
@@ -200,7 +192,7 @@ u64 cellGcmGetTimeStampLocation(u32 index, u32 location)
 			cellGcmSys.error("cellGcmGetTimeStampLocation: Wrong local index (%d)", index);
 			return 0;
 		}
-		return vm::read64(0x40301400 + index * 0x10);
+		return vm::read64(0xC0000000 + index * 0x10);
 	}

 	if (location == CELL_GCM_LOCATION_MAIN) {
@@ -222,31 +214,20 @@ u64 cellGcmGetTimeStampLocation(u32 index, u32 location)
 u32 cellGcmGetControlRegister()
 {
 	cellGcmSys.trace("cellGcmGetControlRegister()");
-	const auto m_config = fxm::get<CellGcmSysConfig>();

-	if (!m_config)
-		return 0;
-	return m_config->gcm_info.control_addr;
+	return gcm_info.control_addr;
 }

 u32 cellGcmGetDefaultCommandWordSize()
 {
 	cellGcmSys.trace("cellGcmGetDefaultCommandWordSize()");
-	const auto m_config = fxm::get<CellGcmSysConfig>();
-
-	if (!m_config)
-		return 0;
-	return m_config->gcm_info.command_size;
+	return gcm_info.command_size;
 }

 u32 cellGcmGetDefaultSegmentWordSize()
 {
 	cellGcmSys.trace("cellGcmGetDefaultSegmentWordSize()");
-	const auto m_config = fxm::get<CellGcmSysConfig>();
-
-	if (!m_config)
-		return 0;
-	return m_config->gcm_info.segment_size;
+	return gcm_info.segment_size;
 }

 s32 cellGcmInitDefaultFifoMode(s32 mode)
@@ -299,10 +280,8 @@ s32 cellGcmBindZcull(u8 index, u32 offset, u32 width, u32 height, u32 cullStart,
 void cellGcmGetConfiguration(vm::ptr<CellGcmConfig> config)
 {
 	cellGcmSys.trace("cellGcmGetConfiguration(config=*0x%x)", config);
-	const auto m_config = fxm::get<CellGcmSysConfig>();

-	if (m_config)
-		*config = m_config->current_config;
+	*config = current_config;
 }

 u32 cellGcmGetFlipStatus()
@@ -318,9 +297,9 @@ u32 cellGcmGetTiledPitchSize(u32 size)
 {
 	cellGcmSys.trace("cellGcmGetTiledPitchSize(size=%d)", size);

-	for (size_t i = 0; i < sizeof(tiled_pitches) / sizeof(tiled_pitches[0]) - 1; i++) {
-		if (tiled_pitches[i] < size && size <= tiled_pitches[i + 1]) {
-			return tiled_pitches[i + 1];
+	for (size_t i=0; i < sizeof(tiled_pitches) / sizeof(tiled_pitches[0]) - 1; i++) {
+		if (tiled_pitches[i] < size && size <= tiled_pitches[i+1]) {
+			return tiled_pitches[i+1];
 		}
 	}
 	return 0;
@@ -345,12 +324,8 @@ s32 _cellGcmInitBody(vm::pptr<CellGcmContextData> context, u32 cmdSize, u32 ioSi
 {
 	cellGcmSys.warning("_cellGcmInitBody(context=**0x%x, cmdSize=0x%x, ioSize=0x%x, ioAddress=0x%x)", context, cmdSize, ioSize, ioAddress);

-	auto m_config = fxm::make<CellGcmSysConfig>();
-	if (!m_config)
-		return CELL_GCM_ERROR_FAILURE;
-
-	m_config->current_config.ioAddress = 0;
-	m_config->current_config.localAddress = 0;
+	current_config.ioAddress = 0;
+	current_config.localAddress = 0;
 	local_size = 0;
 	local_addr = 0;

@@ -381,42 +356,33 @@ s32 _cellGcmInitBody(vm::pptr<CellGcmContextData> context, u32 cmdSize, u32 ioSi
 		return CELL_GCM_ERROR_FAILURE;
 	}

-	m_config->current_config.ioSize = ioSize;
-	m_config->current_config.ioAddress = ioAddress;
-	m_config->current_config.localSize = local_size;
-	m_config->current_config.localAddress = local_addr;
-	m_config->current_config.memoryFrequency = 650000000;
-	m_config->current_config.coreFrequency = 500000000;
+	map_offset_addr = 0;
+	map_offset_pos = 0;
+	current_config.ioSize = ioSize;
+	current_config.ioAddress = ioAddress;
+	current_config.localSize = local_size;
+	current_config.localAddress = local_addr;
+	current_config.memoryFrequency = 650000000;
+	current_config.coreFrequency = 500000000;

 	// Create contexts

-	u32 addr = vm::falloc(0x40000000, 0x400000);
-	if (addr == 0 || addr != 0x40000000)
-		fmt::throw_exception("Failed to alloc 0x40000000.");
-
 	g_defaultCommandBufferBegin = ioAddress;
 	g_defaultCommandBufferFragmentCount = cmdSize / (32 * 1024);

-	m_config->gcm_info.context_addr = 0x40000000;
-	m_config->gcm_info.control_addr = 0x40100000;
-	m_config->gcm_info.label_addr = 0x40300000;
+	gcm_info.context_addr = vm::alloc(0x1000, vm::main);
+	gcm_info.control_addr = vm::alloc(0x1000, vm::main);
+	gcm_info.label_addr = vm::alloc(0x1000, vm::main); // ???

-	m_config->current_context.begin.set(g_defaultCommandBufferBegin + 4096); // 4 kb reserved at the beginning
-	m_config->current_context.end.set(g_defaultCommandBufferBegin + 32 * 1024 - 4); // 4b at the end for jump
-	m_config->current_context.current = m_config->current_context.begin;
-	m_config->current_context.callback.set(ppu_function_manager::addr + 8 * FIND_FUNC(cellGcmCallback));
+	current_context.begin.set(g_defaultCommandBufferBegin + 4096); // 4 kb reserved at the beginning
+	current_context.end.set(g_defaultCommandBufferBegin + 32 * 1024 - 4); // 4b at the end for jump
+	current_context.current = current_context.begin;
+	current_context.callback.set(ppu_function_manager::addr + 8 * FIND_FUNC(cellGcmCallback));

-	m_config->ctxt_addr = context.addr();
-	m_config->gcm_buffers.set(vm::alloc(sizeof(CellGcmDisplayInfo) * 8, vm::main));
-	m_config->zculls_addr = vm::alloc(sizeof(CellGcmZcullInfo) * 8, vm::main);
-	m_config->tiles_addr = vm::alloc(sizeof(CellGcmTileInfo) * 15, vm::main);
+	vm::_ref<CellGcmContextData>(gcm_info.context_addr) = current_context;
+	context->set(gcm_info.context_addr);

-	vm::_ref<CellGcmContextData>(m_config->gcm_info.context_addr) = m_config->current_context;
-	context->set(m_config->gcm_info.context_addr);
-
-	// 0x40 is to offset CellGcmControl from RsxDmaControl
-	m_config->gcm_info.control_addr += 0x40;
-	auto& ctrl = vm::_ref<CellGcmControl>(m_config->gcm_info.control_addr);
+	auto& ctrl = vm::_ref<CellGcmControl>(gcm_info.control_addr);
 	ctrl.put = 0;
 	ctrl.get = 0;
 	ctrl.ref = -1;
@@ -424,10 +390,15 @@ s32 _cellGcmInitBody(vm::pptr<CellGcmContextData> context, u32 cmdSize, u32 ioSi
 	const auto render = fxm::get<GSRender>();
 	render->intr_thread = idm::make_ptr<ppu_thread>("_gcm_intr_thread", 1, 0x4000);
 	render->intr_thread->run();
+	render->ctxt_addr = context.addr();
+	render->gcm_buffers.set(vm::alloc(sizeof(CellGcmDisplayInfo) * 8, vm::main));
+	render->zculls_addr = vm::alloc(sizeof(CellGcmZcullInfo) * 8, vm::main);
+	render->tiles_addr = vm::alloc(sizeof(CellGcmTileInfo) * 15, vm::main);
+	render->gcm_buffers_count = 0;
+	render->gcm_current_buffer = 0;
 	render->main_mem_addr = 0;
-	render->isHLE = true;
-	render->label_addr = m_config->gcm_info.label_addr;
-	render->init(ioAddress, ioSize, m_config->gcm_info.control_addr - 0x40, local_addr);
+	render->label_addr = gcm_info.label_addr;
+	render->init(g_defaultCommandBufferBegin, cmdSize, gcm_info.control_addr, local_addr);

 	return CELL_OK;
 }
@@ -460,10 +431,6 @@ s32 cellGcmSetDisplayBuffer(u8 id, u32 offset, u32 pitch, u32 width, u32 height)
 {
 	cellGcmSys.trace("cellGcmSetDisplayBuffer(id=0x%x, offset=0x%x, pitch=%d, width=%d, height=%d)", id, offset, width ? pitch / width : pitch, width, height);

-	auto m_config = fxm::get<CellGcmSysConfig>();
-	if (!m_config)
-		return CELL_GCM_ERROR_FAILURE;
-
 	if (id > 7)
 	{
 		cellGcmSys.error("cellGcmSetDisplayBuffer: CELL_GCM_ERROR_FAILURE");
@@ -472,21 +439,16 @@ s32 cellGcmSetDisplayBuffer(u8 id, u32 offset, u32 pitch, u32 width, u32 height)

 	const auto render = fxm::get<GSRender>();

-	auto buffers = render->display_buffers;
+	auto buffers = render->gcm_buffers;

 	buffers[id].offset = offset;
 	buffers[id].pitch = pitch;
 	buffers[id].width = width;
 	buffers[id].height = height;

-	m_config->gcm_buffers[id].offset = offset;
-	m_config->gcm_buffers[id].pitch = pitch;
-	m_config->gcm_buffers[id].width = width;
-	m_config->gcm_buffers[id].height = height;
-
-	if (id + 1u > render->display_buffers_count)
+	if (id + 1 > render->gcm_buffers_count)
 	{
-		render->display_buffers_count = id + 1;
+		render->gcm_buffers_count = id + 1;
 	}

 	return CELL_OK;
@@ -503,7 +465,17 @@ void cellGcmSetFlipMode(u32 mode)
 {
 	cellGcmSys.warning("cellGcmSetFlipMode(mode=%d)", mode);

-	fxm::get<GSRender>()->requested_vsync.store(mode == CELL_GCM_DISPLAY_VSYNC);
+	switch (mode)
+	{
+	case CELL_GCM_DISPLAY_HSYNC:
+	case CELL_GCM_DISPLAY_VSYNC:
+	case CELL_GCM_DISPLAY_HSYNC_WITH_NOISE:
+		fxm::get<GSRender>()->flip_mode = mode;
+		break;
+
+	default:
+		break;
+	}
 }

 void cellGcmSetFlipStatus()
@@ -516,9 +488,6 @@ void cellGcmSetFlipStatus()
 s32 cellGcmSetPrepareFlip(ppu_thread& ppu, vm::ptr<CellGcmContextData> ctxt, u32 id)
 {
 	cellGcmSys.trace("cellGcmSetPrepareFlip(ctxt=*0x%x, id=0x%x)", ctxt, id);
-	auto m_config = fxm::get<CellGcmSysConfig>();
-	if (!m_config)
-		return CELL_GCM_ERROR_FAILURE;

 	if (id > 7)
 	{
@@ -537,9 +506,9 @@ s32 cellGcmSetPrepareFlip(ppu_thread& ppu, vm::ptr<CellGcmContextData> ctxt, u32

 	const u32 cmd_size = rsx::make_command(ctxt->current, GCM_FLIP_COMMAND, { id });

-	if (ctxt.addr() == m_config->gcm_info.context_addr)
+	if (ctxt.addr() == gcm_info.context_addr)
 	{
-		vm::_ref<CellGcmControl>(m_config->gcm_info.control_addr).put += cmd_size;
+		vm::_ref<CellGcmControl>(gcm_info.control_addr).put += cmd_size;
 	}

 	return id;
@@ -566,12 +535,15 @@ void cellGcmSetSecondVFrequency(u32 freq)
 	switch (freq)
 	{
 	case CELL_GCM_DISPLAY_FREQUENCY_59_94HZ:
+		render->frequency_mode = freq;
 		render->fps_limit = 59.94;
 		break;
 	case CELL_GCM_DISPLAY_FREQUENCY_SCANOUT:
+		render->frequency_mode = freq;
 		cellGcmSys.todo("Unimplemented display frequency: Scanout");
 		break;
 	case CELL_GCM_DISPLAY_FREQUENCY_DISABLE:
+		render->frequency_mode = freq;
 		cellGcmSys.todo("Unimplemented display frequency: Disabled");
 		break;
 	default:
@@ -585,17 +557,13 @@ s32 cellGcmSetTileInfo(u8 index, u8 location, u32 offset, u32 size, u32 pitch, u
 	cellGcmSys.warning("cellGcmSetTileInfo(index=%d, location=%d, offset=%d, size=%d, pitch=%d, comp=%d, base=%d, bank=%d)",
 		index, location, offset, size, pitch, comp, base, bank);

-	auto m_config = fxm::get<CellGcmSysConfig>();
-	if (!m_config)
-		return CELL_GCM_ERROR_FAILURE;
-
 	if (index >= rsx::limits::tiles_count || base >= 2048 || bank >= 4)
 	{
 		cellGcmSys.error("cellGcmSetTileInfo: CELL_GCM_ERROR_INVALID_VALUE");
 		return CELL_GCM_ERROR_INVALID_VALUE;
 	}

-	if (offset & 0xffff || size & 0xffff || pitch & 0xff)
+	if (offset & 0xffff || size & 0xffff || pitch & 0xf)
 	{
 		cellGcmSys.error("cellGcmSetTileInfo: CELL_GCM_ERROR_INVALID_ALIGNMENT");
 		return CELL_GCM_ERROR_INVALID_ALIGNMENT;
@@ -603,7 +571,7 @@ s32 cellGcmSetTileInfo(u8 index, u8 location, u32 offset, u32 size, u32 pitch, u

 	if (location >= 2 || (comp != 0 && (comp < 7 || comp > 12)))
 	{
-		cellGcmSys.error("cellGcmSetTileInfo: CELL_GCM_ERROR_INVALID_ENUM");
+		cellGcmSys.error("cellGcmSetTileInfo: CELL_GCM_ERROR_INVALID_ALIGNMENT");
 		return CELL_GCM_ERROR_INVALID_ENUM;
 	}

@@ -623,7 +591,7 @@ s32 cellGcmSetTileInfo(u8 index, u8 location, u32 offset, u32 size, u32 pitch, u
 	tile.base = base;
 	tile.bank = bank;

-	vm::_ptr<CellGcmTileInfo>(m_config->tiles_addr)[index] = tile.pack();
+	vm::_ptr<CellGcmTileInfo>(render->tiles_addr)[index] = tile.pack();
 	return CELL_OK;
 }

@@ -656,7 +624,7 @@ void cellGcmSetWaitFlip(vm::ptr<CellGcmContextData> ctxt)
 s32 cellGcmSetWaitFlipUnsafe()
 {
 	cellGcmSys.todo("cellGcmSetWaitFlipUnsafe()");
-
+	
 	return CELL_OK;
 }

@@ -665,10 +633,6 @@ void cellGcmSetZcull(u8 index, u32 offset, u32 width, u32 height, u32 cullStart,
 	cellGcmSys.todo("cellGcmSetZcull(index=%d, offset=0x%x, width=%d, height=%d, cullStart=0x%x, zFormat=0x%x, aaFormat=0x%x, zCullDir=0x%x, zCullFormat=0x%x, sFunc=0x%x, sRef=0x%x, sMask=0x%x)",
 		index, offset, width, height, cullStart, zFormat, aaFormat, zCullDir, zCullFormat, sFunc, sRef, sMask);

-	auto m_config = fxm::get<CellGcmSysConfig>();
-	if (!m_config)
-		return;
-
 	if (index >= rsx::limits::zculls_count)
 	{
 		cellGcmSys.error("cellGcmSetZcull: CELL_GCM_ERROR_INVALID_VALUE");
@@ -679,7 +643,7 @@ void cellGcmSetZcull(u8 index, u32 offset, u32 width, u32 height, u32 cullStart,

 	auto& zcull = render->zculls[index];
 	zcull.offset = offset;
-	zcull.width = width;
+	zcull.width = width; 
 	zcull.height = height;
 	zcull.cullStart = cullStart;
 	zcull.zFormat = zFormat;
@@ -690,7 +654,7 @@ void cellGcmSetZcull(u8 index, u32 offset, u32 width, u32 height, u32 cullStart,
 	zcull.sRef = sRef;
 	zcull.sMask = sMask;

-	vm::_ptr<CellGcmZcullInfo>(m_config->zculls_addr)[index] = zcull.pack();
+	vm::_ptr<CellGcmZcullInfo>(render->zculls_addr)[index] = zcull.pack();
 }

 s32 cellGcmUnbindTile(u8 index)
@@ -726,35 +690,26 @@ s32 cellGcmUnbindZcull(u8 index)
 u32 cellGcmGetTileInfo()
 {
 	cellGcmSys.warning("cellGcmGetTileInfo()");
-	auto m_config = fxm::get<CellGcmSysConfig>();
-	if (!m_config)
-		return 0;
-	return m_config->tiles_addr;
+	return fxm::get<GSRender>()->tiles_addr;
 }

 u32 cellGcmGetZcullInfo()
 {
 	cellGcmSys.warning("cellGcmGetZcullInfo()");
-	auto m_config = fxm::get<CellGcmSysConfig>();
-	if (!m_config)
-		return 0;
-	return m_config->zculls_addr;
+	return fxm::get<GSRender>()->zculls_addr;
 }

 u32 cellGcmGetDisplayInfo()
 {
 	cellGcmSys.warning("cellGcmGetDisplayInfo()");
-	auto m_config = fxm::get<CellGcmSysConfig>();
-	if (!m_config)
-		return 0;
-	return m_config->gcm_buffers.addr();
+	return fxm::get<GSRender>()->gcm_buffers.addr();
 }

 s32 cellGcmGetCurrentDisplayBufferId(vm::ptr<u8> id)
 {
 	cellGcmSys.warning("cellGcmGetCurrentDisplayBufferId(id=*0x%x)", id);

-	if ((*id = fxm::get<GSRender>()->current_display_buffer) > UINT8_MAX)
+	if ((*id = fxm::get<GSRender>()->gcm_current_buffer) > UINT8_MAX)
 	{
 		fmt::throw_exception("Unexpected" HERE);
 	}
@@ -921,7 +876,7 @@ s32 cellGcmIoOffsetToAddress(u32 ioOffset, vm::ptr<u32> address)

 	u32 realAddr;

-	if (!RSXIOMem.getRealAddr(ioOffset, realAddr))
+	if (!RSXIOMem.getRealAddr(ioOffset, realAddr)) 
 		return CELL_GCM_ERROR_FAILURE;

 	*address = realAddr;
@@ -943,6 +898,7 @@ s32 gcmMapEaIoAddress(u32 ea, u32 io, u32 size, bool is_strict)
 		{
 			offsetTable.ioAddress[(ea >> 20) + i] = (io >> 20) + i;
 			offsetTable.eaAddress[(io >> 20) + i] = (ea >> 20) + i;
+			render->strict_ordering[(io >> 20) + i] = is_strict;
 		}
 	}
 	else
@@ -992,7 +948,6 @@ s32 cellGcmMapMainMemory(u32 ea, u32 size, vm::ptr<u32> offset)
 {
 	cellGcmSys.warning("cellGcmMapMainMemory(ea=0x%x, size=0x%x, offset=*0x%x)", ea, size, offset);

-	if (size == 0) return CELL_OK;
 	if ((ea & 0xFFFFF) || (size & 0xFFFFF)) return CELL_GCM_ERROR_FAILURE;

 	u32 io = RSXIOMem.Map(ea, size);
@@ -1007,6 +962,7 @@ s32 cellGcmMapMainMemory(u32 ea, u32 size, vm::ptr<u32> offset)
 		{
 			offsetTable.ioAddress[(ea >> 20) + i] = (u16)((io >> 20) + i);
 			offsetTable.eaAddress[(io >> 20) + i] = (u16)((ea >> 20) + i);
+			render->strict_ordering[(io >> 20) + i] = false;
 		}

 		*offset = io;
@@ -1157,27 +1113,23 @@ s32 cellGcmSetCursorImageOffset(u32 offset)
 void cellGcmSetDefaultCommandBuffer()
 {
 	cellGcmSys.warning("cellGcmSetDefaultCommandBuffer()");
-	auto m_config = fxm::get<CellGcmSysConfig>();
-	if (m_config)
-		vm::write32(m_config->ctxt_addr, m_config->gcm_info.context_addr);
+	vm::write32(fxm::get<GSRender>()->ctxt_addr, gcm_info.context_addr);
 }

 s32 cellGcmSetDefaultCommandBufferAndSegmentWordSize(u32 bufferSize, u32 segmentSize)
 {
 	cellGcmSys.warning("cellGcmSetDefaultCommandBufferAndSegmentWordSize(bufferSize=0x%x, segmentSize=0x%x)", bufferSize, segmentSize);
-	auto m_config = fxm::get<CellGcmSysConfig>();
-	if (!m_config)
-		return CELL_GCM_ERROR_FAILURE;
-	const auto& put = vm::_ref<CellGcmControl>(m_config->gcm_info.control_addr).put;
-	const auto& get = vm::_ref<CellGcmControl>(m_config->gcm_info.control_addr).get;

-	if (put != 0x1000 || get != 0x1000 || bufferSize < segmentSize * 2 || segmentSize >= 0x80000000)
+	const auto& put = vm::_ref<CellGcmControl>(gcm_info.control_addr).put;
+	const auto& get = vm::_ref<CellGcmControl>(gcm_info.control_addr).get;
+
+	if (put != 0x1000 || get != 0x1000 || bufferSize < segmentSize * 2)
 	{
 		return CELL_GCM_ERROR_FAILURE;
 	}

-	m_config->gcm_info.command_size = bufferSize;
-	m_config->gcm_info.segment_size = segmentSize;
+	gcm_info.command_size = bufferSize;
+	gcm_info.segment_size = segmentSize;

 	return CELL_OK;
 }
@@ -1196,11 +1148,9 @@ s32 _cellGcmSetFlipCommand(ppu_thread& ppu, vm::ptr<CellGcmContextData> ctx, u32
 s32 _cellGcmSetFlipCommandWithWaitLabel(ppu_thread& ppu, vm::ptr<CellGcmContextData> ctx, u32 id, u32 label_index, u32 label_value)
 {
 	cellGcmSys.trace("cellGcmSetFlipCommandWithWaitLabel(ctx=*0x%x, id=0x%x, label_index=0x%x, label_value=0x%x)", ctx, id, label_index, label_value);
-	auto m_config = fxm::get<CellGcmSysConfig>();
-	if (!m_config)
-		return CELL_GCM_ERROR_FAILURE;
+
 	s32 res = cellGcmSetPrepareFlip(ppu, ctx, id);
-	vm::write32(m_config->gcm_info.label_addr + 0x10 * label_index, label_value);
+	vm::write32(gcm_info.label_addr + 0x10 * label_index, label_value);
 	return res < 0 ? CELL_GCM_ERROR_FAILURE : CELL_OK;
 }

@@ -1209,10 +1159,6 @@ s32 cellGcmSetTile(u8 index, u8 location, u32 offset, u32 size, u32 pitch, u8 co
 	cellGcmSys.warning("cellGcmSetTile(index=%d, location=%d, offset=%d, size=%d, pitch=%d, comp=%d, base=%d, bank=%d)",
 		index, location, offset, size, pitch, comp, base, bank);

-	auto m_config = fxm::get<CellGcmSysConfig>();
-	if (!m_config)
-		return CELL_GCM_ERROR_FAILURE;
-
 	// Copied form cellGcmSetTileInfo
 	if (index >= rsx::limits::tiles_count || base >= 2048 || bank >= 4)
 	{
@@ -1220,7 +1166,7 @@ s32 cellGcmSetTile(u8 index, u8 location, u32 offset, u32 size, u32 pitch, u8 co
 		return CELL_GCM_ERROR_INVALID_VALUE;
 	}

-	if (offset & 0xffff || size & 0xffff || pitch & 0xff)
+	if (offset & 0xffff || size & 0xffff || pitch & 0xf)
 	{
 		cellGcmSys.error("cellGcmSetTile: CELL_GCM_ERROR_INVALID_ALIGNMENT");
 		return CELL_GCM_ERROR_INVALID_ALIGNMENT;
@@ -1248,7 +1194,7 @@ s32 cellGcmSetTile(u8 index, u8 location, u32 offset, u32 size, u32 pitch, u8 co
 	tile.base = base;
 	tile.bank = bank;

-	vm::_ptr<CellGcmTileInfo>(m_config->tiles_addr)[index] = tile.pack();
+	vm::_ptr<CellGcmTileInfo>(render->tiles_addr)[index] = tile.pack();
 	return CELL_OK;
 }

@@ -1340,11 +1286,8 @@ static bool isInCommandBufferExcept(u32 getPos, u32 bufferBegin, u32 bufferEnd)
 s32 cellGcmCallback(ppu_thread& ppu, vm::ptr<CellGcmContextData> context, u32 count)
 {
 	cellGcmSys.trace("cellGcmCallback(context=*0x%x, count=0x%x)", context, count);
-	auto m_config = fxm::get<CellGcmSysConfig>();
-	if (!m_config)
-		return CELL_GCM_ERROR_FAILURE;

-	auto& ctrl = vm::_ref<CellGcmControl>(m_config->gcm_info.control_addr);
+	auto& ctrl = vm::_ref<CellGcmControl>(gcm_info.control_addr);

 	// Flush command buffer (ie allow RSX to read up to context->current)
 	ctrl.put.exchange(getOffsetFromAddress(context->current.addr()));
@@ -1484,5 +1427,5 @@ DECLARE(ppu_module_manager::cellGcmSys)("cellGcmSys", []()
 	REG_FUNC(cellGcmSys, cellGcmGpadCaptureSnapshot);

 	// Special
-	REG_FUNC(cellGcmSys, cellGcmCallback).flag(MFF_HIDDEN);
+	REG_FUNC(cellGcmSys, cellGcmCallback).flags = MFF_HIDDEN;
 });
@@ -65,12 +65,6 @@ s32 cellHttpSetProxy()
 	return CELL_OK;
 }

-s32 cellHttpGetCookie()
-{
-	UNIMPLEMENTED_FUNC(cellHttp);
-	return CELL_OK;
-}
-
 s32 cellHttpGetProxy()
 {
 	UNIMPLEMENTED_FUNC(cellHttp);
@@ -323,24 +317,6 @@ s32 cellHttpClientSetConnectionWaitStatus()
 	return CELL_OK;
 }

-s32 cellHttpClientGetConnectionWaitStatus()
-{
-	UNIMPLEMENTED_FUNC(cellHttp);
-	return CELL_OK;
-}
-
-s32 cellHttpClientSetConnectionWaitTimeout()
-{
-	UNIMPLEMENTED_FUNC(cellHttp);
-	return CELL_OK;
-}
-
-s32 cellHttpClientGetConnectionWaitTimeout()
-{
-	UNIMPLEMENTED_FUNC(cellHttp);
-	return CELL_OK;
-}
-
 s32 cellHttpClientSetRecvTimeout()
 {
 	UNIMPLEMENTED_FUNC(cellHttp);
@@ -665,18 +641,6 @@ s32 cellHttpTransactionGetSslId()
 	return CELL_OK;
 }

-s32 cellHttpClientSetMinSslVersion()
-{
-	UNIMPLEMENTED_FUNC(cellHttp);
-	return CELL_OK;
-}
-
-s32 cellHttpClientGetMinSslVersion()
-{
-	UNIMPLEMENTED_FUNC(cellHttp);
-	return CELL_OK;
-}
-
 s32 cellHttpClientSetSslVersion()
 {
 	UNIMPLEMENTED_FUNC(cellHttp);
@@ -707,7 +671,6 @@ DECLARE(ppu_module_manager::cellHttp)("cellHttp", []()
 	REG_FUNC(cellHttp, cellHttpsInit);
 	REG_FUNC(cellHttp, cellHttpsEnd);
 	REG_FUNC(cellHttp, cellHttpSetProxy);
-	REG_FUNC(cellHttp, cellHttpGetCookie);
 	REG_FUNC(cellHttp, cellHttpGetProxy);

 	REG_FUNC(cellHttp, cellHttpInitCookie);
@@ -756,10 +719,7 @@ DECLARE(ppu_module_manager::cellHttp)("cellHttp", []()
 	REG_FUNC(cellHttp, cellHttpClientPollConnections);

 	REG_FUNC(cellHttp, cellHttpClientSetConnectionStateCallback);
-	REG_FUNC(cellHttp, cellHttpClientGetConnectionWaitStatus);
 	REG_FUNC(cellHttp, cellHttpClientSetConnectionWaitStatus);
-	REG_FUNC(cellHttp, cellHttpClientGetConnectionWaitTimeout);
-	REG_FUNC(cellHttp, cellHttpClientSetConnectionWaitTimeout);
 	REG_FUNC(cellHttp, cellHttpClientSetRecvTimeout);
 	REG_FUNC(cellHttp, cellHttpClientGetRecvTimeout);
 	REG_FUNC(cellHttp, cellHttpClientSetSendTimeout);
@@ -821,8 +781,6 @@ DECLARE(ppu_module_manager::cellHttp)("cellHttp", []()
 	REG_FUNC(cellHttp, cellHttpTransactionGetSslVersion);
 	REG_FUNC(cellHttp, cellHttpTransactionGetSslId);

-	REG_FUNC(cellHttp, cellHttpClientSetMinSslVersion);
-	REG_FUNC(cellHttp, cellHttpClientGetMinSslVersion);
 	REG_FUNC(cellHttp, cellHttpClientSetSslVersion);
 	REG_FUNC(cellHttp, cellHttpClientGetSslVersion);
 	REG_FUNC(cellHttp, cellHttpClientSetSslIdDestroyCallback);
@@ -1,6 +1,5 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
-#include "Utilities/LUrlParser.h"

 #include "cellHttpUtil.h"

@@ -15,15 +14,50 @@ logs::channel cellHttpUtil("cellHttpUtil");

 s32 cellHttpUtilParseUri(vm::ptr<CellHttpUri> uri, vm::cptr<char> str, vm::ptr<void> pool, u32 size, vm::ptr<u32> required)
 {
-	cellHttpUtil.trace("cellHttpUtilParseUri(uri=*0x%x, str=%s, pool=*0x%x, size=%d, required=*0x%x)", uri, str, pool, size, required);
-	LUrlParser::clParseURL URL = LUrlParser::clParseURL::ParseURL(str.get_ptr());
-	if ( URL.IsValid() )
+
+#ifdef _WIN32
+
+	URL_COMPONENTS stUrlComp;
+
+	ZeroMemory(&stUrlComp, sizeof(URL_COMPONENTS));
+	stUrlComp.dwStructSize = sizeof(URL_COMPONENTS);
+
+	wchar_t lpszScheme[MAX_PATH] = { 0 };
+	wchar_t lpszHostName[MAX_PATH] = { 0 };
+	wchar_t lpszPath[MAX_PATH] = { 0 };
+	wchar_t lpszUserName[MAX_PATH] = { 0 };
+	wchar_t lpszPassword[MAX_PATH] = { 0 };
+
+	stUrlComp.lpszScheme = lpszScheme;
+	stUrlComp.dwSchemeLength = MAX_PATH;
+
+	stUrlComp.lpszHostName = lpszHostName;
+	stUrlComp.dwHostNameLength = MAX_PATH;
+
+	stUrlComp.lpszUrlPath = lpszPath;
+	stUrlComp.dwUrlPathLength = MAX_PATH;
+
+	stUrlComp.lpszUserName = lpszUserName;
+	stUrlComp.dwUserNameLength = MAX_PATH;
+
+	stUrlComp.lpszPassword = lpszPassword;
+	stUrlComp.dwPasswordLength = MAX_PATH;
+
+	std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
+
+	LPCWSTR stupidTypeUrlString = converter.from_bytes(str.get_ptr()).c_str();
+	if (!::WinHttpCrackUrl(stupidTypeUrlString, (DWORD)(LONG_PTR)wcslen(stupidTypeUrlString), ICU_ESCAPE, &stUrlComp))
 	{
-		std::string scheme = URL.m_Scheme;
-		std::string host = URL.m_Host;
-		std::string path = URL.m_Path;
-		std::string username = URL.m_UserName;
-		std::string password = URL.m_Password;
+		cellHttpUtil.error("Error %u in WinHttpCrackUrl.\n", GetLastError());
+	}
+	else
+	{
+
+		std::string scheme = converter.to_bytes(lpszScheme);
+		std::string host = converter.to_bytes(lpszHostName);
+		std::string path = converter.to_bytes(lpszPath);
+		std::string username = converter.to_bytes(lpszUserName);
+		std::string password = converter.to_bytes(lpszPassword);

 		u32 schemeOffset = 0;
 		u32 hostOffset = scheme.length() + 1;
@@ -33,13 +67,10 @@ s32 cellHttpUtilParseUri(vm::ptr<CellHttpUri> uri, vm::cptr<char> str, vm::ptr<v
 		u32 totalSize = passwordOffset + password.length() + 1;

 		//called twice, first to setup pool, then to populate.
-		if (!uri)
-		{
+		if (!uri) {
 			*required = totalSize;
 			return CELL_OK;
-		}
-		else
-		{
+		} else {
 			std::strncpy((char*)vm::base(pool.addr() + schemeOffset), (char*)scheme.c_str(), scheme.length() + 1);
 			std::strncpy((char*)vm::base(pool.addr() + hostOffset), (char*)host.c_str(), host.length() + 1);
 			std::strncpy((char*)vm::base(pool.addr() + pathOffset), (char*)path.c_str(), path.length() + 1);
@@ -51,55 +82,14 @@ s32 cellHttpUtilParseUri(vm::ptr<CellHttpUri> uri, vm::cptr<char> str, vm::ptr<v
 			uri->path.set(pool.addr() + pathOffset);
 			uri->username.set(pool.addr() + usernameOffset);
 			uri->password.set(pool.addr() + passwordOffset);
+			uri->port = stUrlComp.nPort;
+		}
+	}

-			if (URL.m_Port != "")
-			{
-				int port = stoi(URL.m_Port);
-				uri->port = port;
-			}
-			else
-			{
-				uri->port = (u32)80;
-			}
-			return CELL_OK;
-		}
-	}
-	else
-	{
-		std::string parseError;
-		switch(URL.m_ErrorCode)
-		{
-			case LUrlParser::LUrlParserError_Ok:
-				parseError = "No error, URL was parsed fine";
-				break;
-			case LUrlParser::LUrlParserError_Uninitialized:
-				parseError = "Error, LUrlParser is uninitialized";
-				break;
-			case LUrlParser::LUrlParserError_NoUrlCharacter:
-				parseError = "Error, the URL has invalid characters";
-				break;
-			case LUrlParser::LUrlParserError_InvalidSchemeName:
-				parseError = "Error, the URL has an invalid scheme";
-				break;
-			case LUrlParser::LUrlParserError_NoDoubleSlash:
-				parseError = "Error, the URL did not contain a double slash";
-				break;
-			case LUrlParser::LUrlParserError_NoAtSign:
-				parseError = "Error, the URL did not contain an @ sign";
-				break;
-			case LUrlParser::LUrlParserError_UnexpectedEndOfLine:
-				parseError = "Error, unexpectedly got the end of the line";
-				break;
-			case LUrlParser::LUrlParserError_NoSlash:
-				parseError = "Error, URI didn't contain a slash";
-				break;
-			default:
-				parseError = "Error, unkown error #" + std::to_string(static_cast<int>(URL.m_ErrorCode));
-				break;
-		}
-		cellHttpUtil.error("%s, while parsing URI, %s.", parseError, str.get_ptr());
-		return -1;
-	}
+#else
+	cellHttpUtil.todo("cellHttpUtilParseUri(uri=*0x%x, str=%s, pool=*0x%x, size=%d, required=*0x%x)", uri, str, pool, size, required);
+#endif
+	return CELL_OK;
 }

 s32 cellHttpUtilParseUriPath(vm::ptr<CellHttpUriPath> path, vm::cptr<char> str, vm::ptr<void> pool, u32 size, vm::ptr<u32> required)
@@ -177,9 +177,6 @@ error_code cellKbSetCodeType(u32 port_no, u32 type)

 	if (!handler)
 		return CELL_KB_ERROR_UNINITIALIZED;
-
-	if (port_no >= handler->GetKeyboards().size())
-		return CELL_KB_ERROR_INVALID_PARAMETER;
 	
 	KbConfig& current_config = handler->GetConfig(port_no);
 	current_config.code_type = type;
@@ -200,9 +197,6 @@ error_code cellKbSetReadMode(u32 port_no, u32 rmode)

 	if (!handler)
 		return CELL_KB_ERROR_UNINITIALIZED;
-
-	if (port_no >= handler->GetKeyboards().size())
-		return CELL_KB_ERROR_INVALID_PARAMETER;
 	
 	KbConfig& current_config = handler->GetConfig(port_no);
 	current_config.read_mode = rmode;
@@ -219,9 +213,6 @@ error_code cellKbGetConfiguration(u32 port_no, vm::ptr<CellKbConfig> config)
 	if (!handler)
 		return CELL_KB_ERROR_UNINITIALIZED;

-	if (port_no >= handler->GetKeyboards().size())
-		return CELL_KB_ERROR_INVALID_PARAMETER;
-
 	const KbConfig& current_config = handler->GetConfig(port_no);
 	config->arrange = current_config.arrange;
 	config->read_mode = current_config.read_mode;
@@ -161,7 +161,7 @@ bool _L10nCodeParse(s32 code, HostCode& retCode)
 #ifdef _MSC_VER

 // Use code page to transform std::string to std::wstring.
-s32 _OEM2Wide(HostCode oem_code, const std::string& src, std::wstring& dst)
+s32 _OEM2Wide(HostCode oem_code, const std::string src, std::wstring& dst)
 {
 	//Such length returned should include the '\0' character.
 	s32 length = MultiByteToWideChar(oem_code, 0, src.c_str(), -1, NULL, 0);
@@ -178,7 +178,7 @@ s32 _OEM2Wide(HostCode oem_code, const std::string& src, std::wstring& dst)
 }

 // Use Code page to transform std::wstring to std::string.
-s32 _Wide2OEM(HostCode oem_code, const std::wstring& src, std::string& dst)
+s32 _Wide2OEM(HostCode oem_code, const std::wstring src, std::string& dst)
 {
 	//Such length returned should include the '\0' character.
 	s32 length = WideCharToMultiByte(oem_code, 0, src.c_str(), -1, NULL, 0, NULL, NULL);
@@ -195,7 +195,7 @@ s32 _Wide2OEM(HostCode oem_code, const std::wstring& src, std::string& dst)
 }

 // Convert Codepage to Codepage (all char*)
-std::string _OemToOem(HostCode src_code, HostCode dst_code, const std::string& str)
+std::string _OemToOem(HostCode src_code, HostCode dst_code, const std::string str)
 {
 	std::wstring wide; std::string result;
 	_OEM2Wide(src_code, str, wide);
@@ -74,7 +74,7 @@ s32 cellMouseGetInfo(vm::ptr<CellMouseInfo> info)
 	for (u32 i=0; i<CELL_MAX_MICE; i++)	info->vendor_id[i] = current_info.vendor_id[i];
 	for (u32 i=0; i<CELL_MAX_MICE; i++)	info->product_id[i] = current_info.product_id[i];
 	for (u32 i=0; i<CELL_MAX_MICE; i++)	info->status[i] = current_info.status[i];
-
+	
 	return CELL_OK;
 }

@@ -96,7 +96,7 @@ s32 cellMouseInfoTabletMode(u32 port_no, vm::ptr<CellMouseInfoTablet> info)

 	info->is_supported = 0; // Unimplemented: (0=Tablet mode is not supported)
 	info->mode = 1; // Unimplemented: (1=Mouse mode)
-
+	
 	return CELL_OK;
 }

@@ -115,7 +115,7 @@ s32 cellMouseGetData(u32 port_no, vm::ptr<CellMouseData> data)
 	{
 		return CELL_MOUSE_ERROR_NO_DEVICE;
 	}
-
+	
 	MouseData& current_data = handler->GetData(port_no);
 	data->update = current_data.update;
 	data->buttons = current_data.buttons;
@@ -134,27 +134,22 @@ s32 cellMouseGetData(u32 port_no, vm::ptr<CellMouseData> data)

 s32 cellMouseGetDataList(u32 port_no, vm::ptr<CellMouseDataList> data)
 {
-	sys_io.todo("cellMouseGetDataList(port_no=%d, data=0x%x", port_no, data);
-	if (g_cfg.io.mouse == mouse_handler::null)
-		return CELL_MOUSE_ERROR_NO_DEVICE;
-	else
-	{
-		data->list_num = 0;
-		return CELL_OK;
-	}
+	UNIMPLEMENTED_FUNC(sys_io);
+	
+	return CELL_OK;
 }

 s32 cellMouseSetTabletMode(u32 port_no, u32 mode)
 {
 	UNIMPLEMENTED_FUNC(sys_io);
-
+	
 	return CELL_OK;
 }

 s32 cellMouseGetTabletDataList(u32 port_no, u32 data_addr)
 {
 	UNIMPLEMENTED_FUNC(sys_io);
-
+	
 	return CELL_OK;
 }

@@ -83,7 +83,7 @@ public:

 	virtual ~MsgDialogBase();
 	virtual void Create(const std::string& msg) = 0;
-	virtual void CreateOsk(const std::string& msg, char16_t* osk_text, u32 charlimit) = 0;
+	virtual void CreateOsk(const std::string& msg, char16_t* osk_text) = 0;
 	virtual void ProgressBarSetMsg(u32 progressBarIndex, const std::string& msg) = 0;
 	virtual void ProgressBarReset(u32 progressBarIndex) = 0;
 	virtual void ProgressBarInc(u32 progressBarIndex, u32 delta) = 0;
@@ -156,10 +156,6 @@ error_code cellNetCtlGetInfo(s32 code, vm::ptr<CellNetCtlInfo> info)
 	{
 		strcpy_trunc(info->netmask, "255.255.255.255");
 	}
-	else if (code == CELL_NET_CTL_INFO_HTTP_PROXY_CONFIG)
-	{
-		info->http_proxy_config = 0;
-	}

 	return CELL_OK;
 }
@@ -206,54 +202,6 @@ error_code cellNetCtlGetNatInfo(vm::ptr<CellNetCtlNatInfo> natInfo)
 	return CELL_OK;
 }

-error_code cellNetCtlAddHandlerGameInt()
-{
-	cellNetCtl.todo("cellNetCtlAddHandlerGameInt()");
-	return CELL_OK;
-}
-
-error_code cellNetCtlConnectGameInt()
-{
-	cellNetCtl.todo("cellNetCtlConnectGameInt()");
-	return CELL_OK;
-}
-
-error_code cellNetCtlDelHandlerGameInt()
-{
-	cellNetCtl.todo("cellNetCtlDelHandlerGameInt()");
-	return CELL_OK;
-}
-
-error_code cellNetCtlDisconnectGameInt()
-{
-	cellNetCtl.todo("cellNetCtlDisconnectGameInt()");
-	return CELL_OK;
-}
-
-error_code cellNetCtlGetInfoGameInt()
-{
-	cellNetCtl.todo("cellNetCtlGetInfoGameInt()");
-	return CELL_OK;
-}
-
-error_code cellNetCtlGetScanInfoGameInt()
-{
-	cellNetCtl.todo("cellNetCtlGetScanInfoGameInt()");
-	return CELL_OK;
-}
-
-error_code cellNetCtlGetStateGameInt()
-{
-	cellNetCtl.todo("cellNetCtlGetStateGameInt()");
-	return CELL_OK;
-}
-
-error_code cellNetCtlScanGameInt()
-{
-	cellNetCtl.todo("cellNetCtlScanGameInt()");
-	return CELL_OK;
-}
-
 error_code cellGameUpdateInit()
 {
 	cellNetCtl.todo("cellGameUpdateInit()");
@@ -326,15 +274,6 @@ DECLARE(ppu_module_manager::cellNetCtl)("cellNetCtl", []()

 	REG_FUNC(cellNetCtl, cellNetCtlGetNatInfo);

-	REG_FUNC(cellNetCtl, cellNetCtlAddHandlerGameInt);
-	REG_FUNC(cellNetCtl, cellNetCtlConnectGameInt);
-	REG_FUNC(cellNetCtl, cellNetCtlDelHandlerGameInt);
-	REG_FUNC(cellNetCtl, cellNetCtlDisconnectGameInt);
-	REG_FUNC(cellNetCtl, cellNetCtlGetInfoGameInt);
-	REG_FUNC(cellNetCtl, cellNetCtlGetScanInfoGameInt);
-	REG_FUNC(cellNetCtl, cellNetCtlGetStateGameInt);
-	REG_FUNC(cellNetCtl, cellNetCtlScanGameInt);
-
 	REG_FUNC(cellNetCtl, cellGameUpdateInit);
 	REG_FUNC(cellNetCtl, cellGameUpdateTerm);

@@ -14,21 +14,14 @@ s32 cellOskDialogLoadAsync(u32 container, vm::ptr<CellOskDialogParam> dialogPara
 {
 	cellOskDialog.warning("cellOskDialogLoadAsync(container=0x%x, dialogParam=*0x%x, inputFieldInfo=*0x%x)", container, dialogParam, inputFieldInfo);

-	u32 maxLength = (inputFieldInfo->limit_length >= 512) ? 511 : (u32)inputFieldInfo->limit_length;
-
 	std::memset(s_osk_text, 0, sizeof(s_osk_text));

-	if (inputFieldInfo->init_text.addr() != 0)
-		for (u32 i = 0; (i < maxLength) && (inputFieldInfo->init_text[i] != 0); i++)
-			s_osk_text[i] = inputFieldInfo->init_text[i];
-
 	const auto osk = Emu.GetCallbacks().get_msg_dialog();
 	bool result = false;

 	osk->on_close = [&](s32 status)
 	{
-		if (status != CELL_MSGDIALOG_BUTTON_OK) sysutil_send_system_cmd(CELL_SYSUTIL_OSKDIALOG_INPUT_CANCELED, 0);
-		sysutil_send_system_cmd(CELL_SYSUTIL_OSKDIALOG_FINISHED, 0);
+		sysutil_send_system_cmd(status == CELL_MSGDIALOG_BUTTON_OK ? CELL_SYSUTIL_OSKDIALOG_FINISHED : CELL_SYSUTIL_OSKDIALOG_INPUT_CANCELED, 0);
 		result = true;
 	};

@@ -39,7 +32,7 @@ s32 cellOskDialogLoadAsync(u32 container, vm::ptr<CellOskDialogParam> dialogPara

 	Emu.CallAfter([&]()
 	{
-		osk->CreateOsk("On Screen Keyboard", s_osk_text, maxLength);
+		osk->CreateOsk("On Screen Keyboard", s_osk_text);
 	});

 	sysutil_send_system_cmd(CELL_SYSUTIL_OSKDIALOG_LOADED, 0);
@@ -148,12 +141,6 @@ s32 cellOskDialogExtRegisterKeyboardEventHookCallback(u16 hookEventMode, vm::ptr
 	return CELL_OK;
 }

-s32 cellOskDialogExtRegisterKeyboardEventHookCallbackEx(u16 hookEventMode, vm::ptr<cellOskDialogHardwareKeyboardEventHookCallback> pCallback)
-{
-	cellOskDialog.todo("cellOskDialogExtRegisterKeyboardEventHookCallbackEx(hookEventMode=%u, pCallback=*0x%x)", hookEventMode, pCallback);
-	return CELL_OK;
-}
-
 s32 cellOskDialogExtAddJapaneseOptionDictionary(vm::cpptr<char> filePath)
 {
 	cellOskDialog.todo("cellOskDialogExtAddJapaneseOptionDictionary(filePath=**0x%0x)", filePath);
@@ -260,7 +247,6 @@ DECLARE(ppu_module_manager::cellOskDialog)("cellOskExtUtility", []()
 {
 	REG_FUNC(cellOskExtUtility, cellOskDialogExtInputDeviceUnlock);
 	REG_FUNC(cellOskExtUtility, cellOskDialogExtRegisterKeyboardEventHookCallback);
-	REG_FUNC(cellOskExtUtility, cellOskDialogExtRegisterKeyboardEventHookCallbackEx);
 	REG_FUNC(cellOskExtUtility, cellOskDialogExtAddJapaneseOptionDictionary);
 	REG_FUNC(cellOskExtUtility, cellOskDialogExtEnableClipboard);
 	REG_FUNC(cellOskExtUtility, cellOskDialogExtSendFinishMessage);
@@ -3,7 +3,7 @@
 #include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"

-#include "pad_thread.h"
+#include "Emu/Io/PadHandler.h"
 #include "cellPad.h"

 extern logs::channel sys_io;
@@ -12,7 +12,7 @@ s32 cellPadInit(u32 max_connect)
 {
 	sys_io.warning("cellPadInit(max_connect=%d)", max_connect);

-	const auto handler = fxm::import<pad_thread>(Emu.GetCallbacks().get_pad_handler);
+	const auto handler = fxm::import<PadHandlerBase>(Emu.GetCallbacks().get_pad_handler);

 	if (!handler)
 		return CELL_PAD_ERROR_ALREADY_INITIALIZED;
@@ -26,7 +26,7 @@ s32 cellPadEnd()
 {
 	sys_io.notice("cellPadEnd()");

-	if (!fxm::remove<pad_thread>())
+	if (!fxm::remove<PadHandlerBase>())
 		return CELL_PAD_ERROR_UNINITIALIZED;

 	return CELL_OK;
@@ -36,7 +36,7 @@ s32 cellPadClearBuf(u32 port_no)
 {
 	sys_io.trace("cellPadClearBuf(port_no=%d)", port_no);

-	const auto handler = fxm::get<pad_thread>();
+	const auto handler = fxm::get<PadHandlerBase>();

 	if (!handler)
 		return CELL_PAD_ERROR_UNINITIALIZED;
@@ -51,20 +51,20 @@ s32 cellPadClearBuf(u32 port_no)
 	//Set 'm_buffer_cleared' to force a resend of everything
 	//might as well also reset everything in our pad 'buffer' to nothing as well

-	auto& pads = handler->GetPads();
-	auto pad = pads[port_no];
+	std::vector<Pad>& pads = handler->GetPads();
+	Pad& pad = pads[port_no];

-	pad->m_buffer_cleared = true;
-	pad->m_analog_left_x = pad->m_analog_left_y = pad->m_analog_right_x = pad->m_analog_right_y = 128;
+	pad.m_buffer_cleared = true;
+	pad.m_analog_left_x = pad.m_analog_left_y = pad.m_analog_right_x = pad.m_analog_right_y = 128;

-	pad->m_digital_1 = pad->m_digital_2 = 0;
-	pad->m_press_right = pad->m_press_left = pad->m_press_up = pad->m_press_down = 0;
-	pad->m_press_triangle = pad->m_press_circle = pad->m_press_cross = pad->m_press_square = 0;
-	pad->m_press_L1 = pad->m_press_L2 = pad->m_press_R1 = pad->m_press_R2 = 0;
+	pad.m_digital_1 = pad.m_digital_2 = 0;
+	pad.m_press_right = pad.m_press_left = pad.m_press_up = pad.m_press_down = 0;
+	pad.m_press_triangle = pad.m_press_circle = pad.m_press_cross = pad.m_press_square = 0;
+	pad.m_press_L1 = pad.m_press_L2 = pad.m_press_R1 = pad.m_press_R2 = 0;

 	//~399 on sensor y is a level non moving controller
-	pad->m_sensor_y = 399;
-	pad->m_sensor_x = pad->m_sensor_z = pad->m_sensor_g = 512;
+	pad.m_sensor_y = 399;
+	pad.m_sensor_x = pad.m_sensor_z = pad.m_sensor_g = 512;
 	
 	return CELL_OK;
 }
@@ -73,12 +73,12 @@ s32 cellPadGetData(u32 port_no, vm::ptr<CellPadData> data)
 {
 	sys_io.trace("cellPadGetData(port_no=%d, data=*0x%x)", port_no, data);

-	const auto handler = fxm::get<pad_thread>();
+	const auto handler = fxm::get<PadHandlerBase>();

 	if (!handler)
 		return CELL_PAD_ERROR_UNINITIALIZED;

-	auto& pads = handler->GetPads();
+	std::vector<Pad>& pads = handler->GetPads();

 	const PadInfo& rinfo = handler->GetInfo();

@@ -89,39 +89,39 @@ s32 cellPadGetData(u32 port_no, vm::ptr<CellPadData> data)
 	if (port_no >= rinfo.now_connect)
 		return CELL_PAD_ERROR_NO_DEVICE;

-	auto pad = pads[port_no];
+	Pad& pad = pads[port_no];

 	u16 d1Initial, d2Initial; 
-	d1Initial = pad->m_digital_1;
-	d2Initial = pad->m_digital_2;
+	d1Initial = pad.m_digital_1;
+	d2Initial = pad.m_digital_2;
 	bool btnChanged = false;
-	for(Button& button : pad->m_buttons)
+	for(Button& button : pad.m_buttons)
 	{
 		//here we check btns, and set pad accordingly, 
 		//if something changed, set btnChanged

 		if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL1)
 		{
-			if (button.m_pressed) pad->m_digital_1 |= button.m_outKeyCode;
-			else pad->m_digital_1 &= ~button.m_outKeyCode;
+			if (button.m_pressed) pad.m_digital_1 |= button.m_outKeyCode;
+			else pad.m_digital_1 &= ~button.m_outKeyCode;

 			switch (button.m_outKeyCode)
 			{
 			case CELL_PAD_CTRL_LEFT: 
-				if (pad->m_press_left != button.m_value) btnChanged = true;
-				pad->m_press_left = button.m_value;
+				if (pad.m_press_left != button.m_value) btnChanged = true;
+				pad.m_press_left = button.m_value;
 				break;
 			case CELL_PAD_CTRL_DOWN: 
-				if (pad->m_press_down != button.m_value) btnChanged = true;
-				pad->m_press_down = button.m_value; 
+				if (pad.m_press_down != button.m_value) btnChanged = true;
+				pad.m_press_down = button.m_value; 
 				break;
 			case CELL_PAD_CTRL_RIGHT: 
-				if (pad->m_press_right != button.m_value) btnChanged = true;
-				pad->m_press_right = button.m_value; 
+				if (pad.m_press_right != button.m_value) btnChanged = true;
+				pad.m_press_right = button.m_value; 
 				break;
 			case CELL_PAD_CTRL_UP: 
-				if (pad->m_press_up != button.m_value) btnChanged = true;
-				pad->m_press_up = button.m_value; 
+				if (pad.m_press_up != button.m_value) btnChanged = true;
+				pad.m_press_up = button.m_value; 
 				break;
 			//These arent pressure btns
 			case CELL_PAD_CTRL_R3:
@@ -133,42 +133,42 @@ s32 cellPadGetData(u32 port_no, vm::ptr<CellPadData> data)
 		}
 		else if (button.m_offset == CELL_PAD_BTN_OFFSET_DIGITAL2)
 		{
-			if (button.m_pressed) pad->m_digital_2 |= button.m_outKeyCode;
-			else pad->m_digital_2 &= ~button.m_outKeyCode;
+			if (button.m_pressed) pad.m_digital_2 |= button.m_outKeyCode;
+			else pad.m_digital_2 &= ~button.m_outKeyCode;

 			switch (button.m_outKeyCode)
 			{
 			case CELL_PAD_CTRL_SQUARE:
-				if (pad->m_press_square != button.m_value) btnChanged = true;
-				pad->m_press_square = button.m_value;
+				if (pad.m_press_square != button.m_value) btnChanged = true;
+				pad.m_press_square = button.m_value;
 				break;
 			case CELL_PAD_CTRL_CROSS:
-				if (pad->m_press_cross != button.m_value) btnChanged = true;
-				pad->m_press_cross = button.m_value; 
+				if (pad.m_press_cross != button.m_value) btnChanged = true;
+				pad.m_press_cross = button.m_value; 
 				break;
 			case CELL_PAD_CTRL_CIRCLE: 
-				if (pad->m_press_circle != button.m_value) btnChanged = true;
-				pad->m_press_circle = button.m_value;
+				if (pad.m_press_circle != button.m_value) btnChanged = true;
+				pad.m_press_circle = button.m_value;
 				break;
 			case CELL_PAD_CTRL_TRIANGLE:
-				if (pad->m_press_triangle != button.m_value) btnChanged = true;
-				pad->m_press_triangle = button.m_value;
+				if (pad.m_press_triangle != button.m_value) btnChanged = true;
+				pad.m_press_triangle = button.m_value;
 				break;
 			case CELL_PAD_CTRL_R1: 
-				if (pad->m_press_R1 != button.m_value) btnChanged = true;
-				pad->m_press_R1 = button.m_value; 
+				if (pad.m_press_R1 != button.m_value) btnChanged = true;
+				pad.m_press_R1 = button.m_value; 
 				break;
 			case CELL_PAD_CTRL_L1: 
-				if (pad->m_press_L1 != button.m_value) btnChanged = true;
-				pad->m_press_L1 = button.m_value; 
+				if (pad.m_press_L1 != button.m_value) btnChanged = true;
+				pad.m_press_L1 = button.m_value; 
 				break;
 			case CELL_PAD_CTRL_R2: 
-				if (pad->m_press_R2 != button.m_value) btnChanged = true;
-				pad->m_press_R2 = button.m_value; 
+				if (pad.m_press_R2 != button.m_value) btnChanged = true;
+				pad.m_press_R2 = button.m_value; 
 				break;
 			case CELL_PAD_CTRL_L2: 
-				if (pad->m_press_L2 != button.m_value) btnChanged = true;
-				pad->m_press_L2 = button.m_value; 
+				if (pad.m_press_L2 != button.m_value) btnChanged = true;
+				pad.m_press_L2 = button.m_value; 
 				break;
 			default: break;
 			}
@@ -182,131 +182,96 @@ s32 cellPadGetData(u32 port_no, vm::ptr<CellPadData> data)
 		}
 	}

-	for (const AnalogStick& stick : pad->m_sticks)
+	for (const AnalogStick& stick : pad.m_sticks)
 	{
 		switch (stick.m_offset)
 		{
 		case CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X: 
-			if (pad->m_analog_left_x != stick.m_value) btnChanged = true;
-			pad->m_analog_left_x = stick.m_value; 
+			if (pad.m_analog_left_x != stick.m_value) btnChanged = true;
+			pad.m_analog_left_x = stick.m_value; 
 			break;
 		case CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y: 
-			if (pad->m_analog_left_y != stick.m_value) btnChanged = true;
-			pad->m_analog_left_y = stick.m_value; 
+			if (pad.m_analog_left_y != stick.m_value) btnChanged = true;
+			pad.m_analog_left_y = stick.m_value; 
 			break;
 		case CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X: 
-			if (pad->m_analog_right_x != stick.m_value) btnChanged = true;
-			pad->m_analog_right_x = stick.m_value; 
+			if (pad.m_analog_right_x != stick.m_value) btnChanged = true;
+			pad.m_analog_right_x = stick.m_value; 
 			break;
 		case CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y: 
-			if (pad->m_analog_right_y != stick.m_value) btnChanged = true;
-			pad->m_analog_right_y = stick.m_value; 
+			if (pad.m_analog_right_y != stick.m_value) btnChanged = true;
+			pad.m_analog_right_y = stick.m_value; 
 			break;
 		default: break;
 		}
 	}

-	for (const AnalogSensor& sensor : pad->m_sensors)
+	for (const AnalogSensor& sensor : pad.m_sensors)
 	{
 		switch (sensor.m_offset)
 		{
 		case CELL_PAD_BTN_OFFSET_SENSOR_X:
-			if (pad->m_sensor_x != sensor.m_value) btnChanged = true;
-			pad->m_sensor_x = sensor.m_value;
+			if (pad.m_sensor_x != sensor.m_value) btnChanged = true;
+			pad.m_sensor_x = sensor.m_value;
 			break;
 		case CELL_PAD_BTN_OFFSET_SENSOR_Y:
-			if (pad->m_sensor_y != sensor.m_value) btnChanged = true;
-			pad->m_sensor_y = sensor.m_value;
+			if (pad.m_sensor_y != sensor.m_value) btnChanged = true;
+			pad.m_sensor_y = sensor.m_value;
 			break;
 		case CELL_PAD_BTN_OFFSET_SENSOR_Z:
-			if (pad->m_sensor_z != sensor.m_value) btnChanged = true;
-			pad->m_sensor_z = sensor.m_value;
+			if (pad.m_sensor_z != sensor.m_value) btnChanged = true;
+			pad.m_sensor_z = sensor.m_value;
 			break;
 		case CELL_PAD_BTN_OFFSET_SENSOR_G:
-			if (pad->m_sensor_g != sensor.m_value) btnChanged = true;
-			pad->m_sensor_g = sensor.m_value;
+			if (pad.m_sensor_g != sensor.m_value) btnChanged = true;
+			pad.m_sensor_g = sensor.m_value;
 			break;
 		default: break;
 		}
 	}

-	if (d1Initial != pad->m_digital_1 || d2Initial != pad->m_digital_2)
+	if (d1Initial != pad.m_digital_1 || d2Initial != pad.m_digital_2)
 	{
 		btnChanged = true;
 	}

-	
-	// the real hardware only fills the buffer up to "len" elements (16 bit each)
-	if (pad->m_port_setting & CELL_PAD_SETTING_SENSOR_ON)
-	{
-		// report back new data every ~10 ms even if the input doesn't change
-		// this is observed behaviour when using a Dualshock 3 controller
-		static std::chrono::time_point<steady_clock> last_update[CELL_PAD_MAX_PORT_NUM] = { };
-		const std::chrono::time_point<steady_clock> now = steady_clock::now();
+	//not sure if this should officially change with capabilities/portsettings :(
+	data->len = 24;

-		if (btnChanged || pad->m_buffer_cleared || (std::chrono::duration_cast<std::chrono::milliseconds>(now - last_update[port_no]).count() >= 10))
-		{
-			data->len = CELL_PAD_LEN_CHANGE_SENSOR_ON;
-			last_update[port_no] = now;
-		}
-		else
-		{
-			data->len = CELL_PAD_LEN_NO_CHANGE;
-		}
-	}
-	else if (btnChanged || pad->m_buffer_cleared)
+	if (pad.m_buffer_cleared)
 	{
-		// only give back valid data if a controller state changed
-		data->len = (pad->m_port_setting & CELL_PAD_SETTING_PRESS_ON) ? CELL_PAD_LEN_CHANGE_PRESS_ON : CELL_PAD_LEN_CHANGE_DEFAULT;
+		pad.m_buffer_cleared = false;
 	}
-	else
+	else if (!btnChanged)
 	{
-		// report no state changes
-		data->len = CELL_PAD_LEN_NO_CHANGE;
-	}
-
-	pad->m_buffer_cleared = false;
-	
-	// only update parts of the output struct depending on the controller setting
-	if (data->len > CELL_PAD_LEN_NO_CHANGE)
-	{
-		memset(data->button, 0, sizeof(data->button));
-
-		data->button[0] = 0x0; // always 0
-		// bits 15-8 reserved, 7-4 = 0x7, 3-0: data->len/2;
-		data->button[1] = (0x7 << 4) | std::min(data->len / 2, 15);
-
-		data->button[CELL_PAD_BTN_OFFSET_DIGITAL1] = pad->m_digital_1;
-		data->button[CELL_PAD_BTN_OFFSET_DIGITAL2] = pad->m_digital_2;
-		data->button[CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X] = pad->m_analog_right_x;
-		data->button[CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y] = pad->m_analog_right_y;
-		data->button[CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X] = pad->m_analog_left_x;
-		data->button[CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y] = pad->m_analog_left_y;
-		data->button[CELL_PAD_BTN_OFFSET_PRESS_RIGHT] = pad->m_press_right;
-		data->button[CELL_PAD_BTN_OFFSET_PRESS_LEFT] = pad->m_press_left;
-		data->button[CELL_PAD_BTN_OFFSET_PRESS_UP] = pad->m_press_up;
-		data->button[CELL_PAD_BTN_OFFSET_PRESS_DOWN] = pad->m_press_down;
-	}
-
-	if (data->len >= CELL_PAD_LEN_CHANGE_PRESS_ON)
-	{
-		data->button[CELL_PAD_BTN_OFFSET_PRESS_TRIANGLE] = pad->m_press_triangle;
-		data->button[CELL_PAD_BTN_OFFSET_PRESS_CIRCLE] = pad->m_press_circle;
-		data->button[CELL_PAD_BTN_OFFSET_PRESS_CROSS] = pad->m_press_cross;
-		data->button[CELL_PAD_BTN_OFFSET_PRESS_SQUARE] = pad->m_press_square;
-		data->button[CELL_PAD_BTN_OFFSET_PRESS_L1] = pad->m_press_L1;
-		data->button[CELL_PAD_BTN_OFFSET_PRESS_L2] = pad->m_press_L2;
-		data->button[CELL_PAD_BTN_OFFSET_PRESS_R1] = pad->m_press_R1;
-		data->button[CELL_PAD_BTN_OFFSET_PRESS_R2] = pad->m_press_R2;
-	}
-
-	if (data->len == CELL_PAD_LEN_CHANGE_SENSOR_ON)
-	{
-		data->button[CELL_PAD_BTN_OFFSET_SENSOR_X] = pad->m_sensor_x;
-		data->button[CELL_PAD_BTN_OFFSET_SENSOR_Y] = pad->m_sensor_y;
-		data->button[CELL_PAD_BTN_OFFSET_SENSOR_Z] = pad->m_sensor_z;
-		data->button[CELL_PAD_BTN_OFFSET_SENSOR_G] = pad->m_sensor_g;
+		data->len = 0;
 	}
+	data->button[0] = 0x0; // always 0
+	// bits 15-8 reserved, 7-4 = 0x7, 3-0: data->len/2;
+	data->button[1] = (0x7 << 4) | std::min(data->len / 2, 15) & 0xF;
+	//lets still send new data anyway, not sure whats expected still
+	data->button[CELL_PAD_BTN_OFFSET_DIGITAL1]       = pad.m_digital_1;
+	data->button[CELL_PAD_BTN_OFFSET_DIGITAL2]       = pad.m_digital_2;
+	data->button[CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_X] = pad.m_analog_right_x;
+	data->button[CELL_PAD_BTN_OFFSET_ANALOG_RIGHT_Y] = pad.m_analog_right_y;
+	data->button[CELL_PAD_BTN_OFFSET_ANALOG_LEFT_X]  = pad.m_analog_left_x;
+	data->button[CELL_PAD_BTN_OFFSET_ANALOG_LEFT_Y]  = pad.m_analog_left_y;
+	data->button[CELL_PAD_BTN_OFFSET_PRESS_RIGHT]    = pad.m_press_right;
+	data->button[CELL_PAD_BTN_OFFSET_PRESS_LEFT]     = pad.m_press_left;
+	data->button[CELL_PAD_BTN_OFFSET_PRESS_UP]       = pad.m_press_up;
+	data->button[CELL_PAD_BTN_OFFSET_PRESS_DOWN]     = pad.m_press_down;
+	data->button[CELL_PAD_BTN_OFFSET_PRESS_TRIANGLE] = pad.m_press_triangle;
+	data->button[CELL_PAD_BTN_OFFSET_PRESS_CIRCLE]   = pad.m_press_circle;
+	data->button[CELL_PAD_BTN_OFFSET_PRESS_CROSS]    = pad.m_press_cross;
+	data->button[CELL_PAD_BTN_OFFSET_PRESS_SQUARE]   = pad.m_press_square;
+	data->button[CELL_PAD_BTN_OFFSET_PRESS_L1]       = pad.m_press_L1;
+	data->button[CELL_PAD_BTN_OFFSET_PRESS_L2]       = pad.m_press_L2;
+	data->button[CELL_PAD_BTN_OFFSET_PRESS_R1]       = pad.m_press_R1;
+	data->button[CELL_PAD_BTN_OFFSET_PRESS_R2]       = pad.m_press_R2;
+	data->button[CELL_PAD_BTN_OFFSET_SENSOR_X]       = pad.m_sensor_x;
+	data->button[CELL_PAD_BTN_OFFSET_SENSOR_Y]       = pad.m_sensor_y;
+	data->button[CELL_PAD_BTN_OFFSET_SENSOR_Z]       = pad.m_sensor_z;
+	data->button[CELL_PAD_BTN_OFFSET_SENSOR_G]       = pad.m_sensor_g;

 	return CELL_OK;
 }
@@ -315,7 +280,7 @@ s32 cellPadPeriphGetInfo(vm::ptr<CellPadPeriphInfo> info)
 {
 	sys_io.trace("cellPadPeriphGetInfo(info=*0x%x)", info);

-	const auto handler = fxm::get<pad_thread>();
+	const auto handler = fxm::get<PadHandlerBase>();

 	if (!handler)
 		return CELL_PAD_ERROR_UNINITIALIZED;
@@ -328,7 +293,7 @@ s32 cellPadPeriphGetInfo(vm::ptr<CellPadPeriphInfo> info)
 	info->now_connect = rinfo.now_connect;
 	info->system_info = rinfo.system_info;

-	auto& pads = handler->GetPads();
+	std::vector<Pad>& pads = handler->GetPads();

 	// TODO: Support other types of controllers
 	for (u32 i = 0; i < CELL_PAD_MAX_PORT_NUM; ++i)
@@ -336,10 +301,10 @@ s32 cellPadPeriphGetInfo(vm::ptr<CellPadPeriphInfo> info)
 		if (i >= pads.size())
 			break;

-		info->port_status[i] = pads[i]->m_port_status;
-		info->port_setting[i] = pads[i]->m_port_setting;
-		info->device_capability[i] = pads[i]->m_device_capability;
-		info->device_type[i] = pads[i]->m_device_type;
+		info->port_status[i] = pads[i].m_port_status;
+		info->port_setting[i] = pads[i].m_port_setting;
+		info->device_capability[i] = pads[i].m_device_capability;
+		info->device_type[i] = pads[i].m_device_type;
 		info->pclass_type[i] = CELL_PAD_PCLASS_TYPE_STANDARD;
 		info->pclass_profile[i] = 0x0;
 	}
@@ -350,7 +315,7 @@ s32 cellPadPeriphGetInfo(vm::ptr<CellPadPeriphInfo> info)
 s32 cellPadPeriphGetData(u32 port_no, vm::ptr<CellPadPeriphData> data)
 {
 	sys_io.trace("cellPadPeriphGetData(port_no=%d, data=*0x%x)", port_no, data);
-	const auto handler = fxm::get<pad_thread>();
+	const auto handler = fxm::get<PadHandlerBase>();

 	if (!handler)
 		return CELL_PAD_ERROR_UNINITIALIZED;
@@ -377,7 +342,7 @@ s32 cellPadGetDataExtra(u32 port_no, vm::ptr<u32> device_type, vm::ptr<CellPadDa
 {
 	sys_io.trace("cellPadGetDataExtra(port_no=%d, device_type=*0x%x, device_type=*0x%x)", port_no, device_type, data);

-	const auto handler = fxm::get<pad_thread>();
+	const auto handler = fxm::get<PadHandlerBase>();

 	if (!handler)
 		return CELL_PAD_ERROR_UNINITIALIZED;
@@ -405,7 +370,7 @@ s32 cellPadSetActDirect(u32 port_no, vm::ptr<CellPadActParam> param)
 {
 	sys_io.trace("cellPadSetActDirect(port_no=%d, param=*0x%x)", port_no, param);

-	const auto handler = fxm::get<pad_thread>();
+	const auto handler = fxm::get<PadHandlerBase>();

 	if (!handler)
 		return CELL_PAD_ERROR_UNINITIALIZED;
@@ -426,7 +391,7 @@ s32 cellPadGetInfo(vm::ptr<CellPadInfo> info)
 {
 	sys_io.trace("cellPadGetInfo(info=*0x%x)", info);

-	const auto handler = fxm::get<pad_thread>();
+	const auto handler = fxm::get<PadHandlerBase>();

 	if (!handler)
 		return CELL_PAD_ERROR_UNINITIALIZED;
@@ -438,15 +403,15 @@ s32 cellPadGetInfo(vm::ptr<CellPadInfo> info)
 	info->now_connect = rinfo.now_connect;
 	info->system_info = rinfo.system_info;

-	auto& pads = handler->GetPads();
+	std::vector<Pad>& pads = handler->GetPads();

 	for (u32 i=0; i<CELL_MAX_PADS; ++i)
 	{
 		if (i >= pads.size())
 			break;

-		info->status[i] = pads[i]->m_port_status;
-		pads[i]->m_port_status &= ~CELL_PAD_STATUS_ASSIGN_CHANGES;
+		info->status[i] = pads[i].m_port_status;
+		pads[i].m_port_status &= ~CELL_PAD_STATUS_ASSIGN_CHANGES;
 		info->product_id[i] = 0x0268;
 		info->vendor_id[i] = 0x054C;
 	}
@@ -458,7 +423,7 @@ s32 cellPadGetInfo2(vm::ptr<CellPadInfo2> info)
 {
 	sys_io.trace("cellPadGetInfo2(info=*0x%x)", info);

-	const auto handler = fxm::get<pad_thread>();
+	const auto handler = fxm::get<PadHandlerBase>();

 	if (!handler)
 		return CELL_PAD_ERROR_UNINITIALIZED;
@@ -470,18 +435,18 @@ s32 cellPadGetInfo2(vm::ptr<CellPadInfo2> info)
 	info->now_connect = rinfo.now_connect;
 	info->system_info = rinfo.system_info;

-	auto& pads = handler->GetPads();
+	std::vector<Pad>& pads = handler->GetPads();

 	for (u32 i=0; i<CELL_PAD_MAX_PORT_NUM; ++i)
 	{
 		if (i >= pads.size())
 			break;

-		info->port_status[i] = pads[i]->m_port_status;
-		pads[i]->m_port_status &= ~CELL_PAD_STATUS_ASSIGN_CHANGES;
-		info->port_setting[i] = pads[i]->m_port_setting;
-		info->device_capability[i] = pads[i]->m_device_capability;
-		info->device_type[i] = pads[i]->m_device_type;
+		info->port_status[i] = pads[i].m_port_status;
+		pads[i].m_port_status &= ~CELL_PAD_STATUS_ASSIGN_CHANGES;
+		info->port_setting[i] = pads[i].m_port_setting;
+		info->device_capability[i] = pads[i].m_device_capability;
+		info->device_type[i] = pads[i].m_device_type;
 	}

 	return CELL_OK;
@@ -491,7 +456,7 @@ s32 cellPadGetCapabilityInfo(u32 port_no, vm::ptr<CellCapabilityInfo> info)
 {
 	sys_io.trace("cellPadGetCapabilityInfo(port_no=%d, data_addr:=0x%x)", port_no, info.addr());

-	const auto handler = fxm::get<pad_thread>();
+	const auto handler = fxm::get<PadHandlerBase>();

 	if (!handler)
 		return CELL_PAD_ERROR_UNINITIALIZED;
@@ -503,10 +468,10 @@ s32 cellPadGetCapabilityInfo(u32 port_no, vm::ptr<CellCapabilityInfo> info)
 	if (port_no >= rinfo.now_connect)
 		return CELL_PAD_ERROR_NO_DEVICE;

-	const auto& pads = handler->GetPads();
+	const std::vector<Pad>& pads = handler->GetPads();

-	//Should return the same as device capability mask, psl1ght has it backwards in pad->h
-	info->info[0] = pads[port_no]->m_device_capability;
+	//Should return the same as device capability mask, psl1ght has it backwards in pad.h
+	info->info[0] = pads[port_no].m_device_capability;

 	return CELL_OK;
 }
@@ -515,7 +480,7 @@ s32 cellPadSetPortSetting(u32 port_no, u32 port_setting)
 {
 	sys_io.trace("cellPadSetPortSetting(port_no=%d, port_setting=0x%x)", port_no, port_setting);

-	const auto handler = fxm::get<pad_thread>();
+	const auto handler = fxm::get<PadHandlerBase>();

 	if (!handler)
 		return CELL_PAD_ERROR_UNINITIALIZED;
@@ -527,8 +492,8 @@ s32 cellPadSetPortSetting(u32 port_no, u32 port_setting)
 	if (port_no >= rinfo.now_connect)
 		return CELL_PAD_ERROR_NO_DEVICE;

-	auto& pads = handler->GetPads();
-	pads[port_no]->m_port_setting = port_setting;
+	std::vector<Pad>& pads = handler->GetPads();
+	pads[port_no].m_port_setting = port_setting;

 	return CELL_OK;
 }
@@ -537,7 +502,7 @@ s32 cellPadInfoPressMode(u32 port_no)
 {
 	sys_io.trace("cellPadInfoPressMode(port_no=%d)", port_no);

-	const auto handler = fxm::get<pad_thread>();
+	const auto handler = fxm::get<PadHandlerBase>();

 	if (!handler)
 		return CELL_PAD_ERROR_UNINITIALIZED;
@@ -549,16 +514,16 @@ s32 cellPadInfoPressMode(u32 port_no)
 	if (port_no >= rinfo.now_connect)
 		return CELL_PAD_ERROR_NO_DEVICE;

-	const auto& pads = handler->GetPads();
+	const std::vector<Pad>& pads = handler->GetPads();

-	return (pads[port_no]->m_device_capability & CELL_PAD_CAPABILITY_PRESS_MODE) > 0;
+	return (pads[port_no].m_device_capability & CELL_PAD_CAPABILITY_PRESS_MODE) > 0;
 }

 s32 cellPadInfoSensorMode(u32 port_no)
 {
 	sys_io.trace("cellPadInfoSensorMode(port_no=%d)", port_no);

-	const auto handler = fxm::get<pad_thread>();
+	const auto handler = fxm::get<PadHandlerBase>();

 	if (!handler)
 		return CELL_PAD_ERROR_UNINITIALIZED;
@@ -570,16 +535,16 @@ s32 cellPadInfoSensorMode(u32 port_no)
 	if (port_no >= rinfo.now_connect)
 		return CELL_PAD_ERROR_NO_DEVICE;

-	const auto& pads = handler->GetPads();
+	const std::vector<Pad>& pads = handler->GetPads();

-	return (pads[port_no]->m_device_capability & CELL_PAD_CAPABILITY_SENSOR_MODE) > 0;
+	return (pads[port_no].m_device_capability & CELL_PAD_CAPABILITY_SENSOR_MODE) > 0;
 }

 s32 cellPadSetPressMode(u32 port_no, u32 mode)
 {
 	sys_io.trace("cellPadSetPressMode(port_no=%d, mode=%d)", port_no, mode);

-	const auto handler = fxm::get<pad_thread>();
+	const auto handler = fxm::get<PadHandlerBase>();

 	if (!handler)
 		return CELL_PAD_ERROR_UNINITIALIZED;
@@ -594,12 +559,12 @@ s32 cellPadSetPressMode(u32 port_no, u32 mode)
 	if (port_no >= rinfo.now_connect)
 		return CELL_PAD_ERROR_NO_DEVICE;

-	auto& pads = handler->GetPads();
+	std::vector<Pad>& pads = handler->GetPads();

 	if (mode)
-		pads[port_no]->m_port_setting |= CELL_PAD_SETTING_PRESS_ON;
+		pads[port_no].m_port_setting |= CELL_PAD_SETTING_PRESS_ON;
 	else
-		pads[port_no]->m_port_setting &= ~CELL_PAD_SETTING_PRESS_ON;
+		pads[port_no].m_port_setting &= ~CELL_PAD_SETTING_PRESS_ON;

 	return CELL_OK;
 }
@@ -608,7 +573,7 @@ s32 cellPadSetSensorMode(u32 port_no, u32 mode)
 {
 	sys_io.trace("cellPadSetSensorMode(port_no=%d, mode=%d)", port_no, mode);

-	const auto handler = fxm::get<pad_thread>();
+	const auto handler = fxm::get<PadHandlerBase>();

 	if (!handler)
 		return CELL_PAD_ERROR_UNINITIALIZED;
@@ -623,12 +588,12 @@ s32 cellPadSetSensorMode(u32 port_no, u32 mode)
 	if (port_no >= rinfo.now_connect)
 		return CELL_PAD_ERROR_NO_DEVICE;

-	auto& pads = handler->GetPads();
+	std::vector<Pad>& pads = handler->GetPads();

 	if (mode)
-		pads[port_no]->m_port_setting |= CELL_PAD_SETTING_SENSOR_ON;
+		pads[port_no].m_port_setting |= CELL_PAD_SETTING_SENSOR_ON;
 	else
-		pads[port_no]->m_port_setting &= ~CELL_PAD_SETTING_SENSOR_ON;
+		pads[port_no].m_port_setting &= ~CELL_PAD_SETTING_SENSOR_ON;

 	return CELL_OK;
 }
@@ -637,7 +602,7 @@ s32 cellPadLddRegisterController()
 {
 	sys_io.todo("cellPadLddRegisterController()");

-	const auto handler = fxm::get<pad_thread>();
+	const auto handler = fxm::get<PadHandlerBase>();

 	if (!handler)
 		return CELL_PAD_ERROR_UNINITIALIZED;
@@ -649,7 +614,7 @@ s32 cellPadLddDataInsert(s32 handle, vm::ptr<CellPadData> data)
 {
 	sys_io.todo("cellPadLddDataInsert(handle=%d, data=*0x%x)", handle, data);

-	const auto handler = fxm::get<pad_thread>();
+	const auto handler = fxm::get<PadHandlerBase>();

 	if (!handler)
 		return CELL_PAD_ERROR_UNINITIALIZED;
@@ -661,7 +626,7 @@ s32 cellPadLddGetPortNo(s32 handle)
 {
 	sys_io.todo("cellPadLddGetPortNo(handle=%d)", handle);

-	const auto handler = fxm::get<pad_thread>();
+	const auto handler = fxm::get<PadHandlerBase>();

 	if (!handler)
 		return CELL_PAD_ERROR_UNINITIALIZED;
@@ -673,7 +638,7 @@ s32 cellPadLddUnregisterController(s32 handle)
 {
 	sys_io.todo("cellPadLddUnregisterController(handle=%d)", handle);

-	const auto handler = fxm::get<pad_thread>();
+	const auto handler = fxm::get<PadHandlerBase>();

 	if (!handler)
 		return CELL_PAD_ERROR_UNINITIALIZED;
@@ -27,15 +27,6 @@ enum
 	CELL_PAD_PCLASS_TYPE_NAVIGATION = 0x05,
 };

-// Length returned in CellPadData struct
-enum
-{
-	CELL_PAD_LEN_NO_CHANGE = 0,
-	CELL_PAD_LEN_CHANGE_DEFAULT = 8,
-	CELL_PAD_LEN_CHANGE_PRESS_ON = 20,
-	CELL_PAD_LEN_CHANGE_SENSOR_ON = 24,
-};
-
 struct CellPadData
 {
 	be_t<s32> len;
@@ -1,90 +1,41 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"

-namespace vm { using namespace ps3; }
-
 logs::channel cellRec("cellRec");

-struct CellRecSpursParam
+s32 cellRecOpen()
 {
-	vm::bptr<struct CellSpurs> pSpurs;
-	be_t<s32> spu_usage_rate;
-	u8 priority[8];
-};
-
-struct CellRecOption
-{
-	be_t<s32> option;
-	union
-	{
-		be_t<s32> ppu_thread_priority;
-		be_t<s32> spu_thread_priority;
-		be_t<s32> capture_priority;
-		be_t<s32> use_system_spu;
-		be_t<s32> fit_to_youtube;
-		be_t<s32> xmb_bgm;
-		be_t<s32> mpeg4_fast_encode;
-		be_t<u32> ring_sec;
-		be_t<s32> video_input;
-		be_t<s32> audio_input;
-		be_t<s32> audio_input_mix_vol;
-		be_t<s32> reduce_memsize;
-		be_t<s32> show_xmb;
-		vm::bptr<char> metadata_filename;
-		vm::bptr<CellRecSpursParam> pSpursParam;
-		be_t<u64> dummy;
-	} value;
-};
-
-struct CellRecParam
-{
-	be_t<s32> videoFmt;
-	be_t<s32> audioFmt;
-	be_t<s32> numOfOpt;
-	vm::bptr<CellRecOption> pOpt;
-};
-
-using CellRecCallback = void(s32 recStatus, s32 recError, vm::ptr<void> userdata);
-
-s32 cellRecOpen(vm::cptr<char> pDirName, vm::cptr<char> pFileName, vm::cptr<CellRecParam> pParam, u32 container, vm::ptr<CellRecCallback> cb, vm::ptr<void> cbUserData)
-{
-	cellRec.todo("cellRecOpen(pDirName=%s, pFileName=%s, pParam=*0x%x, container=0x%x, cb=*0x%x, cbUserData=*0x%x)", pDirName, pFileName, pParam, container, cb, cbUserData);
-	return CELL_OK;
+	fmt::throw_exception("Unimplemented" HERE);
 }

-s32 cellRecClose(s32 isDiscard)
+s32 cellRecClose()
 {
-	cellRec.todo("cellRecClose(isDiscard=0x%x)", isDiscard);
-	return CELL_OK;
+	fmt::throw_exception("Unimplemented" HERE);
 }

-void cellRecGetInfo(s32 info, vm::ptr<u64> pValue)
+s32 cellRecGetInfo()
 {
-	cellRec.todo("cellRecGetInfo(info=0x%x, pValue=*0x%x)", info, pValue);
+	fmt::throw_exception("Unimplemented" HERE);
 }

 s32 cellRecStop()
 {
-	cellRec.todo("cellRecStop()");
-	return CELL_OK;
+	fmt::throw_exception("Unimplemented" HERE);
 }

 s32 cellRecStart()
 {
-	cellRec.todo("cellRecStart()");
-	return CELL_OK;
+	fmt::throw_exception("Unimplemented" HERE);
 }

-u32 cellRecQueryMemSize(vm::cptr<CellRecParam> pParam)
+s32 cellRecQueryMemSize()
 {
-	cellRec.todo("cellRecQueryMemSize(pParam=*0x%x)", pParam);
-	return 1 * 1024 * 1024; // dummy memory size
+	fmt::throw_exception("Unimplemented" HERE);
 }

-s32 cellRecSetInfo(s32 setInfo, u64 value)
+s32 cellRecSetInfo()
 {
-	cellRec.todo("cellRecSetInfo(setInfo=0x%x, value=0x%x)", setInfo, value);
-	return CELL_OK;
+	fmt::throw_exception("Unimplemented" HERE);
 }


@@ -123,8 +123,8 @@ s32 cellRescGetFlipStatus()

 s32 cellRescGetRegisterCount()
 {
-	cellResc.todo("cellRescGetRegisterCount()");
-	return 0;
+	UNIMPLEMENTED_FUNC(cellResc);
+	return CELL_OK;
 }

 u64 cellRescGetLastFlipTime()
@@ -134,9 +134,10 @@ u64 cellRescGetLastFlipTime()
 	return 0;
 }

-void cellRescSetRegisterCount(s32 regCount)
+s32 cellRescSetRegisterCount()
 {
-	cellResc.todo("cellRescSetRegisterCount(regCount=0x%x)", regCount);
+	UNIMPLEMENTED_FUNC(cellResc);
+	return CELL_OK;
 }

 void cellRescSetVBlankHandler(vm::ptr<void(u32)> handler)
@@ -1,5 +1,7 @@
 #pragma once

+#include "sys_net.h"
+
 namespace vm { using namespace ps3; }

 // Return Codes
@@ -77,9 +79,7 @@ enum
 	CELL_RUDP_POLL_EV_ERROR = 0x0008,
 };

-struct sys_net_sockaddr;
-
-using CellRudpEventHandler = s32(s32 event_id, s32 soc, vm::cptr<u8> data, u32 datalen, vm::cptr<sys_net_sockaddr> addr, u32 addrlen, vm::ptr<void> arg);
+using CellRudpEventHandler = s32(s32 event_id, s32 soc, vm::cptr<u8> data, u32 datalen, vm::cptr<sys_net::sockaddr> addr, u32 addrlen, vm::ptr<void> arg);

 using CellRudpAllocatorFuncAlloc = vm::ptr<void>(u32 size);
 using CellRudpAllocatorFuncFree = void(vm::ptr<void> ptr);
@@ -248,126 +248,12 @@ s32 cellSailRecorderCancel()
 	return CELL_OK;
 }

-s32 cellSailRecorderRegisterComposer()
-{
-	UNIMPLEMENTED_FUNC(cellSailRec);
-	return CELL_OK;
-}
-
-s32 cellSailRecorderUnregisterComposer()
-{
-	UNIMPLEMENTED_FUNC(cellSailRec);
-	return CELL_OK;
-}
-
 s32 cellSailRecorderDumpImage()
 {
 	UNIMPLEMENTED_FUNC(cellSailRec);
 	return CELL_OK;
 }

-s32 cellSailComposerInitialize()
-{
-	UNIMPLEMENTED_FUNC(cellSailRec);
-	return CELL_OK;
-}
-
-s32 cellSailComposerFinalize()
-{
-	UNIMPLEMENTED_FUNC(cellSailRec);
-	return CELL_OK;
-}
-
-s32 cellSailComposerGetStreamParameter()
-{
-	UNIMPLEMENTED_FUNC(cellSailRec);
-	return CELL_OK;
-}
-
-s32 cellSailComposerGetEsAudioParameter()
-{
-	UNIMPLEMENTED_FUNC(cellSailRec);
-	return CELL_OK;
-}
-
-s32 cellSailComposerGetEsUserParameter()
-{
-	UNIMPLEMENTED_FUNC(cellSailRec);
-	return CELL_OK;
-}
-
-s32 cellSailComposerGetEsVideoParameter()
-{
-	UNIMPLEMENTED_FUNC(cellSailRec);
-	return CELL_OK;
-}
-
-s32 cellSailComposerGetEsAudioAu()
-{
-	UNIMPLEMENTED_FUNC(cellSailRec);
-	return CELL_OK;
-}
-
-s32 cellSailComposerGetEsUserAu()
-{
-	UNIMPLEMENTED_FUNC(cellSailRec);
-	return CELL_OK;
-}
-
-s32 cellSailComposerGetEsVideoAu()
-{
-	UNIMPLEMENTED_FUNC(cellSailRec);
-	return CELL_OK;
-}
-
-s32 cellSailComposerTryGetEsAudioAu()
-{
-	UNIMPLEMENTED_FUNC(cellSailRec);
-	return CELL_OK;
-}
-
-s32 cellSailComposerTryGetEsUserAu()
-{
-	UNIMPLEMENTED_FUNC(cellSailRec);
-	return CELL_OK;
-}
-
-s32 cellSailComposerTryGetEsVideoAu()
-{
-	UNIMPLEMENTED_FUNC(cellSailRec);
-	return CELL_OK;
-}
-
-s32 cellSailComposerReleaseEsAudioAu()
-{
-	UNIMPLEMENTED_FUNC(cellSailRec);
-	return CELL_OK;
-}
-
-s32 cellSailComposerReleaseEsUserAu()
-{
-	UNIMPLEMENTED_FUNC(cellSailRec);
-	return CELL_OK;
-}
-
-s32 cellSailComposerReleaseEsVideoAu()
-{
-	UNIMPLEMENTED_FUNC(cellSailRec);
-	return CELL_OK;
-}
-
-s32 cellSailComposerNotifyCallCompleted()
-{
-	UNIMPLEMENTED_FUNC(cellSailRec);
-	return CELL_OK;
-}
-
-s32 cellSailComposerNotifySessionError()
-{
-	UNIMPLEMENTED_FUNC(cellSailRec);
-	return CELL_OK;
-}
-
 DECLARE(ppu_module_manager::cellSailRec)("cellSailRec", []()
 {
 	static ppu_static_module cellMp4("cellMp4");
@@ -415,26 +301,6 @@ DECLARE(ppu_module_manager::cellSailRec)("cellSailRec", []()
 	REG_FUNC(cellSailRec, cellSailRecorderStart);
 	REG_FUNC(cellSailRec, cellSailRecorderStop);
 	REG_FUNC(cellSailRec, cellSailRecorderCancel);
-	REG_FUNC(cellSailRec, cellSailRecorderRegisterComposer);
-	REG_FUNC(cellSailRec, cellSailRecorderUnregisterComposer);

 	REG_FUNC(cellSailRec, cellSailRecorderDumpImage);
-
-	REG_FUNC(cellSailRec, cellSailComposerInitialize);
-	REG_FUNC(cellSailRec, cellSailComposerFinalize);
-	REG_FUNC(cellSailRec, cellSailComposerGetStreamParameter);
-	REG_FUNC(cellSailRec, cellSailComposerGetEsAudioParameter);
-	REG_FUNC(cellSailRec, cellSailComposerGetEsUserParameter);
-	REG_FUNC(cellSailRec, cellSailComposerGetEsVideoParameter);
-	REG_FUNC(cellSailRec, cellSailComposerGetEsAudioAu);
-	REG_FUNC(cellSailRec, cellSailComposerGetEsUserAu);
-	REG_FUNC(cellSailRec, cellSailComposerGetEsVideoAu);
-	REG_FUNC(cellSailRec, cellSailComposerTryGetEsAudioAu);
-	REG_FUNC(cellSailRec, cellSailComposerTryGetEsUserAu);
-	REG_FUNC(cellSailRec, cellSailComposerTryGetEsVideoAu);
-	REG_FUNC(cellSailRec, cellSailComposerReleaseEsAudioAu);
-	REG_FUNC(cellSailRec, cellSailComposerReleaseEsUserAu);
-	REG_FUNC(cellSailRec, cellSailComposerReleaseEsVideoAu);
-	REG_FUNC(cellSailRec, cellSailComposerNotifyCallCompleted);
-	REG_FUNC(cellSailRec, cellSailComposerNotifySessionError);
 });
@@ -1,7 +1,6 @@
-#include "stdafx.h"
+#include "stdafx.h"
 #include "Emu/System.h"
 #include "Emu/Cell/PPUModule.h"
-#include "Emu/Cell/Modules/cellSysutil.h"

 #include "cellSaveData.h"

@@ -64,6 +63,7 @@ static NEVER_INLINE s32 savedata_op(ppu_thread& ppu, u32 operation, u32 version,
 	PFuncFile funcFile, u32 container, u32 unknown, vm::ptr<void> userdata, u32 userId, PFuncDone funcDone)
 {
 	// TODO: check arguments
+
 	std::unique_lock<std::mutex> lock(g_savedata_mutex, std::try_to_lock);

 	if (!lock)
@@ -82,8 +82,6 @@ static NEVER_INLINE s32 savedata_op(ppu_thread& ppu, u32 operation, u32 version,
 	vm::ptr<CellSaveDataFileGet>  fileGet  = g_savedata_context.ptr(&savedata_context::fileGet);
 	vm::ptr<CellSaveDataFileSet>  fileSet  = g_savedata_context.ptr(&savedata_context::fileSet);

-	//TODO: get current user ID
-	// userId(0) = CELL_SYSUTIL_USERID_CURRENT
 	// path of the specified user (00000001 by default)
 	const std::string& base_dir = vfs::get(fmt::format("/dev_hdd0/home/%08u/savedata/", userId ? userId : 1u));

@@ -102,16 +100,13 @@ static NEVER_INLINE s32 savedata_op(ppu_thread& ppu, u32 operation, u32 version,

 		const auto prefix_list = fmt::split(setList->dirNamePrefix.get_ptr(), { "|" });

-		// get the saves matching the supplied prefix
-		for (auto&& entry : fs::dir(base_dir))
+		for (const auto& entry : fs::dir(base_dir))
 		{
 			if (!entry.is_directory)
 			{
 				continue;
 			}

-			entry.name = vfs::unescape(entry.name);
-
 			for (const auto& prefix : prefix_list)
 			{
 				if (entry.name.substr(0, prefix.size()) == prefix)
@@ -146,16 +141,11 @@ static NEVER_INLINE s32 savedata_op(ppu_thread& ppu, u32 operation, u32 version,
 						save_entry2.atime = entry.atime;
 						save_entry2.mtime = entry.mtime;
 						save_entry2.ctime = entry.ctime;
-						if (fs::is_file(base_dir + entry.name + "/ICON0.PNG"))
-						{
-							fs::file icon = fs::file(base_dir + entry.name + "/ICON0.PNG");
-							u32 iconSize = icon.size();
-							std::vector<uchar> iconData;
-							icon.read(iconData, iconSize);
-							save_entry2.iconBuf = iconData;
-						}
+						//save_entry2.iconBuf = NULL; // TODO: Here should be the PNG buffer
+						//save_entry2.iconBufSize = 0; // TODO: Size of the PNG file
 						save_entry2.isNew = false;
-						save_entries.emplace_back(save_entry2);
+
+						save_entries.push_back(save_entry2);
 					}

 					break;
@@ -216,19 +206,10 @@ static NEVER_INLINE s32 savedata_op(ppu_thread& ppu, u32 operation, u32 version,

 			if (result->result < 0)
 			{
-				//TODO: display dialog
 				cellSaveData.warning("savedata_op(): funcList returned < 0.");
 				return CELL_SAVEDATA_ERROR_CBRESULT;
 			}

-			// if the callback has returned ok, lets return OK.
-			// typically used at game launch when no list is actually required.
-			// CELL_SAVEDATA_CBRESULT_OK_LAST_NOCONFIRM is only valid for funcFile and funcDone
-			if (result->result == CELL_SAVEDATA_CBRESULT_OK_LAST)
-			{
-				return CELL_OK;
-			}
-
 			// Clean save data list
 			save_entries.erase(std::remove_if(save_entries.begin(), save_entries.end(), [&listSet](const SaveDataEntry& entry) -> bool
 			{
@@ -243,16 +224,6 @@ static NEVER_INLINE s32 savedata_op(ppu_thread& ppu, u32 operation, u32 version,
 				return true;
 			}), save_entries.end());

-			// Add any new data (not currently supported by the UI)
-			//if (listSet->newData)
-			//{
-			//	SaveDataEntry *_saveDataEntry = new SaveDataEntry();
-			//	_saveDataEntry->dirName = listSet->newData->dirName.get_ptr();
-
-			//	save_entry.dirName = listSet->newData->dirName.get_ptr();
-			//	save_entries.emplace_back(*_saveDataEntry);
-			//}
-
 			// Focus save data
 			s32 focused = -1;

@@ -313,8 +284,6 @@ static NEVER_INLINE s32 savedata_op(ppu_thread& ppu, u32 operation, u32 version,
 			}
 			case CELL_SAVEDATA_FOCUSPOS_NEWDATA:
 			{
-				//TODO: If adding the new data to the save_entries vector
-				// to be displayed in the save mangaer UI, it should be focused here
 				break;
 			}
 			default:
@@ -324,9 +293,10 @@ static NEVER_INLINE s32 savedata_op(ppu_thread& ppu, u32 operation, u32 version,
 			}
 			}

-			// Display Save Data List but do so asynchronously in the GUI thread.
-			bool hasNewData = (bool)listSet->newData; // newData
+			// Display Save Data List but do so asynchronously in the GUI thread.  For, qTimers only work using main UI thread.
 			atomic_t<bool> dlg_result(false);
+			bool hasNewData = (bool) listSet->newData; // Are we saving?
+

 			Emu.CallAfter([&]()
 			{
@@ -339,18 +309,28 @@ static NEVER_INLINE s32 savedata_op(ppu_thread& ppu, u32 operation, u32 version,
 				thread_ctrl::wait_for(1000);
 			}

-			// UI returns -1 for new save games
 			if (selected == -1)
 			{
-				save_entry.dirName = listSet->newData->dirName.get_ptr();
+				if (hasNewData)
+				{
+					save_entry.dirName = listSet->newData->dirName.get_ptr();
+				}
+				else
+				{
+					// This happens if someone tries to load but there is no data selected.  Some games will throw errors (Akiba) if cell_ok is returned
+					return CELL_CANCEL;
+				}
 			}
-
 			// Cancel selected in UI
-			if (selected == -2)
+			else if (selected == -2)
 			{
 				return CELL_CANCEL;
 			}

+			if ((result->result == CELL_SAVEDATA_CBRESULT_OK_LAST) || (result->result == CELL_SAVEDATA_CBRESULT_OK_LAST_NOCONFIRM))
+			{
+				return CELL_OK;
+			}
 		}

 		if (funcFixed)
@@ -358,19 +338,8 @@ static NEVER_INLINE s32 savedata_op(ppu_thread& ppu, u32 operation, u32 version,
 			// Fixed Callback
 			funcFixed(ppu, result, listGet, fixedSet);

-			// skip all following steps if OK_LAST
-			if (result->result == CELL_SAVEDATA_CBRESULT_OK_LAST)
-			{
-				return CELL_OK;
-			}
-
 			if (result->result < 0)
 			{
-				//TODO: Show msgDialog if required
-				// depends on fixedSet->option
-				// 0 = none
-				// 1 = skip confirmation dialog
-				
 				cellSaveData.warning("savedata_op(): funcFixed returned < 0.");
 				return CELL_SAVEDATA_ERROR_CBRESULT;
 			}
@@ -393,7 +362,10 @@ static NEVER_INLINE s32 savedata_op(ppu_thread& ppu, u32 operation, u32 version,
 			{
 				save_entry.dirName = fixedSet->dirName.get_ptr();
 			}
-
+			if ((result->result == CELL_SAVEDATA_CBRESULT_OK_LAST) || (result->result == CELL_SAVEDATA_CBRESULT_OK_LAST_NOCONFIRM))
+			{
+				return CELL_OK;
+			}
 		}

 		if (selected >= 0)
@@ -455,10 +427,8 @@ static NEVER_INLINE s32 savedata_op(ppu_thread& ppu, u32 operation, u32 version,

 		auto file_list = statGet->fileList.get_ptr();

-		for (auto&& entry : fs::dir(dir_path))
+		for (const auto& entry : fs::dir(dir_path))
 		{
-			entry.name = vfs::unescape(entry.name);
-
 			// only files, system files ignored, fileNum is limited by setBuf->fileListMax
 			if (!entry.is_directory && entry.name != "PARAM.SFO" && statGet->fileListNum++ < setBuf->fileListMax)
 			{
@@ -508,11 +478,6 @@ static NEVER_INLINE s32 savedata_op(ppu_thread& ppu, u32 operation, u32 version,
 			return CELL_SAVEDATA_ERROR_CBRESULT;
 		}

-		if (result->result == CELL_SAVEDATA_CBRESULT_OK_LAST)
-		{
-			return CELL_OK;
-		}
-		
 		if (statSet->setParam)
 		{
 			// Update PARAM.SFO
@@ -532,20 +497,18 @@ static NEVER_INLINE s32 savedata_op(ppu_thread& ppu, u32 operation, u32 version,
 				{ "TITLE", psf::string(128, statSet->setParam->title) },
 			});
 		}
-		//else if (psf.empty())
-		//{
-		//	// setParam is specified if something required updating. 
-		//	// Do not exit. Recreate mode will handle the rest
-		//	//return CELL_OK;
-		//}
+		else if (psf.empty())
+		{
+			// setParam is NULL for new savedata: abort operation
+
+			return CELL_OK;
+		}

 		switch (const u32 mode = statSet->reCreateMode & 0xffff)
 		{
 		case CELL_SAVEDATA_RECREATE_NO:
 		{
-			//CELL_SAVEDATA_RECREATE_NO = overwrite and let the user know, not data is corrupt.
-			//cellSaveData.error("Savedata %s considered broken", save_entry.dirName);			
-			//TODO: if this is a save, and it's not auto, then show a dialog
+			cellSaveData.error("Savedata %s considered broken", save_entry.dirName);
 			// fallthrough
 		}

@@ -557,8 +520,7 @@ static NEVER_INLINE s32 savedata_op(ppu_thread& ppu, u32 operation, u32 version,
 		case CELL_SAVEDATA_RECREATE_YES:
 		case CELL_SAVEDATA_RECREATE_YES_RESET_OWNER:
 		{
-
-			// TODO: Only delete data, not owner info
+			// TODO?
 			for (const auto& entry : fs::dir(dir_path))
 			{
 				if (!entry.is_directory)
@@ -567,13 +529,12 @@ static NEVER_INLINE s32 savedata_op(ppu_thread& ppu, u32 operation, u32 version,
 				}
 			}

-			//TODO: probably not deleting owner info
 			if (!statSet->setParam)
 			{
 				// Savedata deleted and setParam is NULL: delete directory and abort operation
 				if (fs::remove_dir(dir_path)) cellSaveData.error("savedata_op(): savedata directory %s deleted", save_entry.dirName);

-				//return CELL_OK;
+				return CELL_OK;
 			}

 			break;
@@ -587,13 +548,16 @@ static NEVER_INLINE s32 savedata_op(ppu_thread& ppu, u32 operation, u32 version,
 		}
 	}

-
+	if ((result->result == CELL_SAVEDATA_CBRESULT_OK_LAST) || (result->result == CELL_SAVEDATA_CBRESULT_OK_LAST_NOCONFIRM))
+	{
+		return CELL_OK;
+	}

 	// Create save directory if necessary
 	if (psf.size() && save_entry.isNew && !fs::create_dir(dir_path))
-	{		
+	{
+		// Let's ignore this error for now
 		cellSaveData.warning("savedata_op(): failed to create %s", dir_path);
-		return CELL_SAVEDATA_ERROR_ACCESS_ERROR;
 	}

 	// Enter the loop where the save files are read/created/deleted
@@ -613,13 +577,9 @@ static NEVER_INLINE s32 savedata_op(ppu_thread& ppu, u32 operation, u32 version,

 		if (result->result == CELL_SAVEDATA_CBRESULT_OK_LAST || result->result == CELL_SAVEDATA_CBRESULT_OK_LAST_NOCONFIRM)
 		{
-			//todo: display user prompt
 			break;
 		}

-		//TODO: Show progress
-		// if it's not an auto load/save
-
 		std::string file_path;

 		switch (const u32 type = fileSet->fileType)
@@ -720,57 +680,6 @@ static NEVER_INLINE s32 savedata_op(ppu_thread& ppu, u32 operation, u32 version,
 	return CELL_OK;
 }

-s32 static NEVER_INLINE save_op_get_list_item(vm::cptr<char> dirName, vm::ptr<CellSaveDataDirStat> dir, vm::ptr<CellSaveDataSystemFileParam> sysFileParam, vm::ptr<u32> bind, vm::ptr<u32> sizeKB, u32 userId)
-{
-
-	//TODO: accurately get the current user
-	if (userId == 0)
-	{
-		userId = 1u;
-	}
-	std::string save_path = vfs::get(fmt::format("/dev_hdd0/home/%08u/savedata/%s/", userId, dirName.get_ptr()));
-	std::string sfo = save_path + "PARAM.SFO";
-
-	if (!fs::is_dir(save_path) && !fs::is_file(sfo))
-	{
-		cellSaveData.error("cellSaveDataGetListItem(): Savedata at %s does not exist", dirName);
-		return CELL_SAVEDATA_ERROR_NODATA;
-	}
-
-	auto psf = psf::load_object(fs::file(sfo));
-
-	if (sysFileParam)
-	{
-		strcpy_trunc(sysFileParam->listParam, psf.at("SAVEDATA_LIST_PARAM").as_string());
-		strcpy_trunc(sysFileParam->title, psf.at("TITLE").as_string());
-		strcpy_trunc(sysFileParam->subTitle, psf.at("SUB_TITLE").as_string());
-		strcpy_trunc(sysFileParam->detail, psf.at("DETAIL").as_string());
-	}
-
-	if (dir)
-	{
-		fs::stat_t dir_info{};
-		if (!fs::stat(save_path, dir_info))
-		{
-			return CELL_SAVEDATA_ERROR_INTERNAL;
-		}
-
-		// get file stats, namely directory
-		strcpy_trunc(dir->dirName, dirName.get_ptr());
-		dir->atime = dir_info.atime;
-		dir->ctime = dir_info.ctime;
-		dir->mtime = dir_info.mtime;
-	}
-
-	if (bind)
-	{
-		//TODO: Set bind in accordance to any problems
-		*bind = 0;
-	}
-
-	return CELL_OK;
-}
-
 // Functions
 s32 cellSaveDataListSave2(ppu_thread& ppu, u32 version, PSetList setList, PSetBuf setBuf, PFuncList funcList,
 	PFuncStat funcStat, PFuncFile funcFile, u32 container, vm::ptr<void> userdata)
@@ -1039,8 +948,27 @@ s32 cellSaveDataFixedExport(ppu_thread& ppu, vm::cptr<char> dirName, u32 maxSize
 s32 cellSaveDataGetListItem(vm::cptr<char> dirName, vm::ptr<CellSaveDataDirStat> dir, vm::ptr<CellSaveDataSystemFileParam> sysFileParam, vm::ptr<u32> bind, vm::ptr<u32> sizeKB)
 {
 	cellSaveData.warning("cellSavaDataGetListItem(dirName=%s, dir=*0x%x, sysFileParam=*0x%x, bind=*0x%x, sizeKB=*0x%x)", dirName, dir, sysFileParam, bind, sizeKB);
-	
-	return save_op_get_list_item(dirName, dir, sysFileParam, bind, sizeKB, 0);
+
+	std::string save_path = vfs::get(fmt::format("/dev_hdd0/home/00000001/savedata/%s/", dirName.get_ptr()));
+	std::string sfo = save_path + "param.sfo";
+
+	if (!fs::is_dir(save_path) && !fs::is_file(sfo)) 
+	{
+		cellSaveData.error("cellSaveDataGetListItem(): Savedata at %s does not exist", dirName);
+		return CELL_SAVEDATA_ERROR_NODATA;
+	}
+
+	auto psf = psf::load_object(fs::file(sfo));
+
+	if (sysFileParam) 
+	{
+		strcpy_trunc(sysFileParam->listParam, psf.at("SAVEDATA_LIST_PARAM").as_string());
+		strcpy_trunc(sysFileParam->title, psf.at("TITLE").as_string());
+		strcpy_trunc(sysFileParam->subTitle, psf.at("SUB_TITLE").as_string());
+		strcpy_trunc(sysFileParam->detail, psf.at("DETAIL").as_string());
+	}
+
+	return CELL_OK;
 }

 s32 cellSaveDataUserListDelete(ppu_thread& ppu, u32 userId, PSetList setList, PSetBuf setBuf, PFuncList funcList, PFuncDone funcDone, u32 container, vm::ptr<void> userdata)
@@ -1080,14 +1008,14 @@ s32 cellSaveDataUserFixedExport(ppu_thread& ppu, u32 userId, vm::cptr<char> dirN

 s32 cellSaveDataUserGetListItem(u32 userId, vm::cptr<char> dirName, vm::ptr<CellSaveDataDirStat> dir, vm::ptr<CellSaveDataSystemFileParam> sysFileParam, vm::ptr<u32> bind, vm::ptr<u32> sizeKB)
 {
-	cellSaveData.warning("cellSavaDataGetListItem(dirName=%s, dir=*0x%x, sysFileParam=*0x%x, bind=*0x%x, sizeKB=*0x%x, userID=*0x%x)", dirName, dir, sysFileParam, bind, sizeKB, userId);
+	UNIMPLEMENTED_FUNC(cellSaveData);

-	return save_op_get_list_item(dirName, dir, sysFileParam, bind, sizeKB, userId);
+	return CELL_OK;
 }

 void cellSysutil_SaveData_init()
 {
-	REG_VAR(cellSysutil, g_savedata_context).flag(MFF_HIDDEN);
+	REG_VNID(cellSysutil, 0x00000000u, g_savedata_context);

 	// libsysutil functions:
 	REG_FUNC(cellSysutil, cellSaveDataEnableOverlay);
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once

 namespace vm { using namespace ps3; }

@@ -282,7 +282,8 @@ struct SaveDataEntry
 	s64 atime;
 	s64 mtime;
 	s64 ctime;
-	std::vector<uchar> iconBuf;
+	//void* iconBuf;
+	//u32 iconBufSize;
 	bool isNew;
 };

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Zangetsu38	ef46739f42	Update LLVM 5.0	2017-07-10 19:00:54 +02:00
Zion Nimchuk	2f72fcdb45	Initial LLVM 5 port	2017-07-10 19:00:54 +02:00
Zangetsu38	9565d64c7d	Update Project to Visual Studio 2017.	2017-07-10 19:00:54 +02:00
RipleyTom	fd061d9c55	Fix Stswi instruction	2017-07-10 19:00:51 +02:00
scribam	648ecc833c	Check if the pth is a valid directory before to look for icons.	2017-07-10 19:00:51 +02:00
Robbie	6a2628f139	Fix VFS default button (#2975 )	2017-07-10 19:00:51 +02:00
Megamouse	93c6826d35	Dagimon super mega level add stretchToDisplayArea to settingsdialog fix color picker and toolbar background settingsdialog adjustments fix tooltips + .pup fix adapter box	2017-07-10 19:00:51 +02:00
Megamouse	9d259368fa	Dagimon mega level ani fixes add color options for toolbar and game icons	2017-07-10 19:00:51 +02:00
Megamouse	6c09198799	Dagimon ultra level gui new design: hidpi fixes settings_dialog fix glitch welcome dialog hdpi adjustments about dialog hdpi adjustments about dialog fix size pad dialog hdpi adjustments settings_dialog: remove SetActiveTab	2017-07-10 19:00:51 +02:00
Megamouse	96c6a67607	Dagimon champion level	2017-07-10 19:00:51 +02:00
Megamouse	cec9a66393	Dagimon rookie level fix lib stuff fix build add slider amd searchbar disable gamelist toolbar per default Dagimon rookie level	2017-07-10 19:00:51 +02:00
Jake	e1f80819ca	Move vblank to 'custom' package_id, move fps limit sleep, fix dx12 0 size fb crash	2017-07-10 01:00:10 -05:00
Jake	8c64bd5754	tiles, sync, bufferId, flipReset	2017-07-08 16:54:18 -05:00
Jake	18964fbab3	gcm: Fix bufferId, sysutil: add refreshrate	2017-07-08 16:54:17 -05:00
Jake	2f0052f10b	add to auto lle	2017-07-08 16:54:17 -05:00
Jake	daed44574b	fix thread	2017-07-08 16:54:17 -05:00
Jake	afd10c5668	dma main fix	2017-07-08 16:54:16 -05:00
Jake	7f37cff370	fix labels	2017-07-08 16:54:16 -05:00
Jake	5966c1a85b	stuff	2017-07-08 16:54:15 -05:00
Jake	036aadc66b	Rebase and cleanup, removed irrelevant code, lv2 lle gcm for now	2017-07-08 16:54:15 -05:00