Fix

Add gcm to auto lle / liblv2
d3d12: Fix 0 sized framebuffer crashes
2026-01-12 11:40:16 +01:00 · 2017-07-31 09:16:37 +02:00 · 2017-07-31 09:16:37 +02:00 · 2017-07-31 09:16:37 +02:00 · 2017-07-31 09:16:37 +02:00 · 2017-07-31 09:16:37 +02:00
56 changed files with 752 additions and 321 deletions
--- a/.gitignore
+++ b/.gitignore
@ -55,6 +55,7 @@ rpcs3/git-version.h

 # Visual Studio Files
 .vs/*
+*.ipch
 *.vspx
 *.psess
 *.VC.*
--- a/.gitmodules
+++ b/.gitmodules
@ -8,7 +8,7 @@
 [submodule "llvm"]
 	path = llvm
 	url = https://github.com/llvm-mirror/llvm
-	branch = release_40
+	branch = release_50
 [submodule "rsx_program_decompiler"]
 	path = rsx_program_decompiler
 	url = https://github.com/RPCS3/rsx_program_decompiler
@ -17,7 +17,7 @@
 	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
@ -42,5 +42,5 @@
 	url = https://github.com/madler/zlib
 [submodule "3rdparty/hidapi"]
 	path = 3rdparty/hidapi
-	url = https://github.com/RPCS3/hidapi
+	url = https://github.com/Zangetsu38/hidapi
 	branch = master
--- a/3rdparty/hidapi
+++ b/3rdparty/hidapi
@ -1 +1 @@
-Subproject commit c095a22c53f13ccafc54dc59b5c882cd4036afd9
+Subproject commit 66eed15b0575acfed12e9a85fb77849d08dae47d
--- a/3rdparty/libpng
+++ b/3rdparty/libpng
@ -1 +1 @@
-Subproject commit 1dcba4d6eb1bad9500be877cbd1b0442fa92cfa6
+Subproject commit bbbcaf112213b3a7625e728365a4be462565b2cf
--- a/README.md
+++ b/README.md
@ -21,15 +21,15 @@ If you want to contribute please take a look at the [Coding Style](https://githu
 ## Dependencies

 ### Windows
-* [Visual Studio 2015](https://www.visualstudio.com/en-us/downloads/download-visual-studio-vs.aspx)
-* [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.7+](https://www.qt.io/download-open-source/) (required; add QTDIR `<QtInstallFolder>\5.7\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`
@ -47,10 +47,10 @@ 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.7\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.7\msvc2015_64`. </br>
+1) Go to the Qt5 menu and edit Qt5 options. Add the path to your Qt installation with compiler e.g. `C:\Qt\5.8\msvc2015_64`. </br>
 2) While selecting the rpcs3qt project, go to Qt5->Project Setting and select the version you added. 

 ### Building the projects
--- a/Utilities/JIT.cpp
+++ b/Utilities/JIT.cpp
@ -258,11 +258,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();
 	}
 };

--- a/Utilities/yaml-cpp.vcxproj
+++ b/Utilities/yaml-cpp.vcxproj
@ -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">
--- a/Vulkan/Vulkan-build/Vulkan-build.vcxproj
+++ b/Vulkan/Vulkan-build/Vulkan-build.vcxproj
@ -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>
--- a/Vulkan/glslang-build/glslang-build.vcxproj
+++ b/Vulkan/glslang-build/glslang-build.vcxproj
@ -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>
--- a/appveyor.yml
+++ b/appveyor.yml
@ -1,6 +1,6 @@
 version: '0.0.3-{build}'

-os: Visual Studio 2015
+os: Visual Studio 2017
 platform: x64
 clone_folder: C:\rpcs3
 clone_depth: 3
@ -15,8 +15,8 @@ before_build:
 - 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 14 Win64" -DZLIB_ROOT=C:/rpcs3/zlib/ -DVULKAN_PREBUILT=ON)
-   else (7z x llvmlibs.7z -aos -oC:\rpcs3 > null && cmake -G "Visual Studio 14 Win64" -DLLVM_DIR=C:/rpcs3/llvm_build/lib/cmake/llvm -DZLIB_ROOT=C:/rpcs3/zlib/ -DVULKAN_PREBUILT=ON)
+ - 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)

 build_script:
 - cmake --build . --config Release -- /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
@ -25,9 +25,9 @@ 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.8\msvc2015_64
+ - set QTDIR=C:\Qt\5.9\msvc2017_64
 - set OPENALDIR=C:\rpcs3\3rdparty\OpenAL
- - set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%QTDIR%;%PATH%
+ - set PATH=C:\Program Files (x86)\MSBuild\15.0\Bin;%QTDIR%;%PATH%
 - set COMMIT_SHA=%APPVEYOR_REPO_COMMIT:~0,8%

 artifacts:
--- a/asmjitsrc/asmjit.vcxproj
+++ b/asmjitsrc/asmjit.vcxproj
@ -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">
--- a/bin/Qt5Core.dll
+++ b/bin/Qt5Core.dll
--- a/bin/Qt5Gui.dll
+++ b/bin/Qt5Gui.dll
--- a/bin/Qt5Widgets.dll
+++ b/bin/Qt5Widgets.dll
--- a/bin/Qt5WinExtras.dll
+++ b/bin/Qt5WinExtras.dll
--- a/bin/imageformats/qicns.dll
+++ b/bin/imageformats/qicns.dll
--- a/bin/imageformats/qico.dll
+++ b/bin/imageformats/qico.dll
--- a/bin/platforms/qwindows.dll
+++ b/bin/platforms/qwindows.dll
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 4423e351176a92975739dd4ea43c2ff5877236ae
+Subproject commit 079c1f30fcb8a9c276bdb55a2433ba7a7db8dd90
--- a/llvm_build/llvm_build.vcxproj
+++ b/llvm_build/llvm_build.vcxproj
@ -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>
--- a/rpcs3-tests/rpcs3-tests.vcxproj
+++ b/rpcs3-tests/rpcs3-tests.vcxproj
@ -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>
--- a/rpcs3.sln
+++ b/rpcs3.sln
@ -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
--- a/rpcs3/CMakeLists.txt
+++ b/rpcs3/CMakeLists.txt
@ -6,7 +6,7 @@ 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)
@ -18,8 +18,8 @@ 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.
@ -38,7 +38,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()
--- a/rpcs3/D3D12GSRender.vcxproj
+++ b/rpcs3/D3D12GSRender.vcxproj
@ -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">
--- a/rpcs3/Emu/Cell/Modules/cellFont.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellFont.cpp
@ -554,7 +554,7 @@ s32 cellFontExtend(u32 a1, u32 a2, u32 a3)
 		//Something happens
 	}
 	//Something happens?
-	return CELL_OK;
+	return -1;
 }

 s32 cellFontRenderCharGlyphImageVertical()
--- a/rpcs3/Emu/Cell/Modules/cellGcmSys.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellGcmSys.cpp
@ -26,16 +26,19 @@ 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

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

 vm::ptr<CellGcmReportData> cellGcmGetReportDataAddressLocation(u32 index, u32 location)
@ -94,7 +102,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(0xC0000000 + index * 0x10);
+		return vm::ptr<CellGcmReportData>::make(0x40301400 + index * 0x10);
 	}

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

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

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

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

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

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

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

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

 s32 cellGcmInitDefaultFifoMode(s32 mode)
@ -280,8 +299,10 @@ 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>();

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

 u32 cellGcmGetFlipStatus()
@ -297,9 +318,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;
@ -324,8 +345,12 @@ 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);

-	current_config.ioAddress = 0;
-	current_config.localAddress = 0;
+	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;
 	local_size = 0;
 	local_addr = 0;

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

-	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;
+	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;

 	// 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);

-	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->gcm_info.context_addr = 0x40000000;
+	m_config->gcm_info.control_addr = 0x40100000;
+	m_config->gcm_info.label_addr = 0x40300000;

-	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->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));

-	vm::_ref<CellGcmContextData>(gcm_info.context_addr) = current_context;
-	context->set(gcm_info.context_addr);
+	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);

-	auto& ctrl = vm::_ref<CellGcmControl>(gcm_info.control_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);
 	ctrl.put = 0;
 	ctrl.get = 0;
 	ctrl.ref = -1;
@ -390,15 +424,10 @@ 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->label_addr = gcm_info.label_addr;
-	render->init(g_defaultCommandBufferBegin, cmdSize, gcm_info.control_addr, local_addr);
+	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);

 	return CELL_OK;
 }
@ -431,6 +460,10 @@ 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");
@ -439,16 +472,21 @@ s32 cellGcmSetDisplayBuffer(u8 id, u32 offset, u32 pitch, u32 width, u32 height)

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

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

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

-	if (id + 1 > render->gcm_buffers_count)
+	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 + 1 > render->display_buffers_count)
 	{
-		render->gcm_buffers_count = id + 1;
+		render->display_buffers_count = id + 1;
 	}

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

-	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;
-	}
+	fxm::get<GSRender>()->requested_vsync.store(mode == CELL_GCM_DISPLAY_VSYNC);
 }

 void cellGcmSetFlipStatus()
@ -488,6 +516,9 @@ 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)
 	{
@ -506,9 +537,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() == gcm_info.context_addr)
+	if (ctxt.addr() == m_config->gcm_info.context_addr)
 	{
-		vm::_ref<CellGcmControl>(gcm_info.control_addr).put += cmd_size;
+		vm::_ref<CellGcmControl>(m_config->gcm_info.control_addr).put += cmd_size;
 	}

 	return id;
@ -535,15 +566,12 @@ 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:
@ -557,6 +585,10 @@ 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");
@ -591,7 +623,7 @@ s32 cellGcmSetTileInfo(u8 index, u8 location, u32 offset, u32 size, u32 pitch, u
 	tile.base = base;
 	tile.bank = bank;

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

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

@ -633,6 +665,10 @@ 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");
@ -643,7 +679,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;
@ -654,7 +690,7 @@ void cellGcmSetZcull(u8 index, u32 offset, u32 width, u32 height, u32 cullStart,
 	zcull.sRef = sRef;
 	zcull.sMask = sMask;

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

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

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

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

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

-	if ((*id = fxm::get<GSRender>()->gcm_current_buffer) > UINT8_MAX)
+	if ((*id = fxm::get<GSRender>()->current_display_buffer) > UINT8_MAX)
 	{
 		fmt::throw_exception("Unexpected" HERE);
 	}
@ -876,7 +921,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;
@ -898,7 +943,6 @@ 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
@ -948,6 +992,7 @@ 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);
@ -962,7 +1007,6 @@ 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;
@ -1113,23 +1157,27 @@ s32 cellGcmSetCursorImageOffset(u32 offset)
 void cellGcmSetDefaultCommandBuffer()
 {
 	cellGcmSys.warning("cellGcmSetDefaultCommandBuffer()");
-	vm::write32(fxm::get<GSRender>()->ctxt_addr, gcm_info.context_addr);
+	auto m_config = fxm::get<CellGcmSysConfig>();
+	if (m_config)
+		vm::write32(m_config->ctxt_addr, m_config->gcm_info.context_addr);
 }

 s32 cellGcmSetDefaultCommandBufferAndSegmentWordSize(u32 bufferSize, u32 segmentSize)
 {
 	cellGcmSys.warning("cellGcmSetDefaultCommandBufferAndSegmentWordSize(bufferSize=0x%x, segmentSize=0x%x)", bufferSize, segmentSize);
-
-	const auto& put = vm::_ref<CellGcmControl>(gcm_info.control_addr).put;
-	const auto& get = vm::_ref<CellGcmControl>(gcm_info.control_addr).get;
+	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)
 	{
 		return CELL_GCM_ERROR_FAILURE;
 	}

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

 	return CELL_OK;
 }
@ -1148,9 +1196,11 @@ 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(gcm_info.label_addr + 0x10 * label_index, label_value);
+	vm::write32(m_config->gcm_info.label_addr + 0x10 * label_index, label_value);
 	return res < 0 ? CELL_GCM_ERROR_FAILURE : CELL_OK;
 }

@ -1159,6 +1209,10 @@ 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)
 	{
@ -1194,7 +1248,7 @@ s32 cellGcmSetTile(u8 index, u8 location, u32 offset, u32 size, u32 pitch, u8 co
 	tile.base = base;
 	tile.bank = bank;

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

@ -1286,8 +1340,11 @@ 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>(gcm_info.control_addr);
+	auto& ctrl = vm::_ref<CellGcmControl>(m_config->gcm_info.control_addr);

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

 	// Special
 	REG_FUNC(cellGcmSys, cellGcmCallback).flags = MFF_HIDDEN;
-});
+});
--- a/rpcs3/Emu/Cell/Modules/cellSpurs.cpp
+++ b/rpcs3/Emu/Cell/Modules/cellSpurs.cpp
@ -880,7 +880,7 @@ s32 _spurs::stop_event_helper(ppu_thread& ppu, vm::ptr<CellSpurs> spurs)
 		return CELL_SPURS_CORE_ERROR_STAT;
 	}

-	if (sys_event_port_send(ppu, spurs->eventPort, 0, 1, 0) != CELL_OK)
+	if (sys_event_port_send(spurs->eventPort, 0, 1, 0) != CELL_OK)
 	{
 		return CELL_SPURS_CORE_ERROR_STAT;
 	}
@ -2794,7 +2794,7 @@ s32 cellSpursEventFlagSet(ppu_thread& ppu, vm::ptr<CellSpursEventFlag> eventFlag
 		// Signal the PPU thread to be woken up
 		eventFlag->pendingRecvTaskEvents[ppuWaitSlot] = ppuEvents;

-		CHECK_SUCCESS(sys_event_port_send(ppu, eventFlag->eventPortId, 0, 0, 0));
+		CHECK_SUCCESS(sys_event_port_send(eventFlag->eventPortId, 0, 0, 0));
 	}

 	if (pendingRecv)
--- a/rpcs3/Emu/Cell/Modules/sceNp.cpp
+++ b/rpcs3/Emu/Cell/Modules/sceNp.cpp
@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx.h"
 #include "Emu/System.h"
 #include "Emu/Cell/PPUModule.h"

@ -911,6 +911,10 @@ s32 sceNpManagerRegisterCallback(vm::ptr<SceNpManagerCallback> callback, vm::ptr
 	{
 		return SCE_NP_ERROR_INVALID_ARGUMENT;
 	}
+	else
+	{
+		return SCE_NP_ERROR_NOT_INITIALIZED;
+	}

 	return CELL_OK;
 }
--- a/rpcs3/Emu/Cell/PPUModule.cpp
+++ b/rpcs3/Emu/Cell/PPUModule.cpp
@ -1198,6 +1198,7 @@ void ppu_load_exec(const ppu_exec_object& elf)
 			{ "cellFont", "libfont.sprx" },
 			{ "cellFontFT", "libfontFT.sprx" },
 			{ "cellFontFT", "libfreetype.sprx" },
+			{ "cellGcmSys", "libgcm_sys.sprx" },
 			{ "cellGifDec", "libgifdec.sprx" },
 			{ "cellGifDec", "libsre.sprx" },
 			{ "cellJpgDec", "libjpgdec.sprx" },
--- a/rpcs3/Emu/Cell/PPUTranslator.cpp
+++ b/rpcs3/Emu/Cell/PPUTranslator.cpp
@ -16,7 +16,7 @@ PPUTranslator::PPUTranslator(LLVMContext& context, Module* module, const ppu_mod
 	, m_module(module)
 	, m_is_be(false)
 	, m_info(info)
-	, m_pure_attr(AttributeSet::get(m_context, AttributeSet::FunctionIndex, {Attribute::NoUnwind, Attribute::ReadNone}))
+	, m_pure_attr(AttributeList::get(m_context,AttributeList::FunctionIndex, AttrBuilder().addAttribute(Attribute::NoUnwind).addAttribute(Attribute::ReadNone)))
 {
 	// There is no weak linkage on JIT, so let's create variables with different names for each module part
 	const u32 gsuffix = m_info.name.empty() ? info.funcs[0].addr : info.funcs[0].addr - m_info.segs[0].addr;
@ -133,7 +133,7 @@ Function* PPUTranslator::Translate(const ppu_function& info)
 	const u64 base = m_reloc ? m_reloc->addr : 0;
 	m_addr = info.addr - base;

-	m_thread = &*m_function->getArgumentList().begin();
+	m_thread = &*m_function->arg_begin();
 	m_base_loaded = m_ir->CreateLoad(m_base);

 	m_body = BasicBlock::Create(m_context, "__body", m_function);
--- a/rpcs3/Emu/Cell/PPUTranslator.h
+++ b/rpcs3/Emu/Cell/PPUTranslator.h
@ -120,7 +120,7 @@ class PPUTranslator final //: public CPUTranslator
 	std::map<u64, const ppu_reloc*> m_relocs;

 	// Attributes for function calls which are "pure" and may be optimized away if their results are unused
-	const llvm::AttributeSet m_pure_attr;
+	const llvm::AttributeList m_pure_attr;

 	// IR builder
 	llvm::IRBuilder<>* m_ir;
@ -404,7 +404,7 @@ public:

 	// Call a function with attribute list
 	template<typename... Args>
-	llvm::CallInst* Call(llvm::Type* ret, llvm::AttributeSet attr, llvm::StringRef name, Args... args)
+	llvm::CallInst* Call(llvm::Type* ret, llvm::AttributeList attr, llvm::StringRef name, Args... args)
 	{
 		// Call the function
 		return m_ir->CreateCall(m_module->getOrInsertFunction(name, llvm::FunctionType::get(ret, {args->getType()...}, false), attr), {args...});
@ -414,7 +414,7 @@ public:
 	template<typename... Args>
 	llvm::CallInst* Call(llvm::Type* ret, llvm::StringRef name, Args... args)
 	{
-		return Call(ret, llvm::AttributeSet{}, name, args...);
+		return Call(ret, llvm::AttributeList{}, name, args...);
 	}

 	// Handle compilation errors
--- a/rpcs3/Emu/Cell/lv2/sys_event.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_event.cpp
@ -418,7 +418,7 @@ error_code sys_event_port_disconnect(u32 eport_id)
 	return CELL_OK;
 }

-error_code sys_event_port_send(ppu_thread& ppu, u32 eport_id, u64 data1, u64 data2, u64 data3)
+error_code sys_event_port_send(u32 eport_id, u64 data1, u64 data2, u64 data3)
 {
 	sys_event.trace("sys_event_port_send(eport_id=0x%x, data1=0x%llx, data2=0x%llx, data3=0x%llx)", eport_id, data1, data2, data3);

--- a/rpcs3/Emu/Cell/lv2/sys_event.h
+++ b/rpcs3/Emu/Cell/lv2/sys_event.h
@ -137,4 +137,4 @@ error_code sys_event_port_create(vm::ps3::ptr<u32> eport_id, s32 port_type, u64
 error_code sys_event_port_destroy(u32 eport_id);
 error_code sys_event_port_connect_local(u32 event_port_id, u32 event_queue_id);
 error_code sys_event_port_disconnect(u32 eport_id);
-error_code sys_event_port_send(ppu_thread& ppu, u32 event_port_id, u64 data1, u64 data2, u64 data3);
+error_code sys_event_port_send(u32 event_port_id, u64 data1, u64 data2, u64 data3);
--- a/rpcs3/Emu/Cell/lv2/sys_prx.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_prx.cpp
@ -19,22 +19,16 @@ logs::channel sys_prx("sys_prx");

 static const std::unordered_map<std::string, int> s_prx_ignore
 {
-	{ "/dev_flash/sys/external/libad_async.sprx", 0 },
-	{ "/dev_flash/sys/external/libad_billboard_util.sprx", 0 },
-	{ "/dev_flash/sys/external/libad_core.sprx", 0 },
 	{ "/dev_flash/sys/external/libaudio.sprx", 0 },
 	{ "/dev_flash/sys/external/libbeisobmf.sprx", 0 },
 	{ "/dev_flash/sys/external/libcamera.sprx", 0 },
-	{ "/dev_flash/sys/external/libgcm_sys.sprx", 0 },
 	{ "/dev_flash/sys/external/libgem.sprx", 0 },
-	{ "/dev_flash/sys/external/libhttp.sprx", 0 },
 	{ "/dev_flash/sys/external/libio.sprx", 0 },
 	{ "/dev_flash/sys/external/libmedi.sprx", 0 },
 	{ "/dev_flash/sys/external/libmic.sprx", 0 },
 	{ "/dev_flash/sys/external/libnet.sprx", 0 },
 	{ "/dev_flash/sys/external/libnetctl.sprx", 0 },
 	{ "/dev_flash/sys/external/librudp.sprx", 0 },
-	{ "/dev_flash/sys/external/libssl.sprx", 0 },
 	{ "/dev_flash/sys/external/libsysutil.sprx", 0 },
 	{ "/dev_flash/sys/external/libsysutil_ap.sprx", 0 },
 	{ "/dev_flash/sys/external/libsysutil_authdialog.sprx", 0 },
--- a/rpcs3/Emu/Cell/lv2/sys_rsx.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_rsx.cpp
@ -1,14 +1,28 @@
 #include "stdafx.h"
 #include "Emu/Memory/Memory.h"
 #include "Emu/System.h"
-
+#include "Emu/Cell/PPUModule.h"
+#include "Emu/RSX/GSRender.h"
+#include "Emu/IdManager.h"
 #include "Emu/Cell/ErrorCodes.h"
 #include "sys_rsx.h"
+#include "sys_event.h"

 namespace vm { using namespace ps3; }

 logs::channel sys_rsx("sys_rsx");

+extern u64 get_timebased_time();
+
+struct SysRsxConfig {
+	be_t<u32> rsx_event_port{ 0 };
+	u32 driverInfo{ 0 };
+};
+
+u64 rsxTimeStamp() {
+	return get_timebased_time();
+}
+
 s32 sys_rsx_device_open()
 {
 	sys_rsx.todo("sys_rsx_device_open()");
@ -35,7 +49,10 @@ s32 sys_rsx_device_close()
 */
 s32 sys_rsx_memory_allocate(vm::ptr<u32> mem_handle, vm::ptr<u64> mem_addr, u32 size, u64 flags, u64 a5, u64 a6, u64 a7)
 {
-	sys_rsx.todo("sys_rsx_memory_allocate(mem_handle=*0x%x, mem_addr=*0x%x, size=0x%x, flags=0x%llx, a5=0x%llx, a6=0x%llx, a7=0x%llx)", mem_handle, mem_addr, size, flags, a5, a6, a7);
+	sys_rsx.warning("sys_rsx_memory_allocate(mem_handle=*0x%x, mem_addr=*0x%x, size=0x%x, flags=0x%llx, a5=0x%llx, a6=0x%llx, a7=0x%llx)", mem_handle, mem_addr, size, flags, a5, a6, a7);
+
+	*mem_handle = 1;
+	*mem_addr = vm::falloc(0xC0000000, size, vm::video);

 	return CELL_OK;
 }
