--- nono/vm/xiospace.h	2026/04/29 17:04:28	1.1
+++ nono/vm/xiospace.h	2026/04/29 17:04:50	1.1.1.6
@@ -1,32 +1,36 @@
 //
 // nono
-// Copyright (C) 2018 isaki@NetBSD.org
+// Copyright (C) 2020 nono project
+// Licensed under nono-license.txt
 //
 
 #pragma once
 
 #include "device.h"
+#include <array>
 
 class XIOSpaceDevice
 	: public IODevice
 {
-	typedef IODevice inherited;
+	using inherited = IODevice;
  public:
 	XIOSpaceDevice();
-	virtual ~XIOSpaceDevice();
+	virtual ~XIOSpaceDevice() override;
 
-	virtual uint64 Read8(uint32 addr);
-	virtual uint64 Read16(uint32 addr);
-	virtual uint64 Read32(uint32 addr);
-	virtual uint64 Write8(uint32 addr, uint32 data);
-	virtual uint64 Write16(uint32 addr, uint32 data);
-	virtual uint64 Write32(uint32 addr, uint32 data);
-	virtual uint64 Peek8(uint32 addr);
+	bool Init() override;
+
+	uint64 Read8(uint32 addr) override;
+	uint64 Read16(uint32 addr) override;
+	uint64 Read32(uint32 addr) override;
+	uint64 Write8(uint32 addr, uint32 data) override;
+	uint64 Write16(uint32 addr, uint32 data) override;
+	uint64 Write32(uint32 addr, uint32 data) override;
+	uint64 Peek8(uint32 addr) override;
 
  private:
 	// アドレス addr に対応する IODevice* を返す。
 	// addr は 24bit マスクされていること。
-	inline IODevice *SearchDevice(uint32 addr)
+	inline IODevice *SearchDevice(uint32 addr) const
 	{
 		uint idx = addr / 8192;
 		__assume(idx < 2048);
@@ -35,5 +39,7 @@ class XIOSpaceDevice
 
 	void AddDevice(IODevice *dev);
 
-	IODevice *table[2048] {};
+	std::array<IODevice*, 2048> table {};
 };
+
+extern std::unique_ptr<XIOSpaceDevice> gXIOSpace;