Emulator: Separate pixel FIFO states into different functions

Most of these were broken on the carry and half-carry calculation.

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "vendor/ruc"]
-	path = vendor/ruc
-	url = https://github.com/riyyi/ruc
+[submodule "vendor/inferno"]
+	path = vendor/inferno
+	url = https://github.com/riyyi/inferno

CMakeLists.txt

@@ -52,21 +52,28 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 # ------------------------------------------
 # Library
 
-set(RUC_BUILD_TESTS OFF)
-add_subdirectory("vendor/ruc")
+set(INFERNO_BUILD_EXAMPLES OFF)
+add_subdirectory("vendor/inferno")
 
 # ------------------------------------------
 # Application target
 
 # Define source files
 file(GLOB_RECURSE PROJECT_SOURCES "src/*.cpp")
-set(PROJECT_SOURCES ${PROJECT_SOURCES})
 
 add_executable(${PROJECT} ${PROJECT_SOURCES})
 target_include_directories(${PROJECT} PRIVATE
-	"src"
-	"vendor/ruc/src")
-target_link_libraries(${PROJECT} ruc)
+	"src")
+target_link_libraries(${PROJECT} inferno)
+
+# ------------------------------------------
+# Assets target
+
+add_custom_target(${PROJECT}-assets
+	COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/copy-assets.cmake
+	WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+add_dependencies(${PROJECT} ${PROJECT}-assets)
+add_dependencies(${PROJECT}-assets inferno-assets) # Copy project assets *AFTER* engine assets!
 
 # ------------------------------------------
 # Execute target
@@ -87,9 +94,6 @@ if (GARBAGE_BUILD_TESTS)
 	add_executable(${PROJECT}-unit-test ${TEST_SOURCES})
 	target_include_directories(${PROJECT}-unit-test PRIVATE
 		"src"
-		"test"
-		"vendor/ruc/src"
-		"vendor/ruc/test")
-	target_link_libraries(${PROJECT}-unit-test ruc)
-	target_link_libraries(${PROJECT}-unit-test ruc-test)
+		"test")
+	target_link_libraries(${PROJECT}-unit-test inferno)
 endif()

README.org

@@ -10,14 +10,13 @@ Accurate GameBoy emulator.
 *** Clone
 
 #+BEGIN_SRC shell-script
-$ git clone https://gitlab.com/riyyi/garbage
+$ git clone https://github.com/riyyi/garbage
 $ cd garbage
-$ git submodule init
-$ git submodule update
+$ git submodule update --init --recursive
 #+END_SRC
 Or
 #+BEGIN_SRC shell-script
-$ git clone --recursive https://gitlab.com/riyyi/garbage
+$ git clone --recursive https://github.com/riyyi/garbage
 #+END_SRC
 
 *** Update

assets/scene/scene1.json

@@ -0,0 +1,16 @@
+{
+	"camera": {
+		"name": "Camera",
+		"translate": [ 0.0, 0.0, -1.0 ],
+		"rotate": [ 0.0, 0.0, 0.0 ],
+		"scale": [ 1.0, 1.0, 1.0 ],
+		"type": "orthographic",
+		"zoom-level": 0.45
+	},
+	"quad" : [
+		{
+			"name": "Screen",
+			"scale": [ 1.0, -0.9, 1.0 ]
+		}
+	]
+}

assets/settings.json

@@ -0,0 +1,9 @@
+{
+	"window": {
+		"fullscreen": "windowed",
+		"height": 432,
+		"title": "GarbAGE",
+		"vsync": true,
+		"width": 480
+	}
+}

cmake/copy-assets.cmake

@@ -0,0 +1 @@
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/../assets DESTINATION ${CMAKE_CURRENT_BINARY_DIR})

doc/terminology.org

@@ -66,12 +66,15 @@ Absolute fixed address, possible values are[[#references][(4)]]: ~0x00~, ~0x08~,
 *** Variables
 
 | Name   | Meaning                |
-|--------+--------------------|
+|--------+------------------------|
 | length | amount of elements     |
 | size   | amount of bytes        |
-|--------+--------------------|
+|--------+------------------------|
 | lhs    | left hand side         |
 | rhs    | right hand side        |
+|--------+------------------------|
+| lsb    | least significant byte |
+| msb    | most significant byte  |
 
 ** References
 

script/opcode-check.sh

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# Get the full path to this script while handling spaces and symlinks correctly
+scriptPath="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
+cd "$scriptPath/.." || exit 1
+
+opcode_check() {
+	path="$1"
+	file="$(basename "$path")"
+
+	max=255
+	for i in $(seq 1 "$max")
+	do
+		opcode=$(printf "0x%.2x\n" "$i")
+		# Pattern: case 0x??:
+		if ! grep -q "case $opcode:" "$path"; then
+			echo "missing opcode: $opcode in $file"
+		fi
+	done
+}
+
+opcode_check "src/cpu.cpp"
+opcode_check "src/cpu-prefix.cpp"

src/cpu-prefix.cpp

@@ -19,7 +19,7 @@ void CPU::prefix()
 
 	// Read next opcode
 	uint8_t opcode = read(m_pc);
-	print("running opcode: {:#04x} @ ({:#06x})\n", opcode, m_pc);
+	// print("running opcode: {:#04x} @ ({:#06x})\n", opcode, m_pc);
 	if (opcode <= 0x07) {
 		rlc();
 	}
@@ -365,11 +365,10 @@ void CPU::swap()
 		m_wait_cycles += 8;
 
 		// Swap upper 4 bits in register r8 with lower 4 bits
-		register_ = register_ & 0xff;
-		register_ = (register_ >> 4) | (register_ << 4);
+		register_ = ((register_ >> 4) | (register_ << 4)) & 0xff;
 
 		// Set flags
-		m_zf = register_ == 0;
+		m_zf = (register_ == 0);
 		m_nf = 0;
 		m_hf = 0;
 		m_cf = 0;
@@ -412,7 +411,7 @@ void CPU::rl()
 		register_ = (old_carry | (register_ << 1)) & 0xff;
 
 		// Set other flags
-		m_zf = register_ == 0;
+		m_zf = (register_ == 0);
 		m_nf = 0;
 		m_hf = 0;
 	};
@@ -452,7 +451,7 @@ void CPU::rlc()
 		register_ = ((register_ >> 7) | (register_ << 1)) & 0xff;
 
 		// Set other flags
-		m_zf = register_ == 0;
+		m_zf = (register_ == 0);
 		m_nf = 0;
 		m_hf = 0;
 	};
@@ -488,13 +487,13 @@ void CPU::rr()
 
 		// Copy bit 0 into carry flag
 		uint32_t old_carry = m_cf != 0;
-		m_cf = (register_ & 0x01) == 0x01;
+		m_cf = (register_ & 0x1) == 0x1;
 
 		// Rotate register r8 right through carry
 		register_ = ((register_ >> 1) | (old_carry << 7)) & 0xff;
 
 		// Set other flags
-		m_zf = register_ == 0;
+		m_zf = (register_ == 0);
 		m_nf = 0;
 		m_hf = 0;
 	};
@@ -534,7 +533,7 @@ void CPU::rrc()
 		register_ = ((register_ >> 1) | (register_ << 7)) & 0xff;
 
 		// Set other flags
-		m_zf = register_ == 0;
+		m_zf = (register_ == 0);
 		m_nf = 0;
 		m_hf = 0;
 	};
@@ -575,13 +574,13 @@ void CPU::sla()
 		//         r8
 
 		// Copy bit 7 into carry flag
-		m_cf = (m_a & 0x80) == 0x80;
+		m_cf = (register_ & 0x80) == 0x80;
 
 		// Shift Left Arithmetically register r8
 		register_ = (register_ << 1) & 0xff;
 
 		// Set other flags
-		m_zf = register_ == 0;
+		m_zf = (register_ == 0);
 		m_nf = 0;
 		m_hf = 0;
 	};
@@ -623,13 +622,13 @@ void CPU::sra()
 		//  └──┘
 
 		// Copy bit 0 into carry flag
-		m_cf = (m_a & 0x01) == 0x01;
+		m_cf = (register_ & 0x1) == 0x1;
 
 		// Shift Right Arithmatically register r8
 		register_ = (register_ >> 1) | (register_ & 0x80); // Note: bit 7 remains
 
 		// Set other flags
