Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-02-18 11:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CPU/NewRec: Fix OOB reads on InstructionInfo

Browse source
This commit is contained in:
Stenzek 2023-12-04 21:21:53 +10:00
parent 4f9cdb37d9
commit 2071addce0
No known key found for this signature in database
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/cpu_newrec_compiler.cpp
View file

@ -111,7 +111,7 @@ const void* CPU::NewRec::Compiler::CompileBlock(CodeCache::Block* block, u32* ho
{ {
CompileInstruction(); CompileInstruction();
if (iinfo->is_last_instruction || m_block_ended) if (m_block_ended || iinfo->is_last_instruction)
{ {
if (!m_block_ended) if (!m_block_ended)
{ {
@ -1111,6 +1111,7 @@ void CPU::NewRec::Compiler::BackupHostState()
bu.dirty_gte_done_cycle = m_dirty_gte_done_cycle; bu.dirty_gte_done_cycle = m_dirty_gte_done_cycle;
bu.block_ended = m_block_ended; bu.block_ended = m_block_ended;
bu.inst = inst; bu.inst = inst;
bu.iinfo = iinfo;
bu.current_instruction_pc = m_current_instruction_pc; bu.current_instruction_pc = m_current_instruction_pc;
bu.current_instruction_delay_slot = m_current_instruction_branch_delay_slot; bu.current_instruction_delay_slot = m_current_instruction_branch_delay_slot;
bu.const_regs_valid = m_constant_regs_valid; bu.const_regs_valid = m_constant_regs_valid;
@ -1139,6 +1140,7 @@ void CPU::NewRec::Compiler::RestoreHostState()
m_current_instruction_branch_delay_slot = bu.current_instruction_delay_slot; m_current_instruction_branch_delay_slot = bu.current_instruction_delay_slot;
m_current_instruction_pc = bu.current_instruction_pc; m_current_instruction_pc = bu.current_instruction_pc;
inst = bu.inst; inst = bu.inst;
iinfo = bu.iinfo;
m_block_ended = bu.block_ended; m_block_ended = bu.block_ended;
m_dirty_gte_done_cycle = bu.dirty_gte_done_cycle; m_dirty_gte_done_cycle = bu.dirty_gte_done_cycle;
m_dirty_instruction_bits = bu.dirty_instruction_bits; m_dirty_instruction_bits = bu.dirty_instruction_bits;

2
src/core/cpu_newrec_compiler.h
View file

@ -436,7 +436,7 @@ protected:
bool dirty_gte_done_cycle; bool dirty_gte_done_cycle;
bool block_ended; bool block_ended;
const Instruction* inst; const Instruction* inst;
const CodeCache::InstructionInfo* iinfo; CodeCache::InstructionInfo* iinfo;
u32 current_instruction_pc; u32 current_instruction_pc;
bool current_instruction_delay_slot; bool current_instruction_delay_slot;
std::bitset<static_cast<size_t>(Reg::count)> const_regs_valid; std::bitset<static_cast<size_t>(Reg::count)> const_regs_valid;