--- nono/debugger/branchhistory.h 2026/04/29 17:05:16 1.1.1.4 +++ nono/debugger/branchhistory.h 2026/04/29 17:05:28 1.1.1.7 @@ -43,8 +43,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(); @@ -103,8 +103,14 @@ class BranchHistory_m680x0 : public Bran { using inherited = BranchHistory; public: - BranchHistory_m680x0(int objid_); - virtual ~BranchHistory_m680x0() override; + // inst の分岐種別 + static const uint32 Normal = 0x00000000; // 通常分岐 + static const uint32 VectorJump = 0x40000000; // ベクタによる分岐 + static const uint32 IOCSCall = 0x80000000; // IOCS コール + static const uint32 Exception = 0xc0000000; // 例外発生 + public: + explicit BranchHistory_m680x0(uint objid_); + ~BranchHistory_m680x0() override; std::string FormatEntry(const BranchEntry& e) override; }; @@ -117,8 +123,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; }; @@ -130,8 +136,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;