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

Hacks to let the kernel access the CPU and vice versa (TODO: Fix)

Browse source
This commit is contained in:
wheremyfoodat 2022-09-20 03:49:53 +03:00
parent 0d9088eddc
commit 1678cd6172
6 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/cpu_dynarmic.hpp
View file

@ -8,6 +8,8 @@
#include "kernel.hpp" #include "kernel.hpp"
#include "memory.hpp" #include "memory.hpp"
class CPU;
class MyEnvironment final : public Dynarmic::A32::UserCallbacks { class MyEnvironment final : public Dynarmic::A32::UserCallbacks {
public: public:
u64 ticksLeft = 0; u64 ticksLeft = 0;
@ -89,7 +91,7 @@ public:
return ticksLeft; return ticksLeft;
} }
MyEnvironment(Memory& mem, Kernel& kernel) : mem(mem), kernel(kernel) {} MyEnvironment(Memory& mem, Kernel& kernel, CPU& cpu) : mem(mem), kernel(kernel) {}
}; };
class CPU { class CPU {

2
include/emulator.hpp
View file

@ -28,7 +28,7 @@ class Emulator {
public: public:
Emulator() : window(sf::VideoMode(width, height), "Alber", sf::Style::Default, sf::ContextSettings(0, 0, 0, 4, 3)), Emulator() : window(sf::VideoMode(width, height), "Alber", sf::Style::Default, sf::ContextSettings(0, 0, 0, 4, 3)),
kernel(cpu.regs(), memory), cpu(memory, kernel) { kernel(cpu, memory), cpu(memory, kernel) {
reset(); reset();
window.setActive(true); window.setActive(true);
} }

9
include/kernel/kernel.hpp
View file

@ -8,8 +8,11 @@
#include "memory.hpp" #include "memory.hpp"
#include "services/service_manager.hpp" #include "services/service_manager.hpp"
class CPU;
class Kernel { class Kernel {
std::array<u32, 16>& regs; std::array<u32, 16>& regs;
CPU& cpu;
Memory& mem; Memory& mem;
// The handle number for the next kernel object to be created // The handle number for the next kernel object to be created
@ -89,11 +92,7 @@ class Kernel {
void outputDebugString(); void outputDebugString();
public: public:
Kernel(std::array<u32, 16>& regs, Memory& mem) Kernel(CPU& cpu, Memory& mem);
: regs(regs), mem(mem), handleCounter(0), serviceManager(regs, mem, currentProcess) {
objects.reserve(512); // Make room for a few objects to avoid further memory allocs later
portHandles.reserve(32);
}
void serviceSVC(u32 svc); void serviceSVC(u32 svc);
void reset(); void reset();
}; };

2
src/core/CPU/cpu_dynarmic.cpp
View file

@ -1,7 +1,7 @@
#ifdef CPU_DYNARMIC #ifdef CPU_DYNARMIC
#include "cpu_dynarmic.hpp" #include "cpu_dynarmic.hpp"
CPU::CPU(Memory& mem, Kernel& kernel) : mem(mem), env(mem, kernel) { CPU::CPU(Memory& mem, Kernel& kernel) : mem(mem), env(mem, kernel, *this) {
cp15 = std::make_shared<CP15>(); cp15 = std::make_shared<CP15>();
Dynarmic::A32::UserConfig config; Dynarmic::A32::UserConfig config;

7
src/core/kernel/kernel.cpp
View file

@ -1,6 +1,13 @@
#include <cassert> #include <cassert>
#include "kernel.hpp" #include "kernel.hpp"
#include "kernel_types.hpp" #include "kernel_types.hpp"
#include "cpu.hpp"
Kernel::Kernel(CPU& cpu, Memory& mem)
: cpu(cpu), regs(cpu.regs()), mem(mem), handleCounter(0), serviceManager(regs, mem, currentProcess) {
objects.reserve(512); // Make room for a few objects to avoid further memory allocs later
portHandles.reserve(32);
}
void Kernel::serviceSVC(u32 svc) { void Kernel::serviceSVC(u32 svc) {
switch (svc) { switch (svc) {

2
src/core/kernel/threads.cpp
View file

@ -1,4 +1,6 @@
#include "kernel.hpp" #include "kernel.hpp"
// This header needs to be included because I did stupid forward decl hack so the kernel and CPU can both access each other
#include "cpu.hpp"
#include "resource_limits.hpp" #include "resource_limits.hpp"
// Internal OS function to spawn a thread // Internal OS function to spawn a thread