Archive/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-28 13:28:01 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Move types.h to util/types.hpp

Browse source
This commit is contained in:
Nekotekina 2020-12-12 15:01:29 +03:00
parent 666a18f5e5
commit b59f142d4e
75 changed files with 87 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Utilities/BEType.h
View file

@ -1,6 +1,6 @@
#pragma once // No BOM and only basic ASCII in this header, or a neko will die #pragma once // No BOM and only basic ASCII in this header, or a neko will die
#include "types.h" #include "util/types.hpp"
#include "util/endian.hpp" #include "util/endian.hpp"
#include <cstring> #include <cstring>
#include <cmath> #include <cmath>

2
Utilities/BitField.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "types.h" #include "util/types.hpp"
template<typename T, uint N> template<typename T, uint N>
struct bf_base struct bf_base

2
Utilities/CPUStats.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include <Utilities/types.h> #include "util/types.hpp"
#ifdef _WIN32 #ifdef _WIN32
#include "windows.h" #include "windows.h"

2
Utilities/Config.cpp
View file

@ -1,6 +1,6 @@
#include "stdafx.h" #include "stdafx.h"
#include "Config.h" #include "Config.h"
#include "Utilities/types.h" #include "util/types.hpp"
#include "util/yaml.hpp" #include "util/yaml.hpp"

2
Utilities/Config.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Utilities/types.h" #include "util/types.hpp"
#include "Utilities/StrFmt.h" #include "Utilities/StrFmt.h"
#include "util/logs.hpp" #include "util/logs.hpp"
#include "util/atomic.hpp" #include "util/atomic.hpp"

2
Utilities/File.h
View file

@ -1,6 +1,6 @@
#pragma once // No BOM and only basic ASCII in this header, or a neko will die #pragma once // No BOM and only basic ASCII in this header, or a neko will die
#include "types.h" #include "util/types.hpp"
#include "bit_set.h" #include "bit_set.h"
#include <memory> #include <memory>

2
Utilities/JIT.cpp
View file

@ -1,4 +1,4 @@
#include "types.h" #include "util/types.hpp"
#include "JIT.h" #include "JIT.h"
#include "StrFmt.h" #include "StrFmt.h"
#include "File.h" #include "File.h"

2
Utilities/JIT.h
View file

@ -167,7 +167,7 @@ inline FT build_function_asm(F&& builder)
#include <string_view> #include <string_view>
#include <unordered_map> #include <unordered_map>
#include "types.h" #include "util/types.hpp"
#include "mutex.h" #include "mutex.h"
#include "restore_new.h" #include "restore_new.h"

2
Utilities/StrFmt.h
View file

@ -1,6 +1,6 @@
#pragma once // No BOM and only basic ASCII in this header, or a neko will die #pragma once // No BOM and only basic ASCII in this header, or a neko will die
#include "types.h" #include "util/types.hpp"
#include <string> #include <string>

2
Utilities/Thread.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "types.h" #include "util/types.hpp"
#include "util/atomic.hpp" #include "util/atomic.hpp"
#include "util/shared_ptr.hpp" #include "util/shared_ptr.hpp"

2
Utilities/Timer.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "types.h" #include "util/types.hpp"
#include <chrono> #include <chrono>

2
Utilities/address_range.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "types.h" #include "util/types.hpp"
#include "StrFmt.h" #include "StrFmt.h"
#include <vector> #include <vector>

2
Utilities/bit_set.h
View file

@ -21,7 +21,7 @@ Examples:
Intersection (&) and symmetric difference (^) is also available. Intersection (&) and symmetric difference (^) is also available.
*/ */
#include "types.h" #include "util/types.hpp"
#include "util/atomic.hpp" #include "util/atomic.hpp"
template <typename T> template <typename T>

2
Utilities/cfmt.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "types.h" #include "util/types.hpp"
#include <climits> #include <climits>
#include <string> #include <string>
#include <vector> #include <vector>

2
Utilities/cond.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "types.h" #include "util/types.hpp"
#include "util/atomic.hpp" #include "util/atomic.hpp"
// Lightweight condition variable // Lightweight condition variable

