--- nono/vm/human68k.cpp	2026/04/29 17:04:28	1.1.1.1
+++ nono/vm/human68k.cpp	2026/04/29 17:04:50	1.1.1.6
@@ -1,19 +1,22 @@
 //
 // nono
-// Copyright (C) 2017 Y.Sugahara (moveccr)
+// Copyright (C) 2020 nono project
+// Licensed under nono-license.txt
+//
+
 //
 // human68k .r .x .z console emulator
 //
 
 #include "human68k.h"
-#include "mpu.h"
-#include "m68030bus.h"
-#include "m68030core.h"
+#include "autofd.h"
 #include "bus.h"
 #include "iodevstream.h"
-#include "scheduler.h"
+#include "mainapp.h"
+#include "m68030bus.h"
+#include "m68030core.h"
+#include "mpu680x0.h"
 #include "vm.h"
-#include <err.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
@@ -33,21 +36,21 @@
 static bool human68k_fline_callback(m68kcpu *cpu, void *arg);
 
 // コンストラクタ
-Human68k::Human68k(const char *file, const char *arg)
+Human68k::Human68k()
 {
 	logname = "human68k";
 	devname = "Human68k";
 
-	assert(file);
-	human68k_file = file;
-	human68k_arg = arg;
+	assert(gMainApp.human68k_file);
+	human68k_file = gMainApp.human68k_file;
+	human68k_arg = gMainApp.human68k_arg;
 
 	Files[0].fd = 0;
-	Files[0].filename = strdup("|stdin");
+	Files[0].filename = "|stdin";
 	Files[1].fd = 1;
-	Files[1].filename = strdup("|stdout");
+	Files[1].filename = "|stdout";
 	Files[2].fd = 2;
-	Files[2].filename = strdup("|stderr");
+	Files[2].filename = "|stderr";
 }
 
 // デストラクタ
@@ -63,30 +66,30 @@ Human68k::Init()
 	uint8 *file;
 
 	// ショートカット用
-	ram = gRAM;
+	ram = gRAM.get();
 	// Fライン命令をこちらで処理する
-	gMPU->SetFLineCallback(human68k_fline_callback, this);
+	gMPU680x0->SetFLineCallback(human68k_fline_callback, this);
 
 	// ワークを用意 (どこでやるか)
 	// $CBC.B MPU 種別 (3:68030)
 	gRAM->Write8(0x0cbc, 3);
 	// $CBD.B FPU 有無 (0xff:あり)
-	if (gMPU->HaveFPU()) {
+	if (gMPU680x0->HaveFPU()) {
 		gRAM->Write8(0x0cbd, 0xff);
 	}
 
 	putmsg(1, "arg=%s", human68k_arg);
 
 	// 実行ファイルオープン
-	int file_fd = open(human68k_file, O_RDONLY);
+	autofd file_fd = open(human68k_file, O_RDONLY);
 	if (file_fd == -1) {
-		warn("open %s", human68k_file);
+		warn("Human68k executable \"%s\" open failed", human68k_file);
 		return false;
 	}
 
 	struct stat st;
 	if (fstat(file_fd, &st) != 0) {
-		warn("fstat %s", human68k_file);
+		warn("Human68k executable \"%s\" fstat failed", human68k_file);
 		return false;
 	}
 	uint32 file_size;
@@ -96,7 +99,7 @@ Human68k::Init()
 	// mmap
 	file = (uint8 *)mmap(NULL, file_size, PROT_READ, MAP_PRIVATE, file_fd, 0);
 	if (file == MAP_FAILED) {
-		warn("mmap");
+		warn("Human68k executable \"%s\" mmap failed", human68k_file);
 		return false;
 	}
 
@@ -113,19 +116,22 @@ Human68k::Init()
 		} else if (file[0] == 0x60 && file[1] == 0x1a) {
 			r = LoadZ(file, file_size);
 		} else {
-			warnx("Invalid file extension");
+			warnx("Human68k executable \"%s\" cannot identify file type",
+				human68k_file);
+			munmap(file, file_size);
 			return false;
 		}
 	}
 	if (!r) {
-		warnx("Invalid file format");
+		warnx("Human68k executable \"%s\" invalid file format", human68k_file);
+		munmap(file, file_size);
 		return false;
 	}
 
 	munmap(file, file_size);
