mirrors/dynarmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

a32_unicorn: Silence PC value assertions

Browse source 
Ensure the PC is properly masked off after a run.
This commit is contained in:
Lioncash 2019-04-20 05:45:45 -04:00 committed by MerryMage
parent 2641d410a4
commit 2acfee66ed
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tests/unicorn_emu/a32_unicorn.cpp
View file

@ -8,6 +8,7 @@
#include "A32/testenv.h" #include "A32/testenv.h"
#include "a32_unicorn.h" #include "a32_unicorn.h"
#include "common/assert.h" #include "common/assert.h"
#include "common/bit_util.h"
#define CHECKED(expr) \ #define CHECKED(expr) \
do { \ do { \
@ -41,15 +42,19 @@ A32Unicorn<TestEnvironment>::~A32Unicorn() {
template <class TestEnvironment> template <class TestEnvironment>
void A32Unicorn<TestEnvironment>::Run() { void A32Unicorn<TestEnvironment>::Run() {
// Thumb execution mode requires the LSB to be set to 1. // Thumb execution mode requires the LSB to be set to 1.
constexpr u64 mask = std::is_same_v<TestEnvironment, ArmTestEnv> ? 0 : 1; constexpr u64 pc_mask = std::is_same_v<TestEnvironment, ArmTestEnv> ? 0 : 1;
while (testenv.ticks_left > 0) { while (testenv.ticks_left > 0) {
CHECKED(uc_emu_start(uc, GetPC() | mask, END_ADDRESS, 0, 1)); CHECKED(uc_emu_start(uc, GetPC() | pc_mask, END_ADDRESS, 0, 1));
testenv.ticks_left--; testenv.ticks_left--;
if (!testenv.interrupts.empty() || testenv.code_mem_modified_by_guest) { if (!testenv.interrupts.empty() || testenv.code_mem_modified_by_guest) {
return; return;
} }
} }
const bool T = Dynarmic::Common::Bit<5>(GetCpsr());
const u32 mask = T ? 0xFFFFFFFE : 0xFFFFFFFC;
const u32 new_pc = GetPC() & mask;
SetPC(new_pc);
} }
template <class TestEnvironment> template <class TestEnvironment>