From 1d9c3fb827d5f8d17111e2f7b0c59ecfe9053ecc Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Fri, 13 Dec 2024 13:56:12 -0500
Subject: [PATCH] Hack in some text output.

---
 Machines/Commodore/Plus4/Pager.hpp |  2 +-
 Machines/Commodore/Plus4/Plus4.cpp | 62 +-----------------------------
 Machines/Commodore/Plus4/Video.hpp | 17 ++++++--
 3 files changed, 16 insertions(+), 65 deletions(-)

diff --git a/Machines/Commodore/Plus4/Pager.hpp b/Machines/Commodore/Plus4/Pager.hpp
index c033f1b58..1bb17789b 100644
--- a/Machines/Commodore/Plus4/Pager.hpp
+++ b/Machines/Commodore/Plus4/Pager.hpp
@@ -17,7 +17,7 @@ enum PagerSide {
 template <typename AddressT, typename DataT, int NumPages>
 class Pager {
 public:
-	DataT read(AddressT address) {
+	DataT read(AddressT address) const {
 		return read_[address >> Shift][address];
 	}
 	DataT &write(AddressT address) {
diff --git a/Machines/Commodore/Plus4/Plus4.cpp b/Machines/Commodore/Plus4/Plus4.cpp
index f23d1a968..99895e18e 100644
--- a/Machines/Commodore/Plus4/Plus4.cpp
+++ b/Machines/Commodore/Plus4/Plus4.cpp
@@ -227,6 +227,7 @@ public:
 					case 0xff0c:	video_.write<0xff0c>(*value);	break;
 					case 0xff0d:	video_.write<0xff0d>(*value);	break;
 					case 0xff12:	video_.write<0xff12>(*value);	break;
+					case 0xff13:	video_.write<0xff13>(*value);	break;
 					case 0xff14:	video_.write<0xff14>(*value);	break;
 					case 0xff1a:	video_.write<0xff1a>(*value);	break;
 					case 0xff1b:	video_.write<0xff1b>(*value);	break;
@@ -274,68 +275,7 @@ private:
 	}
 
 	void run_for(const Cycles cycles) final {
-		static bool log = false;
 		m6502_.run_for(cycles);
-
-		if(!log) return;
-		for(size_t y = 0; y < 25; y++) {
-			for(size_t x = 0; x < 40; x++) {
-				const auto c = ram_[0xc00 + x + (y * 40)];
-				printf("%c", [&] {
-					switch(c) {
-						case 0x00:	return '@';
-						case 0x01:	return 'A';
-						case 0x02:	return 'B';
-						case 0x03:	return 'C';
-						case 0x04:	return 'D';
-						case 0x05:	return 'E';
-						case 0x06:	return 'F';
-						case 0x07:	return 'G';
-						case 0x08:	return 'H';
-						case 0x09:	return 'I';
-						case 0x0a:	return 'J';
-						case 0x0b:	return 'K';
-						case 0x0c:	return 'L';
-						case 0x0d:	return 'M';
-						case 0x0e:	return 'N';
-						case 0x0f:	return 'O';
-						case 0x10:	return 'P';
-						case 0x11:	return 'Q';
-						case 0x12:	return 'R';
-						case 0x13:	return 'S';
-						case 0x14:	return 'T';
-						case 0x15:	return 'U';
-						case 0x16:	return 'V';
-						case 0x17:	return 'W';
-						case 0x18:	return 'X';
-						case 0x19:	return 'Y';
-						case 0x1a:	return 'Z';
-						case 0x1b:	return '[';
-						case 0x1c:	return '\\';
-						case 0x1d:	return ']';
-						case 0x1e:	return '?';
-						case 0x1f:	return '?';
-						case 0x20:	return ' ';
-
-						case 0x2e:	return '.';
-						case 0x30:	return '0';
-						case 0x31:	return '1';
-						case 0x32:	return '2';
-						case 0x33:	return '3';
-						case 0x34:	return '4';
-						case 0x35:	return '5';
-						case 0x36:	return '6';
-						case 0x37:	return '7';
-						case 0x38:	return '8';
-						case 0x39:	return '9';
-
-						default: return '?';
-					}
-				}());
-			}
-			printf("\n");
-		}
-		printf("\n");
 	}
 
 	bool insert_media(const Analyser::Static::Media &) final {
diff --git a/Machines/Commodore/Plus4/Video.hpp b/Machines/Commodore/Plus4/Video.hpp
index c09c2262a..d9c22418b 100644
--- a/Machines/Commodore/Plus4/Video.hpp
+++ b/Machines/Commodore/Plus4/Video.hpp
@@ -75,6 +75,9 @@ public:
 			break;
 
 			case 0xff12:
+//				bitmap_base_ = uint16_t((value & 0x3c) << 10);
+			break;
+			case 0xff13:
 				character_generator_address_ = uint16_t((value & 0xfc) << 8);
 			break;
 			case 0xff14:
@@ -233,15 +236,23 @@ public:
 					pixels_ = reinterpret_cast<uint16_t *>(crt_.begin_data(384, 2));
 				}
 			}
-			time_in_state_ += period;
 
-			// Output pixels. TODO: properly.
+			// Output pixels.
+			// TODO: properly. THIS HACKS IN TEXT OUTPUT. IT IS NOT CORRECT. NOT AS TO TIMING, NOT AS TO CONTENT.
 			if(pixels_) {
 				for(int c = 0; c < period; c++) {
-					pixels_[c] = ((c + horizontal_counter_)  & 1) ? 0x0000 : 0xffff;
+					const auto pixel = time_in_state_ + c;
+					const auto row = vertical_counter_ - 4;
+
+					const auto index = (row >> 3) * 40 + (pixel >> 3);
+					const uint8_t character = pager_.read(uint16_t(index + screen_memory_address_ + 0x400));
+					const uint8_t glyph = pager_.read(character_generator_address_ + character * 8 + (row & 7));
+
+					pixels_[c] = glyph & (0x80 >> (pixel & 7)) ? 0xff00 : 0xffff;
 				}
 				pixels_ += period;
 			}
+			time_in_state_ += period;
 
 			//
 			// Advance for current period.