From c661dfa6418a65873351864eb0b358ab1516b5a8 Mon Sep 17 00:00:00 2001
From: Anonymus Raccoon
Date: Thu, 14 May 2020 19:00:13 +0200
Subject: [PATCH] Fixing ??? message on the bus's debugger
---
sources/Debugger/MemoryBusDebug.cpp | 4 ++--
sources/Debugger/MemoryBusDebug.hpp | 6 +++++-
sources/SNES.cpp | 2 --
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/sources/Debugger/MemoryBusDebug.cpp b/sources/Debugger/MemoryBusDebug.cpp
index 0ddc6c8..17d77fc 100644
--- a/sources/Debugger/MemoryBusDebug.cpp
+++ b/sources/Debugger/MemoryBusDebug.cpp
@@ -165,12 +165,12 @@ namespace ComSquare::Debugger
void MemoryBusDebug::write(uint24_t addr, uint8_t data)
{
auto accessor = this->getAccessor(addr);
- uint8_t value = 0;
+ std::optional value = std::nullopt;
try {
if (accessor)
value = accessor->read(addr - accessor->getStart());
} catch (InvalidAddress &) {
- value = 0;
+ value = std::nullopt;
}
if (!forceSilence)
this->_model.log(BusLog(true, addr, accessor, value, data));
diff --git a/sources/Debugger/MemoryBusDebug.hpp b/sources/Debugger/MemoryBusDebug.hpp
index 9e6cbd8..c477d2d 100644
--- a/sources/Debugger/MemoryBusDebug.hpp
+++ b/sources/Debugger/MemoryBusDebug.hpp
@@ -15,7 +15,11 @@ namespace ComSquare::Debugger
{
//! @brief The struct used to represent memory bus logs.
struct BusLog {
- BusLog(bool write, uint24_t addr, std::shared_ptr &accessor, std::optional oldData, uint8_t newData);
+ BusLog(bool write,
+ uint24_t addr,
+ std::shared_ptr &accessor,
+ std::optional oldData,
+ uint8_t newData);
bool write;
uint24_t addr;
diff --git a/sources/SNES.cpp b/sources/SNES.cpp
index 1ae1b61..153c1e8 100644
--- a/sources/SNES.cpp
+++ b/sources/SNES.cpp
@@ -10,8 +10,6 @@
#include "Debugger/APUDebug.hpp"
#include "Debugger/MemoryBusDebug.hpp"
#include "Debugger/CGramDebug.hpp"
-
-
#endif
namespace ComSquare