From 4df59970daf527ccf67a47b53fa1c5d77b247c72 Mon Sep 17 00:00:00 2001 From: Riyyi Date: Thu, 18 Aug 2022 01:57:39 +0200 Subject: [PATCH] Emulator: Run clang-format --- src/apu.cpp | 3 ++- src/cpu.cpp | 8 +++++--- src/cpu.h | 2 +- src/emu.cpp | 29 ++++++++++++++++++----------- src/emu.h | 2 +- src/main.cpp | 4 ++-- src/ppu.cpp | 8 +++++--- src/ppu.h | 1 + src/processing-unit.cpp | 11 +++++++---- src/processing-unit.h | 2 +- 10 files changed, 43 insertions(+), 27 deletions(-) diff --git a/src/apu.cpp b/src/apu.cpp index ab6b181..ff07dd8 100644 --- a/src/apu.cpp +++ b/src/apu.cpp @@ -7,7 +7,8 @@ #include "apu.h" -APU::APU(unsigned int frequency) : ProcessingUnit(frequency) +APU::APU(unsigned int frequency) + : ProcessingUnit(frequency) { } diff --git a/src/cpu.cpp b/src/cpu.cpp index 029b0d0..3e21fed 100644 --- a/src/cpu.cpp +++ b/src/cpu.cpp @@ -9,7 +9,8 @@ #include "emu.h" #include -CPU::CPU(unsigned int frequency) : ProcessingUnit(frequency) +CPU::CPU(unsigned int frequency) + : ProcessingUnit(frequency) { } @@ -17,8 +18,9 @@ CPU::~CPU() { } -void CPU::update() { +void CPU::update() +{ printf("This is an update from the CPU\n"); Emu::the().writeMemory("RAM", 123, 42); printf("fff"); -} \ No newline at end of file +} diff --git a/src/cpu.h b/src/cpu.h index 5cf65a3..0d1fc98 100644 --- a/src/cpu.h +++ b/src/cpu.h @@ -17,7 +17,7 @@ public: virtual ~CPU(); void update() override; - + // 8-bit Arithmetic and Logic Instructions // 16-bit Arithmetic Instructions diff --git a/src/emu.cpp b/src/emu.cpp index 94cb5f4..fb303a3 100644 --- a/src/emu.cpp +++ b/src/emu.cpp @@ -1,12 +1,15 @@ -#include "emu.h" -#include "cpu.h" #include -void Emu::init(unsigned int frequency) { +#include "cpu.h" +#include "emu.h" + +void Emu::init(unsigned int frequency) +{ m_frequency = frequency; } -void Emu::update() { +void Emu::update() +{ for (auto unit : m_processing_units) { if (m_cycle % (m_frequency / unit->frequency()) == 0) { unit->update(); @@ -15,20 +18,24 @@ void Emu::update() { m_cycle++; } -void Emu::addProcessingUnit(ProcessingUnit* processing_unit) { +void Emu::addProcessingUnit(ProcessingUnit* processing_unit) +{ m_processing_units.push_back(processing_unit); } -void Emu::addMemorySpace(const char* name, int size) { +void Emu::addMemorySpace(const char* name, int size) +{ std::vector memory(size); m_memory_spaces.emplace(name, memory); } -void Emu::writeMemory(const char* memory_space, unsigned int location, uint8_t value) { - // printf("%s %d %d", memory_space, location, value); - // m_memory_spaces[memory_space][location] = value; +void Emu::writeMemory(const char* memory_space, unsigned int location, uint8_t value) +{ + printf("%s %d %d\n", memory_space, location, value); + m_memory_spaces[memory_space][location] = value; } -uint8_t Emu::readMemory(const char* memory_space, unsigned int location){ +uint8_t Emu::readMemory(const char* memory_space, unsigned int location) +{ // return m_memory_spaces[memory_space][location]; -} \ No newline at end of file +} diff --git a/src/emu.h b/src/emu.h index 29b51d4..1d8dc60 100644 --- a/src/emu.h +++ b/src/emu.h @@ -1,8 +1,8 @@ #pragma once #include -#include #include +#include #include "processing-unit.h" #include "ruc/singleton.h" diff --git a/src/main.cpp b/src/main.cpp index c757ee4..3f48447 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,7 +1,7 @@ #include -#include "emu.h" #include "cpu.h" +#include "emu.h" #include "ppu.h" #include "ruc/timer.h" @@ -21,7 +21,7 @@ int main(int argc, char* argv[]) Emu::the().addMemorySpace("RAM", 1024); - for(int i = 0; i < 1000; i++) { + for (int i = 0; i < 1000; i++) { Emu::the().update(); } diff --git a/src/ppu.cpp b/src/ppu.cpp index 4a87c94..2fe91c8 100644 --- a/src/ppu.cpp +++ b/src/ppu.cpp @@ -8,7 +8,8 @@ #include "ppu.h" #include -PPU ::PPU(unsigned int frequency) : ProcessingUnit(frequency) +PPU ::PPU(unsigned int frequency) + : ProcessingUnit(frequency) { } @@ -16,6 +17,7 @@ PPU ::~PPU() { } -void PPU::update() { +void PPU::update() +{ printf("ppu update\n"); -} \ No newline at end of file +} diff --git a/src/ppu.h b/src/ppu.h index e051717..8c243a9 100644 --- a/src/ppu.h +++ b/src/ppu.h @@ -13,5 +13,6 @@ class PPU final : public ProcessingUnit { public: PPU(unsigned int frequency); virtual ~PPU(); + virtual void update() override; }; diff --git a/src/processing-unit.cpp b/src/processing-unit.cpp index a8dcc55..322d368 100644 --- a/src/processing-unit.cpp +++ b/src/processing-unit.cpp @@ -5,10 +5,12 @@ * SPDX-License-Identifier: MIT */ -#include "processing-unit.h" #include -ProcessingUnit::ProcessingUnit(unsigned int frequency) : m_frequency(frequency) +#include "processing-unit.h" + +ProcessingUnit::ProcessingUnit(unsigned int frequency) + : m_frequency(frequency) { } @@ -16,6 +18,7 @@ ProcessingUnit::~ProcessingUnit() { } -unsigned int ProcessingUnit::frequency() { +unsigned int ProcessingUnit::frequency() +{ return m_frequency; -} \ No newline at end of file +} diff --git a/src/processing-unit.h b/src/processing-unit.h index ff00cd8..4969ca1 100644 --- a/src/processing-unit.h +++ b/src/processing-unit.h @@ -17,5 +17,5 @@ public: unsigned int frequency(); private: -unsigned int m_frequency; + unsigned int m_frequency; };