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

restructure: get rid of cpu/utility

Browse Source 
Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
This commit is contained in:
Amneesh Singh
2023-09-23 14:12:53 +05:30
parent 1e8966553f
commit 6c33c77ef3
12 changed files with 197 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,11 +1,11 @@
#include "cpu/cpu-impl.hh"
#include "cpu/utility.hh"
#include "util/bits.hh"
#include <catch2/catch_test_macros.hpp>
#include <limits>
#include <variant>
using namespace matar;
class CpuFixture {
public:
CpuFixture()
@@ -13,8 +13,7 @@ class CpuFixture {
std::vector<uint8_t>(Header::HEADER_SIZE)))) {}
protected:
void exec(arm::InstructionData data,
arm::Condition condition = arm::Condition::AL) {
void exec(arm::InstructionData data, Condition condition = Condition::AL) {
arm::Instruction instruction(condition, data);
cpu.exec_arm(instruction);
}
@@ -746,6 +745,8 @@ TEST_CASE_METHOD(CpuFixture, "PSR Transfer", TAG) {
}
TEST_CASE_METHOD(CpuFixture, "Data Processing", TAG) {
using OpCode = DataProcessing::OpCode;
InstructionData data =
DataProcessing{ .operand = Shift{ .rm = 3,
.data =

6
tests/cpu/arm/instruction.cc
View File

@@ -1,10 +1,10 @@
#include "cpu/arm/instruction.hh"
#include "cpu/utility.hh"
#include <catch2/catch_test_macros.hpp>
#define TAG "disassembler"
using namespace matar::arm;
using namespace matar;
using namespace arm;
TEST_CASE("Branch and Exchange", TAG) {
uint32_t raw = 0b11000001001011111111111100011010;
@@ -309,6 +309,8 @@ TEST_CASE("PSR Transfer", TAG) {
}
TEST_CASE("Data Processing", TAG) {
using OpCode = DataProcessing::OpCode;
uint32_t raw = 0b11100000000111100111101101100001;
Instruction instruction(raw);
DataProcessing* alu = nullptr;