-		m_zf = register_ == 0;
+		m_zf = (register_ == 0);
 		m_nf = 0;
 		m_hf = 0;
 	};
@@ -670,13 +669,13 @@ void CPU::srl()
 		//         r8
 
 		// Copy bit 0 into carry flag
-		m_cf = (m_a & 0x01) == 0x01;
+		m_cf = (register_ & 0x1) == 0x1;
 
 		// Shift Right Locically register r8
 		register_ = (register_ >> 1) & 0x7f; // Note: bit 7 is set to 0
 
 		// Set other flags
-		m_zf = register_ == 0;
+		m_zf = (register_ == 0);
 		m_nf = 0;
 		m_hf = 0;
 	};
@@ -692,7 +691,7 @@ void CPU::srl()
 	case 0x3e: /* SRL (HL) */ {
 		m_wait_cycles += 8; // + 8 = 16 total
 
-		// Rotate the byte pointed to by HL right
+		// Shift right logically the byte pointed to by HL
 		uint32_t data = read(hl());
 		shift_right_logically(data);
 		write(hl(), data);

src/cpu.cpp

@@ -12,6 +12,7 @@
 #include "ruc/format/color.h"
 #include "ruc/format/print.h"
 #include "ruc/meta/assert.h"
+#include "ruc/meta/core.h"
 
 CPU::CPU(uint32_t frequency)
 	: ProcessingUnit(frequency)
@@ -55,18 +56,70 @@ CPU::~CPU()
 
 // -----------------------------------------
 
+void CPU::handleInterrupt(uint32_t interrupt_flag, uint8_t interrupt_source, uint8_t address)
+{
+	// Clear interrupt
+	m_ime = 0;
+	Emu::the().writeMemory(0xff0f, interrupt_flag & (~interrupt_source));
+
+	// Call
+
+	m_wait_cycles += 20;
+
+	// Push address of the program counter on the stack, such that RET can pop it later
+	m_sp = (m_sp - 1) & 0xffff;
+	write(m_sp, m_pc >> 8); // msb(PC)
+	m_sp = (m_sp - 1) & 0xffff;
+	write(m_sp, m_pc & 0xff); // lsb(PC)
+
+	// Jump to address
+	m_pc = address;
+}
+
 void CPU::update()
 {
+	// -------------------------------------
+	// Interrupt Service Routine
+
+	bool effective_ime = m_ime;
+
+	// IME only becomes active after the instruction following EI
+	if (m_should_enable_ime) {
+		m_ime = 1;
+		m_should_enable_ime = 0;
+	}
+
+	if (effective_ime) {
+		// Get the 5 lower bits of the IE (interrupt enable) address
+		uint32_t interrupt_enabled = Emu::the().readMemory(0xffff) & 0x1f;
+		// Get the 5 lower bits of the IF (interrupt flag) address
+		uint32_t interrupt_flag = Emu::the().readMemory(0xff0f) & 0x1f;
+
+		uint32_t interrupt = interrupt_enabled & interrupt_flag;
+		for (uint8_t i = 0; i < 5; ++i) {
+			if (interrupt & BIT(i)) {
+				handleInterrupt(interrupt_flag, BIT(i), i * 8 + 0x40);
+				break;
+			}
+		}
+	}
+
+	// -------------------------------------
+	// Run opcodes
+
 	m_wait_cycles--;
+	// TODO: convert to early-return
 	if (m_wait_cycles <= 0) {
 
 		// print(ruc::format::Emphasis::Underline | ruc::format::Emphasis::Bold | fg(ruc::format::TerminalColor::Blue), "{:#06x}\n", *this);
 
 		// Read next opcode
 		uint8_t opcode = read(m_pc);
-		print("running opcode: {:#04x} @ ({:#06x})\n", opcode, m_pc);
+		// print("running opcode: {:#04x} @ ({:#06x})\n", opcode, m_pc);
 		switch (opcode) {
 
+		case 0x10: /* TODO */ m_pc += 2; break;
+
 		case 0x00: nop(); break;
 		case 0x01: ldi16(); break;
 		case 0x02: ldr8(); break;
@@ -124,7 +177,7 @@ void CPU::update()
 		case 0x37: misc(); break;
 		case 0x38: jrs8(); break;
 		case 0x39: addr16(); break;
-		case 0x3a: ldr8(); break;
+		case 0x3a: lda8(); break;
 		case 0x3b: dec16(); break;
 		case 0x3c: inc8(); break;
 		case 0x3d: dec8(); break;
@@ -281,13 +334,14 @@ void CPU::update()
 		case 0xd6: sub8(); break;
 		case 0xd7: rst(); break;
 		case 0xd8: ret(); break;
+		case 0xd9: ret(); break;
 		case 0xda: jp16(); break;
 		case 0xdc: call(); break;
 		case 0xde: sbc8(); break;
 		case 0xdf: rst(); break;
-		case 0xe0: ldffi8(); break;
+		case 0xe0: ldff8(); break;
 		case 0xe1: pop(); break;
-		case 0xe2: ldr8(); break;
+		case 0xe2: ldff8(); break;
 		case 0xe5: push(); break;
 		case 0xe6: and8(); break;
 		case 0xe7: rst(); break;
@@ -296,15 +350,17 @@ void CPU::update()
 		case 0xea: ldr8(); break;
 		case 0xee: xor8(); break;
 		case 0xef: rst(); break;
-		case 0xf0: ldffi8(); break;
+		case 0xf0: ldff8(); break;
 		case 0xf1: pop(); break;
-		case 0xf2: lda8(); break;
+		case 0xf2: ldff8(); break;
+		case 0xf3: misc(); break;
 		case 0xf5: push(); break;
 		case 0xf6: or8(); break;
 		case 0xf7: rst(); break;
 		case 0xf8: ldr16(); break;
 		case 0xf9: ldr16(); break;
 		case 0xfa: lda8(); break;
+		case 0xfb: misc(); break;
 		case 0xfe: cp(); break;
 		case 0xff: rst(); break;
 
@@ -337,16 +393,18 @@ void CPU::adc8()
 		// ADC A,r8, flags: Z 0 H C
 		m_wait_cycles += 4;
 
+		uint32_t old_carry = m_cf != 0;
+
 		// Set flags
 		m_nf = 0;
-		m_hf = isCarry(m_a, register_, 0x10);
-		m_cf = isCarry(m_a, register_, 0x100);
+		m_hf = isCarry(0xf, m_a, register_, old_carry);
+		m_cf = isCarry(0xff, m_a, register_, old_carry);
 
 		// Add the value in r8 plus the carry flag to A
-		m_a = (m_a + register_ + (m_cf) ? 0x1 : 0) & 0xff;
+		m_a = (m_a + register_ + old_carry) & 0xff;
 
 		// Zero flag
-		m_zf = m_a == 0;
+		m_zf = (m_a == 0);
 	};
 
 	uint8_t opcode = pcRead();
@@ -383,8 +441,8 @@ void CPU::add8()
 
 		// Set flags
 		m_nf = 0;
-		m_hf = isCarry(m_a, register_, 0x10);
-		m_cf = isCarry(m_a, register_, 0x100);
+		m_hf = isCarry(0xf, m_a, register_);
+		m_cf = isCarry(0xff, m_a, register_);
 
 		// Add the value in r8 to A
 		m_a = (m_a + register_) & 0xff;
@@ -478,9 +536,8 @@ void CPU::cp()
 		// Zero flag
 		m_zf = ((m_a - register_) & 0xff) == 0;
 		m_nf = 1;
-		// Note: for negation between two positive numbers the carry result is flipped!
-		m_hf = !isCarry(m_a, register_, 0x10);
-		m_cf = !isCarry(m_a, register_, 0x100);
+		m_hf = isCarrySubtraction(0xf, m_a, register_);
+		m_cf = isCarrySubtraction(0xff, m_a, register_);
 	};
 
 	uint8_t opcode = pcRead();
@@ -541,6 +598,8 @@ void CPU::daa()
 		if (!m_nf) {
 			if (m_cf || m_a > 0x99) {
 				m_a += 0x60;
+				// Carry flag
+				m_cf = 1;
 			}
 
 			if (m_hf || (m_a & 0xf) > 0x9) {
@@ -557,9 +616,6 @@ void CPU::daa()
 			}
 		}
 
-		// Carry flag
-		m_cf = (m_a & 0x100) == 0x100;
-
 		m_a = m_a & 0xff;
 
 		// Set flags
@@ -580,13 +636,13 @@ void CPU::dec8()
 
 		// Set flags
 		m_nf = 1;
-		m_hf = isCarry(register_, -1, 0x10);
+		m_hf = isCarrySubtraction(0xf, register_, 1);
 
 		// Decrement value in register r8 by 1
 		register_ = (register_ - 1) & 0xff;
 
 		// Zero flag
-		m_zf = register_ == 0;
+		m_zf = (register_ == 0);
 	};
 
 	uint8_t opcode = pcRead();
@@ -620,7 +676,7 @@ void CPU::inc8()
 
 		// Set flags
 		m_nf = 0;
-		m_hf = isCarry(register_, 1, 0x10);
+		m_hf = isCarry(0xf, register_, 1);
 
 		// Increment value in register r8 by 1
 		register_ = (register_ + 1) & 0xff;
@@ -706,15 +762,14 @@ void CPU::sbc8()
 
 		// Set flags
 		m_nf = 1;
-		// Note: for negation between two positive numbers the carry result is flipped!
-		m_hf = !isCarry(m_a, register_, 0x10);
-		m_cf = !isCarry(m_a, (register_ + (old_carry) ? 1 : 0), 0x100);
+		m_hf = isCarrySubtraction(0xf, m_a, register_, old_carry);
+		m_cf = isCarrySubtraction(0xff, m_a, register_, old_carry);
 
 		// Subtract the value in r8 and the carry flag from A
-		m_a = (m_a - register_ - (old_carry) ? 1 : 0) & 0xff;
+		m_a = (m_a - register_ - old_carry) & 0xff;
 
 		// Zero flag
-		m_zf = m_a == 0;
+		m_zf = (m_a == 0);
 	};
 
 	uint8_t opcode = pcRead();