@ -60,11 +77,86 @@ s32 sys_rsx_memory_free(u32 mem_handle)
 * @param mem_ctx (IN): mem_ctx given by sys_rsx_memory_allocate
 * @param system_mode (IN):
 */
-s32 sys_rsx_context_allocate(vm::ptr<u32> context_id, vm::ptr<u32> lpar_dma_control, vm::ptr<u32> lpar_driver_info, vm::ptr<u32> lpar_reports, u64 mem_ctx, u64 system_mode)
+s32 sys_rsx_context_allocate(vm::ptr<u32> context_id, vm::ptr<u64> lpar_dma_control, vm::ptr<u64> lpar_driver_info, vm::ptr<u64> lpar_reports, u64 mem_ctx, u64 system_mode)
 {
-	sys_rsx.todo("sys_rsx_context_allocate(context_id=*0x%x, lpar_dma_control=*0x%x, lpar_driver_info=*0x%x, lpar_reports=*0x%x, mem_ctx=0x%llx, system_mode=0x%llx)",
+	sys_rsx.warning("sys_rsx_context_allocate(context_id=*0x%x, lpar_dma_control=*0x%x, lpar_driver_info=*0x%x, lpar_reports=*0x%x, mem_ctx=0x%llx, system_mode=0x%llx)",
 		context_id, lpar_dma_control, lpar_driver_info, lpar_reports, mem_ctx, system_mode);

+	auto m_sysrsx = fxm::make<SysRsxConfig>();
+	if (!m_sysrsx)
+		fmt::throw_exception("sys_rsx_context_allocate called twice.");
+
+	u32 addr = vm::falloc(0x40000000, 0x400000);
+	if (addr == 0 || addr != 0x40000000)
+		fmt::throw_exception("Failed to alloc 0x40000000.");
+
+	*context_id = 0x55555555;
+
+	*lpar_dma_control = 0x40100000;
+	*lpar_driver_info = 0x40200000;
+	*lpar_reports = 0x40300000;
+
+	auto &reports = vm::_ref<RsxReports>(*lpar_reports);
+	std::memset(&reports, 0, sizeof(RsxReports));
+
+	for (int i = 0; i < 64; ++i)
+		reports.notify[i].timestamp = (u64)-1;
+
+	for (int i = 0; i < 256; ++i) {
+		reports.semaphore[i].val = 0x1337C0D3;
+		reports.semaphore[i].pad = 0x1337BABE;
+		reports.semaphore[i].timestamp = (u64)-1; // technically different but should be fine
+	}
+
+	for (int i = 0; i < 2048; ++i)
+		reports.report[i].timestamp = (u64)-1;
+
+	auto &driverInfo = vm::_ref<RsxDriverInfo>(*lpar_driver_info);
+
+	std::memset(&driverInfo, 0, sizeof(RsxDriverInfo));
+
+	driverInfo.version_driver = 0x211;
+	driverInfo.version_gpu = 0x5c;
+	driverInfo.memory_size = 0xFE00000;
+	driverInfo.nvcore_frequency = 500000000; // 0x1DCD6500
+	driverInfo.memory_frequency = 650000000; // 0x26BE3680
+	driverInfo.reportsNotifyOffset = 0x1000;
+	driverInfo.reportsOffset = 0;
+	driverInfo.reportsReportOffset = 0x1400;
+	driverInfo.systemModeFlags = system_mode;
+	driverInfo.hardware_channel = 1; // * i think* this 1 for games, 0 for vsh
+
+	m_sysrsx->driverInfo = *lpar_driver_info;
+
+	auto &dmaControl = vm::_ref<RsxDmaControl>(*lpar_dma_control);
+	dmaControl.get = 0;
+	dmaControl.put = 0;
+	dmaControl.ref = 0xFFFFFFFF;
+
+	if (false/*system_mode == CELL_GCM_SYSTEM_MODE_IOMAP_512MB*/)
+		RSXIOMem.SetRange(0, 0x20000000 /*512MB*/);
+	else
+		RSXIOMem.SetRange(0, 0x10000000 /*256MB*/);
+
+	sys_event_queue_attribute_t attr;
+	attr.protocol = SYS_SYNC_PRIORITY;
+	attr.type = SYS_PPU_QUEUE;
+	auto queueId = vm::make_var<u32>(0);
+	sys_event_queue_create(queueId, vm::make_var(attr), 0, 0x20);
+	driverInfo.handler_queue = queueId->value();
+
+	sys_event_port_create(queueId, SYS_EVENT_PORT_LOCAL, 0);
+	sys_event_port_connect_local(queueId->value(), driverInfo.handler_queue);
+
+	m_sysrsx->rsx_event_port = queueId->value();
+
+	const auto render = fxm::get<GSRender>();
+	render->display_buffers_count = 0;
+	render->current_display_buffer = 0;
+	render->main_mem_addr = 0;
+	render->label_addr = *lpar_reports;
+	render->init(0, 0, *lpar_dma_control, 0xC0000000);
+
 	return CELL_OK;
 }

@ -89,9 +181,11 @@ s32 sys_rsx_context_free(u32 context_id)
 */
 s32 sys_rsx_context_iomap(u32 context_id, u32 io, u32 ea, u32 size, u64 flags)
 {
-	sys_rsx.todo("sys_rsx_context_iomap(context_id=0x%x, io=0x%x, ea=0x%x, size=0x%x, flags=0x%llx)", context_id, io, ea, size, flags);
-
-	return CELL_OK;
+	sys_rsx.warning("sys_rsx_context_iomap(context_id=0x%x, io=0x%x, ea=0x%x, size=0x%x, flags=0x%llx)", context_id, io, ea, size, flags);
+	if (size == 0) return CELL_OK;
+	if (RSXIOMem.Map(ea, size, io))
+		return CELL_OK;
+	return CELL_EINVAL;
 }

 /*
@ -101,58 +195,142 @@ s32 sys_rsx_context_iomap(u32 context_id, u32 io, u32 ea, u32 size, u64 flags)
 * @param io_addr (IN): IO address. E.g. 0x00600000 (Start page 6)
 * @param size (IN): Size to unmap in byte. E.g. 0x00200000
 */
-s32 sys_rsx_context_iounmap(u32 context_id, u32 a2, u32 io_addr, u32 size)
+s32 sys_rsx_context_iounmap(u32 context_id, u32 io_addr, u32 a3, u32 size)
 {
-	sys_rsx.todo("sys_rsx_context_iounmap(context_id=0x%x, a2=0x%x, io_addr=0x%x, size=0x%x)", context_id, a2, io_addr, size);
-
-	return CELL_OK;
+	sys_rsx.warning("sys_rsx_context_iounmap(context_id=0x%x, io_addr=0x%x, a3=0x%x, size=0x%x)", context_id, io_addr, a3, size);
+	if (RSXIOMem.UnmapAddress(io_addr, size))
+		return CELL_OK;
+	return CELL_EINVAL;
 }

 /*
 * lv2 SysCall 674 (0x2A2): sys_rsx_context_attribute
 * @param context_id (IN): RSX context, e.g. 0x55555555
- * @param package_id (IN): 
- * @param a3 (IN): 
- * @param a4 (IN): 
- * @param a5 (IN): 
- * @param a6 (IN): 
+ * @param package_id (IN):
+ * @param a3 (IN):
+ * @param a4 (IN):
+ * @param a5 (IN):
+ * @param a6 (IN):
 */
 s32 sys_rsx_context_attribute(s32 context_id, u32 package_id, u64 a3, u64 a4, u64 a5, u64 a6)
 {
-	sys_rsx.todo("sys_rsx_context_attribute(context_id=0x%x, package_id=0x%x, a3=0x%llx, a4=0x%llx, a5=0x%llx, a6=0x%llx)", context_id, package_id, a3, a4, a5, a6);
+	// Flip/queue/user command/vblank as trace to help with log spam
+	if (package_id == 0x102 || package_id == 0x103 || package_id == 0xFED || package_id == 0xFEF)
+		sys_rsx.trace("sys_rsx_context_attribute(context_id=0x%x, package_id=0x%x, a3=0x%llx, a4=0x%llx, a5=0x%llx, a6=0x%llx)", context_id, package_id, a3, a4, a5, a6);
+	else
+		sys_rsx.warning("sys_rsx_context_attribute(context_id=0x%x, package_id=0x%x, a3=0x%llx, a4=0x%llx, a5=0x%llx, a6=0x%llx)", context_id, package_id, a3, a4, a5, a6);

-	switch(package_id)
+	// todo: these event ports probly 'shouldnt' be here as i think its supposed to be interrupts that are sent from rsx somewhere in lv1
+
+	const auto render = fxm::get<GSRender>();
+
+	//hle protection
+	if (render->isHLE)
+		return 0;
+
+	auto m_sysrsx = fxm::get<SysRsxConfig>();
+
+	auto &driverInfo = vm::_ref<RsxDriverInfo>(m_sysrsx->driverInfo);
+	switch (package_id)
 	{
 	case 0x001: // FIFO
-		break;
-	
-	case 0x100: // Display mode set
+		render->ctrl->get = a3;
+		render->ctrl->put = a4;
 		break;

-	case 0x101: // Display sync
+	case 0x100: // Display mode set
+		break;
+	case 0x101: // Display sync set, cellGcmSetFlipMode
+		// a4 == 2 is vsync, a4 == 1 is hsync
+		render->requested_vsync.store(a4 == 2);
 		break;

 	case 0x102: // Display flip
+		driverInfo.head[a3].flipFlags |= 0x80000000;
+		driverInfo.head[a3].lastFlipTime = rsxTimeStamp(); // should rsxthread set this?
+		// lets give this a shot for giving bufferid back to gcm
+		driverInfo.head[a3].flipBufferId = driverInfo.head[a3].queuedBufferId;
+		// seems gcmSysWaitLabel uses this offset, so lets set it to 0 every flip
+		vm::_ref<u32>(0x40300010) = 0;
+		if (a3 == 0)
+			sys_event_port_send(m_sysrsx->rsx_event_port, 0, (1 << 3), 0);
+		if (a3 == 1)
+			sys_event_port_send(m_sysrsx->rsx_event_port, 0, (1 << 4), 0);
 		break;

-	case 0x103: // ?
+	case 0x103: // Display Queue
+		driverInfo.head[a3].queuedBufferId = a4;
+		driverInfo.head[a3].flipFlags |= 0x40000000 | (1 << a4);
+		if (a3 == 0)
+			sys_event_port_send(m_sysrsx->rsx_event_port, 0, (1 << 5), 0);
+		if (a3 == 1)
+			sys_event_port_send(m_sysrsx->rsx_event_port, 0, (1 << 6), 0);
 		break;
-
 	case 0x104: // Display buffer
+	{
+		u8 id = a3 & 0xFF;
+		u32 width = (a4 >> 32) & 0xFFFFFFFF;
+		u32 height = a4 & 0xFFFFFFFF;
+		u32 pitch = (a5 >> 32) & 0xFFFFFFFF;
+		u32 offset = a5 & 0xFFFFFFFF;
+		if (id > 7)
+			return -17;
+		render->display_buffers[id].width = width;
+		render->display_buffers[id].height = height;
+		render->display_buffers[id].pitch = pitch;
+		render->display_buffers[id].offset = offset;
+
+		render->display_buffers_count = std::max((u32)id + 1, render->display_buffers_count);
+	}
+	break;
+	case 0x105: // destroy buffer?
 		break;

 	case 0x106: // ? (Used by cellGcmInitPerfMon)
 		break;
+	case 0x108: // cellGcmSetSecondVFrequency
+		// a4 == 3, CELL_GCM_DISPLAY_FREQUENCY_59_94HZ
+		// a4 == 2, CELL_GCM_DISPLAY_FREQUENCY_SCANOUT
+		// a4 == 4, CELL_GCM_DISPLAY_FREQUENCY_DISABLE
+		// Note: Scanout/59_94 is ignored currently as we report refresh rate of 59_94hz as it is, so the difference doesnt matter
+		render->enable_second_vhandler.store(a4 != 4);
+		break;
+	case 0x10a: // ? Involved in managing flip status through cellGcmResetFlipStatus
+	{
+		if (a3 > 7)
+			return -17;
+		u32 flipStatus = driverInfo.head[a3].flipFlags;
+		flipStatus = (flipStatus & a4) | a5;
+		driverInfo.head[a3].flipFlags = flipStatus;
+	}
+	break;

-	case 0x10a: // ?
+	case 0x10D: // Called by cellGcmInitCursor
 		break;

 	case 0x300: // Tiles
-		break;
+	{
+		//a4 high bits = ret.tile = (location + 1) | (bank << 4) | ((offset / 0x10000) << 16) | (location << 31);
+		//a4 low bits = ret.limit = ((offset + size - 1) / 0x10000) << 16 | (location << 31);
+		//a5 high bits = ret.pitch = (pitch / 0x100) << 8;
+		//a5 low bits = ret.format = base | ((base + ((size - 1) / 0x10000)) << 13) | (comp << 26) | (1 << 30);
+
+		auto& tile = render->tiles[a3];
+		tile.location = ((a4 >> 32) & 0xF) - 1;
+		tile.offset = ((((a4 >> 32) & 0xFFFFFFFF) >> 16) * 0x10000);
+		tile.size = ((((a4 & 0x7FFFFFFF) >> 16) + 1) * 0x10000) - tile.offset;
+		tile.pitch = (((a5 >> 32) & 0xFFFFFFFF) >> 8) * 0x100;
+		tile.comp = ((a5 & 0xFFFFFFFF) >> 26) & 0xF;
+		tile.base = (a5 & 0xFFFFFFFF) & 0x7FF;
+		tile.bank = (((a4 >> 32) & 0xFFFFFFFF) >> 4) & 0xF;
+		tile.binded = a5 != 0;
+	}
+	break;

 	case 0x301: // Depth-buffer (Z-cull)
 		break;
-
+	case 0x302: // something with zcull
+		break;
 	case 0x600: // Framebuffer setup
 		break;

@ -162,6 +340,24 @@ s32 sys_rsx_context_attribute(s32 context_id, u32 package_id, u64 a3, u64 a4, u6
 	case 0x602: // Framebuffer blit sync
 		break;

+	case 0x603: // Framebuffer close
+		break;
+
+	case 0xFED: // hack: vblank command
+		// todo: this is wrong and should be 'second' vblank handler and freq, but since currently everything is reported as being 59.94, this should be fine
+		driverInfo.head[a3].vBlankCount++;
+		driverInfo.head[a3].lastSecondVTime = rsxTimeStamp();
+		sys_event_port_send(m_sysrsx->rsx_event_port, 0, (1 << 1), 0);
+		if (render->enable_second_vhandler)
+			sys_event_port_send(m_sysrsx->rsx_event_port, 0, (1 << 11), 0); // second vhandler
+		break;
+	case 0xFEF: // hack: user command
+		// 'custom' invalid package id for now 
+		// as i think we need custom lv1 interrupts to handle this accurately
+		// this also should probly be set by rsxthread
+		driverInfo.userCmdParam = a4;
+		sys_event_port_send(m_sysrsx->rsx_event_port, 0, (1 << 7), 0);
+		break;
 	default:
 		return CELL_EINVAL;
 	}
@ -175,19 +371,19 @@ s32 sys_rsx_context_attribute(s32 context_id, u32 package_id, u64 a3, u64 a4, u6
 * @param a2 (OUT): Unused?
 * @param dev_id (IN): An immediate value and always 8. (cellGcmInitPerfMon uses 11, 10, 9, 7, 12 successively).
 */
-s32 sys_rsx_device_map(vm::ptr<u32> addr, vm::ptr<u32> a2, u32 dev_id)
+s32 sys_rsx_device_map(vm::ptr<u64> addr, vm::ptr<u64> a2, u32 dev_id)
 {
-	sys_rsx.todo("sys_rsx_device_map(addr=*0x%x, a2=*0x%x, dev_id=0x%x)", addr, a2, dev_id);
+	sys_rsx.warning("sys_rsx_device_map(addr=*0x%x, a2=*0x%x, dev_id=0x%x)", addr, a2, dev_id);

-	if (dev_id > 15) {
-		// TODO: Throw RSX error
-		return CELL_EINVAL;
+	if (dev_id != 8) {
+		// TODO: lv1 related 
+		fmt::throw_exception("sys_rsx_device_map: Invalid dev_id %d", dev_id);
 	}

-	if (dev_id == 0 || dev_id > 8) {
-		// TODO: lv1 related so we may ignore it.
-		// if (something) { return CELL_EPERM; }
-	}
+	// a2 seems to not be referenced in cellGcmSys
+	*a2 = 0;
+
+	*addr = 0x40000000;

 	return CELL_OK;
 }
@ -203,9 +399,12 @@ s32 sys_rsx_device_unmap(u32 dev_id)
 	return CELL_OK;
 }

-s32 sys_rsx_attribute(u32 a1, u32 a2, u32 a3, u32 a4, u32 a5)
+/*
+ * lv2 SysCall 677 (0x2A5): sys_rsx_attribute
+ */
+s32 sys_rsx_attribute(u32 packageId, u32 a2, u32 a3, u32 a4, u32 a5)
 {
-	sys_rsx.todo("sys_rsx_attribute(a1=0x%x, a2=0x%x, a3=0x%x, a4=0x%x, a5=0x%x)", a1, a2, a3, a4, a5);
+	sys_rsx.warning("sys_rsx_attribute(packageId=0x%x, a2=0x%x, a3=0x%x, a4=0x%x, a5=0x%x)", packageId, a2, a3, a4, a5);

 	return CELL_OK;
-}
+}
--- a/rpcs3/Emu/Cell/lv2/sys_rsx.h
+++ b/rpcs3/Emu/Cell/lv2/sys_rsx.h
@ -1,15 +1,103 @@
 #pragma once

+struct RsxDriverInfo {
+	be_t<u32> version_driver;     // 0x0
+	be_t<u32> version_gpu;        // 0x4
+	be_t<u32> memory_size;        // 0x8
+	be_t<u32> hardware_channel;   // 0xC
+	be_t<u32> nvcore_frequency;   // 0x10
+	be_t<u32> memory_frequency;   // 0x14
+	be_t<u32> unk1[4];            // 0x18 - 0x24
+	be_t<u32> unk2;               // 0x28 -- pgraph stuff
+	be_t<u32> reportsNotifyOffset;// 0x2C offset to notify memory
+	be_t<u32> reportsOffset;      // 0x30 offset to reports memory
+	be_t<u32> reportsReportOffset;// 0x34 offset to reports in reports memory
+	be_t<u32> unk3[6];            // 0x38-0x54
+	be_t<u32> systemModeFlags;    // 0x54
+	u8 unk4[0x1064];              // 0x10B8
+	struct Head {
+		be_t<u64> lastFlipTime;    // 0x0 last flip time
+		be_t<u32> flipFlags;       // 0x8 flags to handle flip/queue
+		be_t<u32> unk1;            // 0xC
+		be_t<u32> flipBufferId;    // 0x10
+		be_t<u32> queuedBufferId;  // 0x14 todo: this is definately not this variable but its 'unused' so im using it for queueId to pass to flip handler
+		be_t<u32> unk3;            // 0x18
+		be_t<u32> unk6;            // 0x18 possible low bits of time stamp?  used in getlastVBlankTime
+		be_t<u64> lastSecondVTime; // 0x20 last time for second vhandler freq
+		be_t<u64> unk4;            // 0x28 
+		be_t<u64> vBlankCount;     // 0x30
+		be_t<u32> unk;             // 0x38 possible u32, 'flip field', top/bottom for interlaced
+		be_t<u32> unk5;            // 0x3C possible high bits of time stamp? used in getlastVBlankTime
+	} head[8]; // size = 0x40, 0x200
+	be_t<u32> unk7;          // 0x12B8
+	be_t<u32> unk8;          // 0x12BC
+	be_t<u32> handlers;      // 0x12C0 -- flags showing which handlers are set
+	be_t<u32> unk9;          // 0x12C4
+	be_t<u32> unk10;         // 0x12C8
+	be_t<u32> userCmdParam;  // 0x12CC
+	be_t<u32> handler_queue; // 0x12D0
+	be_t<u32> unk11;         // 0x12D4
+	be_t<u32> unk12;         // 0x12D8
+	be_t<u32> unk13;         // 0x12DC
+	be_t<u32> unk14;         // 0x12E0
+	be_t<u32> unk15;         // 0x12E4
+	be_t<u32> unk16;         // 0x12E8
+	be_t<u32> unk17;         // 0x12F0
+	be_t<u32> lastError;     // 0x12F4 error param for cellGcmSetGraphicsHandler
+							 // todo: theres more to this 
+};
+static_assert(sizeof(RsxDriverInfo) == 0x12F8, "rsxSizeTest");
+static_assert(sizeof(RsxDriverInfo::Head) == 0x40, "rsxHeadSizeTest");
+
+struct RsxDmaControl {
+	u8 resv[0x40];
+	atomic_be_t<u32> put;
+	atomic_be_t<u32> get;
+	atomic_be_t<u32> ref;
+	be_t<u32> unk[2];
+	be_t<u32> unk1;
+};
+
+struct RsxSemaphore {
+	be_t<u32> val;
+	be_t<u32> pad;
+	be_t<u64> timestamp;
+};
+
+struct RsxNotify {
+	be_t<u64> timestamp;
+	be_t<u64> zero;
+};
+
+struct RsxReport {
+	be_t<u64> timestamp;
+	be_t<u32> val;
+	be_t<u32> pad;
+};
+
+struct RsxReports {
+	RsxSemaphore semaphore[0x100];
+	RsxNotify notify[64];
+	RsxReport report[2048];
+};
+
+struct RsxDisplayInfo {
+	be_t<u32> offset;
+	be_t<u32> pitch;
+	be_t<u32> width;
+	be_t<u32> height;
+};
+
 // SysCalls
 s32 sys_rsx_device_open();
 s32 sys_rsx_device_close();
 s32 sys_rsx_memory_allocate(vm::ps3::ptr<u32> mem_handle, vm::ps3::ptr<u64> mem_addr, u32 size, u64 flags, u64 a5, u64 a6, u64 a7);
 s32 sys_rsx_memory_free(u32 mem_handle);
-s32 sys_rsx_context_allocate(vm::ps3::ptr<u32> context_id, vm::ps3::ptr<u32> lpar_dma_control, vm::ps3::ptr<u32> lpar_driver_info, vm::ps3::ptr<u32> lpar_reports, u64 mem_ctx, u64 system_mode);
+s32 sys_rsx_context_allocate(vm::ps3::ptr<u32> context_id, vm::ps3::ptr<u64> lpar_dma_control, vm::ps3::ptr<u64> lpar_driver_info, vm::ps3::ptr<u64> lpar_reports, u64 mem_ctx, u64 system_mode);
 s32 sys_rsx_context_free(u32 context_id);
 s32 sys_rsx_context_iomap(u32 context_id, u32 io, u32 ea, u32 size, u64 flags);
 s32 sys_rsx_context_iounmap(u32 context_id, u32 a2, u32 io_addr, u32 size);
 s32 sys_rsx_context_attribute(s32 context_id, u32 package_id, u64 a3, u64 a4, u64 a5, u64 a6);
-s32 sys_rsx_device_map(vm::ps3::ptr<u32> addr, vm::ps3::ptr<u32> a2, u32 dev_id);
+s32 sys_rsx_device_map(vm::ps3::ptr<u64> addr, vm::ps3::ptr<u64> a2, u32 dev_id);
 s32 sys_rsx_device_unmap(u32 dev_id);
-s32 sys_rsx_attribute(u32 a1, u32 a2, u32 a3, u32 a4, u32 a5);
+s32 sys_rsx_attribute(u32 a1, u32 a2, u32 a3, u32 a4, u32 a5);
--- a/rpcs3/Emu/Memory/vm.cpp
+++ b/rpcs3/Emu/Memory/vm.cpp
@ -786,6 +786,7 @@ namespace vm
 				std::make_shared<block_t>(0xC0000000, 0x10000000), // video
 				std::make_shared<block_t>(0xD0000000, 0x10000000), // stack
 				std::make_shared<block_t>(0xE0000000, 0x20000000), // SPU reserved
+				std::make_shared<block_t>(0x40000000, 0x10000000), // rsx contexts
 			};
 		}
 	}
