--- nono/vm/human68k.h 2026/04/29 17:05:18 1.1.1.9 +++ nono/vm/human68k.h 2026/04/29 17:05:29 1.1.1.11 @@ -11,12 +11,12 @@ #pragma once #include "device.h" -#include "mainram.h" +class MainbusDevice; +class MainRAMDevice; class MPU680x0Device; -// Human68k 構造 -class Human68k : public Device +class Human68kDevice : public Device { using inherited = Device; @@ -61,8 +61,8 @@ class Human68k : public Device std::string filename {}; }; - Human68k(); - virtual ~Human68k() override; + Human68kDevice(); + ~Human68kDevice() override; bool Init() override; @@ -77,15 +77,16 @@ class Human68k : public Device int32 CloseFile(int32 fileno); int32 WriteFile(int32 fileno, uint32 dataaddr, uint32 size); void FputsFile(int32 fileno, uint32 dataaddr); + int GetFileMode(int32 fileno); void IOCS(); void DOS_PRINT(uint32 dataptr); - bool LoadR(uint8 *memfile, uint size); - bool LoadX(uint8 *memfile, uint size); - bool LoadZ(uint8 *memfile, uint size); - bool LoadELF(uint8 *memfile, uint size); - bool LoadMem(uint32 addr, uint8 *src, uint size); + bool LoadR(const uint8 *memfile, uint size); + bool LoadX(const uint8 *memfile, uint size); + bool LoadZ(const uint8 *memfile, uint size); + bool LoadELF(const uint8 *memfile, uint size); + bool LoadMem(uint32 addr, const uint8 *src, uint size); bool isext(const char *file, const char *ext); @@ -106,6 +107,7 @@ class Human68k : public Device File Files[FilesCount] {}; - MainRAMDevice *ram {}; - MPU680x0Device *mpu {}; + MainbusDevice *mainbus {}; + MainRAMDevice *mainram {}; + MPU680x0Device *mpu680x0 {}; };