Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-19 20:19:13 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Maybe fix oaknut finally

Browse source
This commit is contained in:
wheremyfoodat 2024-03-07 14:56:36 +00:00 • committed by GitHub
parent 199241ba64
commit 2de0e0975d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/PICA/dynapica/shader_rec_emitter_arm64.hpp
View file

@ -118,9 +118,7 @@ class ShaderEmitter : private oaknut::CodeBlock, public oaknut::CodeGenerator {
// PC must be a valid entrypoint here. It doesn't have that much overhead in this case, so we use std::array<>::at() to assert it does
InstructionCallback getInstructionCallback(u32 pc) {
// Cast away the constness because casting to a function pointer is hard otherwise. Legal as long as we don't write to *ptr
uint8_t* ptr = instructionLabels.at(pc).xptr<u8*>();
return reinterpret_cast<InstructionCallback>(ptr);
return reinterpret_cast<InstructionCallback>(oaknut::CodeBlock::ptr() + instructionLabels.at(pc).offset());
}
PrologueCallback getPrologueCallback() { return prologueCb; }

5
src/core/PICA/dynapica/shader_rec_emitter_arm64.cpp
View file

@ -39,7 +39,7 @@ void ShaderEmitter::compile(const PICAShader& shaderUnit) {
align(16);
l(prologueLabel);
prologueCb = prologueLabel.xptr<PrologueCallback>();
prologueCb = prreinterpret_cast<prologueCallback>(oaknut::CodeBlock::ptr() + prologueLabel.offset());
// Set state pointer to the proper pointer
// state pointer is volatile, no need to preserve it
@ -407,8 +407,9 @@ void ShaderEmitter::storeRegister(QReg source, const PICAShader& shader, u32 des
if (writeMask == 0xf) { // No lanes are masked, just use STR
STR(source, statePointer, offset);
} else {
blendMaskPointer = reinterpret_cast<u8*>(oaknut::CodeBlock::ptr() + blendMasks.offset());
LDR(scratch1, statePointer, offset); // Load current value
LDR(scratch2, blendMasks.xptr<u8*>() + writeMask * 16); // Load write mask for blending
LDR(scratch2, blendMaskPointer + writeMask * 16); // Load write mask for blending
BSL(scratch2.B16(), source.B16(), scratch1.B16()); // Scratch2 = (Source & mask) | (original & ~mask)
STR(scratch2, statePointer, offset); // Write it back