@@ -753,9 +808,8 @@ void CPU::sub8()
 
 		// Set flags
 		m_nf = 1;
-		// Note: for negation between two positive numbers the carry result is flipped!
-		m_hf = !isCarry(m_a, register_, 0x10);
-		m_cf = !isCarry(m_a, register_, 0x100);
+		m_hf = isCarrySubtraction(0xf, m_a, register_);
+		m_cf = isCarrySubtraction(0xff, m_a, register_);
 
 		// Subtract the value in r8 from A
 		m_a = (m_a - register_) & 0xff;
@@ -843,7 +897,7 @@ void CPU::lda8()
 	case 0x2a: { // LD A,(HL+) == LD A,(HLI) == LDI A,(HL)
 		m_wait_cycles += 8;
 
-		// Put value at address in HL into A
+		// Load value into register A from the byte pointed by HL
 		uint32_t address = hl();
 		m_a = read(address);
 
@@ -856,23 +910,21 @@ void CPU::lda8()
 	case 0x3a: { // LD A,(HL-) == LD A,(HLD) == LDD A,(HL)
 		m_wait_cycles += 8;
 
-		// Put value at address in HL into A
+		// Load value into register A from the byte pointed by HL
 		uint32_t address = hl();
 		m_a = read(address);
 
 		// Decrement HL
-		address = (address + 1) & 0xffff;
+		address = (address - 1) & 0xffff;
 		m_l = address & 0xff;
 		m_h = address >> 8;
 		break;
 	}
-	case 0xf2: // LD A,(C)
-		m_wait_cycles += 8;
-		m_a = read(m_c);
-		break;
 	case 0xfa: // LD A,a16
 		m_wait_cycles += 16;
-		m_a = pcRead16();
+
+		// Load value into register A from the byte pointed to by register r16
+		m_a = read(pcRead16());
 		break;
 	default:
 		VERIFY_NOT_REACHED();
@@ -887,8 +939,8 @@ void CPU::addr16()
 
 		// Set flags
 		m_nf = 0;
-		m_hf = isCarry(hl(), register_, 0x1000);
-		m_cf = isCarry(hl(), register_, 0x10000);
+		m_hf = isCarry(0xfff, hl(), register_);
+		m_cf = isCarry(0xffff, hl(), register_);
 
 		// Add the value in r16 to HL
 		uint32_t data = (hl() + register_) & 0xffff;
@@ -919,8 +971,8 @@ void CPU::adds8()
 		// Set flags
 		m_zf = 0;
 		m_nf = 0;
-		m_hf = isCarry(m_sp, signed_data, 0x10);
-		m_cf = isCarry(m_sp, signed_data, 0x100);
+		m_hf = isCarry(0xf, m_sp, signed_data);
+		m_cf = isCarry(0xff, m_sp, signed_data);
 
 		// Add the signed value s8 to SP
 		m_sp = m_sp + signed_data;
@@ -953,7 +1005,7 @@ void CPU::inc16()
 	case 0x03: /* INC BC */ setBC(bc() + 1); break;
 	case 0x13: /* INC DE */ setDE(de() + 1); break;
 	case 0x23: /* INC HL */ setHL(hl() + 1); break;
-	case 0x24: /* INC SP */ m_sp = (m_sp + 1) & 0xffff; break;
+	case 0x33: /* INC SP */ m_sp = (m_sp + 1) & 0xffff; break;
 	default:
 		VERIFY_NOT_REACHED();
 	}
@@ -1103,7 +1155,7 @@ void CPU::ldr8()
 	case 0x6d: /* LD L,L    m_l = m_l; */ break;
 	case 0x6e: /* LD L,(HL) */ {
 		m_wait_cycles += 4; // + 4 = 8 total
-		m_e = read(hl());
+		m_l = read(hl());
 		break;
 	}
 	case 0x6f: /* LD L,A */ m_l = m_a; break;
@@ -1154,13 +1206,10 @@ void CPU::ldr8()
 		break;
 	}
 	case 0x7f: /* LD A,A    m_a = m_a; */ break;
-	case 0xe2: /* LD (C),A */ {
-		m_wait_cycles += 4; // + 4 = 8 total
-		write(m_c, m_a);
-		break;
-	}
 	case 0xea: /* LD a16,A */ {
 		m_wait_cycles += 12; // + 4 = 16 total
+
+		// Store value in register A into the byte at address a16
 		write(pcRead16(), m_a);
 		break;
 	}
@@ -1192,7 +1241,7 @@ void CPU::ra()
 		m_cf = (m_a & 0x80) == 0x80;
 
 		// Rotate register A left
-		m_a = (m_a >> 7) | (m_a << 1);
+		m_a = ((m_a >> 7) | (m_a << 1)) & 0xff;
 		break;
 	case 0x0f: // RRCA
 
@@ -1207,7 +1256,7 @@ void CPU::ra()
 		m_cf = (m_a & 0x1) == 0x1;
 
 		// Rotate register A right
-		m_a = (m_a >> 1) | (m_a << 7);
+		m_a = ((m_a >> 1) | (m_a << 7)) & 0xff;
 		break;
 	case 0x17: { // RLA
 
@@ -1223,7 +1272,7 @@ void CPU::ra()
 		m_cf = (m_a & 0x80) == 0x80;
 
 		// Rotate register A left through carry
-		m_a = old_carry | (m_a << 1);
+		m_a = (old_carry | (m_a << 1)) & 0xff;
 		break;
 	}
 	case 0x1f: { // RRA
@@ -1240,7 +1289,7 @@ void CPU::ra()
 		m_cf = (m_a & 0x1) == 0x1;
 
 		// Rotate register A right through carry
-		m_a = (m_a >> 1) | (old_carry << 7);
+		m_a = ((m_a >> 1) | (old_carry << 7)) & 0xff;
 		break;
 	}
 	default:
@@ -1256,22 +1305,34 @@ void CPU::ra()
 	m_hf = 0;
 }
 