-	close(file_fd);
 
 	uint32 last_addr = load_addr + load_size + bss_size;
+	int ram_size = gRAM->GetSize();
 
 	IODeviceStream ds(ram);
 	boot_addr = 0x200;
@@ -298,7 +304,7 @@ Human68k::LoadZ(uint8 *file, uint size)
 bool
 Human68k::LoadMem(uint32 addr, uint8 *src, uint size)
 {
-	if (addr + size > ram_size) {
+	if (addr + size >= gRAM->GetSize()) {
 		errx(EXIT_FAILURE, "file too large");
 	}
 
@@ -335,7 +341,7 @@ Human68k::OpenFile(uint32 fileaddr, uint
 {
 	// XXX: unix host only
 
-	int32 fileno;
+	int32 fileno {};
 	Human68k::File *f = NULL;
 
 	// 開いているエントリを検索して Human fileno を取得
@@ -375,7 +381,7 @@ Human68k::OpenFile(uint32 fileaddr, uint
 	}
 
 	f->fd = fd;
-	f->filename = strdup(filename);
+	f->filename = filename;
 
 	return fileno;
 }
@@ -391,13 +397,13 @@ Human68k::CloseFile(int32 fileno)
 		return -1;
 	}
 	f = &Files[fileno];
-	putmsg(1, "CloseFile: %d %s", fileno, f->filename);
+	putmsg(1, "CloseFile: %d %s", fileno, f->filename.c_str());
 	if (f->fd > 2) {
 		// stdin/out/err は閉じない
 		close(f->fd);
 	}
 	f->fd = -1;
-	free(f->filename);
+	f->filename.clear();
 	return 0;
 }
 
@@ -420,14 +426,12 @@ Human68k::WriteFile(int32 fileno, uint32
 	}
 
 	IODeviceStream ds(ram, dataaddr);
-	uint8 *buf = new uint8[size];
+	std::unique_ptr<uint8[]> buf(new uint8[size]);
 	for (int i = 0; i < size; i++) {
 		buf[i] = ds.Read8();
 	}
 
-	int32 rv = write(f->fd, buf, size);
-
-	delete[] buf;
+	int32 rv = write(f->fd, buf.get(), size);
 	return rv;
 }
 
@@ -449,7 +453,7 @@ Human68k::FputsFile(int32 fileno, uint32
 
 	IODeviceStream ds(ram, dataaddr);
 	int size = 1024;
-	uint8 buf[size];
+	std::vector<uint8> buf(size);
 	bool eof = false;
 
 	do {
@@ -463,7 +467,7 @@ Human68k::FputsFile(int32 fileno, uint32
 			len++;
 		}
 		if (len > 0) {
-			write(f->fd, buf, len);
+			write(f->fd, &buf[0], len);
 		}
 	} while (!eof);
 }
@@ -478,7 +482,7 @@ Human68k::IOCS(m68kcpu *cpu)
 	 case 0x7f:	// _ONTIME
 	 {
 		putmsg(1, "IOCS ONTIME");
-		uint64 t = gScheduler->GetVirtTime();
+		uint64 t = gMPU->GetVirtTime();
 		// nanosec to 10msec, in day
 		RegD(0) = (t / 10_msec) % 8640000;
 		// nanosec to day
@@ -498,7 +502,7 @@ Human68k::IOCS(m68kcpu *cpu)
 			// MPU 状態の取得
 			RegD(0) =
 			    ((250) << 16)	// 25.0MHz
-			  | ((gMPU->HaveFPU() ? 1 : 0) << 15)	// FPU
+			  | ((gMPU680x0->HaveFPU() ? 1 : 0) << 15)	// FPU
 			  | ((0) << 14)		// MMU
 			  | ((3) << 0);		// MPU Type
 			break;
@@ -604,7 +608,7 @@ Human68k::FLineOp(m68kcpu *cpu)
 			vecaddr += 0xd000;
 			RegD(0) = m68030_read_32(cpu, vecaddr);
 			m68030_write_32(cpu, vecaddr, addr);
-		} 
+		}
 		break;
 	 }