--- a/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp
+++ b/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp
@ -523,10 +523,9 @@ void D3D12GSRender::flip(int buffer)
 		size_t offset = 0;
 		if (false)
 		{
-			CellGcmDisplayInfo* buffers = nullptr;// = vm::ps3::_ptr<CellGcmDisplayInfo>(m_gcm_buffers_addr);
-			u32 addr = rsx::get_address(gcm_buffers[gcm_current_buffer].offset, CELL_GCM_LOCATION_LOCAL);
-			w = gcm_buffers[gcm_current_buffer].width;
-			h = gcm_buffers[gcm_current_buffer].height;
+			u32 addr = rsx::get_address(display_buffers[current_display_buffer].offset, CELL_GCM_LOCATION_LOCAL);
+			w = display_buffers[current_display_buffer].width;
+			h = display_buffers[current_display_buffer].height;
 			u8 *src_buffer = vm::ps3::_ptr<u8>(addr);

 			row_pitch = align(w * 4, 256);
--- a/rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.cpp
+++ b/rpcs3/Emu/RSX/D3D12/D3D12RenderTargetSets.cpp
@ -175,9 +175,16 @@ void D3D12GSRender::prepare_render_targets(ID3D12GraphicsCommandList *copycmdlis
 		rsx::method_registers.clear_color_b() / 255.f,
 		rsx::method_registers.clear_color_a() / 255.f,
 	};
+
+	u32 clip_width = rsx::method_registers.surface_clip_width();
+	u32 clip_height = rsx::method_registers.surface_clip_height();
+
+	if (clip_height == 0 || clip_width == 0)
+		return;
+
 	m_rtts.prepare_render_target(copycmdlist,
 		rsx::method_registers.surface_color(), rsx::method_registers.surface_depth_fmt(),
-		rsx::method_registers.surface_clip_width(), rsx::method_registers.surface_clip_height(),
+		clip_width, clip_height,
 		rsx::method_registers.surface_color_target(),
 		get_color_surface_addresses(), get_zeta_surface_address(),
 		m_device.Get(), clear_color, 1.f, 0);
@ -322,7 +329,7 @@ void D3D12GSRender::copy_render_target_to_dma_location()
 	{
 		for (u8 i : get_rtt_indexes(rsx::method_registers.surface_color_target()))
 		{
-			if (!address_color[i])
+			if (!address_color[i] || std::get<1>(m_rtts.m_bound_render_targets[i]) == nullptr)
 				continue;
 			color_buffer_offset_in_heap[i] = download_to_readback_buffer(m_device.Get(), get_current_resource_storage().command_list.Get(), m_readback_resources, std::get<1>(m_rtts.m_bound_render_targets[i]), rsx::method_registers.surface_color());
 			invalidate_address(address_color[i]);
@ -374,7 +381,7 @@ void D3D12GSRender::copy_render_target_to_dma_location()

 		for (u8 i : get_rtt_indexes(rsx::method_registers.surface_color_target()))
 		{
-			if (!address_color[i])
+			if (!address_color[i] || std::get<1>(m_rtts.m_bound_render_targets[i]) == nullptr)
 				continue;
 			copy_readback_buffer_to_dest(dest_buffer[i], m_readback_resources, color_buffer_offset_in_heap[i], srcPitch, dstPitch, clip_h);
 		}
--- a/rpcs3/Emu/RSX/GL/GLGSRender.cpp
+++ b/rpcs3/Emu/RSX/GL/GLGSRender.cpp
@ -985,9 +985,9 @@ void GLGSRender::flip(int buffer)
 		return;
 	}

-	u32 buffer_width = gcm_buffers[buffer].width;
-	u32 buffer_height = gcm_buffers[buffer].height;
-	u32 buffer_pitch = gcm_buffers[buffer].pitch;
+	u32 buffer_width = display_buffers[buffer].width;
+	u32 buffer_height = display_buffers[buffer].height;
+	u32 buffer_pitch = display_buffers[buffer].pitch;

 	// Calculate blit coordinates
 	coordi aspect_ratio;
@ -1016,7 +1016,7 @@ void GLGSRender::flip(int buffer)
 	aspect_ratio.size = new_size;

 	// Find the source image
-	rsx::tiled_region buffer_region = get_tiled_address(gcm_buffers[buffer].offset, CELL_GCM_LOCATION_LOCAL);
+	rsx::tiled_region buffer_region = get_tiled_address(display_buffers[buffer].offset, CELL_GCM_LOCATION_LOCAL);
 	u32 absolute_address = buffer_region.address + buffer_region.base;
 	gl::texture *render_target_texture = m_rtts.get_texture_from_render_target_if_applicable(absolute_address);

--- a/rpcs3/Emu/RSX/RSXThread.cpp
+++ b/rpcs3/Emu/RSX/RSXThread.cpp
@ -34,53 +34,55 @@ namespace rsx

 		switch (location)
 		{
-			case CELL_GCM_CONTEXT_DMA_MEMORY_FRAME_BUFFER:
-			case CELL_GCM_LOCATION_LOCAL:
+		case CELL_GCM_CONTEXT_DMA_MEMORY_FRAME_BUFFER:
+		case CELL_GCM_LOCATION_LOCAL:
+		{
+			// TODO: Don't use unnamed constants like 0xC0000000
+			return 0xC0000000 + offset;
+		}
+
+		case CELL_GCM_CONTEXT_DMA_MEMORY_HOST_BUFFER:
+		case CELL_GCM_LOCATION_MAIN:
+		{
+			if (u32 result = RSXIOMem.RealAddr(offset))
 			{
-				// TODO: Don't use unnamed constants like 0xC0000000
-				return 0xC0000000 + offset;
+				return result;
 			}

-			case CELL_GCM_CONTEXT_DMA_MEMORY_HOST_BUFFER:
-			case CELL_GCM_LOCATION_MAIN:
+			fmt::throw_exception("GetAddress(offset=0x%x, location=0x%x): RSXIO memory not mapped" HERE, offset, location);
+		}
+
+		case CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_LOCAL:
+			return 0x40301400 + offset;
+
+		case CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_MAIN:
+		{
+			if (u32 result = RSXIOMem.RealAddr(0x0e000000 + offset))
 			{
-				if (u32 result = RSXIOMem.RealAddr(offset))
-				{
-					return result;
-				}
-
-				fmt::throw_exception("GetAddress(offset=0x%x, location=0x%x): RSXIO memory not mapped" HERE, offset, location);
-
-				//if (fxm::get<GSRender>()->strict_ordering[offset >> 20])
-				//{
-				//	_mm_mfence(); // probably doesn't have any effect on current implementation
-				//}
+				return result;
 			}

-			case CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_REPORT:
-				return 0x100000 + offset; // TODO: Properly implement
+			fmt::throw_exception("GetAddress(offset=0x%x, location=0x%x): RSXIO memory not mapped" HERE, offset, location);
+		}

-			case CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_MAIN:
-				return 0x800 + offset;	// TODO: Properly implement
+		case CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_NOTIFY0:
+			fmt::throw_exception("Unimplemented CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_NOTIFY0 (offset=0x%x, location=0x%x)" HERE, offset, location);

-			case CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_NOTIFY0:
-				return 0x40 + offset; // TODO: Properly implement
+		case CELL_GCM_CONTEXT_DMA_NOTIFY_MAIN_0:
+			fmt::throw_exception("Unimplemented CELL_GCM_CONTEXT_DMA_NOTIFY_MAIN_0 (offset=0x%x, location=0x%x)" HERE, offset, location);

-			case CELL_GCM_CONTEXT_DMA_NOTIFY_MAIN_0:
-				fmt::throw_exception("Unimplemented CELL_GCM_CONTEXT_DMA_NOTIFY_MAIN_0 (offset=0x%x, location=0x%x)" HERE, offset, location);
+		case CELL_GCM_CONTEXT_DMA_SEMAPHORE_RW:
+		case CELL_GCM_CONTEXT_DMA_SEMAPHORE_R:
+			return 0x40300000 + offset;

-			case CELL_GCM_CONTEXT_DMA_SEMAPHORE_RW:
-			case CELL_GCM_CONTEXT_DMA_SEMAPHORE_R:
-				return 0x100 + offset; // TODO: Properly implement
+		case CELL_GCM_CONTEXT_DMA_DEVICE_RW:
+			return 0x40000000 + offset;

-			case CELL_GCM_CONTEXT_DMA_DEVICE_RW:
-				fmt::throw_exception("Unimplemented CELL_GCM_CONTEXT_DMA_DEVICE_RW (offset=0x%x, location=0x%x)" HERE, offset, location);
+		case CELL_GCM_CONTEXT_DMA_DEVICE_R:
+			return 0x40000000 + offset;

-			case CELL_GCM_CONTEXT_DMA_DEVICE_R:
-				fmt::throw_exception("Unimplemented CELL_GCM_CONTEXT_DMA_DEVICE_R (offset=0x%x, location=0x%x)" HERE, offset, location);
-
-			default:
-				fmt::throw_exception("Invalid location (offset=0x%x, location=0x%x)" HERE, offset, location);
+		default:
+			fmt::throw_exception("Invalid location (offset=0x%x, location=0x%x)" HERE, offset, location);
 		}
 	}

@ -386,7 +388,7 @@ namespace rsx
 				if (get_system_time() - start_time > vblank_count * 1000000 / 60)
 				{
 					vblank_count++;
-
+					sys_rsx_context_attribute(0x55555555, 0xFED, 1, 0, 0, 0);
 					if (vblank_handler)
 					{
 						intr_thread->cmd_list
@ -401,6 +403,8 @@ namespace rsx

 					continue;
 				}
+				while (Emu.IsPaused())
+					std::this_thread::sleep_for(10ms);

 				std::this_thread::sleep_for(1ms); // hack
 			}
@ -1069,9 +1073,9 @@ namespace rsx
 		rsx::method_registers.reset();
 	}

