From 33dfb9e09cb840df2e3812c43d79259a1b3441d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= Date: Sun, 5 Apr 2020 17:14:03 +0200 Subject: [PATCH] fiw the prototype of getVramAddress uint8 -> uint16 --- sources/PPU/PPU.cpp | 9 ++++----- sources/PPU/PPU.hpp | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/sources/PPU/PPU.cpp b/sources/PPU/PPU.cpp index 1813238..fc944fb 100644 --- a/sources/PPU/PPU.cpp +++ b/sources/PPU/PPU.cpp @@ -30,8 +30,8 @@ namespace ComSquare::PPU case 0x36: return this->_registers._mpy.mpyh; default: - //throw InvalidAddress("PPU Internal Registers read", addr); - std::cout << "PPU Internal Registers read" << addr << std::endl; + throw InvalidAddress("PPU Internal Registers read", addr); + //std::cout << "PPU Internal Registers read" << addr << std::endl; } } @@ -112,7 +112,7 @@ namespace ComSquare::PPU //std::cout << "vmdatal" << std::endl; if (!this->_registers._inidisp.fblank) { this->_registers._vmdata.vmdatal = data; - this->vram->write_internal(getVramAddress(), this->_registers._vmdata.vmdata); + this->vram->write_internal(getVramAddress(), this->_registers._vmdata.vmdatal); } if (!this->_registers._vmain.incrementMode) this->_registers._vmadd.vmadd += this->_registers._incrementAmount; @@ -121,7 +121,6 @@ namespace ComSquare::PPU //std::cout << "vmdatah" << std::endl; if (!this->_registers._inidisp.fblank) { this->_registers._vmdata.vmdatah = data; - this->vram->write_internal(getVramAddress(), this->_registers._vmdata.vmdatal); this->vram->write_internal(getVramAddress(), this->_registers._vmdata.vmdatah); } if (this->_registers._vmain.incrementMode) @@ -202,7 +201,7 @@ namespace ComSquare::PPU } } - uint8_t PPU::getVramAddress() + uint16_t PPU::getVramAddress() { uint16_t vanillaAddress = this->_registers._vmadd.vmadd; diff --git a/sources/PPU/PPU.hpp b/sources/PPU/PPU.hpp index 272d6b6..cd54117 100644 --- a/sources/PPU/PPU.hpp +++ b/sources/PPU/PPU.hpp @@ -530,7 +530,7 @@ namespace ComSquare::PPU //! @param The number of cycles to update. virtual void update(unsigned cycles); //! @brief Give the Vram Address with the right Address remapping - uint8_t getVramAddress(); + uint16_t getVramAddress(); //! @brief Give the name of the Address register (used for debug) std::string getValueName(uint24_t addr); //! @brief Return true if the CPU is overloaded with debugging features.