linux appimage versioning changes synced with windows artifact version

windows artifact versioning changes, plus a small syntax fix
minor syntax changes
2018-02-24 15:06:08 +00:00 · 2018-02-24 15:06:08 +00:00 · 2018-02-24 15:06:08 +00:00 · 2018-02-24 02:38:43 +04:00 · 2018-02-23 19:06:37 +00:00 · 2018-02-23 02:08:14 +04:00
434 changed files with 6456 additions and 36373 deletions
@@ -6,7 +6,7 @@ or our discord:
 https://discord.me/RPCS3

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

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

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

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

+# kdevelop
+*.kdev4
+.kdev4/*
+
 # Qt
 moc_*.cpp
 qrc_resources.cpp
@@ -7,8 +7,8 @@
 	ignore = dirty
 [submodule "llvm"]
 	path = llvm
-	url = https://github.com/llvm-mirror/llvm
-	branch = release_40
+	url = https://github.com/RPCS3/llvm
+	branch = release_60
 [submodule "GSL"]
 	path = 3rdparty/GSL
 	url = https://github.com/Microsoft/GSL.git
@@ -35,6 +35,7 @@
 	path = 3rdparty/hidapi
 	url = https://github.com/RPCS3/hidapi
 	branch = master
+	ignore = dirty
 [submodule "3rdparty/Optional"]
 	path = 3rdparty/Optional
 	url = https://github.com/akrzemi1/Optional.git
@@ -26,9 +26,6 @@ git:
  submodules: false

 before_install:
-  - if [ "$CC" = "clang" ]; then
-      export CXX="clang++-4.0" CC="clang-4.0";
-    fi;
  - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$CXX" = "g++" ]; then
      export CXX="g++-5" CC="gcc-5" CXXFLAGS="-Wno-format-security";
    fi;
@@ -55,7 +52,7 @@ before_script:
  - git submodule update --init asmjit 3rdparty/ffmpeg 3rdparty/pugixml 3rdparty/GSL 3rdparty/libpng Utilities/yaml-cpp 3rdparty/cereal 3rdparty/hidapi 3rdparty/Optional Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers
  - mkdir build
  - cd build
-  - export CMAKE_PREFIX_PATH=~/Qt/5.10.0/gcc_64/lib/cmake
+  - export CMAKE_PREFIX_PATH=~/Qt/5.10.1/gcc_64/lib/cmake
  - export CXXFLAGS="$CXXFLAGS -DTRAVIS=true";
  - if [ "$TRAVIS_PULL_REQUEST" = false ]; then
      export CXXFLAGS="$CXXFLAGS -DBRANCH=$TRAVIS_REPO_SLUG/$TRAVIS_BRANCH";
@@ -65,25 +62,28 @@ before_script:
  - cmake .. -DCMAKE_INSTALL_PREFIX=/usr -G Ninja;
  - ninja
  - # AppImage generation
-  - if [ -n "$UPLOAD_URL" ] && [ "$TRAVIS_BRANCH" = "master" ] && [ "$CC" = "clang-4.0" ] && [ "$TRAVIS_PULL_REQUEST" = false ]; then
-      export LD_LIBRARY_PATH=~/Qt/5.10.0/gcc_64/lib;
+  - if [ -n "$UPLOAD_URL" ] && [ "$TRAVIS_BRANCH" = "master" ] && [ "$CC" = "clang" ] && [ "$TRAVIS_PULL_REQUEST" = false ]; then
+      export LD_LIBRARY_PATH=~/Qt/5.10.1/gcc_64/lib;
      DESTDIR=appdir ninja install ; find appdir/ ;
      find ../bin ;
      wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" ;
      chmod a+x linuxdeployqt*.AppImage ;
-      export PATH=~/Qt/5.10.0/gcc_64/bin/:${PATH} ;
+      export PATH=~/Qt/5.10.1/gcc_64/bin/:${PATH} ;
      ./linuxdeployqt*.AppImage --appimage-extract ;
      ./linuxdeployqt*.AppImage ./appdir/usr/share/applications/*.desktop -bundle-non-qt-libs ;
      mkdir ./appdir/usr/plugins/xcbglintegrations/ ;
      mkdir ./appdir/usr/plugins/imageformats/ ;
-      cp ~/Qt/5.10.0/gcc_64/lib/libQt5Svg.so.5 ./appdir/usr/lib/ ;
-      cp ~/Qt/5.10.0/gcc_64/plugins/xcbglintegrations/* ./appdir/usr/plugins/xcbglintegrations/ ;
-      cp ~/Qt/5.10.0/gcc_64/plugins/imageformats/* ./appdir/usr/plugins/imageformats/ ;
-      cp ~/Qt/5.10.0/gcc_64/plugins/platforms/* ./appdir/usr/plugins/platforms/ ;
+      cp ~/Qt/5.10.1/gcc_64/lib/libQt5Svg.so.5 ./appdir/usr/lib/ ;
+      cp ~/Qt/5.10.1/gcc_64/plugins/xcbglintegrations/* ./appdir/usr/plugins/xcbglintegrations/ ;
+      cp ~/Qt/5.10.1/gcc_64/plugins/imageformats/* ./appdir/usr/plugins/imageformats/ ;
+      cp ~/Qt/5.10.1/gcc_64/plugins/platforms/* ./appdir/usr/plugins/platforms/ ;
+      rm ./appdir/usr/lib/libfreetype.so.6 ;
      export PATH=${TRAVIS_BUILD_DIR}/build/squashfs-root/usr/bin/:${PATH} ;
      ./squashfs-root/usr/bin/appimagetool ${TRAVIS_BUILD_DIR}/build/appdir ;
      find ./appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq ;
-      curl ${UPLOAD_URL}${TRAVIS_COMMIT:0:7}-${TRAVIS_BUILD_NUMBER}_linux64 --upload-file ./RPCS3*.AppImage;
+      COMM_TAG="$(git describe --tags $(git rev-list --tags --max-count=1))"
+      COMM_COUNT="$(git rev-list --count HEAD)"
+      curl "${UPLOAD_URL}${TRAVIS_COMMIT:0:8}&t=${COMM_TAG}&a=${COMM_COUNT}" --upload-file ./RPCS3*.AppImage;
   fi;

 script:
@@ -111,14 +111,15 @@ addons:
      - libc6-dev
      - llvm-4.0
      - llvm-4.0-dev
-      - clang-4.0
+      # Clang 5.0 is now bundled in travis, so we no longer need the ppa version.
+      #- clang-4.0
      - libedit-dev
      - g++-5
      - gcc-5
      - libstdc++-5-dev
      - lib32stdc++6
      - zlib1g-dev
-      # We need to install qt 5.10.0 manually because the version trusty provides is too old.
+      # We need to install qt 5.10.1 manually because the version trusty provides is too old.
      #- qtbase5-dev
      - libudev-dev
      - libevdev-dev
@@ -13,8 +13,8 @@
 *
 * You should have received a copy of the GNU Library General Public
 *  License along with this library; if not, write to the
- *  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *  Boston, MA  02111-1307, USA.
+ *  Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 * Or go to http://www.gnu.org/copyleft/lgpl.html
 */

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

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

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

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

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

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

