diff --git a/Utilities/GNU.h b/Utilities/GNU.h index 9b01b57622..e0dd758e2c 100644 --- a/Utilities/GNU.h +++ b/Utilities/GNU.h @@ -225,14 +225,14 @@ static __forceinline uint64_t cntlz64(uint64_t arg) #endif } -// compare 16 packed unsigned byte values (greater than) +// compare 16 packed unsigned bytes (greater than) static __forceinline __m128i _mm_cmpgt_epu8(__m128i A, __m128i B) { // (A xor 0x80) > (B xor 0x80) return _mm_cmpgt_epi8(_mm_xor_si128(A, _mm_set1_epi8(-128)), _mm_xor_si128(B, _mm_set1_epi8(-128))); } -// compare 16 packed unsigned byte values (less or equal) +// compare 16 packed unsigned bytes (less or equal) static __forceinline __m128i _mm_cmple_epu8(__m128i A, __m128i B) { // ((B xor 0x80) > (A xor 0x80)) || A == B diff --git a/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp b/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp index 53cf172f63..9ba08b4753 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellMsgDialog.cpp @@ -91,8 +91,8 @@ int cellMsgDialogOpen2(u32 type, vm::ptr msgString, vm::ptr msgString, vm::ptr s32 + s32 status = (s32)g_msg_dialog_status; + Emu.GetCallbackManager().Register([callback, userData, status]() -> s32 { - callback((s32)g_msg_dialog_status, userData); + callback(status, userData); return CELL_OK; }); } diff --git a/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp b/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp index 609096d59c..55320f1e45 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellPngDec.cpp @@ -804,7 +804,7 @@ void cellPngDec_init(Module *pxThis) #ifdef PRX_DEBUG CallAfter([]() { - libpngdec = (u32)Memory.PRXMem.AllocAlign(sizeof(libpngdec_data), 4096); + libpngdec = (u32)Memory.MainMem.AllocAlign(sizeof(libpngdec_data), 0x100000); memcpy(vm::get_ptr(libpngdec), libpngdec_data, sizeof(libpngdec_data)); libpngdec_rtoc = libpngdec + 0x49710; diff --git a/rpcs3/Emu/SysCalls/Modules/cellSpursJq.cpp b/rpcs3/Emu/SysCalls/Modules/cellSpursJq.cpp index 8c8e50f384..ed4c73b9be 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSpursJq.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSpursJq.cpp @@ -766,7 +766,7 @@ void cellSpursJq_init(Module *pxThis) #ifdef PRX_DEBUG CallAfter([]() { - libspurs_jq = (u32)Memory.PRXMem.AllocAlign(sizeof(libspurs_jq_data), 4096); + libspurs_jq = (u32)Memory.MainMem.AllocAlign(sizeof(libspurs_jq_data), 0x100000); memcpy(vm::get_ptr(libspurs_jq), libspurs_jq_data, sizeof(libspurs_jq_data)); libspurs_jq_rtoc = libspurs_jq + 0x17E80; diff --git a/rpcs3/Emu/SysCalls/Modules/cellSync.cpp b/rpcs3/Emu/SysCalls/Modules/cellSync.cpp index 4a0e1a3ccd..df4de7b5a8 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSync.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSync.cpp @@ -1990,7 +1990,7 @@ void cellSync_init(Module *pxThis) #ifdef PRX_DEBUG CallAfter([]() { - libsre = (u32)Memory.PRXMem.AllocAlign(sizeof(libsre_data), 4096); + libsre = (u32)Memory.MainMem.AllocAlign(sizeof(libsre_data), 0x100000); memcpy(vm::get_ptr(libsre), libsre_data, sizeof(libsre_data)); libsre_rtoc = libsre + 0x399B0; diff --git a/rpcs3/Emu/SysCalls/Modules/cellSync2.cpp b/rpcs3/Emu/SysCalls/Modules/cellSync2.cpp index de4ca912e0..7359814b89 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSync2.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSync2.cpp @@ -458,7 +458,7 @@ void cellSync2_init(Module *pxThis) #ifdef PRX_DEBUG CallAfter([]() { - libsync2 = (u32)Memory.PRXMem.AllocAlign(sizeof(libsync2_data), 4096); + libsync2 = (u32)Memory.MainMem.AllocAlign(sizeof(libsync2_data), 0x100000); memcpy(vm::get_ptr(libsync2), libsync2_data, sizeof(libsync2_data)); libsync2_rtoc = libsync2 + 0xF280;