--- nono/vm/bus.cpp	2026/04/29 17:04:41	1.1.1.5
+++ nono/vm/bus.cpp	2026/04/29 17:04:58	1.1.1.7
@@ -13,7 +13,6 @@ IODevice *devtable[256];
 // 直接アクセスし、そうでなければデバイスクラス経由でアクセスする。
 // 高速モードでは RAM デバイスを経由すること自体とその中でアクセスウェイトを
 // 計算する分を回避したい。
-// スケジューライベントのように、CPU コアが動作していない時に書き換えること。
 int direct_ram_size;
 
 //
@@ -27,7 +26,7 @@ vm_phys_read_8(uint32 addr)
 	uint64 data;
 
 	if (addr < direct_ram_size) {
-		data = ram[HLB(addr)];
+		data = mainram[HLB(addr)];
 	} else {
 		IODevice *dev = ::devtable[addr >> 24];
 		data = dev->Read8(addr);
@@ -40,11 +39,11 @@ vm_phys_read_16(uint32 addr)
 {
 	uint64 data;
 
-	if (__predict_false(addr & 1))
+	if (__predict_false((addr & 1) != 0))
 		PANIC("unaligned access $%08x", addr);
 
 	if (addr < direct_ram_size) {
-		data = *(uint16 *)&ram[HLW(addr)];
+		data = *(uint16 *)&mainram[HLW(addr)];
 	} else {
 		IODevice *dev = ::devtable[addr >> 24];
 		data = dev->Read16(addr);
@@ -57,11 +56,11 @@ vm_phys_read_32(uint32 addr)
 {
 	uint64 data;
 
-	if (__predict_false(addr & 3))
+	if (__predict_false((addr & 3) != 0))
 		PANIC("unaligned access $%08x", addr);
 
 	if (addr < direct_ram_size) {
-		data = *(uint32 *)&ram[addr];
+		data = *(uint32 *)&mainram[addr];
 	} else {
 		IODevice *dev = ::devtable[addr >> 24];
 		data = dev->Read32(addr);
@@ -73,7 +72,7 @@ uint64
 vm_phys_write_8(uint32 addr, uint32 data)
 {
 	if (addr < direct_ram_size) {
-		ram[HLB(addr)] = data;
+		mainram[HLB(addr)] = data;
 		return 0;
 	} else {
 		IODevice *dev = ::devtable[addr >> 24];
@@ -84,11 +83,11 @@ vm_phys_write_8(uint32 addr, uint32 data
 uint64
 vm_phys_write_16(uint32 addr, uint32 data)
 {
-	if (__predict_false(addr & 1))
+	if (__predict_false((addr & 1) != 0))
 		PANIC("unaligned access $%08x", addr);
 
 	if (addr < direct_ram_size) {
-		*(uint16 *)&ram[HLW(addr)] = data;
+		*(uint16 *)&mainram[HLW(addr)] = data;
 		return 0;
 	} else {
 		IODevice *dev = ::devtable[addr >> 24];
@@ -99,11 +98,11 @@ vm_phys_write_16(uint32 addr, uint32 dat
 uint64
 vm_phys_write_32(uint32 addr, uint32 data)
 {
-	if (__predict_false(addr & 3))
+	if (__predict_false((addr & 3) != 0))
 		PANIC("unaligned access $%08x", addr);
 
 	if (addr < direct_ram_size) {
-		*(uint32 *)&ram[addr] = data;
+		*(uint32 *)&mainram[addr] = data;
 		return 0;
 	} else {
 		IODevice *dev = ::devtable[addr >> 24];
@@ -117,7 +116,7 @@ vm_phys_peek_8(uint32 addr)
 	uint64 data;
 
 	if (addr < direct_ram_size) {
-		data = ram[HLB(addr)];
+		data = mainram[HLB(addr)];
 	} else {
 		IODevice *dev = ::devtable[addr >> 24];
 		data = dev->Peek8(addr);