--- nono/debugger/branchhistory.h	2026/04/29 17:05:20	1.1.1.5
+++ nono/debugger/branchhistory.h	2026/04/29 17:05:32	1.1.1.8
@@ -11,7 +11,6 @@
 #pragma once
 
 #include "object.h"
-#include "monitor.h"
 
 class VectorTable;
 
@@ -43,8 +42,8 @@ class BranchHistory : public Object
 	static const uint64 BottomToTop	= (1ULL << 63);	// 新しい方を下に
 
  public:
-	BranchHistory(int objid_);
-	virtual ~BranchHistory() override;
+	explicit BranchHistory(uint objid_);
+	~BranchHistory() override;
 
 	// 初期化
 	void Clear();
@@ -78,7 +77,7 @@ class BranchHistory : public Object
 	uint8 top {};
 
 	// モニタ (デバッガから直接参照する)
-	Monitor monitor { this };
+	Monitor *monitor {};
 
  protected:
 	virtual std::string FormatHeader() const;
@@ -109,8 +108,8 @@ class BranchHistory_m680x0 : public Bran
 	static const uint32 IOCSCall	= 0x80000000;	// IOCS コール
 	static const uint32 Exception	= 0xc0000000;	// 例外発生
  public:
-	BranchHistory_m680x0(int objid_);
-	virtual ~BranchHistory_m680x0() override;
+	explicit BranchHistory_m680x0(uint objid_);
+	~BranchHistory_m680x0() override;
 
 	std::string FormatEntry(const BranchEntry& e) override;
 };
@@ -123,8 +122,8 @@ class BranchHistory_m88xx0 : public Bran
 {
 	using inherited = BranchHistory;
  public:
-	BranchHistory_m88xx0(int objid_);
-	virtual ~BranchHistory_m88xx0() override;
+	explicit BranchHistory_m88xx0(uint objid_);
+	~BranchHistory_m88xx0() override;
 
 	std::string FormatEntry(const BranchEntry& e) override;
 };
@@ -136,8 +135,8 @@ class BranchHistory_hd64180 : public Bra
 {
 	using inherited = BranchHistory;
  public:
-	BranchHistory_hd64180(int objid_);
-	virtual ~BranchHistory_hd64180() override;
+	explicit BranchHistory_hd64180(uint objid_);
+	~BranchHistory_hd64180() override;
 
 	std::string FormatHeader() const override;
 	std::string FormatEntry(const BranchEntry& e) override;