RPCS3 · Nekotekina · Dec 13, 2020 · Dec 13, 2020 · Dec 13, 2020 · Dec 13, 2020
diff --git a/Utilities/File.cpp b/Utilities/File.cpp
@@ -1,7 +1,6 @@
 #include "File.h"
 #include "mutex.h"
 #include "StrFmt.h"
-#include "BEType.h"
 #include "Crypto/sha1.h"
 
 #include <unordered_map>

diff --git a/Utilities/StrFmt.cpp b/Utilities/StrFmt.cpp
@@ -1,8 +1,9 @@
 #include "StrFmt.h"
-#include "BEType.h"
 #include "StrUtil.h"
 #include "cfmt.h"
+#include "util/endian.hpp"
 #include "util/logs.hpp"
+#include "util/v128.hpp"
 
 #include <algorithm>
 #include <string_view>

diff --git a/Utilities/StrFmt.h b/Utilities/StrFmt.h
@@ -119,6 +119,17 @@ struct fmt_unveil<b8, void>
 	}
 };
 
+template <typename T, bool Se, std::size_t Align>
+struct fmt_unveil<se_t<T, Se, Align>, void>
+{
+	using type = typename fmt_unveil<T>::type;
+
+	static inline auto get(const se_t<T, Se, Align>& arg)
+	{
+		return fmt_unveil<T>::get(arg);
+	}
+};
+
 // String type format provider, also type classifier (format() called if an argument is formatted as "%s")
 template <typename T, typename = void>
 struct fmt_class_string

diff --git a/Utilities/Thread.cpp b/Utilities/Thread.cpp
@@ -1296,7 +1296,7 @@ bool handle_access_violation(u32 addr, bool is_writing, x64_context* context) no
 
 			if (op != X64OP_LOAD_BE)
 			{
-				value = se_storage<u32>::swap(value);
+				value = stx::se_storage<u32>::swap(value);
 			}
 
 			if (op == X64OP_LOAD_CMP)
@@ -1338,7 +1338,7 @@ bool handle_access_violation(u32 addr, bool is_writing, x64_context* context) no
 			}
 
 			u32 val32 = static_cast<u32>(reg_value);
-			if (!thread->write_reg(addr, op == X64OP_STORE ? se_storage<u32>::swap(val32) : val32))
+			if (!thread->write_reg(addr, op == X64OP_STORE ? stx::se_storage<u32>::swap(val32) : val32))
 			{
 				return false;
 			}

diff --git a/Utilities/bin_patch.cpp b/Utilities/bin_patch.cpp
@@ -4,6 +4,9 @@
 #include "version.h"
 #include "Emu/System.h"
 
+#include "util/types.hpp"
+#include "util/endian.hpp"
+
 LOG_CHANNEL(patch_log, "PAT");
 
 namespace config_key

diff --git a/Utilities/bin_patch.h b/Utilities/bin_patch.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "BEType.h"
 #include <vector>
 #include <string>
 #include <unordered_map>
 
+#include "util/types.hpp"
 #include "util/yaml.hpp"
 
 namespace patch_key
@@ -53,7 +53,7 @@ class patch_engine
 			f64 double_value;
 		} value { 0 };
 	};
-	
+
 	using patch_app_versions = std::unordered_map<std::string /*app_version*/, bool /*enabled*/>;
 	using patch_serials = std::unordered_map<std::string /*serial*/, patch_app_versions>;
 	using patch_titles = std::unordered_map<std::string /*serial*/, patch_serials>;

diff --git a/rpcs3/Crypto/unedat.cpp b/rpcs3/Crypto/unedat.cpp
@@ -5,6 +5,8 @@
 #include "Utilities/mutex.h"
 #include <cmath>
 
+#include "util/v128.hpp"
+
 LOG_CHANNEL(edat_log, "EDAT");
 
 // Static variables are being modified concurrently in ec.cpp, for now use a mutex

