--- nono/vm/romemu_luna.cpp 2026/04/29 17:05:38 1.1.1.17 +++ nono/vm/romemu_luna.cpp 2026/04/29 17:05:43 1.1.1.18 @@ -43,6 +43,7 @@ #include "pio.h" #include "prom.h" #include "scsidev.h" +#include "scsidomain.h" #include "sio.h" #include "spc.h" #include "ufs.h" @@ -650,7 +651,7 @@ LunaPROMEmuDevice::LoadHostFile() assert(gMainApp.exec_file); LoadInfo info(gMainApp.exec_file); - if (mainram->LoadExec(&info)) { + if (BootLoader::LoadExec(mainram, &info)) { return info.entry; } else { errmsg = "Couldn't load specified host program."; @@ -670,7 +671,7 @@ LunaPROMEmuDevice::LoadGuestFile(const b // ユニット (今は SCSI ID=6 決め打ち) uint id = 6; - SCSITarget *target = spc->GetSCSI()->GetTarget(id); + SCSITarget *target = spc->GetDomain()->GetTarget(id); if (target == NULL) { errmsg = "No bootable disks"; putmsg(0, "%s", errmsg.c_str()); @@ -744,7 +745,7 @@ LunaPROMEmuDevice::LoadGuestFile(const b std::string name = string_format("SCSIHD %u,%c:%s", id, dkpart + 'a', dkfile.c_str()); LoadInfo info(name.c_str(), f.data.data(), f.data.size()); - if (mainram->LoadExec(&info) == false) { + if (BootLoader::LoadExec(mainram, &info) == false) { errmsg = string_format("dk%u,%c,%s load failed", dkunit, dkpart + 'a', dkfile.c_str()); putmsg(0, "%s: %s", __func__, errmsg.c_str()); @@ -824,7 +825,7 @@ LunaPROMEmuDevice::ROM_AP1() strlcpy(buf, (const char *)&Builtin::IPLROM30[0x11280], sizeof(buf)); n = 0x1e; - n += snprintf(buf + n, sizeof(buf) - n, "%d", mainram->GetSizeMB()); + n += snprintf(buf + n, sizeof(buf) - n, "%u", mainram->GetSizeMB()); strlcpy(buf + n, (const char *)&Builtin::IPLROM30[0x1129f], sizeof(buf) - n); Print(std::string(buf));