Modularized APU

.gitignore

@@ -4,4 +4,6 @@ build/
 cmake-build-debug/
 .idea/
 src/.vscode/
-src/dmg_boot.gb
+src/dmg_boot.gb
+tests/*
+.vscode/

run.sh

@@ -29,7 +29,7 @@ elif [[ $last_keyword == "gbemu" ]]; then
         echo "making new build directory"
         mkdir build
         cd build
-        cmake ..
+        cmake -DDEBUG=on ..
         cmake --build . -j8
         ./gbemu
     fi

src/audio.cpp

@@ -1,5 +1,4 @@
 #include "audio.h"
-#include "types.h"
 
 APU::APU()
 {
@@ -16,7 +15,7 @@ APU::APU()
 	enableVINRight = false;
 	volumeLeft = 0;
 	volumeRight = 0;
-
+	mMap = nullptr;
 	channel1 = new PulseChannel(CH1);
 	channel2 = new PulseChannel(CH2);
 	channel3 = new WaveChannel();
@@ -47,6 +46,7 @@ bool APU::init()
 	channel2->setFrameSequencer(frameSequencer);
 	channel3->setFrameSequencer(frameSequencer);
 	channel4->setFrameSequencer(frameSequencer);
+
 	return true;
 }
 
@@ -57,7 +57,7 @@ void APU::test()
 
 void APU::writeByte(Word address, Byte value)
 {
-	printf("APU Address: %X, Value: %X\n", address, value);
+	printf("APU Address: %04X, Value: %04X\n", address, value);
 	if (address == 0xFF26)
 	{
 		bool enable = (value & 0x80) >> 7;
@@ -125,6 +125,7 @@ void APU::writeByte(Word address, Byte value)
 
 Byte APU::readByte(Word address)
 {
+	printf("Address: %04X\n", address);
 	if (address >= 0xFF10 && address <= 0xFF14)
 	{
 		return channel1->readByte(address);
@@ -170,6 +171,16 @@ Byte APU::readByte(Word address)
 
 void APU::stepAPU(int cycles)
 {
+	// Audio write regsisters
+	while (!mMap->isQueueEmpty())
+	{
+		printf("APU working\n");
+		audioRegs writtenRegister = mMap->popAudioWriteQueue();
+		APU::writeByte(writtenRegister.address, writtenRegister.value);
+		Byte value = APU::readByte(writtenRegister.address);
+		mMap->writeMemory(writtenRegister.address, value, false);
+	}
+
 	sampleCounter += cycles;
 	frameSequencerCounter += cycles;
 
@@ -205,6 +216,12 @@ void APU::clearRegisters()
 	channel2->powerOff();
 	channel3->powerOff();
 	channel4->powerOff();
+	// Could be done by simply writing 0s but for checking's sake done as such
+	for (int address = 0xFF10; address <= 0xFF3F; address++)
+	{
+		Byte reg = readByte(address);
+		mMap->writeMemory(address, reg, false);
+	}
 }
 
 // PulseChannel

src/audio.h

@@ -1,5 +1,6 @@
 #pragma once
 #include "types.h"
+#include "mmap.h"
 #include <stdio.h>
 #include <SDL.h>
 
@@ -15,9 +16,9 @@ class PulseChannel
 {
 private:
 	Channel channel;
-    bool enabled;
-    bool dacEnabled;
-    int frameSequencer;
+	bool enabled;
+	bool dacEnabled;
+	int frameSequencer;
 
 	Byte sweepPeriod;
 	bool sweepNegate;
@@ -26,7 +27,7 @@ class PulseChannel
 	// NRx1
 	Byte waveDuty;
 	int lengthTimer;
-    int maxLengthTimer = 64;
+	int maxLengthTimer = 64;
 
 	Byte envelopeInitialVolume;
 	bool envelopeIncrease;
@@ -41,25 +42,24 @@ class PulseChannel
 	void test();
 	void writeByte(Word address, Byte value);
 	Byte readByte(Word address);
-    bool isEnabled();
-    void powerOff();
-    void run();
-    void set_NRx4(Byte value);
-    void setFrameSequencer(int frameSequencer);
-    void trigger();
+	bool isEnabled();
+	void powerOff();
+	void run();
+	void set_NRx4(Byte value);
+	void setFrameSequencer(int frameSequencer);
+	void trigger();
 };
 
 class WaveChannel
 {
 private:
-
 	Byte waveRAM[16];
 	bool dacEnabled;
 	bool enabled;
 
 	int lengthTimer;
 	int maxLengthTimer = 256;
-    int frameSequencer;
+	int frameSequencer;
 
 	Byte outputLevel;
 
@@ -73,22 +73,22 @@ class WaveChannel
 	void writeByte(Word address, Byte value);
 	Byte readByte(Word address);
 	void trigger();
-    bool isEnabled();
-    void powerOff();
-    void set_NRx4(Byte value);
-    void run();
-    void setFrameSequencer(int frameSequencer);
+	bool isEnabled();
+	void powerOff();
+	void set_NRx4(Byte value);
+	void run();
+	void setFrameSequencer(int frameSequencer);
 };
 
 class NoiseChannel
 {
 private:
-    bool enabled;
-    bool dacEnabled;
+	bool enabled;
+	bool dacEnabled;
 
 	int lengthTimer;
 	int maxLengthTimer = 64;
-    int frameSequencer;
+	int frameSequencer;
 
 	Byte envelopeInitialVolume;
 	bool envelopeIncrease;
@@ -112,11 +112,11 @@ class NoiseChannel
 	void writeByte(Word address, Byte value);
 	Byte readByte(Word address);
 	void trigger();
-    bool isEnabled();
-    void powerOff();
-    void set_NRx4(Byte value);
-    void run();
-    void setFrameSequencer(int frameSequencer);
+	bool isEnabled();
+	void powerOff();
+	void set_NRx4(Byte value);
+	void run();
+	void setFrameSequencer(int frameSequencer);
 };
 
 class APU
@@ -160,12 +160,16 @@ class APU
 	WaveChannel* channel3;
 	NoiseChannel* channel4;
 
+	// Memory Map
+	MemoryMap* mMap;
+
 public:
 	APU();
 	void test();
-    bool init();
+	bool init();
 	void writeByte(Word address, Byte value);
 	Byte readByte(Word address);
 	void stepAPU(int cycles);
 	void clearRegisters();
+	void setMemoryMap(MemoryMap* map) { mMap = map; }
 };