From cfaacbd26fd4e52e33c425a98fac709dd53eb2b6 Mon Sep 17 00:00:00 2001 From: black Date: Fri, 4 Jul 2025 21:51:43 +0200 Subject: [PATCH] replaced c-style array with c++ array --- emulator/components/Memory.cpp | 4 ++-- emulator/components/Memory.h | 3 ++- emulator/components/Register.cpp | 4 ++-- emulator/components/Register.h | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/emulator/components/Memory.cpp b/emulator/components/Memory.cpp index 86e3066..140367f 100644 --- a/emulator/components/Memory.cpp +++ b/emulator/components/Memory.cpp @@ -10,9 +10,9 @@ Memory *Memory::getInstance() { } void Memory::store(const int address, const int value) { - m_memory[address] = value; + m_memory.at(address) = value; } int Memory::load(const int address) const { - return m_memory[address]; + return m_memory.at(address); } diff --git a/emulator/components/Memory.h b/emulator/components/Memory.h index 780bdd9..6e4cebe 100644 --- a/emulator/components/Memory.h +++ b/emulator/components/Memory.h @@ -4,6 +4,7 @@ #ifndef MEMORY_H #define MEMORY_H +#include /// Eine Hauptspeicherklasse als Singleton implementiert. /// Als Hauptspeicher wird ein Array genutzt. @@ -17,7 +18,7 @@ private: /// Singleton instance static Memory *m_instance; /// Hauptspeicher (hier 32 kB groß) - int m_memory[8192]; + std::array m_memory; public: /// Singleton Logik diff --git a/emulator/components/Register.cpp b/emulator/components/Register.cpp index 4d5e48b..4d361ec 100644 --- a/emulator/components/Register.cpp +++ b/emulator/components/Register.cpp @@ -11,9 +11,9 @@ Register& Register::getInstance() { } void Register::setRegister(const int reg, const int value) { - m_registers[reg] = value; + m_registers.at(reg) = value; } int Register::getRegister(const int reg) const { - return m_registers[reg]; + return m_registers.at(reg); } diff --git a/emulator/components/Register.h b/emulator/components/Register.h index c6c2ced..d5bf2e2 100644 --- a/emulator/components/Register.h +++ b/emulator/components/Register.h @@ -4,6 +4,7 @@ #ifndef REGISTER_H #define REGISTER_H +#include /// Eine Registerklasse als Singleton implementiert. /// Als Speicher (Registers) wird ein int Array genutzt. @@ -17,7 +18,7 @@ private: /// Singleton instance static Register *m_instance; /// "Echter" Register Speicher - int m_registers[32]; + std::array m_registers; public: /// Singleton Logik