Merge remote-tracking branch 'upstream/master' into stencil-logicop-clear

This commit is contained in:
wheremyfoodat 2023-07-27 17:54:57 +03:00
commit 71898895af
8 changed files with 89 additions and 60 deletions

View file

@ -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;