2
Utilities/hash.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Utilities/types.h" #include "util/types.hpp"
namespace rpcs3 namespace rpcs3
{ {

2
Utilities/lockless.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "types.h" #include "util/types.hpp"
#include "util/atomic.hpp" #include "util/atomic.hpp"
//! Simple sizeless array base for concurrent access. Cannot shrink, only growths automatically. //! Simple sizeless array base for concurrent access. Cannot shrink, only growths automatically.

2
Utilities/mutex.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <mutex> #include <mutex>
#include "types.h" #include "util/types.hpp"
#include "util/atomic.hpp" #include "util/atomic.hpp"
// Shared mutex with small size (u32). // Shared mutex with small size (u32).

2
Utilities/sema.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <mutex> #include <mutex>
#include "types.h" #include "util/types.hpp"
#include "util/atomic.hpp" #include "util/atomic.hpp"
// Lightweight semaphore helper class // Lightweight semaphore helper class

2
Utilities/sync.h
View file

@ -2,7 +2,7 @@
/* For internal use. Don't include. */ /* For internal use. Don't include. */
#include "types.h" #include "util/types.hpp"
#include "util/atomic.hpp" #include "util/atomic.hpp"
#include "util/dyn_lib.hpp" #include "util/dyn_lib.hpp"

2
Utilities/sysinfo.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "types.h" #include "util/types.hpp"
#include <string> #include <string>
namespace utils namespace utils

2
Utilities/typemap.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "types.h" #include "util/types.hpp"
#include "mutex.h" #include "mutex.h"
#include "util/atomic.hpp" #include "util/atomic.hpp"
#include "util/typeindices.hpp" #include "util/typeindices.hpp"

2
Utilities/version.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "types.h" #include "util/types.hpp"
#include <string> #include <string>
namespace utils namespace utils

2
rpcs3/Crypto/key_vault.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Utilities/types.h" #include "util/types.hpp"
#include <string> #include <string>
#include <vector> #include <vector>

2
rpcs3/Crypto/unself.h
View file

@ -3,7 +3,7 @@
#include "key_vault.h" #include "key_vault.h"
#include "zlib.h" #include "zlib.h"
#include "Utilities/types.h" #include "util/types.hpp"
#include "Utilities/File.h" #include "Utilities/File.h"
#include "util/logs.hpp" #include "util/logs.hpp"

2
rpcs3/Crypto/utils.h
View file

@ -4,7 +4,7 @@
// Licensed under the terms of the GNU GPL, version 3 // Licensed under the terms of the GNU GPL, version 3
// http://www.gnu.org/licenses/gpl-3.0.txt // http://www.gnu.org/licenses/gpl-3.0.txt
#include "../../Utilities/types.h" #include "util/types.hpp"
#include <stdlib.h> #include <stdlib.h>
#include "aes.h" #include "aes.h"

4
rpcs3/Emu/Audio/AudioBackend.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Utilities/types.h" #include "util/types.hpp"
enum : u32 enum : u32
{ {
@ -101,7 +101,7 @@ public:
u32 get_sample_size() const; u32 get_sample_size() const;
u32 get_channels() const; u32 get_channels() const;
bool get_convert_to_u16() const; bool get_convert_to_u16() const;
bool has_capability(u32 cap) const; bool has_capability(u32 cap) const;

2
rpcs3/Emu/Audio/AudioDumper.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Utilities/types.h" #include "util/types.hpp"
#include "Utilities/File.h" #include "Utilities/File.h"
struct WAVHeader struct WAVHeader

2
rpcs3/Emu/CPU/CPUTranslator.h
View file

@ -24,7 +24,7 @@
#endif #endif
#include "define_new_memleakdetect.h" #include "define_new_memleakdetect.h"
#include "Utilities/types.h" #include "util/types.hpp"
#include "Utilities/StrFmt.h" #include "Utilities/StrFmt.h"
#include "Utilities/BEType.h" #include "Utilities/BEType.h"
#include "Utilities/BitField.h" #include "Utilities/BitField.h"

2
rpcs3/Emu/Cell/Common.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Utilities/types.h" #include "util/types.hpp"
// Floating-point rounding mode (for both PPU and SPU) // Floating-point rounding mode (for both PPU and SPU)
enum FPSCR_RN enum FPSCR_RN

2
rpcs3/Emu/Cell/ErrorCodes.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Utilities/types.h" #include "util/types.hpp"
// Error code type (return type), implements error reporting. // Error code type (return type), implements error reporting.
class error_code class error_code

2
rpcs3/Emu/Cell/MFC.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Utilities/types.h" #include "util/types.hpp"
enum MFC : u8 enum MFC : u8
{ {

2
rpcs3/Emu/Cell/Modules/StaticHLE.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "../../Utilities/types.h" #include "util/types.hpp"
#include "Emu/Memory/vm_ptr.h" #include "Emu/Memory/vm_ptr.h"
#include <vector> #include <vector>

2
rpcs3/Emu/Cell/SPUAnalyser.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Utilities/types.h" #include "util/types.hpp"
// SPU Instruction Type // SPU Instruction Type
struct spu_itype struct spu_itype

2
rpcs3/Emu/Cell/lv2/sys_trace.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Utilities/types.h" #include "util/types.hpp"
// SysCalls // SysCalls
s32 sys_trace_create(); s32 sys_trace_create();

2
rpcs3/Emu/GameInfo.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Utilities/types.h" #include "util/types.hpp"
#include <string> #include <string>
struct GameInfo struct GameInfo

6
rpcs3/Emu/IdManager.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Utilities/types.h" #include "util/types.hpp"
#include "Utilities/mutex.h" #include "Utilities/mutex.h"
#include <memory> #include <memory>
@ -48,7 +48,7 @@ namespace id_manager
static constexpr std::pair<u32, u32> invl_range = invl_range_extract_impl<T>::invl_range; static constexpr std::pair<u32, u32> invl_range = invl_range_extract_impl<T>::invl_range;
static_assert(count && step && u64{step} * (count - 1) + base < u64{UINT32_MAX} + (base != 0 ? 1 : 0), "ID traits: invalid object range"); static_assert(count && step && u64{step} * (count - 1) + base < u64{UINT32_MAX} + (base != 0 ? 1 : 0), "ID traits: invalid object range");
// TODO: Add more conditions // TODO: Add more conditions
static_assert(!invl_range.second || (u64{invl_range.second} + invl_range.first <= 32 /*....*/ )); static_assert(!invl_range.second || (u64{invl_range.second} + invl_range.first <= 32 /*....*/ ));
}; };
@ -580,7 +580,7 @@ public:
{ {
std::lock_guard lock(id_manager::g_mutex); std::lock_guard lock(id_manager::g_mutex);
if (const auto found = find_id<T, Get>(id); found && if (const auto found = find_id<T, Get>(id); found &&
(!found->second.owner_before(sptr) && !sptr.owner_before(found->second))) (!found->second.owner_before(sptr) && !sptr.owner_before(found->second)))
{ {
ptr = std::move(found->second); ptr = std::move(found->second);

4
rpcs3/Emu/Io/Keyboard.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Utilities/types.h" #include "util/types.hpp"
enum enum
{ {
@ -92,7 +92,7 @@ enum Keys
CELL_KEYC_KANA = 0x88, CELL_KEYC_KANA = 0x88,
CELL_KEYC_HENKAN = 0x8a, CELL_KEYC_HENKAN = 0x8a,
CELL_KEYC_MUHENKAN = 0x8b, CELL_KEYC_MUHENKAN = 0x8b,
// Raw keycodes for ASCII keys // Raw keycodes for ASCII keys
CELL_KEYC_A = 0x04, CELL_KEYC_A = 0x04,
CELL_KEYC_B = 0x05, CELL_KEYC_B = 0x05,

2
rpcs3/Emu/Io/PadHandler.h
View file

@ -4,7 +4,7 @@
#include "pad_types.h" #include "pad_types.h"
#include "pad_config.h" #include "pad_config.h"
#include "pad_config_types.h" #include "pad_config_types.h"
#include "Utilities/types.h" #include "util/types.hpp"
struct PadDevice struct PadDevice
{ {

2
rpcs3/Emu/Io/pad_config_types.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Utilities/types.h" #include "util/types.hpp"
enum class pad_handler enum class pad_handler
{ {

2
rpcs3/Emu/Memory/vm.h
View file

@ -2,7 +2,7 @@
#include <map> #include <map>
#include <memory> #include <memory>
#include "Utilities/types.h" #include "util/types.hpp"
#include "Utilities/StrFmt.h" #include "Utilities/StrFmt.h"
#include "Utilities/BEType.h" #include "Utilities/BEType.h"

2
rpcs3/Emu/Memory/vm_ptr.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Utilities/types.h" #include "util/types.hpp"
#include "Utilities/BEType.h" #include "Utilities/BEType.h"
#include "vm.h" #include "vm.h"

3
rpcs3/Emu/RSX/Capture/rsx_trace.h
View file

@ -1,8 +1,9 @@
#pragma once #pragma once
#include <string> #include <string>
#include <array> #include <array>
#include <vector> #include <vector>
#include "Utilities/types.h" #include "util/types.hpp"
#include "Emu/RSX/rsx_methods.h" #include "Emu/RSX/rsx_methods.h"
namespace rsx namespace rsx

2
rpcs3/Emu/RSX/Common/ShaderParam.h
View file

@ -4,7 +4,7 @@
#include <vector> #include <vector>
#include "Utilities/StrUtil.h" #include "Utilities/StrUtil.h"
#include "Utilities/types.h" #include "util/types.hpp"
enum class FUNCTION enum class FUNCTION
{ {

2
rpcs3/Emu/RSX/Common/TextGlyphs.h
View file

@ -6,7 +6,7 @@
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include "Utilities/types.h" #include "util/types.hpp"
/** /**
* FONT GLYPHS GO HERE * FONT GLYPHS GO HERE

2
rpcs3/Emu/RSX/Common/surface_utils.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Utilities/types.h" #include "util/types.hpp"
#include "Utilities/geometry.h" #include "Utilities/geometry.h"
#include "Utilities/address_range.h" #include "Utilities/address_range.h"
#include "TextureUtils.h" #include "TextureUtils.h"

3
rpcs3/Emu/RSX/GL/GLExecutionState.h
View file

@ -1,5 +1,6 @@
#pragma once #pragma once
#include "Utilities/types.h"
#include "util/types.hpp"
#include "Utilities/geometry.h" #include "Utilities/geometry.h"
#include "OpenGL.h" #include "OpenGL.h"

3
rpcs3/Emu/RSX/Overlays/overlay_animation.h
View file

@ -1,5 +1,6 @@
#pragma once #pragma once
#include "Utilities/types.h"
#include "util/types.hpp"
#include "Utilities/geometry.h" #include "Utilities/geometry.h"
#include "overlay_utils.h" #include "overlay_utils.h"

3
rpcs3/Emu/RSX/Overlays/overlay_controls.h
View file

@ -1,5 +1,6 @@
#pragma once #pragma once
#include "Utilities/types.h"
#include "util/types.hpp"
#include "Utilities/geometry.h" #include "Utilities/geometry.h"
#include "Utilities/File.h" #include "Utilities/File.h"
#include "overlay_utils.h" #include "overlay_utils.h"

2
rpcs3/Emu/RSX/Overlays/overlay_fonts.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Utilities/types.h" #include "util/types.hpp"
#include "overlay_utils.h" #include "overlay_utils.h"
#include <vector> #include <vector>

3
rpcs3/Emu/RSX/Overlays/overlay_utils.h
View file

@ -1,5 +1,6 @@
#pragma once #pragma once
#include "Utilities/types.h"
#include "util/types.hpp"
#include "Utilities/geometry.h" #include "Utilities/geometry.h"
#include <string> #include <string>

2
rpcs3/Emu/RSX/RSXFIFO.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Utilities/types.h" #include "util/types.hpp"
#include "Emu/RSX/gcm_enums.h" #include "Emu/RSX/gcm_enums.h"
struct RsxDmaControl; struct RsxDmaControl;

2
rpcs3/Emu/RSX/RSXFragmentProgram.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "gcm_enums.h" #include "gcm_enums.h"
#include "Utilities/types.h" #include "util/types.hpp"
enum register_type enum register_type
{ {

2
rpcs3/Emu/RSX/RSXOffload.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Utilities/types.h" #include "util/types.hpp"
#include "Utilities/address_range.h" #include "Utilities/address_range.h"
#include <vector> #include <vector>

2
rpcs3/Emu/RSX/RSXVertexProgram.h
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "gcm_enums.h" #include "gcm_enums.h"
#include "Utilities/types.h" #include "util/types.hpp"
#include <vector> #include <vector>
#include <bitset> #include <bitset>

2
rpcs3/Emu/RSX/VK/VulkanAPI.h
View file

@ -12,4 +12,4 @@
#include <vulkan/vulkan.h> #include <vulkan/vulkan.h>
#include <vulkan/vk_sdk_platform.h> #include <vulkan/vk_sdk_platform.h>
#include "define_new_memleakdetect.h" #include "define_new_memleakdetect.h"
#include "Utilities/types.h" #include "util/types.hpp"

3
rpcs3/Emu/RSX/gcm_enums.h
View file

@ -1,5 +1,6 @@
#pragma once #pragma once
#include "Utilities/types.h"
#include "util/types.hpp"
namespace rsx namespace rsx
{ {

3
rpcs3/Emu/RSX/gcm_printing.h
View file

@ -1,5 +1,6 @@
#pragma once #pragma once
#include <Utilities/types.h>
#include "util/types.hpp"
#include <string> #include <string>
#include <functional> #include <functional>

3
rpcs3/Emu/RSX/rsx_decode.h
View file

@ -1,5 +1,6 @@
#pragma once #pragma once
#include "Utilities/types.h"
#include "util/types.hpp"
#include "Utilities/BitField.h" #include "Utilities/BitField.h"
#include "Utilities/StrFmt.h" #include "Utilities/StrFmt.h"
#include <tuple> #include <tuple>

2
rpcs3/Emu/RSX/rsx_vertex_data.h
View file

@ -2,7 +2,7 @@
#include "gcm_enums.h" #include "gcm_enums.h"
#include "Utilities/types.h" #include "util/types.hpp"
#include "rsx_utils.h" #include "rsx_utils.h"
namespace rsx namespace rsx

2
rpcs3/Emu/perf_meter.hpp
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Utilities/types.h" #include "util/types.hpp"
#include "util/logs.hpp" #include "util/logs.hpp"
#include "Utilities/sysinfo.h" #include "Utilities/sysinfo.h"
#include "system_config.h" #include "system_config.h"

2
rpcs3/Loader/ELF.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "../../Utilities/types.h" #include "util/types.hpp"
#include "../../Utilities/File.h" #include "../../Utilities/File.h"
#include "../../Utilities/bit_set.h" #include "../../Utilities/bit_set.h"

4
rpcs3/Loader/PUP.h
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "../../Utilities/types.h" #include "util/types.hpp"
#include "../../Utilities/File.h" #include "../../Utilities/File.h"
#include <vector> #include <vector>
@ -34,7 +34,7 @@ class pup_object
{ {
const fs::file& m_file; const fs::file& m_file;
bool isValid = true; bool isValid = true;
std::vector<PUPFileEntry> m_file_tbl; std::vector<PUPFileEntry> m_file_tbl;
std::vector<PUPHashEntry> m_hash_tbl; std::vector<PUPHashEntry> m_hash_tbl;

2
rpcs3/display_sleep_control.cpp
View file

@ -14,7 +14,7 @@ static IOPMAssertionID s_pm_assertion = kIOPMNullAssertionID;
#include <QtDBus/QDBusInterface> #include <QtDBus/QDBusInterface>
#include <QtDBus/QDBusMessage> #include <QtDBus/QDBusMessage>
#include <QDBusReply> #include <QDBusReply>
#include "Utilities/types.h" #include "util/types.hpp"
static u32 s_dbus_cookie = 0; static u32 s_dbus_cookie = 0;
#endif #endif

2
rpcs3/emucore.vcxproj
View file

@ -548,7 +548,7 @@
<ClInclude Include="..\Utilities\sysinfo.h" /> <ClInclude Include="..\Utilities\sysinfo.h" />
<ClInclude Include="..\Utilities\Thread.h" /> <ClInclude Include="..\Utilities\Thread.h" />
<ClInclude Include="..\Utilities\Timer.h" /> <ClInclude Include="..\Utilities\Timer.h" />
<ClInclude Include="..\Utilities\types.h" /> <ClInclude Include="util\types.hpp" />
<ClInclude Include="..\Utilities\version.h" /> <ClInclude Include="..\Utilities\version.h" />
<ClInclude Include="util\vm.hpp" /> <ClInclude Include="util\vm.hpp" />
<ClInclude Include="util\asm.hpp" /> <ClInclude Include="util\asm.hpp" />

2
rpcs3/emucore.vcxproj.filters
View file

@ -1183,7 +1183,7 @@
<ClInclude Include="Emu\RSX\Common\BufferUtils.h"> <ClInclude Include="Emu\RSX\Common\BufferUtils.h">
<Filter>Emu\GPU\RSX\Common</Filter> <Filter>Emu\GPU\RSX\Common</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\Utilities\types.h"> <ClInclude Include="util\types.hpp">
<Filter>Utilities</Filter> <Filter>Utilities</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\Utilities\BitField.h"> <ClInclude Include="..\Utilities\BitField.h">

2
rpcs3/rpcs3qt/game_list_frame.cpp
View file

@ -17,7 +17,7 @@
#include "Emu/Memory/vm.h" #include "Emu/Memory/vm.h"
#include "Emu/System.h" #include "Emu/System.h"
#include "Loader/PSF.h" #include "Loader/PSF.h"
#include "Utilities/types.h" #include "util/types.hpp"
#include "Utilities/lockless.h" #include "Utilities/lockless.h"
#include "util/yaml.hpp" #include "util/yaml.hpp"
#include "Input/pad_thread.h" #include "Input/pad_thread.h"

2
rpcs3/rpcs3qt/kernel_explorer.h
View file

@ -3,7 +3,7 @@
#include <QDialog> #include <QDialog>
#include <QTreeWidget> #include <QTreeWidget>
#include "Utilities/types.h" #include "util/types.hpp"
class kernel_explorer : public QDialog class kernel_explorer : public QDialog
{ {

2
rpcs3/stdafx.h
View file

@ -13,7 +13,7 @@
#include "define_new_memleakdetect.h" #include "define_new_memleakdetect.h"
#endif #endif
#include "Utilities/types.h" #include "util/types.hpp"
#include "Utilities/BEType.h" #include "Utilities/BEType.h"
#include "util/atomic.hpp" #include "util/atomic.hpp"
#include "Utilities/StrFmt.h" #include "Utilities/StrFmt.h"

2
rpcs3/util/asm.hpp
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Utilities/types.h" #include "util/types.hpp"
extern bool g_use_rtm; extern bool g_use_rtm;
extern u64 g_rtm_tx_limit1; extern u64 g_rtm_tx_limit1;

2
rpcs3/util/atomic.hpp
View file

@ -1,6 +1,6 @@
#pragma once // No BOM and only basic ASCII in this header, or a neko will die #pragma once // No BOM and only basic ASCII in this header, or a neko will die
#include "Utilities/types.h" #include "util/types.hpp"
#include <functional> #include <functional>
#include <mutex> #include <mutex>

2
rpcs3/util/endian.hpp
View file

@ -1,6 +1,6 @@
#pragma once // No BOM and only basic ASCII in this header, or a neko will die #pragma once // No BOM and only basic ASCII in this header, or a neko will die
#include "Utilities/types.h" #include "util/types.hpp"
namespace stx namespace stx
{ {

0
Utilities/types.h → rpcs3/util/types.hpp
View file

2
rpcs3/util/vm.hpp
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Utilities/types.h" #include "util/types.hpp"
namespace utils namespace utils
{ {

2
rpcs3/util/yaml.cpp
View file

@ -1,5 +1,5 @@
#include "util/yaml.hpp" #include "util/yaml.hpp"
#include "Utilities/types.h" #include "util/types.hpp"
#include "Utilities/cheat_info.h" #include "Utilities/cheat_info.h"
#include "Utilities/Config.h" #include "Utilities/Config.h"