-void CPU::ldffi8()
+void CPU::ldff8()
 {
 	uint8_t opcode = pcRead();
 	switch (opcode) {
-	case 0xe0: // LD ($ff00 + i8),A == LDH (io8),A
+	case 0xe0: // LD (0xff00 + s8),A == LDH (io8),A
 		m_wait_cycles += 12;
 
 		// Put value in A into address (0xff00 + next byte in memory)
 		ffWrite(pcRead(), m_a);
 		break;
-	case 0xf0: // LD A,($ff00 + i8) == LDH A,(io8)
+	case 0xe2: // LD (0xff00 + C),A == LDH (C),A
+		m_wait_cycles += 8;
+
+		// Store value in register A into the byte at address 0xff00 + C
+		ffWrite(m_c, m_a);
+		break;
+	case 0xf0: // LD A,(0xff00 + s8) == LDH A,(io8)
 		m_wait_cycles += 12;
 
 		// Put value at address (0xff00 + next byte in memory) into A
 		m_a = ffRead(pcRead());
 		break;
+	case 0xf2: // LD A,(0xff00 + C) == LDH A,(C)
+		m_wait_cycles += 8;
+
+		// Load value into register A from the byte at address 0xff00 + C
+		m_a = ffRead(m_c);
+		break;
 	default:
 		VERIFY_NOT_REACHED();
 	}
@@ -1311,7 +1372,9 @@ void CPU::ldr16()
 		m_wait_cycles += 20;
 
 		// Put value of SP into address given by next 2 bytes in memory
-		write(pcRead16(), m_sp);
+		uint32_t address = pcRead16();
+		write(address, m_sp & 0xff);              // lsb(SP)
+		write((address + 1) & 0xffff, m_sp >> 8); // msb(SP)
 		break;
 	}
 	case 0xf8: { // LD HL,SP + s8 == LDHL SP,s8, flags: 0 0 H C
@@ -1320,18 +1383,20 @@ void CPU::ldr16()
 		// Put SP + next (signed) byte in memory into HL
 		uint32_t signed_data = (pcRead() ^ 0x80) - 0x80;
 		uint32_t sum = m_sp + signed_data;
-		m_h = sum >> 8;
 		m_l = sum & 0xff;
+		m_h = sum >> 8;
 
 		// Set flags
 		m_zf = 0;
 		m_nf = 0;
-		m_hf = isCarry(m_sp, signed_data, 0x10);
-		m_cf = isCarry(m_sp, signed_data, 0x100);
+		m_hf = isCarry(0xf, m_sp, signed_data);
+		m_cf = isCarry(0xff, m_sp, signed_data);
 		break;
 	}
 	case 0xf9: { // LD SP,HL
 		m_wait_cycles += 8;
+
+		// Load register HL into register SP
 		m_sp = hl();
 		break;
 	}
@@ -1347,9 +1412,9 @@ void CPU::pop()
 		m_wait_cycles += 12;
 
 		// Pop register r16 from stack
-		register_low = read(m_sp);
+		register_low = read(m_sp); // lsb(r16)
 		m_sp = (m_sp + 1) & 0xffff;
-		register_high = read(m_sp);
+		register_high = read(m_sp); // msb(r16)
 		m_sp = (m_sp + 1) & 0xffff;
 	};
 
@@ -1382,9 +1447,9 @@ void CPU::push()
 
 		// Push register r16 into stack
 		m_sp = (m_sp - 1) & 0xffff;
-		write(m_sp, register_ >> 8);
+		write(m_sp, register_ >> 8); // msb(r16)
 		m_sp = (m_sp - 1) & 0xffff;
-		write(m_sp, register_ & 0xff);
+		write(m_sp, register_ & 0xff); // lsb(r16)
 	};
 
 	uint8_t opcode = pcRead();
@@ -1408,23 +1473,25 @@ void CPU::call()
 
 		if (!should_call) {
 			m_wait_cycles += 12;
+			return;
 		}
 		m_wait_cycles += 24;
 
-		// Push address of next 2 bytes in memory onto stack
+		// Push address of the instruction after the CALL on the stack,
+		// such that RET can pop it later
 		m_sp = (m_sp - 1) & 0xffff;
-		write(m_sp, data >> 8);
+		write(m_sp, m_pc >> 8); // msb(PC)
 		m_sp = (m_sp - 1) & 0xffff;
-		write(m_sp, data & 0xff);
+		write(m_sp, m_pc & 0xff); // lsb(PC)
 
-		// Jump to this address
+		// Jump to operand address
 		m_pc = data;
 	};
 
 	uint8_t opcode = pcRead();
 	switch (opcode) {
-	case 0xc4: /* CALL NZ,i16 */ function_call(!m_nf); break;
-	case 0xcc: /* CALL Z,i16 */ function_call(m_nf); break;
+	case 0xc4: /* CALL NZ,i16 */ function_call(!m_zf); break;
+	case 0xcc: /* CALL Z,i16 */ function_call(m_zf); break;
 	case 0xcd: /* CALL i16 */ function_call(true); break;
 	case 0xd4: /* CALL NC,i16 */ function_call(!m_cf); break;
 	case 0xdc: /* CALL C,i16 */ function_call(m_cf); break;
@@ -1512,20 +1579,25 @@ void CPU::ret()
 
 		// Return from subroutine if condition cc is met,
 		// this is basically a POP PC (if such an instruction existed)
-		m_pc = read(m_sp);
+		m_pc = read(m_sp); // lsb(SP)
 		m_sp = (m_sp + 1) & 0xffff;
-		m_pc = m_pc | (read(m_sp) << 8);
+		m_pc = m_pc | (read(m_sp) << 8); // msb(SP)
 		m_sp = (m_sp + 1) & 0xffff;
 	};
 
 	uint8_t opcode = pcRead();
 	switch (opcode) {
-	case 0xc0: /* RET NZ,i16 */ function_return(!m_nf); break;
-	case 0xc8: /* RET Z,i16 */ function_return(m_nf); break;
+	case 0xc0: /* RET NZ,i16 */ function_return(!m_zf); break;
+	case 0xc8: /* RET Z,i16 */ function_return(m_zf); break;
 	case 0xc9: /* RET i16 */ function_return(true); break;
 	case 0xd0: /* RET NC,i16 */ function_return(!m_cf); break;
 	case 0xd8: /* RET C,i16 */ function_return(m_cf); break;
-	// case 0xd9: /* RETI */ FIXME break;
+	case 0xd9: /* RETI */ {
+		// Return from subroutine
+		function_return(true);
+		m_ime = true;
+		break;
+	}
 	default:
 		VERIFY_NOT_REACHED();
 	}
@@ -1590,6 +1662,19 @@ void CPU::misc()
 		// Invert carry
 		m_cf = (m_cf) ? 0 : 1;
 		break;
+	case 0xf3: // DI
+		m_wait_cycles += 4;
+
+		// Disable Interrupts by clearing the IME flag
+		m_ime = 0;
+		break;
+	case 0xfb: // EI
+		m_wait_cycles += 4;
+
+		// Enable Interrupts by setting the IME flag.
+		// The flag is only set after the instruction following EI
+		m_should_enable_ime = true;
+		break;
 	default:
 		VERIFY_NOT_REACHED();
 	}
@@ -1641,7 +1726,8 @@ void CPU::write(uint32_t address, uint32_t value)
 
 uint32_t CPU::read(uint32_t address)
 {
-	return Emu::the().readMemory(address) & 0xff;
+	// FIXME: Figure out where HL gets set to above 0xffff
+	return Emu::the().readMemory(address & 0xffff) & 0xff;
 }
 
 void CPU::ffWrite(uint32_t address, uint32_t value)
@@ -1654,32 +1740,14 @@ uint32_t CPU::ffRead(uint32_t address)
 	return Emu::the().readMemory(address | (0xff << 8)) & 0xff;
 }
 
-bool CPU::isCarry(uint32_t lhs, uint32_t rhs, uint32_t limit_bit)
+bool CPU::isCarry(uint32_t limit_bit, uint32_t first, uint32_t second, uint32_t third)
 {
-	// limit_bit values:
-	//  8-bit half-carry = 0x10    or 16
-	//  8-bit carry      = 0x100   or 256
-	// 16-bit half-carry = 0x1000  or 4096
-	// 16-bit carry      = 0x10000 or 65536
+	return (first & limit_bit) + (second & limit_bit) + (third & limit_bit) > limit_bit;
+}
 
-	// Example for 8-bit half-carry:
-	// 0b00111110 62      | 0b00111000 56
-	// 0b00100010 34 +    | 0b00010001 17 +
-	// ---------------    | ---------------
-	// 0b01100000 96      | 0b01001001 73
-	//                    |
-	// 0b00111110 62      | 0b00111000 56
-	// 0b00100010 34 ^    | 0b00010001 17 ^
-	// ---------------    | ---------------
-	// 0b00011100         | 0b00101001
-	// 0b01100000 96 ^    | 0b01001001 73 ^
-	// ---------------    | ---------------
-	// 0b01111100         | 0b01100000
-	// 0b00010000 16 &    | 0b00010000 16 &
-	// ---------------    | ---------------
-	// 0b00010000 = true! | 0b00000000 = false!
-
-	return (lhs ^ rhs ^ (lhs + rhs)) & limit_bit;
+bool CPU::isCarrySubtraction(uint32_t limit_bit, uint32_t lhs, uint32_t rhs, uint32_t rhs_extra)
+{
+	return (lhs & limit_bit) < (rhs & limit_bit) + (rhs_extra & limit_bit);
 }
 
 // -----------------------------------------

