From b3d7f8a20d6c9170dba67d15460da871e6ea63e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Magalh=C3=A3es?= <joamag@gmail.com>
Date: Thu, 5 Sep 2024 01:10:54 +0100
Subject: [PATCH] chore: new asserts on pedantic
---
src/ppu.rs | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/src/ppu.rs b/src/ppu.rs
index 95353008..aea4b898 100644
--- a/src/ppu.rs
+++ b/src/ppu.rs
@@ -11,6 +11,7 @@ use std::{
};
use crate::{
+ assert_pedantic_gb,
color::{
rgb555_to_rgb888, rgb888_to_rgb1555_array, rgb888_to_rgb1555_u16, rgb888_to_rgb565,
rgb888_to_rgb565_u16, Pixel, PixelAlpha, RGB1555_SIZE, RGB565_SIZE, RGB888_SIZE, RGB_SIZE,
@@ -718,6 +719,17 @@ impl Ppu {
return;
}
+ // runs a series of pre-emptive PPU state validations to ensure
+ // that no core invariants are being violated, this is a pedantic
+ // only check, proper features must be set
+ assert_pedantic_gb!(cycles < 80, "Invalid number of cycles in PPU: {}", cycles);
+ assert_pedantic_gb!(
+ self.mode_clock < 600,
+ "Invalid mode clock: {}",
+ self.mode_clock
+ );
+ assert_pedantic_gb!(self.ly < 154, "Invalid LY value: {}", self.ly);
+
// increments the current mode clock by the provided amount
// of CPU cycles (probably coming from a previous CPU clock)
self.mode_clock += cycles;
@@ -824,8 +836,9 @@ impl Ppu {
}
SCY_ADDR => self.scy,
SCX_ADDR => self.scx,
+ // 0xFF44 — LY: LCD Y coordinate
LY_ADDR => self.ly,
- // 0xFF45 — LYC
+ // 0xFF45 — LYC: LY compare
LYC_ADDR => self.lyc,
// 0xFF47 — BGP (Non-CGB Mode only)
BGP_ADDR => self.palettes[0],
--
GitLab