natto1784/matar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: make cpu-impl private when not testing

Browse Source 
Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
This commit is contained in:
Amneesh Singh
2023-09-27 01:25:47 +05:30
parent b55f6ee16b
commit 1baebd72f6
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cpu/cpu-impl.hh
View File

@@ -15,6 +15,10 @@ class CpuImpl {
void chg_mode(const Mode to); void chg_mode(const Mode to);
void exec(const arm::Instruction instruction); void exec(const arm::Instruction instruction);
#ifndef MATAR_CPU_TESTS
private:
#endif
static constexpr uint8_t GPR_COUNT = 16; static constexpr uint8_t GPR_COUNT = 16;
static constexpr uint8_t GPR_FIQ_FIRST = 8; static constexpr uint8_t GPR_FIQ_FIRST = 8;

15
tests/cpu/arm/exec.cc
View File

@@ -1,4 +1,7 @@
#define MATAR_CPU_TESTS
#include "cpu/cpu-impl.hh" #include "cpu/cpu-impl.hh"
#undef MATAR_CPU_TESTS
#include "util/bits.hh" #include "util/bits.hh"
#include <catch2/catch_test_macros.hpp> #include <catch2/catch_test_macros.hpp>
#include <limits> #include <limits>
@@ -332,7 +335,7 @@ TEST_CASE_METHOD(CpuFixture, "Single Data Transfer", TAG) {
// r15 as rn // r15 as rn
{ {
data_transfer->rn = 15; data_transfer->rn = cpu.PC_INDEX;
cpu.gpr[15] = 7577; cpu.gpr[15] = 7577;
exec(data); exec(data);
@@ -348,7 +351,7 @@ TEST_CASE_METHOD(CpuFixture, "Single Data Transfer", TAG) {
// r15 as rd // r15 as rd
{ {
// 4088 // 4088
data_transfer->rd = 15; data_transfer->rd = cpu.PC_INDEX;
cpu.gpr[15] = 444444; cpu.gpr[15] = 444444;
exec(data); exec(data);
@@ -465,7 +468,7 @@ TEST_CASE_METHOD(CpuFixture, "Halfword Transfer", TAG) {
// r15 as rn // r15 as rn
{ {
hw_transfer->rn = 15; hw_transfer->rn = cpu.PC_INDEX;
cpu.gpr[15] = 399; cpu.gpr[15] = 399;
exec(data); exec(data);
@@ -481,7 +484,7 @@ TEST_CASE_METHOD(CpuFixture, "Halfword Transfer", TAG) {
// r15 as rd // r15 as rd
{ {
hw_transfer->rd = 15; hw_transfer->rd = cpu.PC_INDEX;
cpu.gpr[15] = 224; cpu.gpr[15] = 224;
exec(data); exec(data);
@@ -792,7 +795,7 @@ TEST_CASE_METHOD(CpuFixture, "Data Processing", TAG) {
// same as above but with rn (oprerand 1) = 15 // same as above but with rn (oprerand 1) = 15
{ {
processing->rn = 15; processing->rn = cpu.PC_INDEX;
cpu.gpr[15] = -2871; cpu.gpr[15] = -2871;
exec(data); exec(data);
@@ -1057,7 +1060,7 @@ TEST_CASE_METHOD(CpuFixture, "Data Processing", TAG) {
SECTION("R15 as destination") { SECTION("R15 as destination") {
processing->opcode = OpCode::MVN; processing->opcode = OpCode::MVN;
processing->rd = 15; processing->rd = cpu.PC_INDEX;
cpu.gpr[15] = 0; cpu.gpr[15] = 0;
CHECK(cpu.spsr.raw() != cpu.cpsr.raw()); CHECK(cpu.spsr.raw() != cpu.cpsr.raw());
exec(data); exec(data);