src/cpu.h

@@ -22,6 +22,7 @@ public:
 	explicit CPU(uint32_t frequency);
 	virtual ~CPU();
 
+	void handleInterrupt(uint32_t interrupt_flag, uint8_t interrupt_source, uint8_t address);
 	void update() override;
 
 	// -------------------------------------
@@ -71,7 +72,7 @@ public:
 
 	// 8-bit
 	void lda8();
-	void ldffi8();
+	void ldff8();
 	void ldi8();
 	void ldr8();
 
@@ -102,6 +103,10 @@ public:
 
 	// -------------------------------------
 
+	uint32_t a() const { return m_a; }
+	uint32_t b() const { return m_b; }
+	uint32_t c() const { return m_c; }
+
 	uint32_t af() const { return (m_cf << 4 | m_hf << 5 | m_nf << 6 | m_zf << 7) | m_a << 8; }
 	uint32_t bc() const { return m_c | m_b << 8; }
 	uint32_t de() const { return m_e | m_d << 8; }
@@ -109,6 +114,11 @@ public:
 	uint32_t pc() const { return m_pc; }
 	uint32_t sp() const { return m_sp; }
 
+	uint32_t zf() const { return m_zf; }
+	uint32_t nf() const { return m_nf; }
+	uint32_t hf() const { return m_hf; }
+	uint32_t cf() const { return m_cf; }
+
 	void setBC(uint32_t value);
 	void setDE(uint32_t value);
 	void setHL(uint32_t value);
@@ -123,7 +133,8 @@ private:
 	void ffWrite(uint32_t address, uint32_t value);
 	uint32_t ffRead(uint32_t address);
 
-	bool isCarry(uint32_t lhs, uint32_t rhs, uint32_t limit_bit);
+	bool isCarry(uint32_t limit_bit, uint32_t first, uint32_t second, uint32_t third = 0x0);
+	bool isCarrySubtraction(uint32_t limit_bit, uint32_t lhs, uint32_t rhs, uint32_t rhs_extra = 0x0);
 
 	// Registers
 	uint32_t m_a { 0 };  // Accumulator
@@ -141,7 +152,9 @@ private:
 	uint32_t m_nf { 0 };  // Subtraction flag (BCD)
 	uint32_t m_hf { 0 };  // Half Carry flag (BCD)
 	uint32_t m_cf { 0 };  // Carry flag
+	uint32_t m_ime { 0 }; // Interrupt Master Enable flag
 
+	bool m_should_enable_ime { 0 };
 	int8_t m_wait_cycles { 0 };
 };
 

src/dma.cpp

@@ -1,6 +1,5 @@
 /*
  * Copyright (C) 2022 Riyyi
- * Copyright (C) 2022 Th3FrankXD
  *
  * SPDX-License-Identifier: MIT
  */

src/dma.h

@@ -1,6 +1,5 @@
 /*
  * Copyright (C) 2022 Riyyi
- * Copyright (C) 2022 Th3FrankXD
  *
  * SPDX-License-Identifier: MIT
  */

src/emu.cpp

@@ -39,7 +39,7 @@ void Emu::update()
 	}
 }
 
-void Emu::addProcessingUnit(std::string_view name, ProcessingUnit* processing_unit)
+void Emu::addProcessingUnit(std::string_view name, std::shared_ptr<ProcessingUnit> processing_unit)
 {
 	m_processing_units.emplace(name, processing_unit);
 }
