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

CPU/CodeCache: Call Block constructor/destructor

Browse source 
Fixes crash in MSVC Debug build.
This commit is contained in:
Stenzek 2023-11-29 19:16:32 +10:00
parent 03592e8de8
commit 8ce2be57c5
No known key found for this signature in database
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/core/cpu_code_cache.cpp
View file

@ -442,6 +442,7 @@ CPU::CodeCache::Block* CPU::CodeCache::CreateBlock(u32 pc, const BlockInstructio
Assert(it != s_blocks.end()); Assert(it != s_blocks.end());
s_blocks.erase(it); s_blocks.erase(it);
block->~Block();
std::free(block); std::free(block);
block = nullptr; block = nullptr;
} }
@ -452,6 +453,7 @@ CPU::CodeCache::Block* CPU::CodeCache::CreateBlock(u32 pc, const BlockInstructio
block = block =
static_cast<Block*>(std::malloc(sizeof(Block) + (sizeof(Instruction) * size) + (sizeof(InstructionInfo) * size))); static_cast<Block*>(std::malloc(sizeof(Block) + (sizeof(Instruction) * size) + (sizeof(InstructionInfo) * size)));
Assert(block); Assert(block);
new (block) Block();
s_blocks.push_back(block); s_blocks.push_back(block);
} }
@ -710,7 +712,10 @@ void CPU::CodeCache::ClearBlocks()
#endif #endif
for (Block* block : s_blocks) for (Block* block : s_blocks)
{
block->~Block();
std::free(block); std::free(block);
}
s_blocks.clear(); s_blocks.clear();
std::memset(s_lut_block_pointers.get(), 0, sizeof(Block*) * GetLUTSlotCount(false)); std::memset(s_lut_block_pointers.get(), 0, sizeof(Block*) * GetLUTSlotCount(false));