-	void thread::init(const u32 ioAddress, const u32 ioSize, const u32 ctrlAddress, const u32 localAddress)
+	void thread::init(u32 ioAddress, u32 ioSize, u32 ctrlAddress, u32 localAddress)
 	{
-		ctrl = vm::_ptr<CellGcmControl>(ctrlAddress);
+		ctrl = vm::_ptr<RsxDmaControl>(ctrlAddress);
 		this->ioAddress = ioAddress;
 		this->ioSize = ioSize;
 		local_mem_addr = localAddress;
--- a/rpcs3/Emu/RSX/RSXThread.h
+++ b/rpcs3/Emu/RSX/RSXThread.h
@ -22,6 +22,8 @@
 #include "Utilities/variant.hpp"
 #include "define_new_memleakdetect.h"

+#include "Emu/Cell/lv2/sys_rsx.h"
+
 extern u64 get_system_time();

 extern bool user_asked_for_frame_capture;
@ -113,7 +115,7 @@ namespace rsx
 		std::vector<u32> element_push_buffer;

 	public:
-		CellGcmControl* ctrl = nullptr;
+		RsxDmaControl* ctrl = nullptr;

 		Timer timer_sync;

@ -129,22 +131,23 @@ namespace rsx
 	public:
 		std::shared_ptr<class ppu_thread> intr_thread;

+		// I hate this flag, but until hle is closer to lle, its needed
+		bool isHLE{ false };
+
 		u32 ioAddress, ioSize;
 		u32 flip_status;
-		int flip_mode;
 		int debug_level;
-		int frequency_mode;

-		u32 tiles_addr;
-		u32 zculls_addr;
-		vm::ps3::ptr<CellGcmDisplayInfo> gcm_buffers = vm::null;
-		u32 gcm_buffers_count;
-		u32 gcm_current_buffer;
+		atomic_t<bool> requested_vsync{false};
+		atomic_t<bool> enable_second_vhandler{false};
+
+		RsxDisplayInfo display_buffers[8];
+		u32 display_buffers_count{0};
+		u32 current_display_buffer{0};
 		u32 ctxt_addr;
 		u32 label_addr;

 		u32 local_mem_addr, main_mem_addr;
-		bool strict_ordering[0x1000];

 		bool m_rtts_dirty;
 		bool m_transform_constants_dirty;
@ -345,7 +348,7 @@ namespace rsx

 	public:
 		void reset();
-		void init(const u32 ioAddress, const u32 ioSize, const u32 ctrlAddress, const u32 localAddress);
+		void init(u32 ioAddress, u32 ioSize, u32 ctrlAddress, u32 localAddress);

 		tiled_region get_tiled_address(u32 offset, u32 location);
 		GcmTileInfo *find_tile(u32 offset, u32 location);
--- a/rpcs3/Emu/RSX/VK/VKGSRender.cpp
+++ b/rpcs3/Emu/RSX/VK/VKGSRender.cpp
@ -2143,9 +2143,9 @@ void VKGSRender::flip(int buffer)

 	if (!resize_screen)
 	{
-		u32 buffer_width = gcm_buffers[buffer].width;
-		u32 buffer_height = gcm_buffers[buffer].height;
-		u32 buffer_pitch = gcm_buffers[buffer].pitch;
+		u32 buffer_width = display_buffers[buffer].width;
+		u32 buffer_height = display_buffers[buffer].height;
+		u32 buffer_pitch = display_buffers[buffer].pitch;

 		areai screen_area = coordi({}, { (int)buffer_width, (int)buffer_height });

--- a/rpcs3/Emu/RSX/gcm_enums.cpp
+++ b/rpcs3/Emu/RSX/gcm_enums.cpp
@ -968,7 +968,7 @@ rsx::blit_engine::context_dma rsx::blit_engine::to_context_dma(u32 in)
 {
 	switch (in)
 	{
-	case CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_REPORT: return rsx::blit_engine::context_dma::to_memory_get_report;
+	case CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_LOCAL: return rsx::blit_engine::context_dma::to_memory_get_report;
 	case CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_MAIN: return rsx::blit_engine::context_dma::report_location_main;
 	case CELL_GCM_CONTEXT_DMA_MEMORY_HOST_BUFFER: return rsx::blit_engine::context_dma::memory_host_buffer;
 	}
--- a/rpcs3/Emu/RSX/gcm_enums.h
+++ b/rpcs3/Emu/RSX/gcm_enums.h
@ -704,7 +704,7 @@ enum
 {
 	CELL_GCM_CONTEXT_DMA_MEMORY_FRAME_BUFFER = 0xFEED0000, // Local memory
 	CELL_GCM_CONTEXT_DMA_MEMORY_HOST_BUFFER = 0xFEED0001, // Main memory
-	CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_REPORT = 0x66626660,
+	CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_LOCAL = 0x66626660,
 	CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_MAIN = 0xBAD68000,
 	CELL_GCM_CONTEXT_DMA_NOTIFY_MAIN_0 = 0x6660420F,

--- a/rpcs3/Emu/RSX/rsx_decode.h
+++ b/rpcs3/Emu/RSX/rsx_decode.h
@ -1988,6 +1988,32 @@ struct registers_decoder<NV4097_SET_TRANSFORM_PROGRAM_START>
 	}
 };

+template<>
+struct registers_decoder<NV406E_SET_CONTEXT_DMA_SEMAPHORE>
+{
+	struct decoded_type
+	{
+	private:
+		union
+		{
+			u32 raw_value;
+		} m_data;
+	public:
+		decoded_type(u32 raw_value) { m_data.raw_value = raw_value; }
+
+		u32 context_dma() const
+		{
+			return m_data.raw_value;
+		}
+	};
+
+	static std::string dump(decoded_type &&decoded_values)
+	{
+		return "NV406E semaphore: context = " + std::to_string(decoded_values.context_dma());
+	}
+};
+
+
 template<>
 struct registers_decoder<NV406E_SEMAPHORE_OFFSET>
 {
@ -4600,7 +4626,7 @@ constexpr std::integer_sequence<u32, NV4097_SET_VIEWPORT_HORIZONTAL, NV4097_SET_
 	   NV4097_SET_VERTEX_ATTRIB_OUTPUT_MASK, NV4097_SET_SHADER_CONTROL,
 	   NV4097_SET_VERTEX_DATA_BASE_OFFSET, NV4097_SET_INDEX_ARRAY_ADDRESS,
 	   NV4097_SET_VERTEX_DATA_BASE_INDEX, NV4097_SET_SHADER_PROGRAM,
-	   NV4097_SET_TRANSFORM_PROGRAM_START, NV406E_SEMAPHORE_OFFSET, NV4097_SET_SEMAPHORE_OFFSET,
+	   NV4097_SET_TRANSFORM_PROGRAM_START, NV406E_SET_CONTEXT_DMA_SEMAPHORE, NV406E_SEMAPHORE_OFFSET, NV4097_SET_SEMAPHORE_OFFSET,
 	   NV3089_IMAGE_IN_OFFSET, NV3062_SET_OFFSET_DESTIN, NV309E_SET_OFFSET, NV3089_DS_DX, NV3089_DT_DY,
 	   NV0039_PITCH_IN, NV0039_PITCH_OUT, NV0039_LINE_LENGTH_IN, NV0039_LINE_COUNT, NV0039_OFFSET_OUT,
 	   NV0039_OFFSET_IN, NV4097_SET_VERTEX_ATTRIB_INPUT_MASK, NV4097_SET_FREQUENCY_DIVIDER_OPERATION,
--- a/rpcs3/Emu/RSX/rsx_methods.cpp
+++ b/rpcs3/Emu/RSX/rsx_methods.cpp
@ -6,6 +6,7 @@
 #include "rsx_utils.h"
 #include "rsx_decode.h"
 #include "Emu/Cell/PPUCallback.h"
+#include "Emu/Cell/lv2/sys_rsx.h"

 #include <sstream>
 #include <cereal/archives/binary.hpp>
@ -60,9 +61,13 @@ namespace rsx

 		void semaphore_acquire(thread* rsx, u32 _reg, u32 arg)
 		{
-			//TODO: dma
-			while (vm::ps3::read32(rsx->label_addr + method_registers.semaphore_offset_406e()) != arg)
+			const u32 addr = get_address(method_registers.semaphore_offset_406e(), method_registers.semaphore_context_dma_406e());
+			while (vm::ps3::read32(addr) != arg)
 			{
+				// todo: LLE: why does this one keep hanging? is it vsh system semaphore? whats actually pushing this to the command buffer?!
+				if (addr == 0x40000030)
+					break;
+
 				if (Emu.IsStopped())
 					break;

@ -72,8 +77,8 @@ namespace rsx

 		void semaphore_release(thread* rsx, u32 _reg, u32 arg)
 		{
-			//TODO: dma
-			vm::ps3::write32(rsx->label_addr + method_registers.semaphore_offset_406e(), arg);
+			const u32 addr = get_address(method_registers.semaphore_offset_406e(), method_registers.semaphore_context_dma_406e());
+			vm::ps3::write32(addr, arg);
 		}
 	}

@ -100,8 +105,12 @@ namespace rsx
 				//
 			}

-			//TODO: dma
-			vm::ps3::write32(rsx->label_addr + method_registers.semaphore_offset_4097(), arg);
+			const u32 index = method_registers.semaphore_offset_4097() >> 4;
+
+			auto& sema = vm::ps3::_ref<RsxReports>(rsx->label_addr);
+			sema.semaphore[index].val = arg;
+			sema.semaphore[index].pad = 0;
+			sema.semaphore[index].timestamp = rsx->timestamp();
 		}

 		void back_end_write_semaphore_release(thread* rsx, u32 _reg, u32 arg)
@ -111,9 +120,13 @@ namespace rsx
 				//
 			}

-			//TODO: dma
-			vm::ps3::write32(rsx->label_addr + method_registers.semaphore_offset_4097(),
-				(arg & 0xff00ff00) | ((arg & 0xff) << 16) | ((arg >> 16) & 0xff));
+			const u32 index = method_registers.semaphore_offset_4097() >> 4;
+			u32 val = (arg & 0xff00ff00) | ((arg & 0xff) << 16) | ((arg >> 16) & 0xff);
+
+			auto& sema = vm::ps3::_ref<RsxReports>(rsx->label_addr);
+			sema.semaphore[index].val = val;
+			sema.semaphore[index].pad = 0;
+			sema.semaphore[index].timestamp = rsx->timestamp();
 		}

 		template<u32 id, u32 index, int count, typename type>
