--- nono/vm/tvram.h	2026/04/29 17:04:28	1.1
+++ nono/vm/tvram.h	2026/04/29 17:04:36	1.1.1.3
@@ -1,6 +1,7 @@
 //
 // nono
-// Copyright (C) 2017 isaki@NetBSD.org
+// Copyright (C) 2020 nono project
+// Licensed under nono-license.txt
 //
 
 #pragma once
@@ -11,38 +12,45 @@
 class TVRAMDevice
 	: public IODevice
 {
-	typedef IODevice inherited;
+	using inherited = IODevice;
  private:
 	static const int baseaddr = 0xe00000;
 
 	struct tvram {
 		bool sa;				// 同時アクセス
 		bool ap[4];				// 同時アクセスプレーン
+		int xscroll;			// X スクロール
+		int yscroll;			// Y スクロール
 	};
 
  public:
 	TVRAMDevice();
-	virtual ~TVRAMDevice();
+	~TVRAMDevice() override;
 
-	virtual void ResetHard();
+	void ResetHard() override;
 
-	virtual uint64 Read8(uint32 addr);
-	virtual uint64 Read16(uint32 addr);
-	virtual uint64 Write8(uint32 addr, uint32 data);
-	virtual uint64 Write16(uint32 addr, uint32 data);
-	virtual uint64 Peek8(uint32 addr);
+	uint64 Read8(uint32 addr) override;
+	uint64 Read16(uint32 addr) override;
+	uint64 Write8(uint32 addr, uint32 data) override;
+	uint64 Write16(uint32 addr, uint32 data) override;
+	uint64 Peek8(uint32 addr) override;
 
 	void set_crtc_21(uint16 data);
+	void SetScrollX(int x);
+	void SetScrollY(int y);
 
 	bool Render(uint8 *);
 
  private:
+	// アドレスデコーダ
+	uint64 Decoder(uint32 addr) const;
+
 	void Invalidate();
 
-	uint8 *mem = NULL;
+	std::unique_ptr<uint8[]> mem {};
 	// XXX 実際には縦がこれ以上になる可能性はある
 	std::atomic<uint8> atomic_dirty[1024] {};
 	struct tvram tvram {};
 };
 
-extern TVRAMDevice *gTVRAM;
+extern std::unique_ptr<TVRAMDevice> gTVRAM;