mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-01-30 03:32:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #201 from Nekotekina/master

Browse Source 
Compilation fix again
This commit is contained in:
Alexandro Sánchez Bach 2014-04-26 12:55:29 +02:00
commit a2157a5365
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asmjit

@ -1 +1 @@
Subproject commit 316812daf0d734f1e3dc3abb05785737513274f0 Subproject commit b76922fde96232030be302b3bdd9673e9bcec568

4
asmjit.vcxproj
View File

@ -96,12 +96,12 @@
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>.\libs\$(Configuration)_x86\</OutDir> <OutDir>.\libs\$(Configuration)\</OutDir>
<IntDir> <IntDir>
</IntDir> </IntDir>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>.\libs\$(Configuration)_x86\</OutDir> <OutDir>.\libs\$(Configuration)\</OutDir>
<IntDir> <IntDir>
</IntDir> </IntDir>
</PropertyGroup> </PropertyGroup>

4
rpcs3/Emu/Cell/SPURecompiler.h
View File

@ -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++) for (u32 i = 0; i < rec.imm_table.size(); i++)
{ {
@ -407,7 +407,7 @@ public:
return oword_ptr(*imm_var, shift); return oword_ptr(*imm_var, shift);
} }
Mem XmmConst(const __m128 data) Mem XmmConst(const __m128& data)
{ {
return XmmConst((__m128i&)data); return XmmConst((__m128i&)data);
} }

4
rpcs3/Emu/SysCalls/Modules/sys_fs.cpp
View File

@ -152,8 +152,6 @@ void fsAioRead(u32 fd, mem_ptr_t<CellFsAio> aio, int xid, mem_func_ptr_t<void (*
vfsFileBase* orig_file; vfsFileBase* orig_file;
if(!sys_fs.CheckId(fd, orig_file)) return; if(!sys_fs.CheckId(fd, orig_file)) return;
std::string path = orig_file->GetPath();
u64 nbytes = aio->size; u64 nbytes = aio->size;
u32 buf_addr = aio->buf_addr; u32 buf_addr = aio->buf_addr;
@ -207,7 +205,7 @@ fin:
file.Seek(old_pos); 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])", 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 if (func) // start callback thread
{ {