--- nono/vm/human68k.cpp 2026/04/29 17:04:32 1.1.1.3 +++ nono/vm/human68k.cpp 2026/04/29 17:04:35 1.1.1.4 @@ -1,20 +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 "bus.h" +#include "iodevstream.h" #include "mainapp.h" -#include "mpu.h" #include "m68030bus.h" #include "m68030core.h" -#include "bus.h" -#include "iodevstream.h" +#include "mpu680x0.h" #include "scheduler.h" #include "vm.h" -#include #include #include #include @@ -44,11 +46,11 @@ Human68k::Human68k() 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"; } // デストラクタ @@ -343,7 +345,7 @@ Human68k::OpenFile(uint32 fileaddr, uint { // XXX: unix host only - int32 fileno; + int32 fileno {}; Human68k::File *f = NULL; // 開いているエントリを検索して Human fileno を取得 @@ -383,7 +385,7 @@ Human68k::OpenFile(uint32 fileaddr, uint } f->fd = fd; - f->filename = strdup(filename); + f->filename = filename; return fileno; } @@ -399,13 +401,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; } @@ -455,7 +457,7 @@ Human68k::FputsFile(int32 fileno, uint32 IODeviceStream ds(ram, dataaddr); int size = 1024; - uint8 buf[size]; + std::vector buf(size); bool eof = false; do { @@ -469,7 +471,7 @@ Human68k::FputsFile(int32 fileno, uint32 len++; } if (len > 0) { - write(f->fd, buf, len); + write(f->fd, &buf[0], len); } } while (!eof); }