--- nono/vm/human68k.h 2026/04/29 17:05:10 1.1.1.8 +++ nono/vm/human68k.h 2026/04/29 17:05:29 1.1.1.11 @@ -11,11 +11,12 @@ #pragma once #include "device.h" -#include "ram.h" -#include "m68030.h" -// Human68k 構造 -class Human68k : public Device +class MainbusDevice; +class MainRAMDevice; +class MPU680x0Device; + +class Human68kDevice : public Device { using inherited = Device; @@ -60,33 +61,35 @@ class Human68k : public Device std::string filename {}; }; - Human68k(); - virtual ~Human68k() override; + Human68kDevice(); + ~Human68kDevice() override; bool Init() override; - bool FLineOp(m68kcpu *cpu); + bool FLineOp(); + + // MSXDOSDevice からも呼ぶ + static void RequestExit(int code); private: // Human Emulation API - void RequestExit(int code); int32 OpenFile(uint32 fileaddr, uint16 atr, int mode); int32 CloseFile(int32 fileno); int32 WriteFile(int32 fileno, uint32 dataaddr, uint32 size); void FputsFile(int32 fileno, uint32 dataaddr); + int GetFileMode(int32 fileno); - void IOCS(m68kcpu *cpu); + 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); - RAMDevice *ram {}; - const char *human68k_file {}; std::string human68k_arg {}; @@ -103,6 +106,8 @@ class Human68k : public Device uint32 bss_size {}; // BSS セクションサイズ(記録用) File Files[FilesCount] {}; -}; -extern Human68k *gHuman68k; + MainbusDevice *mainbus {}; + MainRAMDevice *mainram {}; + MPU680x0Device *mpu680x0 {}; +};