diff --git a/rpcs3/Crypto/unedat.h b/rpcs3/Crypto/unedat.h
@@ -4,9 +4,10 @@
 
 #include "utils.h"
 
-#include "Utilities/BEType.h"
 #include "Utilities/File.h"
 
+#include "util/v128.hpp"
+
 constexpr u32 SDAT_FLAG = 0x01000000;
 constexpr u32 EDAT_COMPRESSED_FLAG = 0x00000001;
 constexpr u32 EDAT_FLAG_0x02 = 0x00000002;

diff --git a/rpcs3/Crypto/unpkg.h b/rpcs3/Crypto/unpkg.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "Utilities/BEType.h"
 #include <sstream>
 #include <iomanip>
 
@@ -96,7 +95,7 @@ struct PKGExtHeader
 	be_t<u32> ext_hdr_size;                     // Extended header size. ex: 0x40
 	be_t<u32> ext_data_size;                    // ex: 0x180
 	be_t<u32> main_and_ext_headers_hmac_offset; // ex: 0x100
-	be_t<u32> metadata_header_hmac_offset;      // ex: 0x360, 0x390, 0x490 
+	be_t<u32> metadata_header_hmac_offset;      // ex: 0x360, 0x390, 0x490
 	be_t<u64> tail_offset;                      // tail size seams to be always 0x1A0
 	be_t<u32> padding1;
 	be_t<u32> pkg_key_id;                       // Id of the AES key used for decryption. PSP = 0x1, PSVita = 0xC0000002, PSM = 0xC0000004

diff --git a/rpcs3/Crypto/unself.cpp b/rpcs3/Crypto/unself.cpp
@@ -3,13 +3,14 @@
 #include "sha1.h"
 #include "utils.h"
 #include "unself.h"
-#include "Utilities/BEType.h"
 #include "Emu/VFS.h"
 #include "Emu/System.h"
 
 #include <algorithm>
 #include <zlib.h>
 
+#include "util/v128.hpp"
+
 inline u8 Read8(const fs::file& f)
 {
 	u8 ret;

diff --git a/rpcs3/Emu/CPU/CPUTranslator.h b/rpcs3/Emu/CPU/CPUTranslator.h
@@ -26,7 +26,6 @@
 
 #include "util/types.hpp"
 #include "Utilities/StrFmt.h"
-#include "Utilities/BEType.h"
 #include "Utilities/BitField.h"
 #include "util/logs.hpp"
 #include "Utilities/JIT.h"
@@ -38,6 +37,8 @@
 #include <array>
 #include <vector>
 
+#include "util/v128.hpp"
+
 enum class i2 : char
 {
 };

diff --git a/rpcs3/Emu/Cell/Modules/cellAudio.h b/rpcs3/Emu/Cell/Modules/cellAudio.h
@@ -174,7 +174,7 @@ struct audio_port
 		return addr.addr() + position(offset) * buf_size();
 	}
 
-	to_be_t<float>* get_vm_ptr(s32 offset = 0) const
+	be_t<f32>* get_vm_ptr(s32 offset = 0) const
 	{
 		return vm::_ptr<f32>(buf_addr(offset));
 	}

diff --git a/rpcs3/Emu/Cell/Modules/cellAudioIn.h b/rpcs3/Emu/Cell/Modules/cellAudioIn.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include "Utilities/BEType.h"
+#include "util/types.hpp"
+#include "util/endian.hpp"
 
 // Error codes
 enum CellAudioInError

diff --git a/rpcs3/Emu/Cell/Modules/cellGem.h b/rpcs3/Emu/Cell/Modules/cellGem.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "Utilities/BEType.h"
-
 static const float CELL_GEM_SPHERE_RADIUS_MM = 22.5f;
 
 // Error codes