@ -323,10 +336,9 @@ namespace rsx

 			switch (report_dma)
 			{
-			case blit_engine::context_dma::to_memory_get_report: location = CELL_GCM_LOCATION_LOCAL; break;
-			case blit_engine::context_dma::report_location_main:
-			case blit_engine::context_dma::memory_host_buffer: 
-				location = CELL_GCM_LOCATION_MAIN; break;
+			case blit_engine::context_dma::to_memory_get_report: location = CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_LOCAL; break;
+			case blit_engine::context_dma::report_location_main: location = CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_MAIN; break;
+			case blit_engine::context_dma::memory_host_buffer: location = CELL_GCM_CONTEXT_DMA_MEMORY_HOST_BUFFER; break;
 			default:
 				LOG_WARNING(RSX, "nv4097::get_report: bad report dma: 0x%x", (u8)report_dma);
 				return;
@ -339,12 +351,14 @@ namespace rsx
 			switch (type)
 			{
 			case CELL_GCM_ZPASS_PIXEL_CNT:
+				// todo: actual zculling, here we just report max, which seems to be enough for most games, but causes them to render *everything*
+				result->value = 0xFFFFFFFF;
+				break;
 			case CELL_GCM_ZCULL_STATS:
 			case CELL_GCM_ZCULL_STATS1:
 			case CELL_GCM_ZCULL_STATS2:
 			case CELL_GCM_ZCULL_STATS3:
 				result->value = 0;
-				LOG_WARNING(RSX, "NV4097_GET_REPORT: Unimplemented type %d", type);
 				break;

 			default:
@ -352,8 +366,8 @@ namespace rsx
 				LOG_ERROR(RSX, "NV4097_GET_REPORT: Bad type %d", type);
 				break;
 			}
-
-			//result->padding = 0;
+			// This padding is needed to be set to 0, as games may use it for sync
+			result->padding = 0;
 		}

 		void clear_report_value(thread* rsx, u32 _reg, u32 arg)
