--- nono/vm/ram.h 2026/04/29 17:04:53 1.1.1.7 +++ nono/vm/ram.h 2026/04/29 17:05:09 1.1.1.9 @@ -4,12 +4,15 @@ // Licensed under nono-license.txt // +// +// メインメモリ +// + #pragma once #include "device.h" -class RAMDevice - : public IODevice +class RAMDevice : public IODevice { using inherited = IODevice; public: @@ -17,8 +20,7 @@ class RAMDevice virtual ~RAMDevice() override; bool Init() override; - bool PowerOn() override; - void ResetHard() override; + void ResetHard(bool poweron) override; uint64 Read8(uint32 addr) override; uint64 Read16(uint32 addr) override; @@ -40,10 +42,13 @@ class RAMDevice uint32 LoadFile(const char *filepath); // file, filesize で示されるバッファをロードする uint32 LoadFile(const char *name, const uint8 *file, size_t filesize); + private: uint32 LoadGzFile(const char *filepath, const uint8 *file, size_t filesize); uint32 Load_aout(const char *name, const uint8 *file, size_t filesize); uint32 Load_elf32(const char *name, const uint8 *file, size_t filesize); + bool Load_elf32_exec(const char *name, const uint8 *file, size_t filesize); + uint32 Load_elf32_rel(const char *name, const uint8 *file, size_t filesize); // RAM 容量(バイト単位)。ram[] の確保したバイト数 int ram_size {}; @@ -53,4 +58,4 @@ class RAMDevice }; extern std::unique_ptr mainram; -extern std::unique_ptr gRAM; +extern RAMDevice *gRAM;