diff --git a/asmjit b/asmjit index 316812daf0..b76922fde9 160000 --- a/asmjit +++ b/asmjit @@ -1 +1 @@ -Subproject commit 316812daf0d734f1e3dc3abb05785737513274f0 +Subproject commit b76922fde96232030be302b3bdd9673e9bcec568 diff --git a/asmjit.vcxproj b/asmjit.vcxproj index 4f37749805..0fd05578a8 100644 --- a/asmjit.vcxproj +++ b/asmjit.vcxproj @@ -96,12 +96,12 @@ - .\libs\$(Configuration)_x86\ + .\libs\$(Configuration)\ - .\libs\$(Configuration)_x86\ + .\libs\$(Configuration)\ diff --git a/rpcs3/Emu/Cell/SPURecompiler.h b/rpcs3/Emu/Cell/SPURecompiler.h index edb2695d66..4f57910603 100644 --- a/rpcs3/Emu/Cell/SPURecompiler.h +++ b/rpcs3/Emu/Cell/SPURecompiler.h @@ -393,7 +393,7 @@ public: } } - Mem XmmConst(const __m128i data) + Mem XmmConst(const __m128i& data) { for (u32 i = 0; i < rec.imm_table.size(); i++) { @@ -407,7 +407,7 @@ public: return oword_ptr(*imm_var, shift); } - Mem XmmConst(const __m128 data) + Mem XmmConst(const __m128& data) { return XmmConst((__m128i&)data); } diff --git a/rpcs3/Emu/SysCalls/Modules/sys_fs.cpp b/rpcs3/Emu/SysCalls/Modules/sys_fs.cpp index 107cf36520..9a04eade1e 100644 --- a/rpcs3/Emu/SysCalls/Modules/sys_fs.cpp +++ b/rpcs3/Emu/SysCalls/Modules/sys_fs.cpp @@ -152,8 +152,6 @@ void fsAioRead(u32 fd, mem_ptr_t aio, int xid, mem_func_ptr_tGetPath(); - u64 nbytes = aio->size; u32 buf_addr = aio->buf_addr; @@ -207,7 +205,7 @@ fin: file.Seek(old_pos); ConLog.Warning("*** fsAioRead(fd=%d, offset=0x%llx, buf_addr=0x%x, size=0x%x, error=0x%x, res=0x%x, xid=0x%x [%s])", - fd, (u64)aio->offset, buf_addr, (u64)aio->size, error, res, xid, path.c_str()); + fd, (u64)aio->offset, buf_addr, (u64)aio->size, error, res, xid, orig_file->GetPath().c_str()); if (func) // start callback thread {