diff --git a/rpcs3/Emu/Cell/Modules/cellJpgDec.h b/rpcs3/Emu/Cell/Modules/cellJpgDec.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "Utilities/BEType.h"
-
 //Return Codes
 enum CellJpgDecError : u32
 {

diff --git a/rpcs3/Emu/Cell/Modules/cellKb.h b/rpcs3/Emu/Cell/Modules/cellKb.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "Utilities/BEType.h"
 #include "Emu/Io/Keyboard.h"
 
 enum CellKbError : u32

diff --git a/rpcs3/Emu/Cell/Modules/cellMic.h b/rpcs3/Emu/Cell/Modules/cellMic.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "Utilities/BEType.h"
 #include "Utilities/Thread.h"
 
 #include "3rdparty/OpenAL/include/alext.h"

diff --git a/rpcs3/Emu/Cell/Modules/cellMouse.h b/rpcs3/Emu/Cell/Modules/cellMouse.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "Utilities/BEType.h"
-
 enum CellMouseError : u32
 {
 	CELL_MOUSE_ERROR_FATAL                      = 0x80121201,

diff --git a/rpcs3/Emu/Cell/Modules/cellPad.h b/rpcs3/Emu/Cell/Modules/cellPad.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "Utilities/BEType.h"
 #include <array>
 
 enum CellPadError : u32

diff --git a/rpcs3/Emu/Cell/Modules/cellResc.h b/rpcs3/Emu/Cell/Modules/cellResc.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "Utilities/BEType.h"
-
 enum CellRescError : u32
 {
 	CELL_RESC_ERROR_NOT_INITIALIZED   = 0x80210301,

diff --git a/rpcs3/Emu/Cell/Modules/cellRtc.h b/rpcs3/Emu/Cell/Modules/cellRtc.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "Utilities/BEType.h"
 #include "Emu/Memory/vm_ptr.h"
 #include "Emu/Cell/ErrorCodes.h"
 

diff --git a/rpcs3/Emu/Cell/Modules/cellSaveData.h b/rpcs3/Emu/Cell/Modules/cellSaveData.h
@@ -3,6 +3,8 @@
 #include "stdafx.h"
 #include <Emu/Memory/vm_ptr.h>
 
+#include "util/v128.hpp"
+
 // Return codes
 enum CellSaveDataError : u32
 {

diff --git a/rpcs3/Emu/Cell/Modules/cellSpurs.cpp b/rpcs3/Emu/Cell/Modules/cellSpurs.cpp
@@ -15,6 +15,8 @@
 #include "sysPrxForUser.h"
 #include "cellSpurs.h"
 
+#include "util/v128.hpp"
+
 LOG_CHANNEL(cellSpurs);
 
 template <>

diff --git a/rpcs3/Emu/Cell/Modules/cellSpurs.h b/rpcs3/Emu/Cell/Modules/cellSpurs.h
@@ -2,7 +2,7 @@
 
 #include "cellSync.h"
 
-
+#include "util/v128.hpp"
 
 struct CellSpurs;
 struct CellSpursTaskset;

diff --git a/rpcs3/Emu/Cell/Modules/cellSpursSpu.cpp b/rpcs3/Emu/Cell/Modules/cellSpursSpu.cpp
@@ -13,6 +13,8 @@
 #include <thread>
 #include <mutex>
 
+#include "util/v128.hpp"
+
 LOG_CHANNEL(cellSpurs);
 
 //----------------------------------------------------------------------------

diff --git a/rpcs3/Emu/Cell/Modules/cellSubDisplay.h b/rpcs3/Emu/Cell/Modules/cellSubDisplay.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "Utilities/BEType.h"
-
 // Return Codes
 enum CellSubDisplayError : u32
 {

diff --git a/rpcs3/Emu/Cell/Modules/cellVdec.h b/rpcs3/Emu/Cell/Modules/cellVdec.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "Utilities/BEType.h"
-
 // Error Codes
 enum CellVdecError : u32
 {

diff --git a/rpcs3/Emu/Cell/Modules/cellVpost.h b/rpcs3/Emu/Cell/Modules/cellVpost.h
@@ -18,8 +18,6 @@ extern "C"
 #pragma GCC diagnostic pop
 #endif
 
-#include "Utilities/BEType.h"
-
 // Error Codes
 enum CellVpostError : u32
 {

diff --git a/rpcs3/Emu/Cell/Modules/libsynth2.h b/rpcs3/Emu/Cell/Modules/libsynth2.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "Utilities/BEType.h"
-
 // Error Codes
 enum CellSoundSynth2Error : u32
 {

diff --git a/rpcs3/Emu/Cell/Modules/sceNp.cpp b/rpcs3/Emu/Cell/Modules/sceNp.cpp
@@ -15,6 +15,8 @@
 #include "Emu/NP/np_handler.h"
 #include "Emu/NP/np_contexts.h"
 
+#include "util/v128.hpp"
+
 LOG_CHANNEL(sceNp);
 
 template <>

diff --git a/rpcs3/Emu/Cell/Modules/sceNp.h b/rpcs3/Emu/Cell/Modules/sceNp.h
@@ -3,8 +3,6 @@
 #include "cellRtc.h"
 #include "Emu/Cell/ErrorCodes.h"
 
-#include "Utilities/BEType.h"
-
 error_code sceNpInit(u32 poolsize, vm::ptr<void> poolptr);
 error_code sceNpTerm();
 

diff --git a/rpcs3/Emu/Cell/Modules/sceNpClans.h b/rpcs3/Emu/Cell/Modules/sceNpClans.h
@@ -2,8 +2,6 @@
 
 #include "sceNp.h"
 
-#include "Utilities/BEType.h"
-
 // Return codes
 enum SceNpClansError : u32
 {

diff --git a/rpcs3/Emu/Cell/Modules/sceNpCommerce2.h b/rpcs3/Emu/Cell/Modules/sceNpCommerce2.h
@@ -2,8 +2,6 @@
 
 #include "cellRtc.h"
 
-#include "Utilities/BEType.h"
-
 // Return codes
 enum SceNpCommerce2Error
 {

diff --git a/rpcs3/Emu/Cell/Modules/sceNpTus.h b/rpcs3/Emu/Cell/Modules/sceNpTus.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "Utilities/BEType.h"
-
 #include "cellRtc.h"
 #include "sceNp.h"
 

diff --git a/rpcs3/Emu/Cell/PPUAnalyser.h b/rpcs3/Emu/Cell/PPUAnalyser.h
@@ -3,9 +3,10 @@
 #include <string>
 #include <map>
 #include <set>
+#include "util/types.hpp"
+#include "util/endian.hpp"
 
 #include "Utilities/bit_set.h"
-#include "Utilities/BEType.h"
 #include "PPUOpcodes.h"
 
 // PPU Function Attributes

diff --git a/rpcs3/Emu/Cell/PPUCallback.h b/rpcs3/Emu/Cell/PPUCallback.h
@@ -2,6 +2,8 @@
 
 #include "Emu/Cell/PPUThread.h"
 
+#include "util/v128.hpp"
+
 struct ppu_func_opd_t;
 
 namespace ppu_cb_detail

diff --git a/rpcs3/Emu/Cell/PPUFunction.h b/rpcs3/Emu/Cell/PPUFunction.h
@@ -2,6 +2,8 @@
 
 #include "PPUThread.h"
 
+#include "util/v128.hpp"
+
 using ppu_function_t = bool(*)(ppu_thread&);
 
 // BIND_FUNC macro "converts" any appropriate HLE function to ppu_function_t, binding it to PPU thread context.

diff --git a/rpcs3/Emu/Cell/PPUInterpreter.cpp b/rpcs3/Emu/Cell/PPUInterpreter.cpp
@@ -11,6 +11,7 @@
 #include <cmath>
 
 #include "util/asm.hpp"
+#include "util/v128.hpp"
 
 #if !defined(_MSC_VER) && defined(__clang__)
 #pragma GCC diagnostic push