mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-29 22:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

PPUAnalyser: fix std::move nonsense

Browse Source
This commit is contained in:
Megamouse 2023-06-12 03:48:27 +02:00 committed by Ivan
parent 49c6c2c529
commit d662a39a12
3 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rpcs3/Crypto/decrypt_binaries.cpp
View File

@ -75,7 +75,6 @@ usz decrypt_binaries_t::decrypt(std::string klic_input)
fs::file elf_file; fs::file elf_file;
bool tried = false;
bool invalid = false; bool invalid = false;
usz key_it = 0; usz key_it = 0;
u32 file_magic{}; u32 file_magic{};

46
rpcs3/Emu/Cell/PPUAnalyser.cpp
View File

@ -1008,11 +1008,11 @@ bool ppu_module::analyse(u32 lib_toc, u32 entry, const u32 sec_end, const std::b
add_toc(toc); add_toc(toc);
add_func(func.addr, toc, 0); add_func(func.addr, toc, 0);
} }
else if (new_func.toc - func.toc != toc_add) //else if (new_func.toc - func.toc != toc_add)
{ //{
//func.toc = -1; // func.toc = -1;
//new_func.toc = -1; // new_func.toc = -1;
} //}
if (new_func.blocks.empty()) if (new_func.blocks.empty())
{ {
@ -1055,11 +1055,11 @@ bool ppu_module::analyse(u32 lib_toc, u32 entry, const u32 sec_end, const std::b
add_toc(toc); add_toc(toc);
add_func(func.addr, toc, 0); add_func(func.addr, toc, 0);
} }
else if (new_func.toc - func.toc != toc_add) //else if (new_func.toc - func.toc != toc_add)
{ //{
//func.toc = -1; // func.toc = -1;
//new_func.toc = -1; // new_func.toc = -1;
} //}
if (new_func.blocks.empty()) if (new_func.blocks.empty())
{ {
@ -1472,7 +1472,8 @@ bool ppu_module::analyse(u32 lib_toc, u32 entry, const u32 sec_end, const std::b
{ {
break; break;
} }
else if (addr == start && op.opcode == ppu_instructions::NOP())
if (addr == start && op.opcode == ppu_instructions::NOP())
{ {
if (start == func.addr + func.size) if (start == func.addr + func.size)
{ {
@ -1483,16 +1484,19 @@ bool ppu_module::analyse(u32 lib_toc, u32 entry, const u32 sec_end, const std::b
start += 4; start += 4;
continue; continue;
} }
else if (type == ppu_itype::SC && op.opcode != ppu_instructions::SC(0))
if (type == ppu_itype::SC && op.opcode != ppu_instructions::SC(0))
{ {
break; break;
} }
else if (addr == start && op.opcode == ppu_instructions::BLR())
if (addr == start && op.opcode == ppu_instructions::BLR())
{ {
start += 4; start += 4;
continue; continue;
} }
else if (type == ppu_itype::B || type == ppu_itype::BC)
if (type == ppu_itype::B || type == ppu_itype::BC)
{ {
const u32 target = (op.aa ? 0 : addr) + (type == ppu_itype::B ? +op.bt24 : +op.bt14); const u32 target = (op.aa ? 0 : addr) + (type == ppu_itype::B ? +op.bt24 : +op.bt14);
@ -1539,7 +1543,7 @@ bool ppu_module::analyse(u32 lib_toc, u32 entry, const u32 sec_end, const std::b
end = 0; end = 0;
} }
for (auto&& [_, func] : as_rvalue(std::move(fmap))) for (auto&& [_, func] : as_rvalue(fmap))
{ {
if (func.attr & ppu_attr::no_size && entry) if (func.attr & ppu_attr::no_size && entry)
{ {
@ -1560,7 +1564,7 @@ bool ppu_module::analyse(u32 lib_toc, u32 entry, const u32 sec_end, const std::b
continue; continue;
} }
for (auto [addr, size] : func.blocks) for (const auto& [addr, size] : func.blocks)
{ {
if (!size) if (!size)
{ {
@ -1598,7 +1602,7 @@ bool ppu_module::analyse(u32 lib_toc, u32 entry, const u32 sec_end, const std::b
for (auto& rel : this->relocs) for (auto& rel : this->relocs)
{ {
// Disabled (TODO) // Disabled (TODO)
if (1 || !vm::check_addr<4>(rel.addr)) //if (!vm::check_addr<4>(rel.addr))
{ {
continue; continue;
} }
@ -1722,9 +1726,7 @@ bool ppu_module::analyse(u32 lib_toc, u32 entry, const u32 sec_end, const std::b
break; break;
} }
const auto found = fmap.find(target); if (target != i_pos && !fmap.contains(target))
if (target != i_pos && found == fmap.cend())
{ {
if (block_set.count(target) == 0) if (block_set.count(target) == 0)
{ {
@ -1782,9 +1784,7 @@ bool ppu_module::analyse(u32 lib_toc, u32 entry, const u32 sec_end, const std::b
else if (is_good && is_fallback && lim < end) else if (is_good && is_fallback && lim < end)
{ {
// Register fallback target // Register fallback target
const auto found = fmap.find(lim); if (!fmap.contains(lim) && !block_set.contains(lim))
if (found == fmap.cend() && block_set.count(lim) == 0)
{ {
ppu_log.trace("Block target found: 0x%x (i_pos=0x%x)", lim, i_pos); ppu_log.trace("Block target found: 0x%x (i_pos=0x%x)", lim, i_pos);
block_queue.emplace_back(lim, 0); block_queue.emplace_back(lim, 0);

4
rpcs3/Emu/Cell/lv2/sys_lwcond.cpp
View File

@ -1,4 +1,4 @@
#include "stdafx.h" #include "stdafx.h"
#include "sys_lwcond.h" #include "sys_lwcond.h"
#include "Emu/IdManager.h" #include "Emu/IdManager.h"
@ -566,8 +566,6 @@ error_code _sys_lwcond_queue_wait(ppu_thread& ppu, u32 lwcond_id, u32 lwmutex_id
{ {
if (lv2_obj::wait_timeout(timeout, &ppu)) if (lv2_obj::wait_timeout(timeout, &ppu))
{ {
const u64 start_time = ppu.start_time;
// Wait for rescheduling // Wait for rescheduling
if (ppu.check_state()) if (ppu.check_state())
{ {