mirror of
https://github.com/wheremyfoodat/Panda3DS.git
synced 2025-04-20 12:39:13 +12:00
Merge remote-tracking branch 'upstream/master' into stencil-logicop-clear
This commit is contained in:
commit
71898895af
8 changed files with 89 additions and 60 deletions
|
@ -2,7 +2,7 @@
|
|||
#include "cpu_dynarmic.hpp"
|
||||
#include "arm_defs.hpp"
|
||||
|
||||
CPU::CPU(Memory& mem, Kernel& kernel) : mem(mem), env(mem, kernel, *this) {
|
||||
CPU::CPU(Memory& mem, Kernel& kernel) : mem(mem), env(mem, kernel) {
|
||||
cp15 = std::make_shared<CP15>();
|
||||
|
||||
Dynarmic::A32::UserConfig config;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue