--- nono/vm/pluto.h 2026/04/29 17:05:17 1.1.1.9 +++ nono/vm/pluto.h 2026/04/29 17:05:28 1.1.1.11 @@ -11,43 +11,24 @@ #pragma once #include "device.h" -#include class PlutoDevice : public IODevice { using inherited = IODevice; - static const uint baseaddr = 0xeac000; + static const uint32 baseaddr = 0xeac000; public: PlutoDevice(); - virtual ~PlutoDevice() override; + ~PlutoDevice() override; - void ResetHard(bool poweron) 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; + busdata Read(busaddr addr) override; + busdata Write(busaddr addr, uint32 data) override; + busdata Peek1(uint32 addr) override; private: - // ROM - static const uint16 rom[]; - // ホストファイル起動 uint32 ROM_Load(); - // ベンチマーク - void write_8_benchmark(uint32 addr, uint32 data); - void benchmark_start(uint32 data); - void benchmark_end(); - 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 {}; + // ROM + static const uint16 rom[]; };