mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-11 06:40:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ARM build (#12606)

Browse Source
This commit is contained in:
Elad Ashkenazi 2022-09-04 21:11:04 +03:00 committed by GitHub
parent 75efc79930
commit 290226539f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rpcs3/Emu/Cell/PPUThread.cpp
View File

@ -710,8 +710,8 @@ struct ppu_far_jumps_t
Label jmp_address = c.newLabel(); Label jmp_address = c.newLabel();
Label imm_address = c.newLabel(); Label imm_address = c.newLabel();
c.ldr(args[1].r32(), arm::ptr(imm_address)); c.ldr(args[1].w(), arm::ptr(imm_address));
c.str(args[1].r32(), arm::Mem(args[0], ::offset32(&ppu_thread::cia))); c.str(args[1].w(), arm::Mem(args[0], ::offset32(&ppu_thread::cia)));
c.ldr(args[1], arm::ptr(jmp_address)); c.ldr(args[1], arm::ptr(jmp_address));
c.br(args[1]); c.br(args[1]);

4
rpcs3/Emu/RSX/Common/BufferUtils.cpp
View File

@ -360,10 +360,14 @@ namespace
u32 count = ::size32(src); u32 count = ::size32(src);
u64 r; u64 r;
#if defined(ARCH_X64)
if constexpr (sizeof(T) == 2) if constexpr (sizeof(T) == 2)
r = upload_xi16(src.data(), dst.data(), count); r = upload_xi16(src.data(), dst.data(), count);
else else
r = upload_xi32(src.data(), dst.data(), count); r = upload_xi32(src.data(), dst.data(), count);
#else
r = upload_untouched_naive(src.data(), dst.data(), count);
#endif
min_index = r; min_index = r;
max_index = r >> 32; max_index = r >> 32;