--- nono/vm/human68k.cpp	2026/04/29 17:04:44	1.1.1.5
+++ nono/vm/human68k.cpp	2026/04/29 17:04:55	1.1.1.7
@@ -9,12 +9,14 @@
 //
 
 #include "human68k.h"
+#include "autofd.h"
 #include "bus.h"
 #include "iodevstream.h"
 #include "mainapp.h"
 #include "m68030bus.h"
 #include "m68030core.h"
 #include "mpu680x0.h"
+#include "scheduler.h"
 #include "vm.h"
 #include <fcntl.h>
 #include <sys/stat.h>
@@ -36,10 +38,8 @@ static bool human68k_fline_callback(m68k
 
 // コンストラクタ
 Human68k::Human68k()
+	: inherited("Human68k")
 {
-	logname = "human68k";
-	devname = "Human68k";
-
 	assert(gMainApp.human68k_file);
 	human68k_file = gMainApp.human68k_file;
 	human68k_arg = gMainApp.human68k_arg;
@@ -80,7 +80,7 @@ Human68k::Init()
 	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("Human68k executable \"%s\" open failed", human68k_file);
 		return false;
@@ -89,7 +89,6 @@ Human68k::Init()
 	struct stat st;
 	if (fstat(file_fd, &st) != 0) {
 		warn("Human68k executable \"%s\" fstat failed", human68k_file);
-		close(file_fd);
 		return false;
 	}
 	uint32 file_size;
@@ -100,7 +99,6 @@ Human68k::Init()
 	file = (uint8 *)mmap(NULL, file_size, PROT_READ, MAP_PRIVATE, file_fd, 0);
 	if (file == MAP_FAILED) {
 		warn("Human68k executable \"%s\" mmap failed", human68k_file);
-		close(file_fd);
 		return false;
 	}
 
@@ -112,29 +110,31 @@ Human68k::Init()
 	} else if (isext(human68k_file, ".z")) {
 		r = LoadZ(file, file_size);
 	} else {
-		if (file[0] == 0x48 && file[1] == 0x55) {
-			r = LoadX(file, file_size);
-		} else if (file[0] == 0x60 && file[1] == 0x1a) {
-			r = LoadZ(file, file_size);
-		} else {
-			warnx("Human68k executable \"%s\" cannot identify file type",
-				human68k_file);
-			munmap(file, file_size);
-			close(file_fd);
-			return false;
+		// ELF .o のロードを試行する
+		r = LoadELF(file, file_size);
+		if (!r) {
+			if (file[0] == 0x48 && file[1] == 0x55) {
+				r = LoadX(file, file_size);
+			} else if (file[0] == 0x60 && file[1] == 0x1a) {
+				r = LoadZ(file, file_size);
+			} else {
+				warnx("Human68k executable \"%s\" cannot identify file type",
+					human68k_file);
+				munmap(file, file_size);
+				return false;
+			}
 		}
 	}
 	if (!r) {
 		warnx("Human68k executable \"%s\" invalid file format", human68k_file);
 		munmap(file, file_size);
-		close(file_fd);
 		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;
@@ -276,7 +276,6 @@ Human68k::LoadX(uint8 *file, uint size)
 	return true;
 }
 
-
 bool
 Human68k::LoadZ(uint8 *file, uint size)
 {
@@ -304,10 +303,29 @@ Human68k::LoadZ(uint8 *file, uint size)
 	return true;
 }
 
+// なぜか m68k ELF .o が読める
+bool
+Human68k::LoadELF(uint8 *file, uint size)
+{
+	uint32 r;
+
+	r = gRAM->LoadFile(human68k_file, file, size);
+	if (r == 0) {
+		return false;
+	}
+
+	// XXX LoadFile は実際のセクションサイズを今は返さないので size は適当
+	load_addr = r;
+	load_size = size;
+	exec_addr = r;
+	text_size = size;
+	return true;
+}
+
 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,6 +353,14 @@ Human68k::isext(const char *file, const
 }
 
 
+// 仮想マシンの中から終了させる
+void
+Human68k::RequestExit(int code)
+{
+	gMPU->Release();
+	gScheduler->RequestExit();
+}
+
 // fileaddr: Human68k ファイル名のゲストVA
 // atr: Human68k atr
 // mode: unix open mode
@@ -532,7 +558,8 @@ Human68k::IOCS(m68kcpu *cpu)
 
 	 default:
 		printf("Unimplemented IOCS $%02x\n", RegD(0) & 0xff);
-		exit(1);
+		RequestExit(1);
+		break;
 	}
 }
 
@@ -555,7 +582,8 @@ Human68k::FLineOp(m68kcpu *cpu)
 
 	 case 0xff00:		// EXIT
 		putmsg(1, "DOS EXIT");
-		exit(0);
+		RequestExit(0);
+		break;
 
 	 case 0xff09:		// PRINT
 	 {
@@ -611,7 +639,7 @@ Human68k::FLineOp(m68kcpu *cpu)
 			vecaddr += 0xd000;
 			RegD(0) = m68030_read_32(cpu, vecaddr);
 			m68030_write_32(cpu, vecaddr, addr);
-		} 
+		}
 		break;
 	 }
 
@@ -722,7 +750,8 @@ Human68k::FLineOp(m68kcpu *cpu)
 	 {
 		uint32 data = m68030_read_16(cpu, RegA(7));
 		putmsg(1, "DOS EXIT2(%d)", data);
-		exit(data);
+		RequestExit(data);
+		break;
 	 }
 
 	 case 0xffac:		// GETFCB
@@ -789,7 +818,8 @@ Human68k::FLineOp(m68kcpu *cpu)
 
 	 default:
 		printf("Unimplemented DOSCALL $%02x at $%08X\n", RegIR, RegPPC);
-		exit(1);
+		RequestExit(1);
+		break;
 	}
 	return true;
 }