From fc9beafc3226c89dd7b43d76816ecb029a406029 Mon Sep 17 00:00:00 2001 From: Ziemas Date: Tue, 7 Sep 2021 11:42:47 +0200 Subject: [PATCH] Change s8 typedef to int8_t --- common/Pcsx2Types.h | 5 +---- pcsx2/GS/GS.cpp | 2 +- pcsx2/GS/GSState.cpp | 8 ++++---- pcsx2/GS/Renderers/Common/GSRenderer.cpp | 2 +- pcsx2/SaveState.h | 2 +- pcsx2/USB/USB.cpp | 4 ++-- pcsx2/gui/Dialogs/GSDumpDialog.cpp | 2 +- pcsx2/gui/GlobalCommands.cpp | 2 +- pcsx2/gui/MainMenuClicks.cpp | 2 +- pcsx2/gui/SysState.cpp | 4 ++-- 10 files changed, 15 insertions(+), 18 deletions(-) diff --git a/common/Pcsx2Types.h b/common/Pcsx2Types.h index 44ed2e60c5..a5772482e0 100644 --- a/common/Pcsx2Types.h +++ b/common/Pcsx2Types.h @@ -31,10 +31,7 @@ class FastFormatUnicode; // Basic Atomic Types // -------------------------------------------------------------------------------------- -// Note: char does not have a default sign, unlike other types. As we actually want -// char and not signed char in pcsx2, we define s8 to char - -typedef char s8; +typedef int8_t s8; typedef int16_t s16; typedef int32_t s32; typedef int64_t s64; diff --git a/pcsx2/GS/GS.cpp b/pcsx2/GS/GS.cpp index 8aa58babfa..637afaf852 100644 --- a/pcsx2/GS/GS.cpp +++ b/pcsx2/GS/GS.cpp @@ -957,7 +957,7 @@ void GSReplay(char* lpszCmdLine, int renderer) freezeData fd; file->Read(&fd.size, 4); - fd.data = new char[fd.size]; + fd.data = new u8[fd.size]; file->Read(fd.data, fd.size); GSfreeze(FreezeAction::Load, &fd); diff --git a/pcsx2/GS/GSState.cpp b/pcsx2/GS/GSState.cpp index 4d62e7e97f..1cf65940e0 100644 --- a/pcsx2/GS/GSState.cpp +++ b/pcsx2/GS/GSState.cpp @@ -2375,14 +2375,14 @@ void GSState::Transfer(const uint8* mem, uint32 size) } template -static void WriteState(char*& dst, T* src, size_t len = sizeof(T)) +static void WriteState(u8*& dst, T* src, size_t len = sizeof(T)) { memcpy(dst, src, len); dst += len; } template -static void ReadState(T* dst, char*& src, size_t len = sizeof(T)) +static void ReadState(T* dst, u8*& src, size_t len = sizeof(T)) { memcpy(dst, src, len); src += len; @@ -2403,7 +2403,7 @@ int GSState::Freeze(freezeData* fd, bool sizeonly) Flush(); - char* data = fd->data; + u8* data = fd->data; WriteState(data, &m_version); WriteState(data, &m_env.PRIM); @@ -2482,7 +2482,7 @@ int GSState::Defrost(const freezeData* fd) return -1; } - char* data = fd->data; + u8* data = fd->data; int version; diff --git a/pcsx2/GS/Renderers/Common/GSRenderer.cpp b/pcsx2/GS/Renderers/Common/GSRenderer.cpp index f7c174fdc8..a3e5cf5979 100644 --- a/pcsx2/GS/Renderers/Common/GSRenderer.cpp +++ b/pcsx2/GS/Renderers/Common/GSRenderer.cpp @@ -516,7 +516,7 @@ void GSRenderer::VSync(int field) { freezeData fd = {0, nullptr}; Freeze(&fd, true); - fd.data = new char[fd.size]; + fd.data = new u8[fd.size]; Freeze(&fd, false); if (m_control_key) diff --git a/pcsx2/SaveState.h b/pcsx2/SaveState.h index 822662670a..fef1c48140 100644 --- a/pcsx2/SaveState.h +++ b/pcsx2/SaveState.h @@ -42,7 +42,7 @@ static const u32 g_SaveVersion = (0x9A23 << 16) | 0x0000; typedef struct { int size; - s8 *data; + u8 *data; } freezeData; // this function is meant to be used in the place of GSfreeze, and provides a safe layer diff --git a/pcsx2/USB/USB.cpp b/pcsx2/USB/USB.cpp index 32da4ef8d9..468477d314 100644 --- a/pcsx2/USB/USB.cpp +++ b/pcsx2/USB/USB.cpp @@ -385,7 +385,7 @@ s32 USBfreeze(FreezeAction mode, freezeData* data) // restore USBPacket for OHCIState usb_packet_init(&qemu_ohci->usb_packet); - s8* ptr = data->data + sizeof(USBfreezeData); + u8* ptr = data->data + sizeof(USBfreezeData); RegisterDevice& regInst = RegisterDevice::instance(); for (int i = 0; i < 2; i++) { @@ -535,7 +535,7 @@ s32 USBfreeze(FreezeAction mode, freezeData* data) usbd.cycles = clocks; usbd.remaining = remaining; - s8* ptr = data->data + sizeof(USBfreezeData); + u8* ptr = data->data + sizeof(USBfreezeData); // Save the state of the attached devices for (int i = 0; i < 2; i++) diff --git a/pcsx2/gui/Dialogs/GSDumpDialog.cpp b/pcsx2/gui/Dialogs/GSDumpDialog.cpp index 74c42c67e4..99977409da 100644 --- a/pcsx2/gui/Dialogs/GSDumpDialog.cpp +++ b/pcsx2/gui/Dialogs/GSDumpDialog.cpp @@ -729,7 +729,7 @@ void Dialogs::GSDumpDialog::GSThread::ExecuteTaskInThread() m_dump_file->Read(state_data.get(), ss); m_dump_file->Read(®s, 8192); - freezeData fd = {(int)ss, (s8*)state_data.get()}; + freezeData fd = {(int)ss, (u8*)state_data.get()}; m_root_window->m_dump_packets.clear(); while (m_dump_file->Tell() < m_dump_file->Length()) diff --git a/pcsx2/gui/GlobalCommands.cpp b/pcsx2/gui/GlobalCommands.cpp index 8938b89145..dd3c728cd6 100644 --- a/pcsx2/gui/GlobalCommands.cpp +++ b/pcsx2/gui/GlobalCommands.cpp @@ -389,7 +389,7 @@ namespace Implementations freezeData fP = {0, nullptr}; MTGS_FreezeData sstate = {&fP, 0}; GetMTGS().Freeze(FreezeAction::Size, sstate); - fP.data = new char[fP.size]; + fP.data = new u8[fP.size]; GetMTGS().Freeze(FreezeAction::Save, sstate); GetMTGS().Suspend(true); renderswitch = !renderswitch; diff --git a/pcsx2/gui/MainMenuClicks.cpp b/pcsx2/gui/MainMenuClicks.cpp index 1773d99aa2..108ad0fd3f 100644 --- a/pcsx2/gui/MainMenuClicks.cpp +++ b/pcsx2/gui/MainMenuClicks.cpp @@ -101,7 +101,7 @@ void MainEmuFrame::Menu_GSSettings_Click(wxCommandEvent& event) if (is_frame_init) { GetMTGS().Freeze(FreezeAction::Size, sstate); - fP.data = new char[fP.size]; + fP.data = new u8[fP.size]; GetMTGS().Freeze(FreezeAction::Save, sstate); GetMTGS().Suspend(true); } diff --git a/pcsx2/gui/SysState.cpp b/pcsx2/gui/SysState.cpp index a9cc15ca7c..d5a8e4854d 100644 --- a/pcsx2/gui/SysState.cpp +++ b/pcsx2/gui/SysState.cpp @@ -68,7 +68,7 @@ static constexpr SysState_Component GS{"GS", SysState_MTGSFreeze}; void SysState_ComponentFreezeOutRoot(void* dest, SysState_Component comp) { - freezeData fP = {0, (char*)dest}; + freezeData fP = {0, (u8*)dest}; if (comp.freeze(FreezeAction::Size, &fP) != 0) return; if (!fP.size) @@ -98,7 +98,7 @@ void SysState_ComponentFreezeIn(pxInputStream& infp, SysState_Component comp) return; } - ScopedAlloc data(fP.size); + ScopedAlloc data(fP.size); fP.data = data.GetPtr(); infp.Read(fP.data, fP.size);