Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-07-12 18:28:30 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make HLE DSP load binaries too

Browse source
This commit is contained in:
wheremyfoodat 2025-07-08 17:42:58 +03:00
parent c872cfb507
commit 69bbb13d5d
4 changed files with 62 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/core/audio/hle_core.cpp
View file

@ -7,6 +7,7 @@
#include <utility>
#include "audio/aac_decoder.hpp"
#include "audio/dsp_binary.hpp"
#include "audio/dsp_simd.hpp"
#include "config.hpp"
#include "services/dsp.hpp"
@ -89,6 +90,36 @@ namespace Audio {
Helpers::warn("Loading DSP component when already loaded");
}
// We load the DSP binary into DSP memory even though we don't use it in HLE, so that we can
// still see the DSP code in the DSP debugger
u8* dspCode = dspRam.rawMemory.data();
u8* dspData = dspCode + 0x40000;
Dsp1 dsp1;
std::memcpy(&dsp1, data.data(), sizeof(dsp1));
// TODO: verify DSP1 signature & hashes
// Load DSP segments to DSP RAM
for (uint i = 0; i < dsp1.segmentCount; i++) {
auto& segment = dsp1.segments[i];
u32 addr = segment.dspAddr << 1;
u8* src = data.data() + segment.offs;
u8* dst = nullptr;
switch (segment.type) {
case 0:
case 1: dst = dspCode + addr; break;
default: dst = dspData + addr; break;
}
std::memcpy(dst, src, segment.size);
}
bool loadSpecialSegment = (dsp1.flags >> 1) & 0x1;
if (loadSpecialSegment) {
log("LoadComponent: special segment not supported");
}
loaded = true;
scheduler.addEvent(Scheduler::EventType::RunDSP, scheduler.currentTimestamp + Audio::cyclesPerFrame);
}

28
src/core/audio/teakra_core.cpp
View file

@ -5,6 +5,7 @@
#include <cstring>
#include <thread>
#include "audio/dsp_binary.hpp"
#include "services/dsp.hpp"
#undef Assert
@ -13,33 +14,6 @@
using namespace Audio;
struct Dsp1 {
// All sizes are in bytes unless otherwise specified
u8 signature[0x100];
u8 magic[4];
u32 size;
u8 codeMemLayout;
u8 dataMemLayout;
u8 pad[3];
u8 specialType;
u8 segmentCount;
u8 flags;
u32 specialStart;
u32 specialSize;
u64 zeroBits;
struct Segment {
u32 offs; // Offset of the segment data
u32 dspAddr; // Start of the segment in 16-bit units
u32 size;
u8 pad[3];
u8 type;
u8 hash[0x20];
};
Segment segments[10];
};
TeakraDSP::TeakraDSP(Memory& mem, Scheduler& scheduler, DSPService& dspService, EmulatorConfig& config)
: DSPCore(mem, scheduler, dspService, config), pipeBaseAddr(0), running(false) {
// Set up callbacks for Teakra