@ -472,6 +486,7 @@ namespace rsx
 			if (in_origin != blit_engine::transfer_origin::corner)
 			{
 				LOG_ERROR(RSX, "NV3089_IMAGE_IN_SIZE: unknown origin (%d)", (u8)in_origin);
+				return;
 			}

 			if (operation != rsx::blit_engine::transfer_operation::srccopy)
@ -514,14 +529,14 @@ namespace rsx
 				//HACK: it's extension of the flip-hack. remove this when textures cache would be properly implemented
 				for (int i = 0; i < rsx::limits::color_buffers_count; ++i)
 				{
-					u32 begin = rsx->gcm_buffers[i].offset;
+					u32 begin = rsx->display_buffers[i].offset;

 					if (dst_offset < begin || !begin)
 					{
 						continue;
 					}

-					if (rsx->gcm_buffers[i].width < 720 || rsx->gcm_buffers[i].height < 480)
+					if (rsx->display_buffers[i].width < 720 || rsx->display_buffers[i].height < 480)
 					{
 						continue;
 					}
@ -531,7 +546,7 @@ namespace rsx
 						return;
 					}

-					u32 end = begin + rsx->gcm_buffers[i].height * rsx->gcm_buffers[i].pitch;
+					u32 end = begin + rsx->display_buffers[i].height * rsx->display_buffers[i].pitch;

 					if (dst_offset < end)
 					{
@ -862,14 +877,14 @@ namespace rsx
 			rsx->timer_sync.Start();
 		}
 		
