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

Fix dynarmic submodule (#446)

Browse source 
* Remove dynarmic submodule

* Add dynarmic mirror

* Update oaknut

* Update shader JIT to work with latest oaknut

* Maybe fix oaknut finally

* hlep

* More arm64 shader derps

* Fixing more shader JIT brokenness

* aaaaaaaaaaaa

* Update shader_rec_emitter_arm64.hpp

* Update shader_rec_emitter_arm64.cpp
This commit is contained in:
wheremyfoodat 2024-03-07 17:47:21 +00:00 • committed by GitHub
parent 24705fe67e
commit 25d8e5807f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.gitmodules vendored
View file

@ -1,9 +1,6 @@
[submodule "third_party/elfio"] [submodule "third_party/elfio"]
path = third_party/elfio path = third_party/elfio
url = https://github.com/serge1/ELFIO url = https://github.com/serge1/ELFIO
[submodule "third_party/dynarmic"]
path = third_party/dynarmic
url = https://github.com/merryhime/dynarmic
[submodule "third_party/SDL2"] [submodule "third_party/SDL2"]
path = third_party/SDL2 path = third_party/SDL2
url = https://github.com/libsdl-org/SDL url = https://github.com/libsdl-org/SDL
@ -61,3 +58,6 @@
[submodule "third_party/boost"] [submodule "third_party/boost"]
path = third_party/boost path = third_party/boost
url = https://github.com/Panda3DS-emu/ext-boost url = https://github.com/Panda3DS-emu/ext-boost
[submodule "third_party/dynarmic"]
path = third_party/dynarmic
url = https://github.com/Panda3DS-emu/dynarmic

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

@ -42,6 +42,12 @@ class ShaderEmitter : private oaknut::CodeBlock, public oaknut::CodeGenerator {
oaknut::Label emitLog2Func(); oaknut::Label emitLog2Func();
oaknut::Label emitExp2Func(); oaknut::Label emitExp2Func();
template <typename T>
T getLabelPointer(const oaknut::Label& label) {
auto pointer = reinterpret_cast<u8*>(oaknut::CodeBlock::ptr()) + label.offset();
return reinterpret_cast<T>(pointer);
}
// Compile all instructions from [current recompiler PC, end) // Compile all instructions from [current recompiler PC, end)
void compileUntil(const PICAShader& shaderUnit, u32 endPC); void compileUntil(const PICAShader& shaderUnit, u32 endPC);
// Compile instruction "instr" // Compile instruction "instr"
@ -118,13 +124,11 @@ 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 // 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) { 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 return getLabelPointer<InstructionCallback>(instructionLabels.at(pc));
uint8_t* ptr = instructionLabels.at(pc).ptr<u8*>();
return reinterpret_cast<InstructionCallback>(ptr);
} }
PrologueCallback getPrologueCallback() { return prologueCb; } PrologueCallback getPrologueCallback() { return prologueCb; }
void compile(const PICAShader& shaderUnit); void compile(const PICAShader& shaderUnit);
}; };
#endif // arm64 recompiler check #endif // arm64 recompiler check

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

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

2
third_party/dynarmic vendored

@ -1 +1 @@
Subproject commit 96e179465884be74987d5847d6741cdabdfe1b48 Subproject commit a41c380246d3d9f9874f0f792d234dc0cc17c180

2
third_party/oaknut vendored

@ -1 +1 @@
Subproject commit 1d51f551294897ab4c8001c5259c8c5dee7e2a85 Subproject commit 94c726ce0338b054eb8cb5ea91de8fe6c19f4392