-option(VULKAN_PREBUILT "" OFF)
-
 # TODO: do real installation, including copying directory structure
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${PROJECT_BINARY_DIR}/bin")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${PROJECT_BINARY_DIR}/bin")
@@ -24,11 +24,11 @@ If you want to contribute please take a look at the [Coding Style](https://githu
 * [Visual C++ Redistributable Packages for Visual Studio 2015](http://www.microsoft.com/en-us/download/details.aspx?id=48145)
 * [Cmake 3.1.0+](https://www.cmake.org/download/) (required; add to PATH)
 * [Python 3.3+](https://www.python.org/downloads/) (required; add to PATH)
-* [Qt 5.8+](https://www.qt.io/download-open-source/) (required; add QTDIR `<QtInstallFolder>\5.8\msvc2015_64\` environment variable if you do not want to use the Visual Studio Qt Plugin)
+* [Qt 5.10+](https://www.qt.io/download-open-source/) (required; add QTDIR environment variable if you do not want to use the Visual Studio Qt Plugin: e.g. `<QtInstallFolder>\5.10.1\msvc2015_64\`)
 * [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.10+](https://www.qt.io/download-open-source/)
 * GCC 5.1+ or Clang 3.5.0+ ([not GCC 6.1](https://github.com/RPCS3/rpcs3/issues/1691))
 * Debian & Ubuntu: `sudo apt-get install cmake build-essential libasound2-dev libpulse-dev libopenal-dev libglew-dev zlib1g-dev libedit-dev libvulkan-dev libudev-dev git qt5-default`
 * Arch: `sudo pacman -S glew openal cmake llvm qt5-base`
@@ -48,14 +48,14 @@ To initialize the repository don't forget to execute `git submodule update --ini
 ### Configuring Qt

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


 Open `rpcs3.sln`


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

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

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

 Most files are licensed under the terms of GNU GPLv2 License, see LICENSE file for details. Some files may be licensed differently, check appropriate file headers for details.
@@ -1034,7 +1034,7 @@ fs::file::file(const std::string& path, bs_t<open_mode> mode)
 				(fmt::throw_exception("Invalid whence (0x%x)" HERE, whence), 0);

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

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

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

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

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

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

 extern void ppu_set_breakpoint(u32 addr);
@@ -365,7 +365,7 @@ std::string GDBDebugServer::get_reg(std::shared_ptr<ppu_thread> thread, u32 rid)
 		return std::string(8, 'x');
 	default:
 		if (rid > 70) return "";
-		return (rid > 31) 
+		return (rid > 31)
 			? u64_to_padded_hex(reinterpret_cast<u64&>(thread->fpr[rid - 32])) //fpr
 			: u64_to_padded_hex(thread->gpr[rid]); //gpr
 	}
@@ -453,13 +453,12 @@ bool GDBDebugServer::cmd_thread_info(gdb_cmd & cmd)
 		result += u64_to_padded_hex(static_cast<u64>(cpu.id));
 	};
 	idm::select<ppu_thread>(on_select);
-	idm::select<ARMv7Thread>(on_select);
 	idm::select<RawSPUThread>(on_select);
 	idm::select<SPUThread>(on_select);

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

@@ -768,7 +767,7 @@ void GDBDebugServer::on_task()
 				}
 			}
 		}
-		catch (std::runtime_error& e) 
+		catch (std::runtime_error& e)
 		{
 			if (client_socket) {
 				closesocket(client_socket);
@@ -177,7 +177,6 @@ namespace logs
 	channel HLE("HLE");
 	channel PPU("PPU");
 	channel SPU("SPU");
-	channel ARMv7("ARMv7");

 	// Channel registry mutex
 	semaphore<> g_mutex;
@@ -104,7 +104,6 @@ namespace logs
 	extern channel HLE;
 	extern channel PPU;
 	extern channel SPU;
-	extern channel ARMv7;

 	// Log level control: set all channels to level::notice
 	void reset();
@@ -90,7 +90,7 @@ enum x64_reg_t : u32
 	X64R_XMM13,
 	X64R_XMM14,
 	X64R_XMM15,
-	
+
 	X64R_AL,
 	X64R_CL,
 	X64R_DL,
@@ -99,7 +99,7 @@ enum x64_reg_t : u32
 	X64R_CH,
 	X64R_DH,
 	X64R_BH,
-	
+
 	X64_NOT_SET,
 	X64_IMM8,
 	X64_IMM16,
@@ -176,7 +176,7 @@ void decode_x64_reg_op(const u8* code, x64_op_t& out_op, x64_reg_t& out_reg, siz
 			{
 				LOG_ERROR(MEMORY, "decode_x64_reg_op(%016llxh): LOCK prefix found twice", (size_t)code - out_length);
 			}
-			
+
 			lock = true;
 			continue;
 		}
@@ -186,7 +186,7 @@ void decode_x64_reg_op(const u8* code, x64_op_t& out_op, x64_reg_t& out_reg, siz
 			{
 				LOG_ERROR(MEMORY, "decode_x64_reg_op(%016llxh): REPNE/REPNZ prefix found twice", (size_t)code - out_length);
 			}
-			
+
 			repne = true;
 			continue;
 		}
@@ -196,7 +196,7 @@ void decode_x64_reg_op(const u8* code, x64_op_t& out_op, x64_reg_t& out_reg, siz
 			{
 				LOG_ERROR(MEMORY, "decode_x64_reg_op(%016llxh): REP/REPE/REPZ prefix found twice", (size_t)code - out_length);
 			}
-			
+
 			repe = true;
 			continue;
 		}
@@ -225,7 +225,7 @@ void decode_x64_reg_op(const u8* code, x64_op_t& out_op, x64_reg_t& out_reg, siz
 			{
 				LOG_ERROR(MEMORY, "decode_x64_reg_op(%016llxh): operand-size override prefix found twice", (size_t)code - out_length);
 			}
-			
+
 			oso = true;
 			continue;
 		}
@@ -917,7 +917,7 @@ bool get_x64_reg_value(x64_context* context, x64_reg_t reg, size_t d_size, size_
 	else if (reg == X64_IMM32)
 	{
 		const s32 imm_value = *(s32*)(RIP(context) + i_size - 4);
-		
+
 		switch (d_size)
 		{
 		case 4: out_value = (u32)imm_value; return true;
@@ -1254,7 +1254,7 @@ bool handle_access_violation(u32 addr, bool is_writing, x64_context* context)
 				}
 				if (entry.start_addr <= addr && addr <= addr + mem->size - 1)
 				{
-					// Place the page fault event onto table so that other functions [sys_mmapper_free_address and ppu pagefault funcs] 
+					// Place the page fault event onto table so that other functions [sys_mmapper_free_address and ppu pagefault funcs]
 					// know that this thread is page faulted and where.

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

 					error_code sending_error = sys_event_port_send(entry.port_id, data1, data2, data3);
-					
+
 					// If we fail due to being busy, wait a bit and try again.
 					while (sending_error == CELL_EBUSY)
 					{
@@ -1282,7 +1282,7 @@ bool handle_access_violation(u32 addr, bool is_writing, x64_context* context)
 						thread_ctrl::wait_for(1000);
 						sending_error = sys_event_port_send(entry.port_id, data1, data2, data3);
 					}
-					
+
 					if (sending_error)
 					{
 						fmt::throw_exception("Unknown error %x while trying to pass page fault.", sending_error.value);
@@ -1707,7 +1707,7 @@ bool thread_ctrl::_wait_for(u64 usec)
 		}
 	}
 	_lock{_this->m_mutex};
-	
+
 	do
 	{
 		// Mutex is unlocked at the start and after the waiting
@@ -32,13 +32,23 @@ void patch_engine::append(const std::string& patch)
 {
 	if (fs::file f{patch})
 	{
-		auto root = YAML::Load(f.to_string());
+		YAML::Node root;
+
+		try
+		{
+			root = YAML::Load(f.to_string());
+		}
+		catch (const std::exception& e)
+		{
+			LOG_FATAL(GENERAL, "Failed to load patch file %s\n%s thrown: %s", patch, typeid(e).name(), e.what());
+			return;
+		}

 		for (auto pair : root)
 		{
 			auto& name = pair.first.Scalar();
 			auto& data = m_map[name];
-			
+
 			for (auto patch : pair.second)
 			{
 				u64 type64 = 0;
@@ -91,7 +101,7 @@ void patch_engine::append(const std::string& patch)
 					break;
 				}
 				}
-				
+
 				data.emplace_back(info);
 			}
 		}
@@ -39,6 +39,12 @@ bool utils::has_512()
 	return g_value;
 }

+bool utils::has_xop()
+{
+	static const bool g_value = has_avx() && get_cpuid(0x80000001, 0)[2] & 0x800;
+	return g_value;
+}
+
 std::string utils::get_system_info()
 {
 	std::string result;
@@ -92,6 +98,11 @@ std::string utils::get_system_info()
 		{
 			result += '+';
 		}
+
+		if (has_xop())
+		{
+			result += 'x';
+		}
 	}

 	if (has_rtm())
@@ -26,6 +26,8 @@ namespace utils

 	bool has_512();

+	bool has_xop();
+
 	inline bool transaction_enter()
 	{
 		while (true)
@@ -1,79 +1,107 @@
-#---------------------------------#
-#      general configuration      #
-#---------------------------------#

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

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

-# clone directory
-clone_folder: c:\projects\rpcs3
-
-# environment variables
 environment:
-  QTDIR: C:\Qt\5.9\msvc2015_64
+  QTDIR: C:\Qt\5.10.0\msvc2015_64
+  LLVMLIBS: https://drive.google.com/uc?export=download&id=0B8A6NaxhQAGRY2k3Q2Yya05lcm8
+  VULKAN: https://drive.google.com/uc?export=download&id=1A2eOMmCO714i0U7J0qI4aEMKnuWl8l_R
+  COMPATDB: https://rpcs3.net/compatibility?api=v1&export

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

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

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

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

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

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

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

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

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

-# to disable automatic tests
 test: off

-#---------------------------------#
-#      artifacts configuration    #
-#---------------------------------#
-
-# pushing entire folder as a zip archive
 artifacts:
- - path: bin
-   name: 'rpcs3-v0.0.4-$(COMMIT_DATE)-$(COMMIT_SHA)_win64'
+- path: $(RPCS3)
+  name: rpcs3
+- path: $(RPCS3).sha256
+  name: rpcs3 sha256 hash
+- path: openssl_win64.7z
+  name: openssl
+- path: openssl_win64.7z.sha256
+  name: openssl sha256 hash
+
+on_finish: 
+- ps: | # update appveyor build version, done last to prevent webhook breakage
+    update-appveyorbuild -version $env:AVVER
@@ -1,65 +0,0 @@
-#include "ps3emu_api.h"
-
-ps3emu_api::ps3emu_api(const std::string &path)
-{
-	load(path);
-}
-
-bool ps3emu_api::load(const std::string &path)
-{
-	if (!m_library.load(path))
-	{
-		return false;
-	}
-
-	bool is_no_errors = true;
-
-	if (!m_library.get(get_api_version, "ps3emu_api_get_api_version") || get_api_version() != ps3emu_api_version)
-	{
-		is_no_errors = false;
-	}
-
-	is_no_errors = is_no_errors && m_library.get(initialize, "ps3emu_api_initialize");
-	is_no_errors = is_no_errors && m_library.get(destroy, "ps3emu_api_destroy");
-
-	is_no_errors = is_no_errors && m_library.get(get_version_string, "ps3emu_api_get_version_string");
-	is_no_errors = is_no_errors && m_library.get(get_version_number, "ps3emu_api_get_version_number");
-	is_no_errors = is_no_errors && m_library.get(get_name_string, "ps3emu_api_get_name_string");
-
-	is_no_errors = is_no_errors && m_library.get(load_elf, "ps3emu_api_load_elf");
-
-	is_no_errors = is_no_errors && m_library.get(set_state, "ps3emu_api_set_state");
-	is_no_errors = is_no_errors && m_library.get(get_state, "ps3emu_api_get_state");
-
-	if (!is_no_errors)
-	{
-		close();
-		return false;
-	}
-
-	return true;
-}
-
-bool ps3emu_api::loaded() const
-{
-	return m_library.loaded();
-}
-
-void ps3emu_api::close()
-{
-	initialize = nullptr;
-	destroy = nullptr;
-	get_version_string = nullptr;
-	get_version_number = nullptr;
-	get_name_string = nullptr;
-	load_elf = nullptr;
-	set_state = nullptr;
-	get_state = nullptr;
-
-	m_library.close();
-}
-
-ps3emu_api::operator bool() const
-{
-	return loaded();
-}
@@ -1,35 +0,0 @@
-#pragma once
-
-#include <Utilities/dynamic_library.h>
-#include <string>
-#include "ps3emu_api_enums.h"
-#include "ps3emu_api_structs.h"
-
-class ps3emu_api
-{
-	utils::dynamic_library m_library;
-	
-public:
-	ps3emu_api() = default;
-	ps3emu_api(const std::string &path);
-
-	unsigned int(*get_api_version)() = nullptr;
-	ps3emu_api_error_code(*initialize)(const ps3emu_api_initialize_callbacks *callbacks) = nullptr;
-	ps3emu_api_error_code(*destroy)() = nullptr;
-
-	ps3emu_api_error_code(*get_version_string)(char *dest_buffer, int dest_buffer_size) = nullptr;
-	ps3emu_api_error_code(*get_version_number)(int *version_number) = nullptr;
-	ps3emu_api_error_code(*get_name_string)(char *dest_buffer, int dest_buffer_size) = nullptr;
-
-	ps3emu_api_error_code(*load_elf)(const char *path) = nullptr;
-
-	ps3emu_api_error_code(*set_state)(ps3emu_api_state state) = nullptr;
-	ps3emu_api_error_code(*get_state)(ps3emu_api_state *state) = nullptr;
-
-	bool load(const std::string &path);
-	bool loaded() const;
-	void close();
-	
-	explicit operator bool() const;
-};
-
@@ -33,7 +33,7 @@ Controller.prototype.ComponentSelectionPageCallback = function() {
    var widget = gui.currentPageWidget();

    widget.deselectAll();
-    widget.selectComponent("qt.qt5.5100.gcc_64");
+    widget.selectComponent("qt.qt5.5101.gcc_64");

    gui.clickButton(buttons.NextButton);
 }
@@ -6,12 +6,12 @@ set(CMAKE_CXX_STANDARD 14)
 include(CheckCXXCompilerFlag)

 # Qt section
-find_package(Qt5 5.7 COMPONENTS Widgets Network)
+find_package(Qt5 5.10 COMPONENTS Widgets Network)
 if(WIN32)
-	find_package(Qt5 5.7 COMPONENTS WinExtras REQUIRED)
+	find_package(Qt5 5.10 COMPONENTS WinExtras REQUIRED)
 	set(RPCS3_QT_LIBS Qt5::Widgets Qt5::WinExtras Qt5::Network)
 else()
-	find_package(Qt5 5.7 COMPONENTS DBus Gui)
+	find_package(Qt5 5.10 COMPONENTS DBus Gui)
 	if(Qt5DBus_FOUND)
 		set(RPCS3_QT_LIBS Qt5::Widgets Qt5::DBus Qt5::Network)
 		add_definitions(-DHAVE_QTDBUS)
@@ -23,15 +23,15 @@ 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.10.0)
+		message("Minimum supported Qt5 version is 5.10.0! You have version ${Qt5Widgets_VERSION} installed, please upgrade!")
 		if("${CMAKE_SYSTEM}" MATCHES "Linux")
 			message(FATAL_ERROR "Most distros do not provide an up-to-date version of Qt.
 If you're on Ubuntu or Linux Mint, there are PPAs you can use to install an up-to-date qt5 version.
-        https://launchpad.net/~beineri/+archive/ubuntu/opt-qt593-xenial
-        https://launchpad.net/~beineri/+archive/ubuntu/opt-qt593-trusty
+        https://launchpad.net/~beineri/+archive/ubuntu/opt-qt-5.10.1-xenial
+        https://launchpad.net/~beineri/+archive/ubuntu/opt-qt-5.10.1-trusty
 just make sure to run
-    source /opt/qt59/bin/qt59-env.sh
+    source /opt/qt510/bin/qt510-env.sh
 before re-running cmake")
 		elseif(WIN32)
 			message(FATAL_ERROR "You can download the latest version of Qt5 here: https://www.qt.io/download-open-source/")
@@ -42,7 +42,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.10.1\\msvc2017_64\\)")
 	elseif("${CMAKE_SYSTEM}" MATCHES "Linux")
 		message(FATAL_ERROR "Make sure to install your distro's qt5 package!")
 	else()
@@ -108,7 +108,7 @@ if(NOT MSVC)

 	add_compile_options(-msse -msse2 -mcx16 -mrtm)

-	if(NOT DEFINED ENV{TRAVIS})
+	if(NOT DEFINED ENV{TRAVIS} AND USE_NATIVE_INSTRUCTIONS)
 		add_compile_options(-march=native)
 	endif()

@@ -394,7 +394,7 @@ if(NOT MSVC)
 endif()

 if(WIN32)
-	target_link_libraries(rpcs3 ws2_32.lib Winmm.lib Psapi.lib VKstatic.1 glslang OSDependent OGLCompiler SPIRV HLSL setupapi.lib hidapi-hid Shlwapi.lib)
+	target_link_libraries(rpcs3 ws2_32.lib Winmm.lib Psapi.lib gdi32.lib VKstatic.1 glslang OSDependent OGLCompiler SPIRV HLSL setupapi.lib hidapi-hid Shlwapi.lib)
 	if(NOT MSVC)
 		target_link_libraries(rpcs3 ${OPENGL_LIBRARIES} opengl32.lib glu32.lib libpthread)
 	else()
@@ -457,6 +457,13 @@ endif()

 cotire(rpcs3)

+if (UNIX)
+# Copy icons to executable directory
+add_custom_command(TARGET rpcs3 POST_BUILD
+                   COMMAND ${CMAKE_COMMAND} -E copy_directory
+                       ${CMAKE_SOURCE_DIR}/bin/Icons $<TARGET_FILE_DIR:rpcs3>/Icons)
+endif()
+                       
 # Unix installation
 if(UNIX AND NOT APPLE)
 	# Install the binary
@@ -1 +1,13 @@
+#ifdef LLVM_AVAILABLE
+
 #include "CPUTranslator.h"
+
+cpu_translator::cpu_translator(llvm::LLVMContext& context, llvm::Module* module, bool is_be)
+    : m_context(context)
+	, m_module(module)
+	, m_is_be(is_be)
+{
+
+}
+
+#endif
@@ -1 +1,782 @@
 #pragma once
+
+#ifdef LLVM_AVAILABLE
+
+#include "restore_new.h"
+#ifdef _MSC_VER
+#pragma warning(push, 0)
+#endif
+#include "llvm/IR/LLVMContext.h"
+#include "llvm/IR/IRBuilder.h"
+#include "llvm/IR/Module.h"
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+#include "define_new_memleakdetect.h"
+
+#include "../Utilities/types.h"
+#include "../Utilities/StrFmt.h"
+#include "../Utilities/BEType.h"
+#include "../Utilities/BitField.h"
+
+#include <unordered_map>
+#include <map>
+#include <unordered_set>
+#include <set>
+#include <array>
+#include <vector>
+
+template <typename T = void>
+struct llvm_value_t
+{
+	static_assert(std::is_same<T, void>::value, "llvm_value_t<> error: unknown type");
+
+	using type = void;
+	static constexpr uint esize      = 0;
+	static constexpr bool is_int     = false;
+	static constexpr bool is_sint    = false;
+	static constexpr bool is_uint    = false;
+	static constexpr bool is_float   = false;
+	static constexpr uint is_vector  = false;
+	static constexpr uint is_pointer = false;
+
+	static llvm::Type* get_type(llvm::LLVMContext& context)
+	{
+		return llvm::Type::getVoidTy(context);
+	}
+
+	llvm::Value* eval(llvm::IRBuilder<>* ir) const
+	{
+		return value;
+	}
+
+	llvm::Value* value;
+
+	// llvm_value_t() = default;
+
+	// llvm_value_t(llvm::Value* value)
+	// 	: value(value)
+	// {
+	// }
+};
+
+template <>
+struct llvm_value_t<bool> : llvm_value_t<void>
+{
+	using type = bool;
+	using base = llvm_value_t<void>;
+	using base::base;
+
+	static constexpr uint esize  = 1;
+	static constexpr uint is_int = true;
+
+	static llvm::Type* get_type(llvm::LLVMContext& context)
+	{
+		return llvm::Type::getInt1Ty(context);
+	}
+};
+
+template <>
+struct llvm_value_t<char> : llvm_value_t<void>
+{
+	using type = char;
+	using base = llvm_value_t<void>;
+	using base::base;
+
+	static constexpr uint esize  = 8;
+	static constexpr bool is_int = true;
+
+	static llvm::Type* get_type(llvm::LLVMContext& context)
+	{
+		return llvm::Type::getInt8Ty(context);
+	}
+};
+
+template <>
+struct llvm_value_t<s8> : llvm_value_t<char>
+{
+	using type = s8;
+	using base = llvm_value_t<char>;
+	using base::base;
+
+	static constexpr bool is_sint = true;
+};
+
+template <>
+struct llvm_value_t<u8> : llvm_value_t<char>
+{
+	using type = u8;
+	using base = llvm_value_t<char>;
+	using base::base;
+
+	static constexpr bool is_uint = true;
+};
+
+template <>
+struct llvm_value_t<s16> : llvm_value_t<s8>
+{
+	using type = s16;
+	using base = llvm_value_t<s8>;
+	using base::base;
+
+	static constexpr uint esize = 16;
+
+	static llvm::Type* get_type(llvm::LLVMContext& context)
+	{
+		return llvm::Type::getInt16Ty(context);
+	}
+};
+
+template <>
+struct llvm_value_t<u16> : llvm_value_t<s16>
+{
+	using type = u16;
+	using base = llvm_value_t<s16>;
+	using base::base;
+
+	static constexpr bool is_sint = false;
+	static constexpr bool is_uint = true;
+};
+
+template <>
+struct llvm_value_t<s32> : llvm_value_t<s8>
+{
+	using type = s32;
+	using base = llvm_value_t<s8>;
+	using base::base;
+
+	static constexpr uint esize = 32;
+
+	static llvm::Type* get_type(llvm::LLVMContext& context)
+	{
+		return llvm::Type::getInt32Ty(context);
+	}
+};
+
+template <>
+struct llvm_value_t<u32> : llvm_value_t<s32>
+{
+	using type = u32;
+	using base = llvm_value_t<s32>;
+	using base::base;
+
+	static constexpr bool is_sint = false;
+	static constexpr bool is_uint = true;
+};
+
+template <>
+struct llvm_value_t<s64> : llvm_value_t<s8>
+{
+	using type = s64;
+	using base = llvm_value_t<s8>;
+	using base::base;
+
+	static constexpr uint esize = 64;
+
+	static llvm::Type* get_type(llvm::LLVMContext& context)
+	{
+		return llvm::Type::getInt64Ty(context);
+	}
+};
+
+template <>
+struct llvm_value_t<u64> : llvm_value_t<s64>
+{
+	using type = u64;
+	using base = llvm_value_t<s64>;
+	using base::base;
+
+	static constexpr bool is_sint = false;
+	static constexpr bool is_uint = true;
+};
+
+template <>
+struct llvm_value_t<s128> : llvm_value_t<s8>
+{
+	using type = s128;
+	using base = llvm_value_t<s8>;
+	using base::base;
+
+	static constexpr uint esize = 128;
+
+	static llvm::Type* get_type(llvm::LLVMContext& context)
+	{
+		return llvm::Type::getIntNTy(context, 128);
+	}
+};
+
+template <>
+struct llvm_value_t<u128> : llvm_value_t<s128>
+{
+	using type = u128;
+	using base = llvm_value_t<s128>;
+	using base::base;
+
+	static constexpr bool is_sint = false;
+	static constexpr bool is_uint = true;
+};
+
+template <>
+struct llvm_value_t<f32> : llvm_value_t<void>
+{
+	using type = f32;
+	using base = llvm_value_t<void>;
+	using base::base;
+
+	static constexpr uint esize    = 32;
+	static constexpr bool is_float = true;
+
+	static llvm::Type* get_type(llvm::LLVMContext& context)
+	{
+		return llvm::Type::getFloatTy(context);
+	}
+};
+
+template <>
+struct llvm_value_t<f64> : llvm_value_t<void>
+{
+	using type = f64;
+	using base = llvm_value_t<void>;
+	using base::base;
+
+	static constexpr uint esize    = 64;
+	static constexpr bool is_float = true;
+
+	static llvm::Type* get_type(llvm::LLVMContext& context)
+	{
+		return llvm::Type::getDoubleTy(context);
+	}
+};
+
+template <typename T>
+struct llvm_value_t<T*> : llvm_value_t<T>
+{
+	static_assert(!std::is_void<T>::value, "llvm_value_t<> error: invalid pointer to void type");
+
+	using type = T*;
+	using base = llvm_value_t<T>;
+	using base::base;
+
+	static constexpr uint is_pointer = llvm_value_t<T>::is_pointer + 1;
+
+	static llvm::Type* get_type(llvm::LLVMContext& context)
+	{
+		return llvm_value_t<T>::get_type(context)->getPointerTo();
+	}
+};
+
+template <typename T, uint N>
+struct llvm_value_t<T[N]> : llvm_value_t<T>
+{
+	static_assert(!llvm_value_t<T>::is_vector, "llvm_value_t<> error: invalid multidimensional vector");
+	static_assert(!llvm_value_t<T>::is_pointer, "llvm_value_t<>: vector of pointers is not allowed");
+
+	using type = T[N];
+	using base = llvm_value_t<T>;
+	using base::base;
+
+	static constexpr uint is_vector  = N;
+	static constexpr uint is_pointer = 0;
+
+	static llvm::Type* get_type(llvm::LLVMContext& context)
+	{
+		return llvm::VectorType::get(llvm_value_t<T>::get_type(context), N);
+	}
+};
+
+template <typename T, typename A1, typename A2>
+struct llvm_add_t
+{
+	using type = T;
+
+	A1 a1;
+	A2 a2;
+
+	static_assert(llvm_value_t<T>::is_sint || llvm_value_t<T>::is_uint || llvm_value_t<T>::is_float, "llvm_add_t<>: invalid type");
+
+	llvm::Value* eval(llvm::IRBuilder<>* ir) const
+	{
+		const auto v1 = a1.eval(ir);
+		const auto v2 = a2.eval(ir);
+
+		if (llvm_value_t<T>::is_int)
+		{
+			return ir->CreateAdd(v1, v2);
+		}
+
+		if (llvm_value_t<T>::is_float)
+		{
+			return ir->CreateFAdd(v1, v2);
+		}
+	}
+};
+
+template <typename T1, typename T2, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<std::is_same<typename T1::type, typename T2::type>::value>>
+inline llvm_add_t<typename T1::type, T1, T2> operator +(T1 a1, T2 a2)
+{
+	return {a1, a2};
+}
+
+template <typename T, typename A1, typename A2>
+struct llvm_sub_t
+{
+	using type = T;
+
+	A1 a1;
+	A2 a2;
+
+	static_assert(llvm_value_t<T>::is_sint || llvm_value_t<T>::is_uint || llvm_value_t<T>::is_float, "llvm_sub_t<>: invalid type");
+
+	llvm::Value* eval(llvm::IRBuilder<>* ir) const
+	{
+		const auto v1 = a1.eval(ir);
+		const auto v2 = a2.eval(ir);
+
+		if (llvm_value_t<T>::is_int)
+		{
+			return ir->CreateSub(v1, v2);
+		}
+
+		if (llvm_value_t<T>::is_float)
+		{
+			return ir->CreateFSub(v1, v2);
+		}
+	}
+};
+
+template <typename T1, typename T2, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<std::is_same<typename T1::type, typename T2::type>::value>>
+inline llvm_sub_t<typename T1::type, T1, T2> operator -(T1 a1, T2 a2)
+{
+	return {a1, a2};
+}
+
+template <typename T, typename A1, typename A2>
+struct llvm_mul_t
+{
+	using type = T;
+
+	A1 a1;
+	A2 a2;
+
+	static_assert(llvm_value_t<T>::is_sint || llvm_value_t<T>::is_uint || llvm_value_t<T>::is_float, "llvm_mul_t<>: invalid type");
+
+	llvm::Value* eval(llvm::IRBuilder<>* ir) const
+	{
+		const auto v1 = a1.eval(ir);
+		const auto v2 = a2.eval(ir);
+
+		if (llvm_value_t<T>::is_int)
+		{
+			return ir->CreateMul(v1, v2);
+		}
+
+		if (llvm_value_t<T>::is_float)
+		{
+			return ir->CreateFMul(v1, v2);
+		}
+	}
+};
+
+template <typename T1, typename T2, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<std::is_same<typename T1::type, typename T2::type>::value>>
+inline llvm_mul_t<typename T1::type, T1, T2> operator *(T1 a1, T2 a2)
+{
+	return {a1, a2};
+}
+
+template <typename T, typename A1, typename A2>
+struct llvm_div_t
+{
+	using type = T;
+
+	A1 a1;
+	A2 a2;
+
+	static_assert(llvm_value_t<T>::is_sint || llvm_value_t<T>::is_uint || llvm_value_t<T>::is_float, "llvm_div_t<>: invalid type");
+
+	llvm::Value* eval(llvm::IRBuilder<>* ir) const
+	{
+		const auto v1 = a1.eval(ir);
+		const auto v2 = a2.eval(ir);
+
+		if (llvm_value_t<T>::is_sint)
+		{
+			return ir->CreateSDiv(v1, v2);
+		}
+
+		if (llvm_value_t<T>::is_uint)
+		{
+			return ir->CreateUDiv(v1, v2);
+		}
+
+		if (llvm_value_t<T>::is_float)
+		{
+			return ir->CreateFDiv(v1, v2);
+		}
+	}
+};
+
+template <typename T1, typename T2, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<std::is_same<typename T1::type, typename T2::type>::value>>
+inline llvm_div_t<typename T1::type, T1, T2> operator /(T1 a1, T2 a2)
+{
+	return {a1, a2};
+}
+
+template <typename T, typename A1>
+struct llvm_neg_t
+{
+	using type = T;
+
+	A1 a1;
+
+	static_assert(llvm_value_t<T>::is_sint || llvm_value_t<T>::is_uint || llvm_value_t<T>::is_float, "llvm_neg_t<>: invalid type");
+
+	llvm::Value* eval(llvm::IRBuilder<>* ir) const
+	{
+		const auto v1 = a1.eval(ir);
+
+		if (llvm_value_t<T>::is_int)
+		{
+			return ir->CreateNeg(v1);
+		}
+
+		if (llvm_value_t<T>::is_float)
+		{
+			return ir->CreateFNeg(v1);
+		}
+	}
+};
+
+template <typename T1, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<llvm_value_t<typename T1::type>::esize>>
+inline llvm_neg_t<typename T1::type, T1> operator -(T1 a1)
+{
+	return {a1};
+}
+
+// Constant int helper
+struct llvm_int_t
+{
+	u64 value;
+
+	u64 eval(llvm::IRBuilder<>*) const
+	{
+		return value;
+	}
+};
+
+template <typename T, typename A1, typename A2>
+struct llvm_shl_t
+{
+	using type = T;
+
+	A1 a1;
+	A2 a2;
+
+	static_assert(llvm_value_t<T>::is_sint || llvm_value_t<T>::is_uint, "llvm_shl_t<>: invalid type");
+
+	llvm::Value* eval(llvm::IRBuilder<>* ir) const
+	{
+		const auto v1 = a1.eval(ir);
+		const auto v2 = a2.eval(ir);
+
+		if (llvm_value_t<T>::is_sint)
+		{
+			return ir->CreateShl(v1, v2);
+		}
+
+		if (llvm_value_t<T>::is_uint)
+		{
+			return ir->CreateShl(v1, v2);
+		}
+	}
+};
+
+template <typename T1, typename T2, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<std::is_same<typename T1::type, typename T2::type>::value>>
+inline llvm_shl_t<typename T1::type, T1, T2> operator <<(T1 a1, T2 a2)
+{
+	return {a1, a2};
+}
+
+template <typename T1, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<llvm_value_t<typename T1::type>::is_int>>
+inline llvm_shl_t<typename T1::type, T1, llvm_int_t> operator <<(T1 a1, u64 a2)
+{
+	return {a1, llvm_int_t{a2}};
+}
+
+template <typename T, typename A1, typename A2>
+struct llvm_shr_t
+{
+	using type = T;
+
+	A1 a1;
+	A2 a2;
+
+	static_assert(llvm_value_t<T>::is_sint || llvm_value_t<T>::is_uint, "llvm_shr_t<>: invalid type");
+
+	llvm::Value* eval(llvm::IRBuilder<>* ir) const
+	{
+		const auto v1 = a1.eval(ir);
+		const auto v2 = a2.eval(ir);
+
+		if (llvm_value_t<T>::is_sint)
+		{
+			return ir->CreateAShr(v1, v2);
+		}
+
+		if (llvm_value_t<T>::is_uint)
+		{
+			return ir->CreateLShr(v1, v2);
+		}
+	}
+};
+
+template <typename T1, typename T2, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<std::is_same<typename T1::type, typename T2::type>::value>>
+inline llvm_shr_t<typename T1::type, T1, T2> operator >>(T1 a1, T2 a2)
+{
+	return {a1, a2};
+}
+
+template <typename T1, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<llvm_value_t<typename T1::type>::is_int>>
+inline llvm_shr_t<typename T1::type, T1, llvm_int_t> operator >>(T1 a1, u64 a2)
+{
+	return {a1, llvm_int_t{a2}};
+}
+
+template <typename T, typename A1, typename A2>
+struct llvm_and_t
+{
+	using type = T;
+
+	A1 a1;
+	A2 a2;
+
+	static_assert(llvm_value_t<T>::is_int, "llvm_and_t<>: invalid type");
+
+	llvm::Value* eval(llvm::IRBuilder<>* ir) const
+	{
+		const auto v1 = a1.eval(ir);
+		const auto v2 = a2.eval(ir);
+
+		if (llvm_value_t<T>::is_int)
+		{
+			return ir->CreateAnd(v1, v2);
+		}
+	}
+};
+
+template <typename T1, typename T2, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<std::is_same<typename T1::type, typename T2::type>::value>>
+inline llvm_and_t<typename T1::type, T1, T2> operator &(T1 a1, T2 a2)
+{
+	return {a1, a2};
+}
+
+template <typename T1, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<llvm_value_t<typename T1::type>::is_int>>
+inline llvm_and_t<typename T1::type, T1, llvm_int_t> operator &(T1 a1, u64 a2)
+{
+	return {a1, llvm_int_t{a2}};
+}
+
+template <typename T, typename A1, typename A2>
+struct llvm_or_t
+{
+	using type = T;
+
+	A1 a1;
+	A2 a2;
+
+	static_assert(llvm_value_t<T>::is_int, "llvm_or_t<>: invalid type");
+
+	llvm::Value* eval(llvm::IRBuilder<>* ir) const
+	{
+		const auto v1 = a1.eval(ir);
+		const auto v2 = a2.eval(ir);
+
+		if (llvm_value_t<T>::is_int)
+		{
+			return ir->CreateOr(v1, v2);
+		}
+	}
+};
+
+template <typename T1, typename T2, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<std::is_same<typename T1::type, typename T2::type>::value>>
+inline llvm_or_t<typename T1::type, T1, T2> operator |(T1 a1, T2 a2)
+{
+	return {a1, a2};
+}
+
+template <typename T1, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<llvm_value_t<typename T1::type>::is_int>>
+inline llvm_or_t<typename T1::type, T1, llvm_int_t> operator |(T1 a1, u64 a2)
+{
+	return {a1, llvm_int_t{a2}};
+}
+
+template <typename T, typename A1, typename A2>
+struct llvm_xor_t
+{
+	using type = T;
+
+	A1 a1;
+	A2 a2;
+
+	static_assert(llvm_value_t<T>::is_int, "llvm_xor_t<>: invalid type");
+
+	llvm::Value* eval(llvm::IRBuilder<>* ir) const
+	{
+		const auto v1 = a1.eval(ir);
+		const auto v2 = a2.eval(ir);
+
+		if (llvm_value_t<T>::is_int)
+		{
+			return ir->CreateXor(v1, v2);
+		}
+	}
+};
+
+template <typename T1, typename T2, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<std::is_same<typename T1::type, typename T2::type>::value>>
+inline llvm_xor_t<typename T1::type, T1, T2> operator ^(T1 a1, T2 a2)
+{
+	return {a1, a2};
+}
+
+template <typename T1, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<llvm_value_t<typename T1::type>::is_int>>
+inline llvm_xor_t<typename T1::type, T1, llvm_int_t> operator ^(T1 a1, u64 a2)
+{
+	return {a1, llvm_int_t{a2}};
+}
+
+template <typename T, typename A1>
+struct llvm_not_t
+{
+	using type = T;
+
+	A1 a1;
+
+	static_assert(llvm_value_t<T>::is_int, "llvm_not_t<>: invalid type");
+
+	llvm::Value* eval(llvm::IRBuilder<>* ir) const
+	{
+		const auto v1 = a1.eval(ir);
+
+		if (llvm_value_t<T>::is_int)
+		{
+			return ir->CreateNot(v1);
+		}
+	}
+};
+
+template <typename T1, typename = decltype(std::declval<T1>().eval(0)), typename = std::enable_if_t<llvm_value_t<typename T1::type>::is_int>>
+inline llvm_not_t<typename T1::type, T1> operator ~(T1 a1)
+{
+	return {a1};
+}
+
+class cpu_translator
+{
+protected:
+	cpu_translator(llvm::LLVMContext& context, llvm::Module* module, bool is_be);
+
+	// LLVM context
+	llvm::LLVMContext& m_context;
+
+	// Module to which all generated code is output to
+	llvm::Module* const m_module;
+
+	// Endianness, affects vector element numbering (TODO)
+	const bool m_is_be;
+
+	// IR builder
+	llvm::IRBuilder<>* m_ir;
+
+public:
+	// Convert a C++ type to an LLVM type (TODO: remove)
+	template <typename T>
+	llvm::Type* GetType()
+	{
+		return llvm_value_t<T>::get_type(m_context);
+	}
+
+	template <typename T>
+	llvm::Type* get_type()
+	{
+		return llvm_value_t<T>::get_type(m_context);
+	}
+
+	template <typename T>
+	using value_t = llvm_value_t<T>;
+
+	template <typename T>
+	auto eval(T expr)
+	{
+		value_t<typename T::type> result;
+		result.value = expr.eval(m_ir);
+		return result;
+	}
+
+	template <typename T, typename T2>
+	value_t<T> bitcast(T2 expr)
+	{
+		value_t<T> result;
+		result.value = m_ir->CreateBitCast(expr.eval(m_ir), result.get_type(m_context));
+		return result;
+	}
+
+	template <typename T, typename T2>
+	value_t<T> trunc(T2 expr)
+	{
+		value_t<T> result;
+		result.value = m_ir->CreateTrunc(expr.eval(m_ir), result.get_type(m_context));
+		return result;
+	}
+
+	template <typename T, typename T2>
+	value_t<T> sext(T2 expr)
+	{
+		value_t<T> result;
+		result.value = m_ir->CreateSExt(expr.eval(m_ir), result.get_type(m_context));
+		return result;
+	}
+
+	template <typename T, typename T2>
+	value_t<T> zext(T2 expr)
+	{
+		value_t<T> result;
+		result.value = m_ir->CreateZExt(expr.eval(m_ir), result.get_type(m_context));
+		return result;
+	}
+
+	// Get unsigned addition carry into the sign bit (s = a + b)
+	template <typename T>
+	static inline auto ucarry(T a, T b, T s)
+	{
+		return ((a ^ b) & ~s) | (a & b);
+	}
+
+	// Get signed addition overflow into the sign bit (s = a + b)
+	template <typename T>
+	static inline auto scarry(T a, T b, T s)
+	{
+		return (b ^ s) & ~(a ^ b);
+	}
+
+	// Get signed subtraction overflow into the sign bit (d = a - b)
+	template <typename T>
+	static inline auto sborrow(T a, T b, T d)
+	{
+		return (a ^ b) & (a ^ d);
+	}
+
+	// Bitwise select (c ? a : b)
+	template <typename T>
+	static inline auto merge(T c, T a, T b)
+	{
+		return (a & c) | (b & ~c);
+	}
+
+	// Average: (a + b + 1) >> 1
+	template <typename T>
+	static inline auto avg(T a, T b)
+	{
+		return (a >> 1) + (b >> 1) + ((a | b) & 1);
+	}
+};
+
+#endif
@@ -158,7 +158,7 @@ void mfc_thread::cpu_task()

 					if ((cmd.cmd & ~(MFC_BARRIER_MASK | MFC_FENCE_MASK)) == MFC_PUTQLLUC_CMD)
 					{
-						auto& data = vm::ps3::_ref<decltype(spu.rdata)>(cmd.eal);
+						auto& data = vm::_ref<decltype(spu.rdata)>(cmd.eal);
 						const auto to_write = spu._ref<decltype(spu.rdata)>(cmd.lsa & 0x3ffff);

 						cmd.size = 0;
@@ -302,7 +302,7 @@ void mfc_thread::cpu_task()
 					spu.ch_tag_stat.push(spu, completed);
 					no_updates = 0;
 				}
-				else if (completed && spu.ch_tag_mask == completed && spu.ch_tag_upd.compare_and_swap_test(2, 0))
+				else if (spu.ch_tag_mask == completed && spu.ch_tag_upd.compare_and_swap_test(2, 0))
 				{
 					spu.ch_tag_stat.push(spu, completed);
 					no_updates = 0;
@@ -1,6 +1,6 @@
 #pragma once

-namespace vm { using namespace ps3; }
+

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

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

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

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

-namespace vm { using namespace ps3; }
+

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

-namespace vm { using namespace ps3; }
+

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

 #include "Utilities/Thread.h"

-namespace vm { using namespace ps3; }
+

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

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

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

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

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

-namespace vm { using namespace ps3; }
+

 // Error codes
 enum
@@ -1,6 +1,6 @@
 #pragma once

-namespace vm { using namespace ps3; }
+

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

 #include "cellBgdl.h"

-namespace vm { using namespace ps3; }
+

 logs::channel cellBGDL("cellBGDL");

@@ -30,5 +30,5 @@ struct CellBGDLInfo
 	be_t<u64> received_size;
 	be_t<u64> content_size;
 	be_t<s32> state; // CellBGDLState
-	vm::ps3::bptr<void> reserved;
+	vm::bptr<void> reserved;
 };
@@ -1,6 +1,6 @@
 #pragma once

-namespace vm { using namespace ps3; }
+

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

-namespace vm { using namespace ps3; }
+

 // libCelp8Enc = 0x806140a1 - 0x806140bf

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

-namespace vm { using namespace ps3; }
+

 // libCelpEnc = 0x80614001 - 0x806140ff

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

-namespace vm { using namespace ps3; }
+

 logs::channel cellCrossController("cellCrossController");

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

-namespace vm { using namespace ps3; }
+

 // libDaisy = 0x80410501 - 0x804105ff

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

-namespace vm { using namespace ps3; }
+

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

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

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

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

-namespace vm { using namespace ps3; }
+

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

-namespace vm { using namespace ps3; }
+

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

 #include "cellFont.h"

-namespace vm { using namespace ps3; }
+

 struct CellFontLibraryConfigFT
 {
@@ -11,7 +11,7 @@

 #include <mutex>

-namespace vm { using namespace ps3; }
+

 logs::channel cellFs("cellFs");

@@ -417,7 +417,7 @@ error_code cellFsGetDirectoryEntries(u32 fd, vm::ptr<CellFsDirectoryEntry> entri
 		return CellError(+op->arg._code);
 	}

-	return not_an_error(rc);	
+	return not_an_error(rc);
 }

 error_code cellFsReadWithOffset(u32 fd, u64 offset, vm::ptr<void> buf, u64 buffer_size, vm::ptr<u64> nread)
@@ -433,7 +433,7 @@ error_code cellFsReadWithOffset(u32 fd, u64 offset, vm::ptr<void> buf, u64 buffe
 	vm::var<lv2_file_op_rw> arg;

 	arg->_vtable = vm::cast(0xfa8a0000); // Intentionally wrong (provide correct vtable if necessary)
-	
+
 	arg->op = 0x8000000a;
 	arg->fd = fd;
 	arg->buf = buf;
@@ -447,7 +447,7 @@ error_code cellFsReadWithOffset(u32 fd, u64 offset, vm::ptr<void> buf, u64 buffe
 	{
 		*nread = rc && rc != CELL_EFSSPECIFIC ? 0 : arg->out_size.value();
 	}
-	
+
 	if (!rc && arg->out_code)
 	{
 		return CellError(+arg->out_code);
@@ -475,7 +475,7 @@ error_code cellFsWriteWithOffset(u32 fd, u64 offset, vm::cptr<void> buf, u64 dat
 	vm::var<lv2_file_op_rw> arg;

 	arg->_vtable = vm::cast(0xfa8b0000); // Intentionally wrong (provide correct vtable if necessary)
-	
+
 	arg->op = 0x8000000b;
 	arg->fd = fd;
 	arg->buf = vm::const_ptr_cast<void>(buf);
@@ -623,7 +623,7 @@ error_code cellFsAllocateFileAreaWithoutZeroFill(vm::cptr<char> path, u64 size)
 	{
 		return CellError(rc);
 	}
-	
+
 	return CELL_OK;
 }

@@ -670,7 +670,7 @@ s32 cellFsStReadInit(u32 fd, vm::cptr<CellFsRingBuffer> ringbuf)
 	{
 		return CELL_EBADF;
 	}
-	
+
 	if (file->flags & CELL_FS_O_WRONLY)
 	{
 		return CELL_EPERM;
@@ -780,7 +780,7 @@ s32 cellFsStReadStop(u32 fd)
 s32 cellFsStRead(u32 fd, vm::ptr<u8> buf, u64 size, vm::ptr<u64> rsize)
 {
 	cellFs.todo("cellFsStRead(fd=%d, buf=*0x%x, size=0x%llx, rsize=*0x%x)", fd, buf, size, rsize);
-	
+
 	const auto file = idm::get<lv2_fs_object, lv2_file>(fd);

 	if (!file)
@@ -812,7 +812,7 @@ s32 cellFsStReadGetCurrentAddr(u32 fd, vm::ptr<u32> addr, vm::ptr<u64> size)
 s32 cellFsStReadPutCurrentAddr(u32 fd, vm::ptr<u8> addr, u64 size)
 {
 	cellFs.todo("cellFsStReadPutCurrentAddr(fd=%d, addr=*0x%x, size=0x%llx)", fd, addr, size);
-	
+
 	const auto file = idm::get<lv2_fs_object, lv2_file>(fd);

 	if (!file)
@@ -828,7 +828,7 @@ s32 cellFsStReadPutCurrentAddr(u32 fd, vm::ptr<u8> addr, u64 size)
 s32 cellFsStReadWait(u32 fd, u64 size)
 {
 	cellFs.todo("cellFsStReadWait(fd=%d, size=0x%llx)", fd, size);
-	
+
 	const auto file = idm::get<lv2_fs_object, lv2_file>(fd);

 	if (!file)
@@ -837,7 +837,7 @@ s32 cellFsStReadWait(u32 fd, u64 size)
 	}

 	// TODO
-	
+
 	return CELL_OK;
 }

@@ -853,7 +853,7 @@ s32 cellFsStReadWaitCallback(u32 fd, u64 size, vm::ptr<void(s32 xfd, u64 xsize)>
 	}

 	// TODO
-	
+
 	return CELL_OK;
 }

@@ -2,7 +2,7 @@

 #include "Emu/Cell/ErrorCodes.h"

-namespace vm { using namespace ps3; }
+

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

-namespace vm { using namespace ps3; }
+

 #include "Emu/RSX/GCM.h"

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

-namespace vm { using namespace ps3; }
+

 static const float CELL_GEM_SPHERE_RADIUS_MM = 22.5f;

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

-namespace vm { using namespace ps3; }
+

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

-namespace vm { using namespace ps3; }
+

 // libHttp = 0x80710001 - 0x80710fff
 // libHttps = 0x80710a01 - 0x80710aff
@@ -10,10 +10,10 @@ enum
 {
 	CELL_HTTP_NET_ERROR_TYPE_MASK = 0xffffff00,
 	CELL_HTTP_NET_ERROR_MASK = 0xff,
-	
+
 	// CELL_HTTP_NET_ERROR
 	// CELL_HTTP_IS_NET_RESOLVER_ERROR
-	
+
 	CELL_HTTP_ERROR_ALREADY_INITIALIZED = 0x80710001,
 	CELL_HTTP_ERROR_NOT_INITIALIZED = 0x80710002,
 	CELL_HTTP_ERROR_NO_MEMORY = 0x80710003,
@@ -48,7 +48,7 @@ enum
 	CELL_HTTP_ERROR_CACHE_NOT_INITIALIZED = 0x80710044,
 	CELL_HTTP_ERROR_LINE_EXCEEDS_MAX = 0x80710045,
 	CELL_HTTP_ERROR_REQUIRES_BASIC_AUTH = 0x80710046,
-	
+
 	CELL_HTTP_ERROR_UNKNOWN = 0x80710051,
 	CELL_HTTP_ERROR_INTERNAL = 0x80710052,
 	CELL_HTTP_ERROR_NONREMOVABLE = 0x80710053,
@@ -62,7 +62,7 @@ enum
 	CELL_HTTP_ERROR_DECODE_SETUP = 0x8071005b,
 	CELL_HTTP_ERROR_DECODE_STREAM = 0x8071005c,
 	CELL_HTTP_ERROR_BROKEN_DECODE_STREAM = 0x8071005d,
-	
+
 	CELL_HTTP_ERROR_INVALID_DCACHE_PATH = 0x80710060,
 	CELL_HTTP_ERROR_DCACHE_ALREADY_INITIALIZED = 0x80710061,
 	CELL_HTTP_ERROR_DCACHE_NOT_INITIALIZED = 0x80710062,
@@ -94,12 +94,12 @@ enum
 	CELL_HTTP_ERROR_DCACHE_ABORTED = 0x80710082,
 	CELL_HTTP_ERROR_DCACHE_INDEX_IS_CLOSING = 0x80710083,
 	CELL_HTTP_ERROR_DCACHE_UNKNOWN_INDEX_STATE = 0x80710084,
-	
+
 	CELL_HTTP_ERROR_NET_FIN = 0x80710091,
 	CELL_HTTP_ERROR_NET_CONNECT_TIMEOUT = 0x80710092,
 	CELL_HTTP_ERROR_NET_SELECT_TIMEOUT = 0x80710093,
 	CELL_HTTP_ERROR_NET_SEND_TIMEOUT = 0x80710094,
-	
+
 	CELL_HTTP_ERROR_NET_RESOLVER = 0x80710100,
 	CELL_HTTP_ERROR_NET_ABORT = 0x80710200,
 	CELL_HTTP_ERROR_NET_OPTION = 0x80710300,
@@ -1,6 +1,6 @@
 #pragma once

-namespace vm { using namespace ps3; }
+

 // libHttp_Util: 0x80711001 - 0x807110ff

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

-namespace vm { using namespace ps3; }
+

 typedef vm::ptr<void> CellImeJpHandle;

@@ -17,11 +17,9 @@ enum {
 	CELL_IMEJP_MOVE_CLAUSE_GAP	= 8,
 };

-//cellImeJpEnterChar, returning values pointed in pOutputStatus. 
+//cellImeJpEnterChar, returning values pointed in pOutputStatus.
 enum {
 	CELL_IMEJP_RET_NONE			= 0,
 	CELL_IMEJP_RET_THROUGH		= 1,
 	CELL_IMEJP_RET_CONFIRMED	= 2,
 };
-
-
@@ -1,6 +1,6 @@
 #pragma once

-namespace vm { using namespace ps3; }
+

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

-namespace vm { using namespace ps3; }
+

 // Error Codes
 enum
@@ -11,7 +11,7 @@ enum
 	CELL_JPGENC_ERROR_EMPTY = 0x80611194,
 	CELL_JPGENC_ERROR_RESET = 0x80611195,
 	CELL_JPGENC_ERROR_FATAL = 0x80611196,
-	
+
 	CELL_JPGENC_ERROR_STREAM_ABORT = 0x806111A1,
 	CELL_JPGENC_ERROR_STREAM_SKIP = 0x806111A2,
 	CELL_JPGENC_ERROR_STREAM_OVERFLOW = 0x806111A3,
@@ -26,19 +26,19 @@ enum
 	CELL_JPGENC_COLOR_SPACE_YCbCr = 3,
 	CELL_JPGENC_COLOR_SPACE_RGBA = 10,
 	CELL_JPGENC_COLOR_SPACE_ARGB = 20,
-	
+
 	CELL_JPGENC_SAMPLING_FMT_YCbCr444,
 	CELL_JPGENC_SAMPLING_FMT_YCbCr422,
 	CELL_JPGENC_SAMPLING_FMT_YCbCr420,
 	CELL_JPGENC_SAMPLING_FMT_YCbCr411,
 	CELL_JPGENC_SAMPLING_FMT_FULL,
-	
+
 	CELL_JPGENC_DCT_METHOD_QUALITY = 0,
 	CELL_JPGENC_DCT_METHOD_FAST = 5,
-	
+
 	CELL_JPGENC_COMPR_MODE_CONSTANT_QUALITY,
 	CELL_JPGENC_COMPR_MODE_STREAM_SIZE_LIMIT,
-	
+
 	CELL_JPGENC_LOCATION_FILE,
 	CELL_JPGENC_LOCATION_BUFFER,
 };
@@ -6,7 +6,7 @@
 #include "Emu/Io/KeyboardHandler.h"
 #include "cellKb.h"

-namespace vm { using namespace ps3; }
+

 extern logs::channel sys_io;

@@ -95,12 +95,12 @@ u16 cellKbCnvRawCode(u32 arrange, u32 mkey, u32 led, u16 rawcode)
 	// ASCII
 	if (rawcode >= 0x04 && rawcode <= 0x1D)                                   // 'A' - 'Z'
 	{
-		rawcode -= 
-			(mkey&(CELL_KB_MKEY_L_SHIFT|CELL_KB_MKEY_R_SHIFT)) ? 
+		rawcode -=
+			(mkey&(CELL_KB_MKEY_L_SHIFT|CELL_KB_MKEY_R_SHIFT)) ?
 			((led&(CELL_KB_LED_CAPS_LOCK)) ? 0 : 0x20) :
 			((led&(CELL_KB_LED_CAPS_LOCK)) ? 0x20 : 0);
 		return rawcode + 0x5D;
-	}				
+	}
 	if (rawcode >= 0x1E && rawcode <= 0x26) return rawcode + 0x13;            // '1' - '9'
 	if (rawcode == 0x27) return 0x30;                                         // '0'
 	if (rawcode == 0x28) return 0x0A;                                         // '\n'
@@ -136,7 +136,7 @@ error_code cellKbGetInfo(vm::ptr<CellKbInfo> info)
 	{
 		info->status[i] = current_info.status[i];
 	}
-	
+
 	return CELL_OK;
 }

@@ -165,7 +165,7 @@ error_code cellKbRead(u32 port_no, vm::ptr<CellKbData> data)
 	}

 	current_data.len = 0;
-	
+
 	return CELL_OK;
 }

@@ -180,7 +180,7 @@ error_code cellKbSetCodeType(u32 port_no, u32 type)

 	if (port_no >= handler->GetKeyboards().size())
 		return CELL_KB_ERROR_INVALID_PARAMETER;
-	
+
 	KbConfig& current_config = handler->GetConfig(port_no);
 	current_config.code_type = type;
 	return CELL_OK;
@@ -203,7 +203,7 @@ error_code cellKbSetReadMode(u32 port_no, u32 rmode)

 	if (port_no >= handler->GetKeyboards().size())
 		return CELL_KB_ERROR_INVALID_PARAMETER;
-	
+
 	KbConfig& current_config = handler->GetConfig(port_no);
 	current_config.read_mode = rmode;

@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"

-namespace vm { using namespace ps3; }
+

 logs::channel cellKey2char("cellKey2char");

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

-namespace vm { using namespace ps3; }
+

 // L10nResult
 enum
@@ -1,6 +1,6 @@
 #pragma once

-namespace vm { using namespace ps3; }
+

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

-namespace vm { using namespace ps3; }
+

 enum
 {
@@ -315,6 +315,11 @@ s32 cellMsgDialogProgressBarSetMsg(u32 progressBarIndex, vm::cptr<char> msgStrin
 {
 	cellSysutil.warning("cellMsgDialogProgressBarSetMsg(progressBarIndex=%d, msgString=%s)", progressBarIndex, msgString);

+	if (!msgString)
+	{
+		return CELL_MSGDIALOG_ERROR_PARAM;
+	}
+
 	if (auto rsxthr = fxm::get<GSRender>())
 	{
 		if (auto dlg2 = rsxthr->shell_get_current_dialog())
@@ -331,7 +336,7 @@ s32 cellMsgDialogProgressBarSetMsg(u32 progressBarIndex, vm::cptr<char> msgStrin
 		return CELL_MSGDIALOG_ERROR_DIALOG_NOT_OPENED;
 	}

-	if (progressBarIndex >= dlg->type.progress_bar_count || !msgString)
+	if (progressBarIndex >= dlg->type.progress_bar_count)
 	{
 		return CELL_MSGDIALOG_ERROR_PARAM;
 	}
@@ -2,7 +2,7 @@

 #include "Utilities/BitField.h"

-namespace vm { using namespace ps3; }
+

 enum
 {
@@ -2,131 +2,287 @@
 #include "Emu/System.h"
 #include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
-
-#include "cellMusic.h"
+#include "Emu/Cell/lv2/sys_lwmutex.h"
+#include "Emu/Cell/lv2/sys_lwcond.h"
+#include "Emu/Cell/lv2/sys_spu.h"
+#include "cellSearch.h"
+#include "cellSpurs.h"
 #include "cellSysutil.h"

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

 logs::channel cellMusic("cellMusic");

-struct music2_t
+struct music_t
 {
-	vm::ptr<CellMusic2Callback> func;
+	vm::ptr<void(u32 event, vm::ptr<void> param, vm::ptr<void> userData)> func;
 	vm::ptr<void> userData;
 };

-s32 cellMusicGetSelectionContext()
+s32 cellMusicGetSelectionContext(vm::ptr<CellMusicSelectionContext> context)
 {
-	UNIMPLEMENTED_FUNC(cellMusic); 
+	cellMusic.todo("cellMusicGetSelectionContext(context=*0x%x)", context);
 	return CELL_OK;
 }

-s32 cellMusicSetSelectionContext2()
+s32 cellMusicSetSelectionContext2(vm::ptr<CellMusicSelectionContext> context)
 {
-	UNIMPLEMENTED_FUNC(cellMusic); 
+	cellMusic.todo("cellMusicSetSelectionContext2(context=*0x%x)", context);
+
+	const auto music = fxm::get_always<music_t>();
+
+	if (!music->func)
+		return CELL_MUSIC2_ERROR_GENERIC;
+
+	sysutil_register_cb([=](ppu_thread& ppu) -> s32
+	{
+		music->func(ppu, CELL_MUSIC2_EVENT_SET_SELECTION_CONTEXT_RESULT, vm::addr_t(CELL_OK), music->userData);
+		return CELL_OK;
+	});
+
 	return CELL_OK;
 }

-s32 cellMusicSetVolume2()
+s32 cellMusicSetVolume2(f32 level)
 {
-	UNIMPLEMENTED_FUNC(cellMusic); 
+	cellMusic.todo("cellMusicSetVolume2(level=0x%x)", level);
+
+	const auto music = fxm::get_always<music_t>();
+
+	if (!music->func)
+		return CELL_MUSIC2_ERROR_GENERIC;
+
+	sysutil_register_cb([=](ppu_thread& ppu) -> s32
+	{
+		music->func(ppu, CELL_MUSIC2_EVENT_SET_VOLUME_RESULT, vm::addr_t(CELL_OK), music->userData);
+		return CELL_OK;
+	});
+
 	return CELL_OK;
 }

-s32 cellMusicGetContentsId()
+s32 cellMusicGetContentsId(vm::ptr<CellSearchContentId> contents_id)
 {
-	UNIMPLEMENTED_FUNC(cellMusic); 
+	cellMusic.todo("cellMusicGetContentsId(contents_id=*0x%x)", contents_id);
 	return CELL_OK;
 }

-s32 cellMusicSetSelectionContext()
+s32 cellMusicSetSelectionContext(vm::ptr<CellMusicSelectionContext> context)
 {
-	UNIMPLEMENTED_FUNC(cellMusic); 
+	cellMusic.todo("cellMusicSetSelectionContext(context=*0x%x)", context);
+
+	const auto music = fxm::get_always<music_t>();
+
+	if (!music->func)
+		return CELL_MUSIC_ERROR_GENERIC;
+
+	sysutil_register_cb([=](ppu_thread& ppu) -> s32
+	{
+		music->func(ppu, CELL_MUSIC_EVENT_SET_SELECTION_CONTEXT_RESULT, vm::addr_t(CELL_OK), music->userData);
+		return CELL_OK;
+	});
+
 	return CELL_OK;
 }

-s32 cellMusicInitialize2SystemWorkload()
+s32 cellMusicInitialize2SystemWorkload(s32 mode, vm::ptr<CellMusic2Callback> func, vm::ptr<void> userData, vm::ptr<CellSpurs> spurs, vm::cptr<u8> priority, vm::cptr<struct CellSpursSystemWorkloadAttribute> attr)
 {
-	UNIMPLEMENTED_FUNC(cellMusic); 
+	cellMusic.todo("cellMusicInitialize2SystemWorkload(mode=0x%x, func=*0x%x, userData=*0x%x, spurs=*0x%x, priority=*0x%x, attr=*0x%x)", mode, func, userData, spurs, priority, attr);
+
+	const auto music = fxm::make_always<music_t>();
+	music->func = func;
+	music->userData = userData;
+
+	sysutil_register_cb([=](ppu_thread& ppu) -> s32
+	{
+		music->func(ppu, CELL_MUSIC2_EVENT_INITIALIZE_RESULT, vm::addr_t(CELL_OK), userData);
+		return CELL_OK;
+	});
+
 	return CELL_OK;
 }

-s32 cellMusicGetPlaybackStatus2()
+s32 cellMusicGetPlaybackStatus2(vm::ptr<s32> status)
 {
-	UNIMPLEMENTED_FUNC(cellMusic); 
+	cellMusic.todo("cellMusicGetPlaybackStatus2(status=*0x%x)", status);
 	return CELL_OK;
 }

-s32 cellMusicGetContentsId2()
+s32 cellMusicGetContentsId2(vm::ptr<CellSearchContentId> contents_id)
 {
-	UNIMPLEMENTED_FUNC(cellMusic); 
+	cellMusic.todo("cellMusicGetContentsId2(contents_id=*0x%x)", contents_id);
 	return CELL_OK;
 }

 s32 cellMusicFinalize()
 {
-	UNIMPLEMENTED_FUNC(cellMusic); 
+	cellMusic.todo("cellMusicFinalize()");
+
+	const auto music = fxm::get_always<music_t>();
+
+	if (music->func)
+	{
+		sysutil_register_cb([=](ppu_thread& ppu) -> s32
+		{
+			music->func(ppu, CELL_MUSIC_EVENT_FINALIZE_RESULT, vm::addr_t(CELL_OK), music->userData);
+			return CELL_OK;
+		});
+	}
+
 	return CELL_OK;
 }

-s32 cellMusicInitializeSystemWorkload()
+s32 cellMusicInitializeSystemWorkload(s32 mode, u32 container, vm::ptr<CellMusicCallback> func, vm::ptr<void> userData, vm::ptr<CellSpurs> spurs, vm::cptr<u8> priority, vm::cptr<struct CellSpursSystemWorkloadAttribute> attr)
 {
-	UNIMPLEMENTED_FUNC(cellMusic); 
+	cellMusic.todo("cellMusicInitializeSystemWorkload(mode=0x%x, container=0x%x, func=*0x%x, userData=*0x%x, spurs=*0x%x, priority=*0x%x, attr=*0x%x)", mode, container, func, userData, spurs, priority, attr);
+
+	if (mode != CELL_MUSIC2_PLAYER_MODE_NORMAL)
+	{
+		cellMusic.todo("Unknown player mode: 0x%x", mode);
+		return CELL_MUSIC_ERROR_PARAM;
+	}
+
+	const auto music = fxm::make_always<music_t>();
+	music->func = func;
+	music->userData = userData;
+
+	sysutil_register_cb([=](ppu_thread& ppu) -> s32
+	{
+		music->func(ppu, CELL_MUSIC_EVENT_INITIALIZE_RESULT, vm::addr_t(CELL_OK), userData);
+		return CELL_OK;
+	});
+
 	return CELL_OK;
 }

-s32 cellMusicInitialize()
+s32 cellMusicInitialize(s32 mode, u32 container, s32 spuPriority, vm::ptr<CellMusicCallback> func, vm::ptr<void> userData)
 {
-	UNIMPLEMENTED_FUNC(cellMusic); 
+	cellMusic.todo("cellMusicInitialize(mode=0x%x, container=0x%x, spuPriority=0x%x, func=*0x%x, userData=*0x%x)", mode, container, spuPriority, func, userData);
+
+	if (mode != CELL_MUSIC2_PLAYER_MODE_NORMAL)
+	{
+		cellMusic.todo("Unknown player mode: 0x%x", mode);
+		return CELL_MUSIC_ERROR_PARAM;
+	}
+
+	const auto music = fxm::make_always<music_t>();
+	music->func = func;
+	music->userData = userData;
+
+	sysutil_register_cb([=](ppu_thread& ppu) -> s32
+	{
+		music->func(ppu, CELL_MUSIC_EVENT_INITIALIZE_RESULT, vm::addr_t(CELL_OK), userData);
+		return CELL_OK;
+	});
+
 	return CELL_OK;
 }

 s32 cellMusicFinalize2()
 {
-	UNIMPLEMENTED_FUNC(cellMusic); 
+	cellMusic.todo("cellMusicFinalize2()");
+
+	const auto music = fxm::get_always<music_t>();
+
+	if (music->func)
+	{
+		sysutil_register_cb([=](ppu_thread& ppu) -> s32
+		{
+			music->func(ppu, CELL_MUSIC2_EVENT_FINALIZE_RESULT, vm::addr_t(CELL_OK), music->userData);
+			return CELL_OK;
+		});
+	}
+
 	return CELL_OK;
 }

-s32 cellMusicGetSelectionContext2()
+s32 cellMusicGetSelectionContext2(vm::ptr<CellMusicSelectionContext> context)
 {
-	UNIMPLEMENTED_FUNC(cellMusic); 
+	cellMusic.todo("cellMusicGetSelectionContext2(context=*0x%x)", context);
 	return CELL_OK;
 }

-s32 cellMusicGetVolume()
+s32 cellMusicGetVolume(vm::ptr<f32> level)
 {
-	UNIMPLEMENTED_FUNC(cellMusic); 
+	cellMusic.todo("cellMusicGetVolume(level=*0x%x)", level);
 	return CELL_OK;
 }

-s32 cellMusicGetPlaybackStatus()
+s32 cellMusicGetPlaybackStatus(vm::ptr<s32> status)
 {
-	UNIMPLEMENTED_FUNC(cellMusic); 
+	cellMusic.todo("cellMusicGetPlaybackStatus(status=*0x%x)", status);
 	return CELL_OK;
 }

-s32 cellMusicSetPlaybackCommand2()
+s32 cellMusicSetPlaybackCommand2(s32 command, vm::ptr<void> param)
 {
-	UNIMPLEMENTED_FUNC(cellMusic); 
+	cellMusic.todo("cellMusicSetPlaybackCommand2(command=0x%x, param=*0x%x)", command, param);
+
+	const auto music = fxm::get_always<music_t>();
+
+	if (!music->func)
+		return CELL_MUSIC2_ERROR_GENERIC;
+
+	sysutil_register_cb([=](ppu_thread& ppu) -> s32
+	{
+		music->func(ppu, CELL_MUSIC2_EVENT_SET_PLAYBACK_COMMAND_RESULT, vm::addr_t(CELL_OK), music->userData);
+		return CELL_OK;
+	});
+
 	return CELL_OK;
 }

-s32 cellMusicSetPlaybackCommand()
+s32 cellMusicSetPlaybackCommand(s32 command, vm::ptr<void> param)
 {
-	UNIMPLEMENTED_FUNC(cellMusic); 
+	cellMusic.todo("cellMusicSetPlaybackCommand(command=0x%x, param=*0x%x)", command, param);
+
+	const auto music = fxm::get_always<music_t>();
+
+	if (!music->func)
+		return CELL_MUSIC_ERROR_GENERIC;
+
+	sysutil_register_cb([=](ppu_thread& ppu) -> s32
+	{
+		music->func(ppu, CELL_MUSIC_EVENT_SET_PLAYBACK_COMMAND_RESULT, vm::addr_t(CELL_OK), music->userData);
+		return CELL_OK;
+	});
+
 	return CELL_OK;
 }

 s32 cellMusicSelectContents2()
 {
-	UNIMPLEMENTED_FUNC(cellMusic); 
+	cellMusic.todo("cellMusicSelectContents2()");
+
+	const auto music = fxm::get_always<music_t>();
+
+	if (!music->func)
+		return CELL_MUSIC2_ERROR_GENERIC;
+
+	sysutil_register_cb([=](ppu_thread& ppu) -> s32
+	{
+		music->func(ppu, CELL_MUSIC2_EVENT_SELECT_CONTENTS_RESULT, vm::addr_t(CELL_OK), music->userData);
+		return CELL_OK;
+	});
+
 	return CELL_OK;
 }

-s32 cellMusicSelectContents()
+s32 cellMusicSelectContents(u32 container)
 {
-	UNIMPLEMENTED_FUNC(cellMusic); 
+	cellMusic.todo("cellMusicSelectContents(container=0x%x)", container);
+
+	const auto music = fxm::get_always<music_t>();
+
+	if (!music->func)
+		return CELL_MUSIC_ERROR_GENERIC;
+
+	sysutil_register_cb([=](ppu_thread& ppu) -> s32
+	{
+		music->func(ppu, CELL_MUSIC_EVENT_SELECT_CONTENTS_RESULT, vm::addr_t(CELL_OK), music->userData);
+		return CELL_OK;
+	});
+
 	return CELL_OK;
 }

@@ -140,28 +296,40 @@ s32 cellMusicInitialize2(s32 mode, s32 spuPriority, vm::ptr<CellMusic2Callback>
 		return CELL_MUSIC2_ERROR_PARAM;
 	}

-	const auto music = fxm::make_always<music2_t>();
+	const auto music = fxm::make_always<music_t>();
 	music->func = func;
 	music->userData = userData;

 	sysutil_register_cb([=](ppu_thread& ppu) -> s32
 	{
-		func(ppu, CELL_MUSIC2_EVENT_INITIALIZE_RESULT, vm::make_var<s32>(CELL_OK), userData);
+		music->func(ppu, CELL_MUSIC2_EVENT_INITIALIZE_RESULT, vm::addr_t(CELL_OK), userData);
 		return CELL_OK;
 	});

 	return CELL_OK;
 }

-s32 cellMusicSetVolume()
+s32 cellMusicSetVolume(f32 level)
 {
-	UNIMPLEMENTED_FUNC(cellMusic); 
+	cellMusic.todo("cellMusicSetVolume(level=0x%x)", level);
+
+	const auto music = fxm::get_always<music_t>();
+
+	if (!music->func)
+		return CELL_MUSIC_ERROR_GENERIC;
+
+	sysutil_register_cb([=](ppu_thread& ppu) -> s32
+	{
+		music->func(ppu, CELL_MUSIC_EVENT_SET_VOLUME_RESULT, vm::addr_t(CELL_OK), music->userData);
+		return CELL_OK;
+	});
+
 	return CELL_OK;
 }

-s32 cellMusicGetVolume2()
+s32 cellMusicGetVolume2(vm::ptr<f32> level)
 {
-	UNIMPLEMENTED_FUNC(cellMusic); 
+	cellMusic.todo("cellMusicGetVolume2(level=*0x%x)", level);
 	return CELL_OK;
 }

@@ -12,8 +12,8 @@ enum
 	CELL_MUSIC_ERROR_PLAYBACK_FAILURE   = 0x8002c107,
 	CELL_MUSIC_ERROR_NO_MORE_CONTENT    = 0x8002c108,
 	CELL_MUSIC_DIALOG_OPEN              = 0x8002c109,
-	CELL_MUSIC_DIALOG_CLOSE             = 0x8002c10A,
-	CELL_MUSIC_ERROR_GENERIC            = 0x8002c1FF,
+	CELL_MUSIC_DIALOG_CLOSE             = 0x8002c10a,
+	CELL_MUSIC_ERROR_GENERIC            = 0x8002c1ff,

 	CELL_MUSIC2_PLAYBACK_FINISHED       = CELL_MUSIC_PLAYBACK_FINISHED,
 	CELL_MUSIC2_ERROR_PARAM             = CELL_MUSIC_ERROR_PARAM,
@@ -120,8 +120,8 @@ enum
 	CELL_MUSIC_SELECTION_CONTEXT_SIZE         = 2048,
 };

-using CellMusicCallback = void(u32 event, vm::ps3::ptr<void> param, vm::ps3::ptr<void> userData);
-using CellMusic2Callback = void(u32 event, vm::ps3::ptr<void> param, vm::ps3::ptr<void> userData);
+using CellMusicCallback = void(u32 event, vm::ptr<void> param, vm::ptr<void> userData);
+using CellMusic2Callback = void(u32 event, vm::ptr<void> param, vm::ptr<void> userData);

 struct CellMusicSelectionContext
 {
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"

-namespace vm { using namespace ps3; }
+

 logs::channel cellMusicDecode("cellMusicDecode");

@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"

-namespace vm { using namespace ps3; }
+

 logs::channel cellMusicExport("cellMusicExport");

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

-namespace vm { using namespace ps3; }
+

 // Error Codes
 enum CellNetCtlError : u32
@@ -1,6 +1,6 @@
 #pragma once

-namespace vm { using namespace ps3; }
+

 //error codes
 enum
@@ -92,7 +92,7 @@ enum CellOskDialogType
 	CELL_OSKDIALOG_TYPE_SEPARATE_CANDIDATE_WINDOW = 8,
 };

-enum 
+enum
 {
 	CELL_OSKDIALOG_STRING_SIZE = 512, //Theroretical maxium for osk input, games can specify a lower limit
 };
@@ -2,7 +2,7 @@
 #include "Emu/Cell/PPUModule.h"
 #include "Emu/Cell/lv2/sys_spu.h"

-namespace vm { using namespace ps3; }
+

 logs::channel cellOvis("cellOvis");

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

-namespace vm { using namespace ps3; }
+

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

-namespace vm { using namespace ps3; }
+

 // Error Codes
 enum
@@ -38,7 +38,7 @@ enum
 	CELL_PAMF_FS_48kHz = 1,
 };

-enum 
+enum
 {
 	CELL_PAMF_BIT_LENGTH_16 = 1,
 	CELL_PAMF_BIT_LENGTH_24 = 3,
@@ -60,7 +60,7 @@ enum
 	CELL_PAMF_AVC_LEVEL_4P2 = 42,
 };

-enum 
+enum
 {
 	CELL_PAMF_AVC_FRC_24000DIV1001 = 0,
 	CELL_PAMF_AVC_FRC_24           = 1,
@@ -263,7 +263,7 @@ struct PamfStreamHeader
 	u8 unknown2;
 	be_t<u32> ep_offset; // offset of EP section in header
 	be_t<u32> ep_num; // count of EPs
-	
+
 	union
 	{
 		u8 data[32]; // specific info
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"

-namespace vm { using namespace ps3; }
+

 logs::channel cellPhotoDecode("cellPhotoDecode");

@@ -18,14 +18,14 @@ enum

 // Datatypes
 struct CellPhotoDecodeSetParam
-{ 
+{
 	u32 dstBuffer_addr;
 	u16 width;
 	u16 height;
 };

 struct CellPhotoDecodeReturnParam
-{ 
+{
 	u16 width;
 	u16 height;
 };
@@ -1,7 +1,8 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
+#include "cellSysutil.h"
+

-namespace vm { using namespace ps3; }

 logs::channel cellPhotoExport("cellPhotoExport");

@@ -20,6 +21,16 @@ enum
 	CELL_PHOTO_EXPORT_UTIL_ERROR_INITIALIZE   = 0x8002c20a,
 };

+struct CellPhotoExportSetParam
+{
+	vm::bptr<char> photo_title;
+	vm::bptr<char> game_title;
+	vm::bptr<char> game_comment;
+	vm::bptr<void> reserved;
+};
+
+using CellPhotoExportUtilFinishCallback = void(s32 result, vm::ptr<void> userdata);
+
 s32 cellPhotoInitialize()
 {
 	UNIMPLEMENTED_FUNC(cellPhotoExport);
@@ -38,39 +49,81 @@ s32 cellPhotoRegistFromFile()
 	return CELL_OK;
 }

-s32 cellPhotoExportInitialize()
+error_code cellPhotoExportInitialize(u32 version, u32 container, vm::ptr<CellPhotoExportUtilFinishCallback> funcFinish, vm::ptr<void> userdata)
 {
-	UNIMPLEMENTED_FUNC(cellPhotoExport);
+	cellPhotoExport.todo("cellPhotoExportInitialize(version=0x%x, container=0x%x, funcFinish=*0x%x, userdata=*0x%x)", version, container, funcFinish, userdata);
+
+	sysutil_register_cb([=](ppu_thread& ppu) -> s32
+	{
+		funcFinish(ppu, CELL_OK, userdata);
+		return CELL_OK;
+	});
+
 	return CELL_OK;
 }

-s32 cellPhotoExportInitialize2()
+error_code cellPhotoExportInitialize2(u32 version, vm::ptr<CellPhotoExportUtilFinishCallback> funcFinish, vm::ptr<void> userdata)
 {
-	UNIMPLEMENTED_FUNC(cellPhotoExport);
+	cellPhotoExport.todo("cellPhotoExportInitialize2(version=0x%x, funcFinish=*0x%x, userdata=*0x%x)", version, funcFinish, userdata);
+
+	sysutil_register_cb([=](ppu_thread& ppu) -> s32
+	{
+		funcFinish(ppu, CELL_OK, userdata);
+		return CELL_OK;
+	});
+
 	return CELL_OK;
 }

-s32 cellPhotoExportFinalize()
+error_code cellPhotoExportFinalize(vm::ptr<CellPhotoExportUtilFinishCallback> funcFinish, vm::ptr<void> userdata)
 {
-	UNIMPLEMENTED_FUNC(cellPhotoExport);
+	cellPhotoExport.todo("cellPhotoExportFinalize(funcFinish=*0x%x, userdata=*0x%x)", funcFinish, userdata);
+
+	sysutil_register_cb([=](ppu_thread& ppu) -> s32
+	{
+		funcFinish(ppu, CELL_OK, userdata);
+		return CELL_OK;
+	});
+
 	return CELL_OK;
 }

-s32 cellPhotoExportFromFile()
+error_code cellPhotoExportFromFile(vm::cptr<char> srcHddDir, vm::cptr<char> srcHddFile, vm::ptr<CellPhotoExportSetParam> param, vm::ptr<CellPhotoExportUtilFinishCallback> funcFinish, vm::ptr<void> userdata)
 {
-	UNIMPLEMENTED_FUNC(cellPhotoExport);
+	cellPhotoExport.todo("cellPhotoExportFromFile(srcHddDir=%s, srcHddFile=%s, param=*0x%x, funcFinish=*0x%x, userdata=*0x%x)", srcHddDir, srcHddFile, param, funcFinish, userdata);
+
+	sysutil_register_cb([=](ppu_thread& ppu) -> s32
+	{
+		funcFinish(ppu, CELL_OK, userdata);
+		return CELL_OK;
+	});
+
 	return CELL_OK;
 }

-s32 cellPhotoExportFromFileWithCopy()
+error_code cellPhotoExportFromFileWithCopy(vm::cptr<char> srcHddDir, vm::cptr<char> srcHddFile, vm::ptr<CellPhotoExportSetParam> param, vm::ptr<CellPhotoExportUtilFinishCallback> funcFinish, vm::ptr<void> userdata)
 {
-	UNIMPLEMENTED_FUNC(cellPhotoExport);
+	cellPhotoExport.todo("cellPhotoExportFromFileWithCopy(srcHddDir=%s, srcHddFile=%s, param=*0x%x, funcFinish=*0x%x, userdata=*0x%x)", srcHddDir, srcHddFile, param, funcFinish, userdata);
+
+	sysutil_register_cb([=](ppu_thread& ppu) -> s32
+	{
+		funcFinish(ppu, CELL_OK, userdata);
+		return CELL_OK;
+	});
+
 	return CELL_OK;
 }

-s32 cellPhotoExportProgress()
+error_code cellPhotoExportProgress(vm::ptr<CellPhotoExportUtilFinishCallback> funcFinish, vm::ptr<void> userdata)
 {
-	UNIMPLEMENTED_FUNC(cellPhotoExport);
+	cellPhotoExport.todo("cellPhotoExportProgress(funcFinish=*0x%x, userdata=*0x%x)", funcFinish, userdata);
+
+	sysutil_register_cb([=](ppu_thread& ppu) -> s32
+	{
+		funcFinish(ppu, 0xFFFF, userdata); // 0-0xFFFF where 0xFFFF = 100%
+		return CELL_OK;
+	});
+
 	return CELL_OK;
 }

@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"

-namespace vm { using namespace ps3; }
+

 logs::channel cellPhotoImportUtil("cellPhotoImportUtil");

@@ -18,24 +18,24 @@ enum

 // Datatypes
 struct CellPhotoImportFileDataSub
-{ 
+{
 	int width;
 	int height;
-	//CellPhotoImportFormatType format; 
-	//CellPhotoImportTexRot rotate; 
-}; 
+	//CellPhotoImportFormatType format;
+	//CellPhotoImportTexRot rotate;
+};

 struct CellPhotoImportFileData
-{ 
-	char dstFileName;   //[CELL_FS_MAX_FS_FILE_NAME_LENGTH]; 
-	char photo_title;   //[CELL_PHOTO_IMPORT_PHOTO_TITLE_MAX_LENGTH*3]; 
-	char game_title;    //[CELL_PHOTO_IMPORT_GAME_TITLE_MAX_SIZE]; 
-	char game_comment;  //[CELL_PHOTO_IMPORT_GAME_COMMENT_MAX_SIZE]; 
-	CellPhotoImportFileDataSub* data_sub; 
+{
+	char dstFileName;   //[CELL_FS_MAX_FS_FILE_NAME_LENGTH];
+	char photo_title;   //[CELL_PHOTO_IMPORT_PHOTO_TITLE_MAX_LENGTH*3];
+	char game_title;    //[CELL_PHOTO_IMPORT_GAME_TITLE_MAX_SIZE];
+	char game_comment;  //[CELL_PHOTO_IMPORT_GAME_COMMENT_MAX_SIZE];
+	CellPhotoImportFileDataSub* data_sub;
 };

 struct CellPhotoImportSetParam
-{ 
+{
 	unsigned int fileSizeMax;
 };

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

-namespace vm { using namespace ps3; }
+

 enum CellPngTxtType : s32
 {
@@ -1,5 +1,5 @@
 #pragma once
-namespace vm { using namespace ps3; }
+

 #include "cellPng.h"

@@ -328,7 +328,7 @@ static s32 getPngDecColourType(u8 type)

 static bool cellPngColorSpaceHasAlpha(u32 colorspace)
 {
-	switch (colorspace) 
+	switch (colorspace)
 	{
 	case CELL_PNGDEC_RGBA:
 	case CELL_PNGDEC_ARGB:
@@ -1,10 +1,22 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"
+#include "Emu/IdManager.h"
+#include "cellSysutil.h"
+

-namespace vm { using namespace ps3; }

 logs::channel cellRec("cellRec");

+enum
+{
+	CELL_REC_STATUS_UNLOAD = 0,
+	CELL_REC_STATUS_OPEN = 1,
+	CELL_REC_STATUS_START = 2,
+	CELL_REC_STATUS_STOP = 3,
+	CELL_REC_STATUS_CLOSE = 4,
+	CELL_REC_STATUS_ERR = 10
+};
+
 struct CellRecSpursParam
 {
 	vm::bptr<struct CellSpurs> pSpurs;
@@ -46,15 +58,40 @@ struct CellRecParam

 using CellRecCallback = void(s32 recStatus, s32 recError, vm::ptr<void> userdata);

-s32 cellRecOpen(vm::cptr<char> pDirName, vm::cptr<char> pFileName, vm::cptr<CellRecParam> pParam, u32 container, vm::ptr<CellRecCallback> cb, vm::ptr<void> cbUserData)
+struct rec_t
+{
+	vm::ptr<CellRecCallback> cb;
+	vm::ptr<void> cbUserData;
+};
+
+error_code cellRecOpen(vm::cptr<char> pDirName, vm::cptr<char> pFileName, vm::cptr<CellRecParam> pParam, u32 container, vm::ptr<CellRecCallback> cb, vm::ptr<void> cbUserData)
 {
 	cellRec.todo("cellRecOpen(pDirName=%s, pFileName=%s, pParam=*0x%x, container=0x%x, cb=*0x%x, cbUserData=*0x%x)", pDirName, pFileName, pParam, container, cb, cbUserData);
+
+	const auto rec = fxm::make_always<rec_t>();
+	rec->cb = cb;
+	rec->cbUserData = cbUserData;
+
+	sysutil_register_cb([=](ppu_thread& ppu) -> s32
+	{
+		cb(ppu, CELL_REC_STATUS_OPEN, CELL_OK, cbUserData);
+		return CELL_OK;
+	});
+
 	return CELL_OK;
 }

-s32 cellRecClose(s32 isDiscard)
+error_code cellRecClose(s32 isDiscard)
 {
 	cellRec.todo("cellRecClose(isDiscard=0x%x)", isDiscard);
+
+	sysutil_register_cb([=](ppu_thread& ppu) -> s32
+	{
+		const auto rec = fxm::get_always<rec_t>();
+		rec->cb(ppu, CELL_REC_STATUS_CLOSE, CELL_OK, rec->cbUserData);
+		return CELL_OK;
+	});
+
 	return CELL_OK;
 }

@@ -63,15 +100,31 @@ void cellRecGetInfo(s32 info, vm::ptr<u64> pValue)
 	cellRec.todo("cellRecGetInfo(info=0x%x, pValue=*0x%x)", info, pValue);
 }

-s32 cellRecStop()
+error_code cellRecStop()
 {
 	cellRec.todo("cellRecStop()");
+
+	sysutil_register_cb([=](ppu_thread& ppu) -> s32
+	{
+		const auto rec = fxm::get_always<rec_t>();
+		rec->cb(ppu, CELL_REC_STATUS_STOP, CELL_OK, rec->cbUserData);
+		return CELL_OK;
+	});
+
 	return CELL_OK;
 }

-s32 cellRecStart()
+error_code cellRecStart()
 {
 	cellRec.todo("cellRecStart()");
+
+	sysutil_register_cb([=](ppu_thread& ppu) -> s32
+	{
+		const auto rec = fxm::get_always<rec_t>();
+		rec->cb(ppu, CELL_REC_STATUS_START, CELL_OK, rec->cbUserData);
+		return CELL_OK;
+	});
+
 	return CELL_OK;
 }

@@ -81,7 +134,7 @@ u32 cellRecQueryMemSize(vm::cptr<CellRecParam> pParam)
 	return 1 * 1024 * 1024; // dummy memory size
 }

-s32 cellRecSetInfo(s32 setInfo, u64 value)
+error_code cellRecSetInfo(s32 setInfo, u64 value)
 {
 	cellRec.todo("cellRecSetInfo(setInfo=0x%x, value=0x%x)", setInfo, value);
 	return CELL_OK;
@@ -1,6 +1,6 @@
 #pragma once

-namespace vm { using namespace ps3; }
+

 enum
 {
@@ -27,33 +27,33 @@ enum

 enum CellRescBufferMode
 {
-	CELL_RESC_720x480   = 0x1, 
-	CELL_RESC_720x576   = 0x2, 
-	CELL_RESC_1280x720  = 0x4, 
-	CELL_RESC_1920x1080 = 0x8, 
+	CELL_RESC_720x480   = 0x1,
+	CELL_RESC_720x576   = 0x2,
+	CELL_RESC_1280x720  = 0x4,
+	CELL_RESC_1920x1080 = 0x8,
 };

 enum CellRescPalTemporalMode
 {
-	CELL_RESC_PAL_50                            = 0, 
-	CELL_RESC_PAL_60_DROP                       = 1, 
-	CELL_RESC_PAL_60_INTERPOLATE                = 2, 
-	CELL_RESC_PAL_60_INTERPOLATE_30_DROP        = 3, 
-	CELL_RESC_PAL_60_INTERPOLATE_DROP_FLEXIBLE  = 4, 
-	CELL_RESC_PAL_60_FOR_HSYNC                  = 5, 
+	CELL_RESC_PAL_50                            = 0,
+	CELL_RESC_PAL_60_DROP                       = 1,
+	CELL_RESC_PAL_60_INTERPOLATE                = 2,
+	CELL_RESC_PAL_60_INTERPOLATE_30_DROP        = 3,
+	CELL_RESC_PAL_60_INTERPOLATE_DROP_FLEXIBLE  = 4,
+	CELL_RESC_PAL_60_FOR_HSYNC                  = 5,
 };

 enum CellRescRatioConvertMode
 {
-	CELL_RESC_FULLSCREEN             = 0, 
-	CELL_RESC_LETTERBOX              = 1, 
-	CELL_RESC_PANSCAN                = 2, 
+	CELL_RESC_FULLSCREEN             = 0,
+	CELL_RESC_LETTERBOX              = 1,
+	CELL_RESC_PANSCAN                = 2,
 };

 enum CellRescFlipMode
 {
-	CELL_RESC_DISPLAY_VSYNC          = 0, 
-	CELL_RESC_DISPLAY_HSYNC          = 1, 
+	CELL_RESC_DISPLAY_VSYNC          = 0,
+	CELL_RESC_DISPLAY_HSYNC          = 1,
 };

 enum CellRescDstFormat
@@ -64,18 +64,18 @@ enum CellRescDstFormat

 enum CellRescResourcePolicy
 {
-	CELL_RESC_CONSTANT_VRAM          = 0x0, 
-	CELL_RESC_MINIMUM_VRAM           = 0x1, 
-	CELL_RESC_MINIMUM_GPU_LOAD       = 0x2, 
+	CELL_RESC_CONSTANT_VRAM          = 0x0,
+	CELL_RESC_MINIMUM_VRAM           = 0x1,
+	CELL_RESC_MINIMUM_GPU_LOAD       = 0x2,
 };

 enum CellRescConvolutionFilterMode
 {
-	CELL_RESC_NORMAL_BILINEAR        = 0, 
-	CELL_RESC_INTERLACE_FILTER       = 1, 
-	CELL_RESC_3X3_GAUSSIAN           = 2, 
-	CELL_RESC_2X3_QUINCUNX           = 3, 
-	CELL_RESC_2X3_QUINCUNX_ALT       = 4, 
+	CELL_RESC_NORMAL_BILINEAR        = 0,
+	CELL_RESC_INTERLACE_FILTER       = 1,
+	CELL_RESC_3X3_GAUSSIAN           = 2,
+	CELL_RESC_2X3_QUINCUNX           = 3,
+	CELL_RESC_2X3_QUINCUNX_ALT       = 4,
 };

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

-namespace vm { using namespace ps3; }
+

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

-namespace vm { using namespace ps3; }
+

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

 #include "cellVpost.h"

-namespace vm { using namespace ps3; }
+

 // Error Codes
 enum
@@ -157,8 +157,8 @@ enum
 	_CELL_SAIL_PARAMETER_TYPE_NUM_OF_ELEMENTS                 = 36, // Should be never used
 	CELL_SAIL_PARAMETER_SOURCE_PPU_THREAD_PRIORITY            = CELL_SAIL_PARAMETER_IO_PPU_THREAD_PRIORITY,
 	CELL_SAIL_PARAMETER_DMUX_SPURS_TASK_PRIORITY              = CELL_SAIL_PARAMETER_DMUX_SPURS_TASK_PRIORITIES, // Deprecated
-	CELL_SAIL_PARAMETER_VDEC_SPURS_TASK_PRIORITY              = CELL_SAIL_PARAMETER_VDEC_SPURS_TASK_PRIORITIES, // Deprecated 
-	CELL_SAIL_PARAMETER_ADEC_SPURS_TASK_PRIORITY              = CELL_SAIL_PARAMETER_ADEC_SPURS_TASK_PRIORITIES, // Deprecated 
+	CELL_SAIL_PARAMETER_VDEC_SPURS_TASK_PRIORITY              = CELL_SAIL_PARAMETER_VDEC_SPURS_TASK_PRIORITIES, // Deprecated
+	CELL_SAIL_PARAMETER_ADEC_SPURS_TASK_PRIORITY              = CELL_SAIL_PARAMETER_ADEC_SPURS_TASK_PRIORITIES, // Deprecated
 	CELL_SAIL_PARAMETER_VPOST_SPURS_TASK_PRIORITY             = CELL_SAIL_PARAMETER_VPOST_SPURS_TASK_PRIORITIES, // Deprecated
 };

@@ -367,7 +367,7 @@ enum
 	// 5. Back Right
 	// 6. Back Center
 	// 7. LFE
-	// (for at3plus) 
+	// (for at3plus)
 	CELL_SAIL_AUDIO_CH_LAYOUT_7CH_LCRxycE  = 10,

 	// 1. Front Left
@@ -1035,7 +1035,7 @@ struct CellSailAviMediaType
 	union u {
 		struct audio {
 			be_t<u16> formatTag;
-			be_t<u16> reserved; // Specify 0 
+			be_t<u16> reserved; // Specify 0
 			union u {
 				struct mpeg {
 					be_t<u16> headLayer; // Specify 0
@@ -1,6 +1,6 @@
 #pragma once

-namespace vm { using namespace ps3; }
+

 // Return codes
 enum
@@ -16,7 +16,7 @@ enum
 	CELL_SAVEDATA_ERROR_NOUSER          = 0x8002b409,
 	CELL_SAVEDATA_ERROR_SIZEOVER        = 0x8002b40a,
 	CELL_SAVEDATA_ERROR_NODATA          = 0x8002b40b,
-	CELL_SAVEDATA_ERROR_NOTSUPPORTED    = 0x8002b40c,	
+	CELL_SAVEDATA_ERROR_NOTSUPPORTED    = 0x8002b40c,
 };

 // Callback return codes
@@ -97,7 +97,7 @@ enum

 // Datatypes
 struct CellSaveDataSetList
-{ 
+{
 	be_t<u32> sortType;
 	be_t<u32> sortOrder;
 	vm::bptr<char> dirNamePrefix;
@@ -105,7 +105,7 @@ struct CellSaveDataSetList
 };

 struct CellSaveDataSetBuf
-{ 
+{
 	be_t<u32> dirListMax;
 	be_t<u32> fileListMax;
 	be_t<u32> reserved[6];
@@ -113,16 +113,16 @@ struct CellSaveDataSetBuf
 	vm::bptr<void> buf;
 };

-struct CellSaveDataNewDataIcon 
-{ 
+struct CellSaveDataNewDataIcon
+{
 	vm::bptr<char> title;
 	be_t<u32> iconBufSize;
 	vm::bptr<void> iconBuf;
 	vm::bptr<void> reserved;
 };

-struct CellSaveDataListNewData 
-{ 
+struct CellSaveDataListNewData
+{
 	be_t<u32> iconPosition;
 	vm::bptr<char> dirName;
 	vm::bptr<CellSaveDataNewDataIcon> icon;
@@ -130,14 +130,14 @@ struct CellSaveDataListNewData
 };

 struct CellSaveDataDirList
-{ 
-	char dirName[CELL_SAVEDATA_DIRNAME_SIZE]; 
+{
+	char dirName[CELL_SAVEDATA_DIRNAME_SIZE];
 	char listParam[CELL_SAVEDATA_SYSP_LPARAM_SIZE];
 	char reserved[8];
 };

 struct CellSaveDataListGet
-{ 
+{
 	be_t<u32> dirNum;
 	be_t<u32> dirListNum;
 	vm::bptr<CellSaveDataDirList> dirList;
@@ -145,7 +145,7 @@ struct CellSaveDataListGet
 };

 struct CellSaveDataListSet
-{ 
+{
 	be_t<u32> focusPosition;
 	vm::bptr<char> focusDirName;
 	be_t<u32> fixedListNum;
@@ -155,45 +155,45 @@ struct CellSaveDataListSet
 };

 struct CellSaveDataFixedSet
-{ 
+{
 	vm::bptr<char> dirName;
 	vm::bptr<CellSaveDataNewDataIcon> newIcon;
 	be_t<u32> option;
 };

-struct CellSaveDataSystemFileParam 
-{ 
-	char title[CELL_SAVEDATA_SYSP_TITLE_SIZE]; 
-	char subTitle[CELL_SAVEDATA_SYSP_SUBTITLE_SIZE]; 
-	char detail[CELL_SAVEDATA_SYSP_DETAIL_SIZE]; 
-	be_t<u32> attribute; 
-	char reserved2[4]; 
-	char listParam[CELL_SAVEDATA_SYSP_LPARAM_SIZE]; 
-	char reserved[256]; 
+struct CellSaveDataSystemFileParam
+{
+	char title[CELL_SAVEDATA_SYSP_TITLE_SIZE];
+	char subTitle[CELL_SAVEDATA_SYSP_SUBTITLE_SIZE];
+	char detail[CELL_SAVEDATA_SYSP_DETAIL_SIZE];
+	be_t<u32> attribute;
+	char reserved2[4];
+	char listParam[CELL_SAVEDATA_SYSP_LPARAM_SIZE];
+	char reserved[256];
 };

 struct CellSaveDataDirStat
-{ 
+{
 	be_t<s64> atime;
 	be_t<s64> mtime;
 	be_t<s64> ctime;
-	char dirName[CELL_SAVEDATA_DIRNAME_SIZE]; 
+	char dirName[CELL_SAVEDATA_DIRNAME_SIZE];
 };

 struct CellSaveDataFileStat
-{ 
+{
 	be_t<u32> fileType;
 	char reserved1[4];
 	be_t<u64> size;
 	be_t<s64> atime;
 	be_t<s64> mtime;
 	be_t<s64> ctime;
-	char fileName[CELL_SAVEDATA_FILENAME_SIZE]; 
+	char fileName[CELL_SAVEDATA_FILENAME_SIZE];
 	char reserved2[3];
 };

 struct CellSaveDataStatGet
-{ 
+{
 	be_t<s32> hddFreeSizeKB;
 	be_t<u32> isNewData;
 	CellSaveDataDirStat dir;
@@ -208,7 +208,7 @@ struct CellSaveDataStatGet
 };

 struct CellSaveDataAutoIndicator
-{ 
+{
 	be_t<u32> dispPosition;
 	be_t<u32> dispMode;
 	vm::bptr<char> dispMsg;
@@ -217,25 +217,25 @@ struct CellSaveDataAutoIndicator
 	vm::bptr<void> reserved;
 };

-struct CellSaveDataStatSet 
-{ 
+struct CellSaveDataStatSet
+{
 	vm::bptr<CellSaveDataSystemFileParam> setParam;
 	be_t<u32> reCreateMode;
 	vm::bptr<CellSaveDataAutoIndicator> indicator;
 };

 struct CellSaveDataFileGet
-{ 
+{
 	be_t<u32> excSize;
 	char reserved[64];
-}; 
+};

-struct CellSaveDataFileSet 
-{ 
+struct CellSaveDataFileSet
+{
 	be_t<u32> fileOperation;
 	vm::bptr<void> reserved;
 	be_t<u32> fileType;
-	u8 secureFileId[CELL_SAVEDATA_SECUREFILEID_SIZE]; 
+	u8 secureFileId[CELL_SAVEDATA_SECUREFILEID_SIZE];
 	vm::bptr<char> fileName;
 	be_t<u32> fileOffset;
 	be_t<u32> fileSize;
@@ -243,8 +243,8 @@ struct CellSaveDataFileSet
 	vm::bptr<void> fileBuf;
 };

-struct CellSaveDataCBResult 
-{ 
+struct CellSaveDataCBResult
+{
 	be_t<s32> result;
 	be_t<u32> progressBarInc;
 	be_t<s32> errNeedSizeKB;
@@ -253,9 +253,9 @@ struct CellSaveDataCBResult
 };

 struct CellSaveDataDoneGet
-{ 
+{
 	be_t<s32> excResult;
-	char dirName[CELL_SAVEDATA_DIRNAME_SIZE]; 
+	char dirName[CELL_SAVEDATA_DIRNAME_SIZE];
 	be_t<s32> sizeKB;
 	be_t<s32> hddFreeSizeKB;
 	char reserved[64];
@@ -4,7 +4,7 @@

 #include "cellScreenshot.h"

-namespace vm { using namespace ps3; }
+

 logs::channel cellScreenshot("cellScreenshot");

@@ -12,7 +12,7 @@ enum

 struct CellScreenShotSetParam
 {
-	vm::ps3::bcptr<char> photo_title;
-	vm::ps3::bcptr<char> game_title;
-	vm::ps3::bcptr<char> game_comment;
+	vm::bcptr<char> photo_title;
+	vm::bcptr<char> game_title;
+	vm::bcptr<char> game_comment;
 };
@@ -2,9 +2,10 @@
 #include "Emu/System.h"
 #include "Emu/IdManager.h"
 #include "Emu/Cell/PPUModule.h"
+#include "cellMusic.h"
+#include "cellSysutil.h"

 #include "cellSearch.h"
-#include "cellSysutil.h"

 logs::channel cellSearch("cellSearch");

@@ -32,7 +32,6 @@ enum
 	CELL_SEARCH_TITLE_LEN_MAX           = 384,
 	CELL_SEARCH_TAG_NUM_MAX             = 6,
 	CELL_SEARCH_TAG_LEN_MAX             = 63,
-	CELL_MUSIC_SELECTION_CONTEXT_SIZE   = 2048,
 	CELL_SEARCH_PATH_LEN_MAX            = 63,
 	CELL_SEARCH_MTOPTION_LEN_MAX        = 63,
 	CELL_SEARCH_DEVELOPERDATA_LEN_MAX   = 64,
@@ -226,7 +225,7 @@ enum CellSearchSharableType : s32
 };

 using CellSearchId = s32;
-using CellSearchSystemCallback = void(CellSearchEvent event, s32 result, vm::ps3::cptr<void> param, vm::ps3::ptr<void> userData);
+using CellSearchSystemCallback = void(CellSearchEvent event, s32 result, vm::cptr<void> param, vm::ptr<void> userData);

 struct CellSearchContentId
 {
@@ -339,11 +338,6 @@ struct CellSearchVideoSceneInfo
 	char tags[CELL_SEARCH_TAG_NUM_MAX][CELL_SEARCH_TAG_LEN_MAX];
 };

-struct CellMusicSelectionContext
-{
-	char data[CELL_MUSIC_SELECTION_CONTEXT_SIZE];
-};
-
 struct CellSearchContentInfoPath
 {
 	char contentPath[CELL_SEARCH_PATH_LEN_MAX + 1];
@@ -3,7 +3,7 @@

 #include "cellSpudll.h"

-namespace vm { using namespace ps3; }
+

 logs::channel cellSpudll("cellSpudll");

@@ -17,8 +17,8 @@ struct CellSpudllHandleConfig
 	be_t<u32> dmaTag;
 	be_t<u32> numMaxReferred;
 	be_t<u32> numMaxDepend;
-	vm::ps3::bptr<void> unresolvedSymbolValueForFunc;
-	vm::ps3::bptr<void> unresolvedSymbolValueForObject;
-	vm::ps3::bptr<void> unresolvedSymbolValueForOther;
+	vm::bptr<void> unresolvedSymbolValueForFunc;
+	vm::bptr<void> unresolvedSymbolValueForObject;
+	vm::bptr<void> unresolvedSymbolValueForOther;
 	be_t<u32> __reserved__[9];
 };
@@ -2,7 +2,7 @@

 #include "cellSync.h"

-namespace vm { using namespace ps3; }
+

 struct CellSpurs;
 struct CellSpursTaskset;
@@ -671,7 +671,7 @@ struct alignas(16) CellSpursTaskAttribute2
 	be_t<u64> eaContext;
 	CellSpursTaskLsPattern lsPattern;
 	vm::bcptr<char> name;
-	
+
 	u8 reserved[220];
 };

@@ -1,3 +1 @@
 #pragma once
-
-namespace vm { using namespace ps3; }
@@ -9,7 +9,7 @@

 logs::channel cellSsl("cellSsl");

-namespace vm { using namespace ps3; }
+

 enum SpecialCerts { BaltimoreCert = 6, Class3G2V2Cert = 13, ClassSSV4Cert = 15, EntrustNetCert = 18, GTECyberTrustGlobalCert = 23 };

@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"

-namespace vm { using namespace ps3; }
+

 extern logs::channel cellSysutil;

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

-namespace vm { using namespace ps3; }
+

 // Return Codes
 enum CellSubDisplayError : u32
@@ -2,7 +2,7 @@

 #include "Utilities/BitField.h"

-namespace vm { using namespace ps3; }
+

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

-namespace vm { using namespace ps3; }
+

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

-namespace vm { using namespace ps3; }
+

 typedef void(CellSysconfCallback)(s32 result, vm::ptr<void> userdata);

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

-namespace vm { using namespace ps3; }
+

 enum
 {
@@ -141,9 +141,9 @@ enum
 enum
 {
 	CELL_SYSCACHE_RET_OK_CLEARED      = 0,
-	CELL_SYSCACHE_RET_OK_RELAYED      = 1, 
+	CELL_SYSCACHE_RET_OK_RELAYED      = 1,

-	CELL_SYSCACHE_ID_SIZE             = 32,	
+	CELL_SYSCACHE_ID_SIZE             = 32,
 	CELL_SYSCACHE_PATH_MAX            = 1055,

 	CELL_SYSCACHE_ERROR_ACCESS_ERROR  = 0x8002bc01, // I don't think we need this
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "Emu/Cell/PPUModule.h"

-namespace vm { using namespace ps3; }
+

 logs::channel cellSysutilAp("cellSysutilAp");

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

-namespace vm { using namespace ps3; }
+

 // Error codes
 enum CellSysutilAvc2Error : u32
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
zarroboogs	dc55d5be8f	linux appimage versioning changes synced with windows artifact version	2018-02-24 15:06:08 +00:00
zarroboogs	06546b5195	windows artifact versioning changes, plus a small syntax fix	2018-02-24 15:06:08 +00:00
zarroboogs	ca9c1674f7	minor syntax changes	2018-02-24 15:06:08 +00:00
scribam	ede76033a7	Add callbacks for cellMusic	2018-02-24 02:38:43 +04:00
Nikolay Amiantov	41bd07274f	Fix quoting in cmake	2018-02-23 19:06:37 +00:00
Megamouse	5266dd6c60	Update for Qt 5.10 (#4202 ) * Update Readme for Qt 5.10 * Update cmake for Qt 5.10 * Update travis to Qt 5.10.1	2018-02-23 02:08:14 +04:00
Megamouse	cf1c45dfe8	Qt: use setAttribute(AA_DisableWindowContextHelpButton) instead of flags probably needs Qt 5.10.1 to work propery	2018-02-22 00:18:14 +04:00
Megamouse	ae7e275a9d	sceNpTrophyGetRequiredDiskSpace: take vfs into account for trophy dir	2018-02-22 00:18:14 +04:00
Megamouse	b60f29282a	Qt: add translation to save manager messageboxes	2018-02-22 00:18:14 +04:00
Megamouse	bda466c3bd	Qt: improve VFS dialog a bit - use normal selection instead of doubleclick - move SaveSettings out of the tabs to reduce file access - translate EmptyPath as well - some other minor refactors to reduce lines of code	2018-02-22 00:18:14 +04:00
kd-11	4c6ceeff11	rsx/vk: Cleanup - Silence some warnings, remove dprints	2018-02-21 14:59:46 +03:00
kd-11	77f2b521e1	vulkan: Swapchains reimplemented - Adds support for abstract implementations - Adds native windowing implementations for WIN32 and X11 as fallbacks when present support is lacking (headless configs)	2018-02-21 14:59:46 +03:00
Juhn	1b26ec56ed	Implement _sys_qsort in sys_libc_.cpp (#4176 )	2018-02-21 00:24:47 +04:00
elad	7c0fd5094e	disasm: clamp spu address	2018-02-20 20:27:57 +04:00
elad	d5b9eb0caa	add kdevelop to gitignore	2018-02-19 19:07:22 +00:00
elad	1a0b2bf050	add vscode files to gitignore such as .vscode\settings.json	2018-02-19 19:07:22 +00:00
Zion Nimchuk	f52fa5e46c	Re-arrange VULKAN_PREBUILT option	2018-02-19 17:30:24 +04:00
Zion Nimchuk	77b8f3a0f9	Add an easy way for package builders to disable native cpu optimizations	2018-02-19 17:30:24 +04:00
Megamouse	95d232db4f	Qt: fix gamegrid scroll scrollafter is useless in gamegrid, because the currentIndex was reset after PopulateGameGrid, so just ignore it.	2018-02-19 01:23:40 +04:00
Robbie	00b1ff752d	Add flag for rockband. Tests have shown it independent other flags. But, actual use is currently not known.	2018-02-18 04:29:41 +04:00
elad	877b296fc3	hle: return enosys on unpresented syscalls	2018-02-16 21:57:31 +04:00
kd-11	ee88e7f948	rsx/gl: Hotfix for GL format compatibility check when high precision depth buffers is enabled	2018-02-16 16:14:54 +03:00
kd-11	ebb9fc7cd9	vk/drivers: Restore polaris+ patch to disable primitive restart	2018-02-16 16:14:54 +03:00
kd-11	32f0e91893	vulkan: Improve primitive restart workaround for vega/polaris - For some reason the hardware forgets that primitive restart is enabled and tries to actually read vertex index 65535 - Works correctly if uint32 vertex indices are used instead of uint16 for cases where primitive restart is active	2018-02-16 16:14:54 +03:00
kd-11	a8ab408f64	rsx: Account for null blit ops (memcpy) - Do not perform extra memory tasks if no actual image copy was performed	2018-02-16 16:14:54 +03:00
kd-11	661b8b006f	rsx: Add texture readback statistics to the texture cache and debug overlay	2018-02-16 16:14:54 +03:00
kd-11	1bd77c2f51	rsx: Add cache pattern checking to blit engine resources - Feature was implemented long ago but was not functional due to bugs	2018-02-16 16:14:54 +03:00
kd-11	c191a98ec3	vulkan API fixes - Fix for texture barriers - vulkan: Rework texture cache handling of depth surfaces - Support for scaled depth blit using overlay pass - Support proper readback of D24S8 in both D32F_S8 and D24U_S8 variants - Optimize the depth conversion routines with SSE - vulkan: Replace slow single element copy with std::memcpy - Check heap status before attempting blit operations - Bump guard size on upload buffer as well	2018-02-16 16:14:54 +03:00
kd-11	3bbecd998a	infinitesimal fixes	2018-02-16 16:14:54 +03:00
kd-11	3406cc9886	gl: Fix save binding state for cube textures	2018-02-16 16:14:54 +03:00
kd-11	bd297d079d	rsx: Minor optimizations	2018-02-16 16:14:54 +03:00
kd-11	a5500ebfa4	rsx: Fix disjoint draw range splitting - Fixes flickering and missing draws in R&C and other games such as Motorstorm Apocalypse and Okami HD when strict mode is disabled	2018-02-16 16:14:54 +03:00
kd-11	a64bea1286	rsx/fp: Discard shaders with undefined (non-existent) writes. On nvidia+vulkan, undefined writes autofill with blue color	2018-02-16 16:14:54 +03:00
kd-11	b67f28e00d	rsx/texture_cache: Do not access non-existent components	2018-02-16 16:14:54 +03:00
kd-11	89c548b5d3	rsx: fbo fixes 2.5 - Implement flush-always behaviour to partially fix readback from a currently bound fbo - Without this, only the first read is correct, as more draws are added the results become 'wrong' - Fixes WCB and cpublit behviour - Synchronize blit_dst surfaces to avoid data loss when gpu texture scaling is used - Its still faster in such cases to disable gpu texture scaling but some types cannot be disabled without force cpu blit (e.g framebuffer transfers) - Memory management tuning - rsx: on-demand texture cache rescanning for unprotected sections - rsx: Only framebuffer resources are upscaled - Do not resize regular blit engine resources - Lazy initialize readback buffer when using opengl -- These measures should help minimize vram usage	2018-02-16 16:14:54 +03:00
kd-11	02e571adbc	gl: Cleanup some more things - Avoid referencing GL's null texture - Improve texture creation helpers - Remove useless __glcheck from GLHelpers.cpp	2018-02-16 16:14:54 +03:00
kd-11	98e50d3064	gl: Reuse framebuffer textures whenever possible	2018-02-16 16:14:54 +03:00
kd-11	f20fd217f8	rsx: Reorganize framebuffer setup code - Fixes some fast paths for framebuffer creation and binding	2018-02-16 16:14:54 +03:00
elad	95c6ac699b	hle: gpio syscalls * add sys_gpio_get, sys_gpio_set	2018-02-12 04:29:07 +04:00
Ani	9caceeacd7	gui: Update compatibility colors Update to the colors now used by the website	2018-02-12 01:58:14 +04:00
Ani	2f7f8a629d	Move Contributing to .github	2018-02-12 01:58:14 +04:00
Ani	a994c46256	GL: Update glext.h to ver 20180114	2018-02-12 01:58:14 +04:00
Ani	c689a9ba8e	rpcs3qt: Handle duplicate name warning The name 'verticalLayout_29' (QVBoxLayout) is already in use, defaulting to 'verticalLayout_291'.	2018-02-12 01:58:14 +04:00
Ani	777cd9a8ae	Remove redundant imports They are already included on the related rpcs3qt files	2018-02-12 01:58:14 +04:00
Ani	6dd2c78b1b	Remove unused files (ps3emu_api)	2018-02-12 01:58:14 +04:00
Ani	372cb39ce8	openAL: Update to 1.18.2	2018-02-12 01:58:14 +04:00
Nekotekina	d2652aedd2	VK: add two options (workarounds) Force FIFO present mode option is workaround for recent MESA drivers Force primitive restart flag should also work on said drivers	2018-02-11 19:52:14 +03:00
Nekotekina	fa04ff6d90	CPUTranslator: add bitcast, trunc, zext, sext	2018-02-10 15:57:01 +03:00
Nekotekina	cce0ad0c35	Clean vm::ps3 namespace use	2018-02-09 17:49:37 +03:00
Nekotekina	76be7d40ac	Remove PSP2	2018-02-09 15:24:46 +03:00
Nekotekina	13aa88c3c4	Game list: improve deduplication logic	2018-02-08 21:10:03 +03:00
Nekotekina	439a78d12c	SPU ASMJIT: rewrite 128-bit shifts by bit Six instructions changed to use xmm registers instead of gpr. ROTQBII, ROTQMBII, SHLQBII look better (shifts by imm) ROTQBI, ROTQMBI, SHLQBI changed for consistency (shifts by variable)	2018-02-08 21:10:03 +03:00
Nekotekina	c7c49ab286	SPU ASMJIT: minor change to ROTH instruction Only AVX-512 path is changed (third version). This instruction is extremely rare. And the code is probably not optimal. So this commit is pretty useless.	2018-02-08 21:10:03 +03:00
Nekotekina	3972b176cd	Add ignore=dirty to hidapi submodule	2018-02-08 21:10:03 +03:00
Nekotekina	2a4f38959a	Update LLVM submodule URL	2018-02-08 21:10:03 +03:00
Nekotekina	b01e460863	PPU LLVM: rewrite AVG instructions	2018-02-08 21:10:03 +03:00
Nekotekina	93c0a0aa35	PPU LLVM: rewrite add/sub instructions Use new patterns for saturation instructions Avoid ZExt/SExt completely	2018-02-08 21:10:03 +03:00
Nekotekina	74834527eb	SPU: rewrite ORX instruction	2018-02-08 21:10:03 +03:00
Nekotekina	9b9ac3ca62	SPU: emit VZEROUPPER Workaround dirty AVX high state	2018-02-08 21:10:03 +03:00
Nekotekina	db83113316	Initial cpu_translator impl	2018-02-08 21:10:03 +03:00
Nekotekina	d66e56392e	Handle exceptions at loading patch file	2018-02-08 20:46:13 +03:00
Nekotekina	17ce5d9117	Handle exceptions at game list update Should fix #4056	2018-02-08 20:46:13 +03:00
Nekotekina	e2439e962c	SPU: use XOP instructions	2018-02-08 20:46:13 +03:00
Nekotekina	84103b69cf	SPU: 16-bit shifts for AVX2	2018-02-08 20:46:13 +03:00
elad	5b5f2d4240	hle: add a missing check in sys_spu check if exit code exists and the spu is stopped by a stop instruction and optimize the way were getting the exit code	2018-02-06 04:09:07 +04:00
elad	956ae17876	spu: add a missing STOP code should fix #2456 for whatever reason, this call accepts only an empty ouput mailbox, otherwise break	2018-02-06 04:09:07 +04:00
elad	a6fb6c865d	mfc: dont check for one completed command if tag update requast is 2 Instead check only for completed commads tag groups specified in the tag mask ( as real hw does )	2018-02-06 04:09:07 +04:00
Nicba1010	06fc4233d2	appveyor: Add artifact sha-256 hash files (#4148 ) * Add artifact sha-256 hash files (for checksum)	2018-02-04 21:29:56 +00:00
Zeke Sonxx	c21fa2d8bc	Make fs::dir::open skip forward on failed metadata instead of crashing	2018-02-04 00:21:40 +04:00
TGEnigma	f6b0b31e8b	Fix gs_frame spawning on monitor other than the one the main window is on (#4029 ) * Fix gs_frame spawning on a screen other than the one the RPCS3 window is on for multi-monitor setups * Cleaned up code & refactored it into a utility function for reuse * Qt: take gs_frame's framemargins into account by using showEvent	2018-02-03 19:50:48 +00:00
scribam	cd9bfba790	Add sceNpMatchingInt	2018-02-03 14:07:38 +00:00
scribam	6001808174	Add callbacks for cellPhotoExport	2018-02-03 03:52:06 +00:00
zarroboogs	6b95d52ba3	update av build version as late as possible to prevent webhook breakage	2018-02-03 02:07:37 +00:00
zarroboogs	f290555e68	package artifacts using 7z LZMA2 ultra compression	2018-02-03 02:07:37 +00:00
zarroboogs	e8bae00f57	minor refactoring	2018-02-03 02:07:37 +00:00
zarroboogs	00cfe003f7	reformat libs fetching, fix appveyor build with luck	2018-02-03 02:07:37 +00:00
zarroboogs	3e4d12ccf1	update qt 5.9 -> 5.10.0	2018-02-03 02:07:37 +00:00
zarroboogs	46dd7084f7	download and distribute compat db, cache db in case download fails	2018-02-03 02:07:37 +00:00
zarroboogs	6f8e1f648c	add openssl artifact using prebuilt binaries from appveyor build env	2018-02-03 02:07:37 +00:00
zarroboogs	d322a81bd1	nuke after_package, move stuff to after_build	2018-02-03 02:07:37 +00:00
zarroboogs	6275636ada	version and artifacts changes - fetch latest tag from git describe, use 7z for artifacts in after_build section	2018-02-03 02:07:37 +00:00
zarroboogs	a226524e92	reformat and move BRANCH and PATH setting, reformat submodules fetching	2018-02-03 02:07:37 +00:00
zarroboogs	13b3be3e7f	reformat llvm and vulkan libs fetching	2018-02-03 02:07:37 +00:00
zarroboogs	71c47734fb	removed comments copied directly from appveyor docs, clone_folder is not needed since it's set to the default value	2018-02-03 02:07:37 +00:00
TGEnigma	55821041bf	core/GUI: Fix null pointer dereference	2018-02-02 11:17:12 +03:00
kd-11	e7537cded5	vk: Also discard background if window is too small in vertical axis	2018-02-02 10:07:55 +03:00
kd-11	ea8bdda9a3	rsx/gl/vk: Support for swizzled? context surfaces - For some surfaces, dimensions are passed via the log2 bits rather than surface pitch -- This is similar to the setup for nv406e and probably means the surfaces are padded and swizzled	2018-02-02 10:07:55 +03:00
kd-11	eeb6e29e39	vulkan: implement proper texture read barriers	2018-02-02 10:07:55 +03:00
kd-11	b9cca71c47	gl: API compliance fixes - Do not assume texture2D when creating new textures - Flag invalid texture cache if readonly texture is trampled by fbo memory. Avoids binding a stale handle to the pipeline and is rare enough that it should not hurt performance	2018-02-02 10:07:55 +03:00
scribam	2821915eae	Add callbacks for cellVideoUpload	2018-02-01 17:19:52 +04:00
scribam	68143bc47c	Add callbacks for cellVideoExport	2018-02-01 17:19:52 +04:00
scribam	f4e5bfbdf7	Add callbacks for cellRec	2018-02-01 17:19:52 +04:00
Zion Nimchuk	70fe0cc224	Install and load icons from Icons in executable directory, fixes local builds using Icons	2018-01-31 01:01:33 +04:00
Zion Nimchuk	9d079ede85	remove libfreetype.so.6, fixes AppImages for some users	2018-01-31 01:01:33 +04:00
kd-11	4f7d3e5dc1	vk: Stuff - Remove subpass dependencies; transitions are handled via exicit imagememrybarriers - Reuse sampler objects whenever possible; create/delete cycles are not free	2018-01-30 21:16:43 +03:00
kd-11	33bcdd476c	glsl/fp/vp: Avoid shader clutter - Do not add unused subroutines in shaders unless necessary -- makes shaders easier to read and disassembled spir-v has less clutter - glsl: Replace switch block with lookup table	2018-01-30 21:16:43 +03:00
kd-11	2e04dceaf0	rsx: misc fixes - Supply explicit options for spv emit allowing optimizations (not yet compiled into the backend) - Add epsilon fix to glslcommon - Fix shader dialog crash when using qt (race condition)	2018-01-30 21:16:43 +03:00
kd-11	648fc92184	rsx/fp/vp: Epsilon value is too large! - Original epsilon value was 1.E-10 which nvidia linux driver could not read properly -- Restores the original value represented in decimal notation	2018-01-30 21:16:43 +03:00
kd-11	c05d164eee	gl: Implement swap control on linux	2018-01-30 21:16:43 +03:00
Juhn	d37aa466ff	Fix native UI save_dialog when there are no saves (#4113 ) - Also implements single action list view with cancel action only	2018-01-30 16:26:00 +03:00
ZeroZero2018	cd8e97a7c6	Fix to B8 format render target swizzling (#4123 )	2018-01-29 21:58:25 +03:00
isJuhn	a27e2db455	Stub some functions in cellWebBrowser	2018-01-28 02:50:42 +04:00
Megamouse	bb5bdb2e8c	improve cellKB keyreleases and autorepeat	2018-01-27 01:57:55 +04:00
Zion	9614fef4b9	Use clang 5.0 in travis (#4115 ) * Use clang 5.0 in travis * Change clang-5.0 to just clang	2018-01-26 18:18:09 +00:00
Megamouse	b9c10a186d	Qt/Core: implement max llvm compile threads	2018-01-26 01:57:05 +04:00
Zangetsu38	c8965564e4	vk/ogl: Fix regression for G8B8	2018-01-24 20:20:28 +03:00
Zangetsu38	a9c26b40dd	hle: Stub function Unimplemented in NpSns.	2018-01-24 20:20:28 +03:00
Jake	efe6a6cf53	rsx: fixed emulated primitive restart	2018-01-24 16:28:09 +00:00
Jake	2f414f96bf	rsx: fix potential hang during thread close	2018-01-24 16:28:09 +00:00
Inviuz	cc0d7c5985	improved hack/fix for cellsurmixer	2018-01-24 15:21:24 +00:00