-		rsx->gcm_current_buffer = arg;
+		rsx->current_display_buffer = arg;
 		rsx->flip(arg);
 		// After each flip PS3 system is executing a routine that changes registers value to some default.
 		// Some game use this default state (SH3).
-		rsx->reset();
+		if (rsx->isHLE)
+			rsx->reset();

 		rsx->last_flip_time = get_system_time() - 1000000;
-		rsx->gcm_current_buffer = arg;
 		rsx->flip_status = CELL_GCM_DISPLAY_FLIP_STATUS_DONE;

 		if (rsx->flip_handler)
@ -887,6 +902,7 @@ namespace rsx

 	void user_command(thread* rsx, u32, u32 arg)
 	{
+		sys_rsx_context_attribute(0x55555555, 0xFEF, 0, arg, 0, 0);
 		if (rsx->user_handler)
 		{
 			rsx->intr_thread->cmd_list
@ -900,6 +916,31 @@ namespace rsx
 		}
 	}

+	namespace gcm
+	{
+		// not entirely sure which one should actually do the flip, or if these should be handled seperately,
+		// so for now lets flip in queue and just let the driver deal with it
+		template<u32 index>
+		struct driver_flip
+		{
+			static void impl(thread* rsx, u32 _reg, u32 arg)
+			{
+				rsx->reset();
+				sys_rsx_context_attribute(0x55555555, 0x102, index, arg, 0, 0);
+			}
+		};
+
+		template<u32 index>
+		struct queue_flip
+		{
+			static void impl(thread* rsx, u32 _reg, u32 arg)
+			{
+				flip_command(rsx, _reg, arg);
+				sys_rsx_context_attribute(0x55555555, 0x103, index, arg, 0, 0);
+			}
+		};
+	}
+
 	void rsx_state::reset()
 	{
 		//setup method registers
@ -971,7 +1012,7 @@ namespace rsx
 		registers[NV4097_SET_SURFACE_FORMAT] = (8 << 0) | (2 << 5) | (0 << 12) | (1 << 16) | (1 << 24);

 		// rsx dma initial values
-		registers[NV4097_SET_CONTEXT_DMA_REPORT] = CELL_GCM_CONTEXT_DMA_TO_MEMORY_GET_REPORT;
+		registers[NV4097_SET_CONTEXT_DMA_REPORT] = CELL_GCM_CONTEXT_DMA_REPORT_LOCATION_LOCAL;
 		registers[NV406E_SET_CONTEXT_DMA_SEMAPHORE] = CELL_GCM_CONTEXT_DMA_SEMAPHORE_RW;
 		registers[NV3062_SET_CONTEXT_DMA_IMAGE_DESTIN] = CELL_GCM_CONTEXT_DMA_MEMORY_FRAME_BUFFER;
 		registers[NV309E_SET_CONTEXT_DMA_IMAGE] = CELL_GCM_CONTEXT_DMA_MEMORY_FRAME_BUFFER;
@ -1081,10 +1122,17 @@ namespace rsx
 		methods[NV4097_SET_SURFACE_COLOR_BOFFSET]         = nullptr;
 		methods[NV4097_SET_SURFACE_PITCH_B]               = nullptr;
 		methods[NV4097_SET_SURFACE_COLOR_TARGET]          = nullptr;
+		methods[0x224 >> 2]                               = nullptr;
+		methods[0x228 >> 2]                               = nullptr;
+		methods[0x230 >> 2]                               = nullptr;
 		methods[NV4097_SET_SURFACE_PITCH_Z]               = nullptr;
 		methods[NV4097_INVALIDATE_ZCULL]                  = nullptr;
 		methods[NV4097_SET_CYLINDRICAL_WRAP]              = nullptr;
 		methods[NV4097_SET_CYLINDRICAL_WRAP1]             = nullptr;
+		methods[0x240 >> 2]                               = nullptr;
+		methods[0x244 >> 2]                               = nullptr;
+		methods[0x248 >> 2]                               = nullptr;
+		methods[0x24C >> 2]                               = nullptr;
 		methods[NV4097_SET_SURFACE_PITCH_C]               = nullptr;
 		methods[NV4097_SET_SURFACE_PITCH_D]               = nullptr;
 		methods[NV4097_SET_SURFACE_COLOR_COFFSET]         = nullptr;
@ -1153,6 +1201,7 @@ namespace rsx
 		methods[NV4097_SET_FOG_MODE]                      = nullptr;
 		methods[NV4097_SET_FOG_PARAMS]                    = nullptr;
 		methods[NV4097_SET_FOG_PARAMS + 1]                = nullptr;
+		methods[0x8d8 >> 2]                               = nullptr;
 		methods[NV4097_SET_SHADER_PROGRAM]                = nullptr;
 		methods[NV4097_SET_VERTEX_TEXTURE_OFFSET]         = nullptr;
 		methods[NV4097_SET_VERTEX_TEXTURE_FORMAT]         = nullptr;
@ -1236,6 +1285,7 @@ namespace rsx
 		methods[NV4097_SET_TEXTURE_BORDER_COLOR]          = nullptr;
 		methods[NV4097_SET_VERTEX_DATA4F_M]               = nullptr;
 		methods[NV4097_SET_COLOR_KEY_COLOR]               = nullptr;
+		methods[0x1d04 >> 2]                              = nullptr;
 		methods[NV4097_SET_SHADER_CONTROL]                = nullptr;
 		methods[NV4097_SET_INDEXED_CONSTANT_READ_LIMITS]  = nullptr;
 		methods[NV4097_SET_SEMAPHORE_OFFSET]              = nullptr;
@ -1362,6 +1412,8 @@ namespace rsx
 		bind_array<GCM_FLIP_HEAD, 1, 2, nullptr>();
 		bind_array<GCM_DRIVER_QUEUE, 1, 8, nullptr>();

+		bind_array<(0x400 >> 2), 1, 0x10, nullptr>();
+		bind_array<(0x440 >> 2), 1, 0x20, nullptr>();
 		bind_array<NV4097_SET_ANISO_SPREAD, 1, 16, nullptr>();
 		bind_array<NV4097_SET_VERTEX_TEXTURE_OFFSET, 1, 8 * 4, nullptr>();
 		bind_array<NV4097_SET_VERTEX_DATA_SCALED4S_M, 1, 32, nullptr>();
@ -1387,16 +1439,6 @@ namespace rsx
 		bind<NV406E_SEMAPHORE_ACQUIRE, nv406e::semaphore_acquire>();
 		bind<NV406E_SEMAPHORE_RELEASE, nv406e::semaphore_release>();

-		/*
-
-		// Store previous fbo addresses to detect RTT config changes.
-		std::array<u32, 4> m_previous_color_address = {};
-		u32 m_previous_address_z = 0;
-		u32 m_previous_target = 0;
-		u32 m_previous_clip_horizontal = 0;
-		u32 m_previous_clip_vertical = 0;
-		*/
-
 		// NV4097
 		bind<NV4097_TEXTURE_READ_SEMAPHORE_RELEASE, nv4097::texture_read_semaphore_release>();
 		bind<NV4097_BACK_END_WRITE_SEMAPHORE_RELEASE, nv4097::back_end_write_semaphore_release>();
@ -1455,9 +1497,14 @@ namespace rsx
 		//NV0039
 		bind<NV0039_BUFFER_NOTIFY, nv0039::buffer_notify>();

+		// lv1 hypervisor
+		bind_array<GCM_SET_USER_COMMAND, 1, 2, user_command>();
+		bind_range<GCM_FLIP_HEAD, 1, 2, gcm::driver_flip>();
+		bind_range<GCM_DRIVER_QUEUE, 1, 8, gcm::queue_flip>();
+
 		// custom methods
 		bind<GCM_FLIP_COMMAND, flip_command>();
-		bind_array<GCM_SET_USER_COMMAND, 1, 2, user_command>();
+		

 		return true;	
 	}();