@@ -64,18 +64,37 @@ void Emu::removeMemorySpace(std::string_view name)
 
 void Emu::writeMemory(uint32_t address, uint32_t value)
 {
+	// Bail if the CPU tries to write to a read-only address
+	switch (address) {
+	case 0xff44:
+		ruc::error("writing to read-only address: {:#06x}", address);
+		VERIFY_NOT_REACHED();
+		break;
+	default:
+		break;
+	}
+
 	for (auto& memory_space : m_memory_spaces) {
 		auto& memory = memory_space.second;
-		if (address == 0xff50) {
-			Loader::the().disableBootrom();
-		}
-		else if (address >= memory.start_address && address <= memory.end_address) {
+		if (address >= memory.start_address && address <= memory.end_address) {
 			// Note: ECHO RAM hack
 			if (address >= 0xc000 && address <= 0xddff) {
 				writeMemory(address + (0xe000 - 0xc000), value);
 			}
 
 			memory.memory[memory.active_bank][address - memory.start_address] = value;
+
+			if (address == 0xff50) {
+				print("DISABLING BOOTROM\n");
+				Loader::the().disableBootrom();
+			}
+
+			// Write serial data from linkport I/O, used for blargg's test ROMs
+			if (address == 0xff02 && value == 0x81) {
+				uint32_t data = readMemory(0xff01);
+				print("{:c}", (data >= 58 && data <= 64) ? data + 7 : data);
+			}
+
 			return;
 		}
 	}
@@ -87,6 +106,13 @@ void Emu::writeMemory(uint32_t address, uint32_t value)
 
 uint32_t Emu::readMemory(uint32_t address) const
 {
+	switch (address) {
+	case 0xff44:
+		return *m_processing_units.at("PPU")->sharedRegister("LY");
+	default:
+		break;
+	};
+
 	for (const auto& memory_space : m_memory_spaces) {
 		const auto& memory = memory_space.second;
 		if (address >= memory.start_address && address <= memory.end_address) {

src/emu.h

@@ -8,7 +8,7 @@
 #pragma once
 
 #include <cstdint> // uint32_t
-#include <string>
+#include <memory>  // std::shared_ptr
 #include <string_view>
 #include <unordered_map>
 #include <vector>
@@ -30,11 +30,16 @@ class Emu final : public ruc::Singleton<Emu> {
 public:
 	Emu(s) {}
 
+	enum Mode : uint8_t {
+		DMG, // Game Boy
+		CGB, // Game Boy Color
+	};
+
 	void init(uint32_t frequency);
 
 	void update();
 
-	void addProcessingUnit(std::string_view name, ProcessingUnit* processing_unit);
+	void addProcessingUnit(std::string_view name, std::shared_ptr<ProcessingUnit> processing_unit);
 	void addMemorySpace(std::string_view name, uint32_t start_address, uint32_t end_address, uint32_t amount_of_banks = 1);
 	void removeMemorySpace(std::string_view name);
 
@@ -43,10 +48,12 @@ public:
 
 	// -------------------------------------
 
-	ProcessingUnit* processingUnit(std::string_view name) const { return m_processing_units.at(name); }
+	Mode mode() const { return m_mode; }
+	std::shared_ptr<ProcessingUnit> processingUnit(std::string_view name) const { return m_processing_units.at(name); }
 	MemorySpace memorySpace(std::string_view name) { return m_memory_spaces[name]; }
 
 private:
+	Mode m_mode { Mode::DMG };
 	uint32_t m_frequency { 0 };
 	double m_timestep { 0 };
 	uint32_t m_cycle { 0 };
@@ -55,6 +62,6 @@ private:
 
 	ruc::Timer m_timer;
 
-	std::unordered_map<std::string_view, ProcessingUnit*> m_processing_units;
+	std::unordered_map<std::string_view, std::shared_ptr<ProcessingUnit>> m_processing_units;
 	std::unordered_map<std::string_view, MemorySpace> m_memory_spaces;
 };

src/loader.cpp

@@ -6,6 +6,7 @@
 
 #include <cstddef> // size_t
 #include <cstdint> // uint32_t
+#include <memory>  // std::make_shared
 
 #include "cpu.h"
 #include "emu.h"
@@ -42,13 +43,13 @@ void Loader::init()
 {
 	destroy();
 
-	Emu::the().init(8000000);
+	Emu::the().init(4000000);
 
-	CPU cpu(8000000);
-	PPU ppu(4000000);
+	auto cpu = std::make_shared<CPU>(4000000);
+	auto ppu = std::make_shared<PPU>(4000000);
 
-	Emu::the().addProcessingUnit("cpu", &cpu);
-	Emu::the().addProcessingUnit("ppu", &ppu);
+	Emu::the().addProcessingUnit("CPU", cpu);
+	Emu::the().addProcessingUnit("PPU", ppu);
 
 	// https://gbdev.io/pandocs/Memory_Map.html
 	// https://gbdev.io/pandocs/Power_Up_Sequence.html
@@ -77,15 +78,6 @@ void Loader::init()
 
 		Emu::the().writeMemory(i, bootrom[i]);
 	}
-
-	update();
-}
-
-void Loader::update()
-{
-	while (true) {
-		Emu::the().update();
-	}
 }
 
 void Loader::destroy()

src/loader.h

@@ -22,7 +22,6 @@ public:
 
 private:
 	void init();
-	void update();
 	void destroy();
 
 	void loadCartridgeHeader();

src/main.cpp

@@ -5,14 +5,23 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "loader.h"
+#include <string_view>
+
+#include "inferno.h"
+#include "inferno/entrypoint.h"
+#include "ppu.h"
 #include "ruc/argparser.h"
 #include "ruc/format/print.h"
 #include "ruc/timer.h"
-#include <string_view>
 
-int main(int argc, const char* argv[])
-{
+#include "emu.h"
+#include "loader.h"
+
+class GarbAGE final : public Inferno::Application {
+public:
+	GarbAGE(int argc, char* argv[])
+		: Application()
+	{
 		std::string_view bootrom_path = "gbc_bios.bin";
 		std::string_view rom_path;
 
@@ -23,6 +32,29 @@ int main(int argc, const char* argv[])
 
 		Loader::the().setBootromPath(bootrom_path);
 		Loader::the().loadRom(rom_path);
+	}
 
-	return 0;
+	~GarbAGE()
+	{
+	}
+
+	void update() override
+	{
+		// 154 scanlines * 456 cycles = 70224 cycles per frame
+		for (int i = 0; i < (144 * 456 + 10 * 456); ++i) {
+			Emu::the().update();
+		}
+	}
+
+	void render() override
+	{
+		auto* ppu = static_cast<PPU*>(Emu::the().processingUnit("PPU").get());
+		ppu->render();
+	}
+};
+
+Inferno::Application* Inferno::createApplication(int argc, char* argv[])
+{
+	GarbAGE* gameboy = new GarbAGE(argc, argv);
+	return gameboy;
 }

src/ppu.cpp

@@ -5,20 +5,298 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "ppu.h"
-#include "ruc/format/print.h"
-#include <iostream>
+#include <cstdint> // uint8_t, uint16_t, uint32_t
+#include <memory>  // std::make_shared
 
-PPU ::PPU(unsigned int frequency)
+#include "glm/ext/vector_float3.hpp" // glm::vec3
+#include "glm/ext/vector_float4.hpp" // glm::vec4
+#include "inferno/application.h"
+#include "inferno/component/spritecomponent.h"
+#include "inferno/component/transformcomponent.h"
+#include "inferno/scene/scene.h"
+#include "ruc/format/print.h"
+
+#include "emu.h"
+#include "ppu.h"
+#include "ruc/meta/assert.h"
+
+PPU::PPU(uint32_t frequency)
 	: ProcessingUnit(frequency)
 {
+	m_shared_registers.emplace("LY", &m_lcd_y_coordinate);
+
+	auto& scene = Inferno::Application::the().scene();
+	m_entity = scene.findEntity("Screen");
 }
 
-PPU ::~PPU()
+PPU::~PPU()
 {
 }
 
 void PPU::update()
 {
-	// print("ppu update\n");
+	LCDC lcd_control = static_cast<LCDC>(Emu::the().readMemory(0xff40));
+	if (!(lcd_control & LCDC::LCDandPPUEnable)) {
+		return;
+	}
+
+	// print("PPU update\n");
+
+	m_clocks_into_frame++;
+
+	switch (m_state) {
+	case State::OAMSearch:
+		// OAM logic goes here..
+
+		if (m_clocks_into_frame % 80 == 0) {
+			// Reset FIFO
+			m_pixel_fifo = {};
+
+			m_state = State::PixelTransfer;
+		}
+		break;
+	case State::PixelTransfer:
+		updatePixelFifo();
+
+		if (m_lcd_x_coordinate == 160) {
+			m_lcd_x_coordinate = 0;
+			m_state = State::HBlank;
+		}
+		break;
+	case State::HBlank:
+		// H-Blank logic goes here..
+
+		if (m_clocks_into_frame % (80 + 172 + 204) == 0) {
+			m_lcd_y_coordinate++;
+			if (m_lcd_y_coordinate == 144) {
+				m_state = State::VBlank;
+			}
+			else {
+				m_state = State::OAMSearch;
+			}
+		}
+		break;
+	case State::VBlank:
+		// V-Blank logic goes here..
+
+		if (m_clocks_into_frame % (80 + 172 + 204) == 0) {
+			m_lcd_y_coordinate++;
+			if (m_lcd_y_coordinate == 154) {
+				resetFrame();
+			}
+		}
+
+		break;
+	default:
+		VERIFY_NOT_REACHED();
+	};
+}
+
+void PPU::render()
+{
+	LCDC lcd_control = static_cast<LCDC>(Emu::the().readMemory(0xff40));
+
+	if (!(lcd_control & LCDC::BGandWindowEnable)) {
+		// When Bit 0 is cleared, both background and window become blank (white)
+		auto pixel = getPixelColor(0, Palette::BGP);
+		for (size_t i = 0; i < m_screen.size(); i += 3) {
+			m_screen[i + 0] = pixel[0];
+			m_screen[i + 1] = pixel[1];
+			m_screen[i + 2] = pixel[2];
+		}
+	}
+
+	auto& scene = Inferno::Application::the().scene();
+	auto texture = std::make_shared<Inferno::Texture>(m_screen.data(), SCREEN_WIDTH, SCREEN_HEIGHT, FORMAT_SIZE);
+	scene.removeComponent<Inferno::SpriteComponent>(m_entity);
+	scene.addComponent<Inferno::SpriteComponent>(m_entity, glm::vec4 { 1.0f }, texture);
+}
+
+void PPU::resetFrame()
+{
+	m_state = State::OAMSearch;
+	m_clocks_into_frame = 0;
+	m_lcd_x_coordinate = 0;
+	m_lcd_y_coordinate = 0;
+}
+
+// -----------------------------------------
+
+uint32_t PPU::getBgTileDataAddress(uint8_t tile_index)
+{
+	// https://gbdev.io/pandocs/Tile_Data.html
+	switch (m_pixel_fifo.tile_data_address) {
+	case 0x8000:
+		// 0x8000-0x8fff: index   0 => 255
+		return m_pixel_fifo.tile_data_address + (tile_index * TILE_SIZE); // Each tile is 16 bytes
+	case 0x8800:
+		// 0x8800-0x8fff: index 128 => 255 (or -128 => -1)
+		// 0x9000-0x97ff: index   0 => 127
+		if (tile_index <= 127) {
+			return m_pixel_fifo.tile_data_address + 0x800 + (tile_index * TILE_SIZE); // Each tile is 16 bytes
+		}
+		else {
+			return m_pixel_fifo.tile_data_address + ((tile_index - 128) * TILE_SIZE); // Each tile is 16 bytes
+		}
+	default:
+		VERIFY_NOT_REACHED();
+		return 0;
+	};
+};
+
+std::array<uint8_t, 3> PPU::getPixelColor(uint8_t color_index, Palette palette)
+{
+	VERIFY(color_index < 4, "trying to fetch invalid color index '{}'", color_index);
+
+	switch (Emu::the().mode()) {
+	case Emu::Mode::DMG: {
+		uint8_t palette_data = Emu::the().readMemory(palette) & 0xff;
+		uint8_t palette_value = palette_data >> (color_index * 2) & 0x3;
+		switch (palette_value) {
+		case 0:
+			return { 200, 199, 168 };
+		case 1:
+			return { 160, 160, 136 };
+		case 2:
+			return { 104, 104, 80 };
+		case 3:
+			return { 39, 40, 24 };
+		default:
+			VERIFY_NOT_REACHED();
+		};
+	}
+	case Emu::Mode::CGB:
+		VERIFY_NOT_REACHED();
+	default:
+		VERIFY_NOT_REACHED();
+	}
+
+	return {};
+}
+
+void PPU::updatePixelFifo()
+{
+	switch (m_pixel_fifo.state) {
+	case PixelFifo::State::TileIndex:
+		tileIndex();
+		break;
+	case PixelFifo::State::TileDataLow:
+		tileDataLow();
+		break;
+	case PixelFifo::State::TileDataHigh:
+		tileDataHigh();
+		break;
+	case PixelFifo::State::Sleep:
+		sleep();
+		break;
+	case PixelFifo::State::Push:
+		pushFifo();
+		break;
+	default:
+		VERIFY_NOT_REACHED();
+	};
+
+	pushPixel();
+}
+
+void PPU::tileIndex()
+{
+	if (!m_pixel_fifo.step) {
+		m_pixel_fifo.step = true;
+	}
+	else {
+		m_pixel_fifo.step = false;
+		m_pixel_fifo.state = PixelFifo::State::TileDataLow;
+
+		LCDC lcd_control = static_cast<LCDC>(Emu::the().readMemory(0xff40));
+
+		// Tile map
+		uint32_t bg_tile_map_address = (lcd_control & LCDC::BGTileMapArea) ? 0x9c00 : 0x9800;
+		// uint32_t window_tile_map_address = (lcd_control & LCDC::WindowTileMapArea) ? 0x9c00 : 0x9800;
+
+		// Tile data
+		m_pixel_fifo.tile_data_address = (lcd_control & LCDC::BGandWindowTileDataArea) ? 0x8000 : 0x8800;
+
+		// Viewport
+		// https://gbdev.io/pandocs/Scrolling.html#mid-frame-behavior
+		m_pixel_fifo.viewport_x = Emu::the().readMemory(0xff43); // TODO: only read lower 3-bits at beginning of scanline
+		m_pixel_fifo.viewport_y = Emu::the().readMemory(0xff42);
+
+		// Read the tile map index
+		uint16_t offset = (((m_pixel_fifo.viewport_y + m_lcd_y_coordinate) / TILE_HEIGHT) * 32)
+		                  + ((m_pixel_fifo.viewport_x + m_pixel_fifo.x_coordinate) / TILE_WIDTH);
+		m_pixel_fifo.x_coordinate += 8;
+		m_pixel_fifo.tile_index = Emu::the().readMemory(bg_tile_map_address + offset);
+
+		// Set the tile line we're currently on
+		m_pixel_fifo.tile_line = (m_pixel_fifo.viewport_y + m_lcd_y_coordinate) % TILE_HEIGHT;
+	}
+}
+
+void PPU::tileDataLow()
+{
+	if (!m_pixel_fifo.step) {
+		m_pixel_fifo.step = true;
+	}
+	else {
+		m_pixel_fifo.step = false;
+		m_pixel_fifo.state = PixelFifo::State::TileDataHigh;
+
+		// Read tile data
+		m_pixel_fifo.pixels_lsb = Emu::the().readMemory(
+			getBgTileDataAddress(m_pixel_fifo.tile_index)
+			+ m_pixel_fifo.tile_line * 2); // Each tile line is 2 bytes
+	}
+}
+
+void PPU::tileDataHigh()
+{
+	if (!m_pixel_fifo.step) {
+		m_pixel_fifo.step = true;
+	}
+	else {
+		m_pixel_fifo.step = false;
+		m_pixel_fifo.state = PixelFifo::State::Sleep;
+
+		// Read tile data
+		m_pixel_fifo.pixels_msb = Emu::the().readMemory(
+			getBgTileDataAddress(m_pixel_fifo.tile_index)
+			+ m_pixel_fifo.tile_line * 2 // Each tile line is 2 bytes
+			+ 1);
+	}
+}
+
+void PPU::sleep()
+{
+	if (m_pixel_fifo.background.size() <= TILE_WIDTH + 1) {
+		m_pixel_fifo.state = PixelFifo::State::Push;
+	}
+}
+
+void PPU::pushFifo()
+{
+	m_pixel_fifo.state = PixelFifo::State::TileIndex;
+
+	for (uint8_t i = 0; i < TILE_WIDTH; ++i) {
+		uint8_t color_index = (m_pixel_fifo.pixels_lsb >> (7 - i)
+		                       | ((m_pixel_fifo.pixels_msb >> (7 - i)) << 1))
+		                      & 0x3;
+		m_pixel_fifo.background.push({ color_index, Palette::BGP });
+	}
+}
+
+void PPU::pushPixel()
+{
+	// The pixel FIFO needs to contain more than 8 pixels to shift one out
+	if (m_pixel_fifo.background.size() > 8) {
+		auto pixel = m_pixel_fifo.background.front();
+		m_pixel_fifo.background.pop();
+
+		uint32_t index = (m_lcd_y_coordinate * SCREEN_WIDTH + m_lcd_x_coordinate) * FORMAT_SIZE;
+		auto color = getPixelColor(pixel.first, pixel.second);
+		m_screen[index + 0] = color[0];
+		m_screen[index + 1] = color[1];
+		m_screen[index + 2] = color[2];
+		m_lcd_x_coordinate++;
+	}
 }

src/ppu.h

@@ -7,12 +7,103 @@
 
 #pragma once
 
+#include <array>
+#include <cstdint> // uint8_t, uint16_t, uint32_t
+#include <queue>
+#include <utility> // std::pair
+
+#include "ruc/meta/core.h"
+
 #include "processing-unit.h"
 
+#define SCREEN_WIDTH 160
+#define SCREEN_HEIGHT 144
+#define FORMAT_SIZE 3
+#define TILE_WIDTH 8
+#define TILE_HEIGHT 8
+#define TILE_SIZE 16
+
 class PPU final : public ProcessingUnit {
 public:
-	PPU(unsigned int frequency);
-	virtual ~PPU();
+	PPU(uint32_t frequency);
+	~PPU();
 
-	virtual void update() override;
+	enum LCDC : uint8_t {
+		None = 0,
+		BGandWindowEnable = BIT(0),
+		OBJEnable = BIT(1),
+		OBJSize = BIT(2),                 // 0 = 8x8, 1 = 8x16
+		BGTileMapArea = BIT(3),           // 0 = 0x9800-9bff, 1 = 0x9c00-9fff
+		BGandWindowTileDataArea = BIT(4), // 0 = 0x8800-97ff, 1 = 0x8000-8fff
+		WindowEnable = BIT(5),            //
+		WindowTileMapArea = BIT(6),       // 0 = 0x9800-9bff, 1 = 0x9c00-9fff
+		LCDandPPUEnable = BIT(7),
+	};
+
+	enum State : uint8_t {
+		HBlank = 0,
+		VBlank = 1,
+		OAMSearch = 2,
+		PixelTransfer = 3,
+	};
+
+	enum Palette : uint16_t {
+		BGP = 0xff47,  // BG and Window palette
+		OBP0 = 0xff48, // OBJ palette 0
+		OBP1 = 0xff49, // OBJ palette 1
+	};
+
+	struct PixelFifo {
+		enum State : uint8_t {
+			TileIndex,
+			TileDataLow,
+			TileDataHigh,
+			Sleep,
+			Push,
+		};
+
+		State state { State::TileIndex };
+		bool step { false };
+		uint32_t tile_data_address { 0 };
+		uint8_t viewport_x { 0 };
+		uint8_t viewport_y { 0 };
+		uint8_t x_coordinate { 0 };
+		uint8_t tile_index { 0 };
+		uint8_t tile_line { 0 };
+		uint8_t pixels_lsb { 0 };
+		uint8_t pixels_msb { 0 };
+
+		using Fifo = std::queue<std::pair<uint8_t, Palette>>; // colorID, source
+
+		Fifo background;
+		Fifo oam;
+	};
+
+	void update() override;
+	void render();
+	void resetFrame();
+
+private:
+	uint32_t getBgTileDataAddress(uint8_t tile_index);
+	std::array<uint8_t, 3> getPixelColor(uint8_t color_index, Palette palette);
+
+	void updatePixelFifo();
+	void tileIndex();
+	void tileDataLow();
+	void tileDataHigh();
+	void sleep();
+	void pushFifo();
+	void pushPixel();
+
+	// -------------------------------------
+
+	State m_state { State::OAMSearch };
+	uint32_t m_clocks_into_frame { 0 };
+	uint32_t m_lcd_x_coordinate { 0 };
+	uint32_t m_lcd_y_coordinate { 0 }; // Note: includes V-Blank
+
+	PixelFifo m_pixel_fifo;
+
+	uint32_t m_entity { 0 };
+	std::array<uint8_t, SCREEN_WIDTH * SCREEN_HEIGHT * FORMAT_SIZE> m_screen;
 };

test/testcpu.cpp

@@ -4,7 +4,11 @@
  * SPDX-License-Identifier: MIT
  */
 
+#include <memory> // std::make_shared, std::shared_ptr
+#include <vector>
+
 #include "cpu.h"
+#include "emu.h"
 #include "macro.h"
 #include "testcase.h"
 #include "testsuite.h"
@@ -12,9 +16,39 @@
 struct CPUTest {
 	CPU cpu { 0 };
 
-	bool isCarry(uint32_t lhs, uint32_t rhs, uint32_t limit_bit) { return cpu.isCarry(lhs, rhs, limit_bit); }
+	bool isCarry(uint32_t limit_bit, uint32_t first, uint32_t second, uint32_t third = 0x0)
+	{
+		return cpu.isCarry(limit_bit, first, second, third);
+	}
+
+	bool isCarrySubtraction(uint32_t limit_bit, uint32_t lhs, uint32_t rhs, uint32_t rhs_extra = 0x0)
+	{
+		return cpu.isCarrySubtraction(limit_bit, lhs, rhs, rhs_extra);
+	}
 };
 
+std::shared_ptr<CPU> runCPUTest(std::vector<uint8_t> test)
+{
+	auto cpu = std::make_shared<CPU>(4000000);
+
+	Emu::the().destroy();
+	Emu::the().init(8000000);
+	Emu::the().addProcessingUnit("cpu", cpu);
+	Emu::the().addMemorySpace("FULL", 0x0000, 0xffff);
+
+	// Load the test
+	for (size_t i = 0; i < test.size(); ++i) {
+		Emu::the().writeMemory(i, test[i]);
+	}
+
+	// Run the test
+	while (cpu->pc() < test.size()) {
+		Emu::the().update();
+	}
+
+	return cpu;
+}
+
 // -----------------------------------------
 
 TEST_CASE(CPUIsCarry)
@@ -23,27 +57,126 @@ TEST_CASE(CPUIsCarry)
 
 	// 8-bit Half-carry false
 
-	EXPECT_EQ(test.isCarry(56, 17, 0x10), false);
+	EXPECT(test.isCarry(0xf, 56, 17) == false);
 
-	EXPECT_EQ(test.isCarry(16, -1, 0x10), false);
-	EXPECT_EQ(test.isCarry(32, -1, 0x10), false);
-	EXPECT_EQ(test.isCarry(144, -1, 0x10), false);
-	EXPECT_EQ(test.isCarry(211, -20, 0x10), false);
+	EXPECT(test.isCarrySubtraction(0xf, 136, 1) == false);
+	EXPECT(test.isCarrySubtraction(0xf, 219, 20) == false);
+	EXPECT(test.isCarrySubtraction(0xf, 250, 20) == false);
 
 	// 8-bit Half-carry true
 
-	EXPECT_EQ(test.isCarry(46, 34, 0x10), true);
-	EXPECT_EQ(test.isCarry(62, 34, 0x10), true);
+	EXPECT(test.isCarry(0xf, 46, 34) == true);
+	EXPECT(test.isCarry(0xf, 62, 34) == true);
 
-	EXPECT_EQ(test.isCarry(136, -1, 0x10), true);
-	EXPECT_EQ(test.isCarry(219, -20, 0x10), true);
-	EXPECT_EQ(test.isCarry(250, -20, 0x10), true);
+	EXPECT(test.isCarrySubtraction(0xf, 16, 1) == true);
+	EXPECT(test.isCarrySubtraction(0xf, 32, 1) == true);
+	EXPECT(test.isCarrySubtraction(0xf, 144, 1) == true);
+	EXPECT(test.isCarrySubtraction(0xf, 211, 20) == true);
 
 	// 8-bit Full carry false
 
-	EXPECT_EQ(test.isCarry(254, 1, 0x100), false);
+	EXPECT(test.isCarry(0xff, 254, 1) == false);
 
 	// 8-bit Full carry true
 
-	EXPECT_EQ(test.isCarry(254, 2, 0x100), true);
+	EXPECT(test.isCarry(0xff, 254, 2) == true);
+}
+
+TEST_CASE(CPUAddPlusCarry)
+{
+	std::shared_ptr<CPU> cpu(0);
+
+	// ADC A,E
+
+	std::vector<uint8_t> adc_r8 = {
+		// clang-format off
+		0x3e, 0xe1,       // LD A,i8
+		0x1e, 0x0f,       // LD E,i8
+		0x37,             // SCF
+		0x8b,             // ADC A,E
+		// clang-format on
+	};
+	cpu = runCPUTest(adc_r8);
+	EXPECT_EQ(cpu->a(), 0xf1);
+	EXPECT_EQ(cpu->zf(), 0x0);
+	EXPECT_EQ(cpu->nf(), 0x0);
+	EXPECT_EQ(cpu->hf(), 0x1);
+	EXPECT_EQ(cpu->cf(), 0x0);
+
+	// ADC A,i8
+
+	std::vector<uint8_t> adc_i8 = {
+		// clang-format off
+		0x3e, 0xe1,       // LD A,i8
+		0x37,             // SCF
+		0xce, 0x3b,       // ADC A,i8
+		// clang-format on
+	};
+	cpu = runCPUTest(adc_i8);
+	EXPECT_EQ(cpu->a(), 0x1d);
+	EXPECT_EQ(cpu->zf(), 0x0);
+	EXPECT_EQ(cpu->nf(), 0x0);
+	EXPECT_EQ(cpu->hf(), 0x0);
+	EXPECT_EQ(cpu->cf(), 0x1);
+
+	// ADC A,(HL)
+
+	std::vector<uint8_t> adc_hl = {
+		// clang-format off
+		0x3e, 0xe1,       // LD A,i8
+		0x36, 0x1e,       // LD (HL),i8
+		0x37,             // SCF
+		0x8e,             // ADC A,(HL)
+		// clang-format on
+	};
+	cpu = runCPUTest(adc_hl);
+	EXPECT_EQ(cpu->a(), 0x0);
+	EXPECT_EQ(cpu->zf(), 0x1);
+	EXPECT_EQ(cpu->nf(), 0x0);
+	EXPECT_EQ(cpu->hf(), 0x1);
+	EXPECT_EQ(cpu->cf(), 0x1);
+}
+
+TEST_CASE(CPUSetStackPointer)
+{
+	std::vector<uint8_t> test = { 0x31, 0xfe, 0xff }; // LD SP,i16
+	auto cpu = runCPUTest(test);
+	EXPECT_EQ(cpu->sp(), 0xfffe);
+}
+
+TEST_CASE(CPUPushToStack)
+{
+	// PUSH BC
+
+	std::vector<uint8_t> push_bc = {
+		// clang-format off
+		0x31, 0xfe, 0xff, // LD SP,i16
+		0x01, 0xfc, 0xff, // LD BC,i16
+		0xc5,             // PUSH BC
+		// clang-format on
+	};
+	auto cpu = runCPUTest(push_bc);
+	EXPECT_EQ(cpu->bc(), 0xfffc);
+	EXPECT_EQ(cpu->sp(), 0xfffc);
+	EXPECT_EQ(Emu::the().readMemory(0xfffd), 0xff);
+	EXPECT_EQ(Emu::the().readMemory(0xfffc), 0xfc);
+}
+
+TEST_CASE(CPUPopFromStack)
+{
+	// POP BC
+
+	std::vector<uint8_t> pop_bc = {
+		// clang-format off
+		0x31, 0xfe, 0xff, // LD SP,i16
+		0x11, 0x5f, 0x3c, // LD DE,i16
+		0xd5,             // PUSH DE
+		0xc1,             // POP BC
+		// clang-format on
+	};
+	auto cpu = runCPUTest(pop_bc);
+	EXPECT_EQ(cpu->bc(), 0x3c5f);
+	EXPECT_EQ(cpu->sp(), 0xfffe);
+	EXPECT_EQ(Emu::the().readMemory(0xfffd), 0x3c);
+	EXPECT_EQ(Emu::the().readMemory(0xfffc), 0x5f);
 }