--- nono/vm/pluto.h 2026/04/29 17:04:36 1.1.1.3 +++ nono/vm/pluto.h 2026/04/29 17:05:24 1.1.1.10 @@ -4,25 +4,32 @@ // Licensed under nono-license.txt // +// +// Pluto-X (独自の仮想ボード) +// + #pragma once #include "device.h" #include -class PlutoDevice - : public IODevice +class PlutoDevice : public IODevice { using inherited = IODevice; + static const uint baseaddr = 0xeac000; + public: PlutoDevice(); ~PlutoDevice() 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 Peek8(uint32 addr) override; + void ResetHard(bool poweron) override; + + busdata Read8(uint32 addr) override; + busdata Read16(uint32 addr) override; + busdata Read32(uint32 addr) override; + busdata Write8(uint32 addr, uint32 data) override; + busdata Write16(uint32 addr, uint32 data) override; + busdata Peek8(uint32 addr) override; private: // ROM @@ -35,12 +42,12 @@ class PlutoDevice void write_8_benchmark(uint32 addr, uint32 data); void benchmark_start(uint32 data); void benchmark_end(); - int m_count = 0; - int m_test_num = 0; - const char *m_test_name = NULL; - int m_inst_len = 0; - int m_inst_cycle = 0; - int m_start_addr = 0; + int m_count {}; + int m_test_num {}; + const char *m_test_name {}; + int m_inst_len {}; + int m_inst_cycle {}; + int m_start_addr {}; timeval m_start {}; timeval m_total {}; };