--- nono/m680x0/m68030disasm.cpp	2026/04/29 17:04:49	1.1.1.6
+++ nono/m680x0/m68030disasm.cpp	2026/04/29 17:05:15	1.1.1.7
@@ -5,11 +5,10 @@
 //
 
 #include "m68030disasm.h"
-#include "bus.h"
+#include "debugger_memory.h"
 
 // コンストラクタ
-m680x0disasm::m680x0disasm(DebuggerMemoryStream& mem_)
-	: inherited(mem_)
+m680x0disasm::m680x0disasm()
 {
 }
 
@@ -20,9 +19,9 @@ m680x0disasm::~m680x0disasm()
 
 // 逆アセンブルを実行
 bool
-m680x0disasm::Exec()
+m680x0disasm::Exec(DebuggerMemoryStream *mem_)
 {
-	ExecInit();
+	ExecInit(mem_);
 
 	ir.clear();
 	name.clear();
@@ -30,7 +29,7 @@ m680x0disasm::Exec()
 	src.clear();
 	dst.clear();
 
-	pc0 = (uint32)mem.laddr;
+	pc0 = (uint32)mem->laddr;
 
 	switch (fetch16() >> 6) {
 #include "m68030switch.h"
@@ -85,14 +84,14 @@ m680x0disasm::Exec()
 uint32
 m680x0disasm::peek16()
 {
-	return mem.PeekInst();
+	return mem->Peek(2);
 }
 
 // ワードフェッチ
 uint32
 m680x0disasm::fetch16()
 {
-	uint16 data = mem.FetchInst();
+	uint16 data = mem->Read(2);
 	// IR にも入れる
 	ir.push_back(data);
 	return data;
@@ -211,7 +210,7 @@ m680x0disasm::make_ea(uint mmrr)
 		s = addr32();
 		break;
 	 case 0x3a:			// d16(pc)
-		s = addr32((uint32)mem.laddr + (int32)(int16)fetch16()) +
+		s = addr32((uint32)mem->laddr + (int32)(int16)fetch16()) +
 			"(" + make_reg(Reg::PC) + ")";
 		break;
 	 case 0x3b:			// d8(pc,IX)
@@ -2980,9 +2979,13 @@ OP_DEF(addq_l)
 	dst = make_ea();
 }
 
-// Scc/SF のメイン部分。
-void
-m680x0disasm::ops_scc()
+// %0101_cccc11_mmmrrr	Scc.B <ea>
+// %0101_cccc11_001yyy	DBcc.W Dy,<label>
+// %0101_cccc11_111010	TRAPcc.W #<imm>
+// %0101_cccc11_111011	TRAPcc.L #<imm>
+// %0101_cccc11_111100	TRAPcc
+// %0101_000111_001yyy	DBRA.W Dy,<label>
+OP_DEF(scc)
 {
 	uint n = ir[0] & 0x3f;
 	uint cc = (ir[0] >> 8) & 15;
@@ -3028,16 +3031,6 @@ m680x0disasm::ops_scc()
 	}
 }
 
-// %0101_000011_mmmrrr	ST.B <ea>
-// %0101_000011_001yyy	DBT.W Dy,<label>
-// %0101_000011_111010	TRAPT.W #<imm>
-// %0101_000011_111011	TRAPT.L #<imm>
-// %0101_000011_111100	TRAPT
-OP_DEF(st)
-{
-	ops_scc();
-}
-
 // %0101_qqq100_mmmrrr	SUBQ.B #qqq,<ea>
 OP_DEF(subq_b)
 {
@@ -3069,173 +3062,13 @@ OP_DEF(subq_l)
 	dst = make_ea();
 }
 
-// %0101_000111_mmmrrr	SF.B <ea>
-// %0101_000111_001yyy	DBRA.W Dy,<label>
-// %0101_000111_111010	TRAPF.W #<imm>
-// %0101_000111_111011	TRAPF.L #<imm>
-// %0101_000111_111100	TRAPF
-OP_DEF(sf)
-{
-	ops_scc();
-}
-
-// %0101_001011_mmmrrr	SHI.B <ea>
-// %0101_001011_001yyy	DBHI.W Dy,<label>
-// %0101_001011_111010	TRAPHI.W #<imm>
-// %0101_001011_111011	TRAPHI.L #<imm>
-// %0101_001011_111100	TRAPHI
-OP_DEF(shi)
-{
-	ops_scc();
-}
-
-// %0101_001111_mmmrrr	SLS.B <ea>
-// %0101_001111_001yyy	DBLS.W Dy,<label>
-// %0101_001111_111010	TRAPLS.W #<imm>
-// %0101_001111_111011	TRAPLS.L #<imm>
-// %0101_001111_111100	TRAPLS
-OP_DEF(sls)
-{
-	ops_scc();
-}
-
-// %0101_010011_mmmrrr	SCC.B <ea>
-// %0101_010011_001yyy	DBCC.W Dy,<label>
-// %0101_010011_111010	TRAPCC.W #<imm>
-// %0101_010011_111011	TRAPCC.L #<imm>
-// %0101_010011_111100	TRAPCC
-OP_DEF(scc)
-{
-	ops_scc();
-}
-
-// %0101_010111_mmmrrr	SCS.B <ea>
-// %0101_010111_001yyy	DBCS.W Dy,<label>
-// %0101_010111_111010	TRAPCS.W #<imm>
-// %0101_010111_111011	TRAPCS.L #<imm>
-// %0101_010111_111100	TRAPCS
-OP_DEF(scs)
-{
-	ops_scc();
-}
-
-// %0101_011011_mmmrrr	SNE.B <ea>
-// %0101_011011_001yyy	DBNE.W Dy,<label>
-// %0101_011011_111010	TRAPNE.W #<imm>
-// %0101_011011_111011	TRAPNE.L #<imm>
-// %0101_011011_111100	TRAPNE
-OP_DEF(sne)
-{
-	ops_scc();
-}
-
-// %0101_011111_mmmrrr	SEQ.B <ea>
-// %0101_011111_001yyy	DBEQ.W Dy,<label>
-// %0101_011111_111010	TRAPEQ.W #<imm>
-// %0101_011111_111011	TRAPEQ.L #<imm>
-// %0101_011111_111100	TRAPEQ
-OP_DEF(seq)
-{
-	ops_scc();
-}
-
-// %0101_100011_mmmrrr	SVC.B <ea>
-// %0101_100011_001yyy	DBVC.W Dy,<label>
-// %0101_100011_111010	TRAPVC.W #<imm>
-// %0101_100011_111011	TRAPVC.L #<imm>
-// %0101_100011_111100	TRAPVC
-OP_DEF(svc)
-{
-	ops_scc();
-}
-
-// %0101_100111_mmmrrr	SVS.B <ea>
-// %0101_100111_001yyy	DBVS.W Dy,<label>
-// %0101_100111_111010	TRAPVS.W #<imm>
-// %0101_100111_111011	TRAPVS.L #<imm>
-// %0101_100111_111100	TRAPVS
-OP_DEF(svs)
-{
-	ops_scc();
-}
-
-// %0101_101011_mmmrrr	SPL.B <ea>
-// %0101_101011_001yyy	DBPL.W Dy,<label>
-// %0101_101011_111010	TRAPPL.W #<imm>
-// %0101_101011_111011	TRAPPL.L #<imm>
-// %0101_101011_111100	TRAPPL
-OP_DEF(spl)
-{
-	ops_scc();
-}
-
-// %0101_101111_mmmrrr	SMI.B <ea>
-// %0101_101111_001yyy	DBMI.W Dy,<label>
-// %0101_101111_111010	TRAPMI.W #<imm>
-// %0101_101111_111011	TRAPMI.L #<imm>
-// %0101_101111_111100	TRAPMI
-OP_DEF(smi)
-{
-	ops_scc();
-}
-
-// %0101_110011_mmmrrr	SGE.B <ea>
-// %0101_110011_001yyy	DBGE.W Dy,<label>
-// %0101_110011_111010	TRAPGE.W #<imm>
-// %0101_110011_111011	TRAPGE.L #<imm>
-// %0101_110011_111100	TRAPGE
-OP_DEF(sge)
-{
-	ops_scc();
-}
-
-// %0101_110111_mmmrrr	SLT.B <ea>
-// %0101_110111_001yyy	DBLT.W Dy,<label>
-// %0101_110111_111010	TRAPLT.W #<imm>
-// %0101_110111_111011	TRAPLT.L #<imm>
-// %0101_110111_111100	TRAPLT
-OP_DEF(slt)
-{
-	ops_scc();
-}
-
-// %0101_111011_mmmrrr	SGT.B <ea>
-// %0101_111011_001yyy	DBGT.W Dy,<label>
-// %0101_111011_111010	TRAPGT.W #<imm>
-// %0101_111011_111011	TRAPGT.L #<imm>
-// %0101_111011_111100	TRAPGT
-OP_DEF(sgt)
-{
-	ops_scc();
-}
-
-// %0101_111111_mmmrrr	SLE.B <ea>
-// %0101_111111_001yyy	DBLE.W Dy,<label>
-// %0101_111111_111010	TRAPLE.W #<imm>
-// %0101_111111_111011	TRAPLE.L #<imm>
-// %0101_111111_111100	TRAPLE
-OP_DEF(sle)
-{
-	ops_scc();
-}
-
-
 // BRA/BSR/Bcc の共通部分。
+// name は呼び出し側で処理済み。
 void
 m680x0disasm::ops_bcc()
 {
-	uint cond = (ir[0] >> 8) & 0x0f;
 	uint32 disp = ir[0] & 0xff;
 
-	switch (cond) {
-	 case 0:	name = "bra";	break;
-	 case 1:	name = "bsr";	break;
-	 default:
-		name = "b";
-		name += conditions[cond];
-		break;
-	}
-
 	if (disp == 0) {
 		// Bxx.W <label>
 		size = Size::W;
@@ -3257,6 +3090,7 @@ m680x0disasm::ops_bcc()
 // %0110_000011_111111	BRA.L <label>
 OP_DEF(bra)
 {
+	name = "bra";
 	ops_bcc();
 }
 
@@ -3265,118 +3099,18 @@ OP_DEF(bra)
 // %0110_000111_111111	BSR.L <label>
 OP_DEF(bsr)
 {
+	name = "bsr";
 	ops_bcc();
 }
 
-// %0110_001000_000000	BHI.W <label>
-// %0110_0010nn_nnnnnn	BHI.B <label>
-// %0110_001011_111111	BHI.L <label>
-OP_DEF(bhi)
-{
-	ops_bcc();
-}
-
-// %0110_001100_000000	BLS.W <label>
-// %0110_0011nn_nnnnnn	BLS.B <label>
-// %0110_001111_111111	BLS.L <label>
-OP_DEF(bls)
-{
-	ops_bcc();
-}
-
-// %0110_010000_000000	BCC.W <label>
-// %0110_0100nn_nnnnnn	BCC.B <label>
-// %0110_010011_111111	BCC.L <label>
+// %0110_cccc00_000000	Bcc.W <label>
+// %0110_ccccnn_nnnnnn	Bcc.B <label>
+// %0110_cccc11_111111	Bcc.L <label>
 OP_DEF(bcc)
 {
-	ops_bcc();
-}
-
-// %0110_010100_000000	BCS.W <label>
-// %0110_0101nn_nnnnnn	BCS.B <label>
-// %0110_010111_111111	BCS.L <label>
-OP_DEF(bcs)
-{
-	ops_bcc();
-}
-
-// %0110_011000_000000	BNE.W <label>
-// %0110_0110nn_nnnnnn	BNE.B <label>
-// %0110_011011_111111	BNE.L <label>
-OP_DEF(bne)
-{
-	ops_bcc();
-}
-
-// %0110_011100_000000	BEQ.W <label>
-// %0110_0111nn_nnnnnn	BEQ.B <label>
-// %0110_011111_111111	BEQ.L <label>
-OP_DEF(beq)
-{
-	ops_bcc();
-}
-
-// %0110_100000_000000	BVC.W <label>
-// %0110_1000nn_nnnnnn	BVC.B <label>
-// %0110_100011_111111	BVC.L <label>
-OP_DEF(bvc)
-{
-	ops_bcc();
-}
-
-// %0110_100100_000000	BVS.W <label>
-// %0110_1001nn_nnnnnn	BVS.B <label>
-// %0110_100111_111111	BVS.L <label>
-OP_DEF(bvs)
-{
-	ops_bcc();
-}
-
-// %0110_101000_000000	BPL.W <label>
-// %0110_1010nn_nnnnnn	BPL.B <label>
-// %0110_101011_111111	BPL.L <label>
-OP_DEF(bpl)
-{
-	ops_bcc();
-}
-
-// %0110_101100_000000	BMI.W <label>
-// %0110_1011nn_nnnnnn	BMI.B <label>
-// %0110_101111_111111	BMI.L <label>
-OP_DEF(bmi)
-{
-	ops_bcc();
-}
-
-// %0110_110000_000000	BGE.W <label>
-// %0110_1100nn_nnnnnn	BGE.B <label>
-// %0110_110011_111111	BGE.L <label>
-OP_DEF(bge)
-{
-	ops_bcc();
-}
-
-// %0110_110100_000000	BLT.W <label>
-// %0110_1101nn_nnnnnn	BLT.B <label>
-// %0110_110111_111111	BLT.L <label>
-OP_DEF(blt)
-{
-	ops_bcc();
-}
-
-// %0110_111000_000000	BGT.W <label>
-// %0110_1110nn_nnnnnn	BGT.B <label>
-// %0110_111011_111111	BGT.L <label>
-OP_DEF(bgt)
-{
-	ops_bcc();
-}
-
-// %0110_111100_000000	BLE.W <label>
-// %0110_1111nn_nnnnnn	BLE.B <label>
-// %0110_111111_111111	BLE.L <label>
-OP_DEF(ble)
-{
+	uint cond = (ir[0] >> 8) & 0x0f;
+	name = "b";
+	name += conditions[cond];
 	ops_bcc();
 }