--- nono/vm/device.cpp 2026/04/29 17:04:28 1.1.1.1 +++ nono/vm/device.cpp 2026/04/29 17:04:44 1.1.1.4 @@ -1,6 +1,7 @@ // // nono -// Copyright (C) 2017 isaki@NetBSD.org +// Copyright (C) 2020 nono project +// Licensed under nono-license.txt // #include "device.h" @@ -112,7 +113,7 @@ IODevice::Write16(uint32 addr, uint32 da { int64 berr; - berr = Write8(addr, data >> 8) ; + berr = Write8(addr, data >> 8); if (berr < 0) return berr; berr = Write8(addr + 1, data & 0xff); @@ -138,7 +139,7 @@ IODevice::Write32(uint32 addr, uint32 da uint64 IODevice::Peek8(uint32 addr) { - return 0; + return 0xff; } @@ -149,6 +150,7 @@ IODevice::Peek8(uint32 addr) // コンストラクタ BusErrDevice::BusErrDevice() { + logname = "buserr"; devname = "(BusErr)"; devaddr = -1; // XXX どうしたもんか } @@ -160,36 +162,42 @@ BusErrDevice::~BusErrDevice() uint64 BusErrDevice::Read8(uint32 addr) { + putlog(1, "$%08x.b", addr); return (uint64)-1; } uint64 BusErrDevice::Read16(uint32 addr) { + putlog(1, "$%08x.w", addr); return (uint64)-1; } uint64 BusErrDevice::Read32(uint32 addr) { + putlog(1, "$%08x.l", addr); return (uint64)-1; } uint64 BusErrDevice::Write8(uint32 addr, uint32 data) { + putlog(1, "$%08x.b <- %02X", addr, data); return (uint64)-1; } uint64 BusErrDevice::Write16(uint32 addr, uint32 data) { + putlog(1, "$%08x.w <- %04X", addr, data); return (uint64)-1; } uint64 BusErrDevice::Write32(uint32 addr, uint32 data) { + putlog(1, "$%08x.l <- %08X", addr, data); return (uint64)-1; }