--- a/rpcs3/Emu/RSX/rsx_methods.h
+++ b/rpcs3/Emu/RSX/rsx_methods.h
@ -889,6 +889,11 @@ namespace rsx
 			return decode<NV4097_SET_BEGIN_END>().primitive();
 		}

+		u32 semaphore_context_dma_406e() const
+		{
+			return decode<NV406E_SET_CONTEXT_DMA_SEMAPHORE>().context_dma();
+		}
+
 		u32 semaphore_offset_406e() const
 		{
 			return decode<NV406E_SEMAPHORE_OFFSET>().semaphore_offset();
--- a/rpcs3/GLGSRender.vcxproj
+++ b/rpcs3/GLGSRender.vcxproj
@ -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">
@ -95,4 +95,4 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
-</Project>
+</Project>
--- a/rpcs3/OpenAL.vcxproj
+++ b/rpcs3/OpenAL.vcxproj
@ -31,7 +31,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
--- a/rpcs3/VKGSRender.vcxproj
+++ b/rpcs3/VKGSRender.vcxproj
@ -61,7 +61,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
--- a/rpcs3/XAudio.vcxproj
+++ b/rpcs3/XAudio.vcxproj
@ -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">
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@ -30,7 +30,7 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
--- a/rpcs3/rpcs3.vcxproj
+++ b/rpcs3/rpcs3.vcxproj
@ -26,7 +26,7 @@
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <PlatformToolSet>v140</PlatformToolSet>
+    <PlatformToolSet>v141</PlatformToolSet>
    <OutputDirectory>release\</OutputDirectory>
    <ATLMinimizesCRunTimeLibraryUsage>false</ATLMinimizesCRunTimeLibraryUsage>
    <CharacterSet>Unicode</CharacterSet>
@ -35,7 +35,7 @@
    <PrimaryOutput>rpcs3</PrimaryOutput>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release - LLVM|x64'" Label="Configuration">
-    <PlatformToolSet>v140</PlatformToolSet>
+    <PlatformToolSet>v141</PlatformToolSet>
    <OutputDirectory>release\</OutputDirectory>
    <ATLMinimizesCRunTimeLibraryUsage>false</ATLMinimizesCRunTimeLibraryUsage>
    <CharacterSet>Unicode</CharacterSet>
@ -44,7 +44,7 @@
    <PrimaryOutput>rpcs3</PrimaryOutput>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <PlatformToolSet>v140</PlatformToolSet>
+    <PlatformToolSet>v141</PlatformToolSet>
    <OutputDirectory>debug\</OutputDirectory>
    <ATLMinimizesCRunTimeLibraryUsage>false</ATLMinimizesCRunTimeLibraryUsage>
    <CharacterSet>Unicode</CharacterSet>
@ -53,7 +53,7 @@
    <PrimaryOutput>rpcs3</PrimaryOutput>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug - LLVM|x64'" Label="Configuration">
-    <PlatformToolSet>v140</PlatformToolSet>
+    <PlatformToolSet>v141</PlatformToolSet>
    <OutputDirectory>debug\</OutputDirectory>
    <ATLMinimizesCRunTimeLibraryUsage>false</ATLMinimizesCRunTimeLibraryUsage>
    <CharacterSet>Unicode</CharacterSet>
--- a/rpcs3/rpcs3qt/rsx_debugger.cpp
+++ b/rpcs3/rpcs3qt/rsx_debugger.cpp
@ -411,9 +411,7 @@ void Buffer::mouseDoubleClickEvent(QMouseEvent* event)
 			return;
 		}

-		const auto buffers = render->gcm_buffers;
-		if (!buffers)
-			return;
+		const auto buffers = render->display_buffers;

 		// TODO: Is there any better way to choose the color buffers
 #define SHOW_BUFFER(id) \
@ -705,12 +703,9 @@ void rsx_debugger::GetBuffers()

 	// Draw Buffers
 	// TODO: Currently it only supports color buffers
-	for (u32 bufferId=0; bufferId < render->gcm_buffers_count; bufferId++)
+	for (u32 bufferId=0; bufferId < render->display_buffers_count; bufferId++)
 	{
-		if(!vm::check_addr(render->gcm_buffers.addr()))
-			continue;
-
-		auto buffers = render->gcm_buffers;
+		auto buffers = render->display_buffers;
 		u32 RSXbuffer_addr = render->local_mem_addr + buffers[bufferId].offset;

 		if(!vm::check_addr(RSXbuffer_addr))
--- a/rpcs3_llvm.props
+++ b/rpcs3_llvm.props
@ -10,7 +10,7 @@
    <Lib>
      <AdditionalLibraryDirectories Condition="'$(Configuration)'=='Debug - LLVM'">..\llvm_build\Debug\lib</AdditionalLibraryDirectories>
      <AdditionalLibraryDirectories Condition="'$(Configuration)'=='Release - LLVM'">..\llvm_build\Release\lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>LLVMProfileData.lib;LLVMDebugInfoCodeView.lib;LLVMDebugInfoMSF.lib;LLVMInstrumentation.lib;LLVMMCJIT.lib;LLVMRuntimeDyld.lib;LLVMVectorize.lib;LLVMX86CodeGen.lib;LLVMGlobalISel.lib;LLVMX86Disassembler.lib;LLVMExecutionEngine.lib;LLVMAsmPrinter.lib;LLVMSelectionDAG.lib;LLVMCodeGen.lib;LLVMScalarOpts.lib;LLVMInstCombine.lib;LLVMTransformUtils.lib;LLVMAnalysis.lib;LLVMTarget.lib;LLVMX86Desc.lib;LLVMX86AsmPrinter.lib;LLVMObject.lib;LLVMMCParser.lib;LLVMBitReader.lib;LLVMCore.lib;LLVMX86Utils.lib;LLVMMC.lib;LLVMX86Info.lib;LLVMSupport.lib;LLVMMCDisassembler.lib;LLVMipo.lib</AdditionalDependencies>
+      <AdditionalDependencies>LLVMProfileData.lib;LLVMDebugInfoCodeView.lib;LLVMDebugInfoMSF.lib;LLVMInstrumentation.lib;LLVMMCJIT.lib;LLVMRuntimeDyld.lib;LLVMVectorize.lib;LLVMX86CodeGen.lib;LLVMGlobalISel.lib;LLVMX86Disassembler.lib;LLVMExecutionEngine.lib;LLVMAsmPrinter.lib;LLVMSelectionDAG.lib;LLVMCodeGen.lib;LLVMScalarOpts.lib;LLVMInstCombine.lib;LLVMTransformUtils.lib;LLVMAnalysis.lib;LLVMTarget.lib;LLVMX86Desc.lib;LLVMX86AsmPrinter.lib;LLVMObject.lib;LLVMMCParser.lib;LLVMBitReader.lib;LLVMCore.lib;LLVMX86Utils.lib;LLVMMC.lib;LLVMX86Info.lib;LLVMSupport.lib;LLVMMCDisassembler.lib;LLVMipo.lib;LLVMBinaryFormat.lib</AdditionalDependencies>
    </Lib>
  </ItemDefinitionGroup>
  <ItemGroup />
Author	SHA1	Message	Date
Zangetsu38	668005c856	Fix	2017-07-31 09:16:37 +02:00
Jake	7efa53b218	Add gcm to auto lle / liblv2	2017-07-31 09:16:37 +02:00
Jake	ad3fc60631	d3d12: Fix 0 sized framebuffer crashes	2017-07-31 09:16:37 +02:00
Jake	c09cbeac15	sys_rsx: implement support for lle-gcm	2017-07-31 09:16:37 +02:00
Jake	e854eb6ecd	rsx/gcm: Implement rsx dma. Refactor gcm/rsx to not be as codependent	2017-07-31 09:16:37 +02:00
Zangetsu38	e7841b5d9e	Update LLVM 5.0	2017-07-31 09:15:24 +02:00
Zangetsu38	76a49518e0	Update Project to Visual Studio 2017.	2017-07-31 09:07:17 +02:00
Zion Nimchuk	4a197e16a6	Initial LLVM 5 port	2017-07-31 09:07:15 +02:00