--- nono/debugger/debugger.h	2026/04/29 17:05:32	1.1.1.11
+++ nono/debugger/debugger.h	2026/04/29 17:05:49	1.1.1.13
@@ -120,8 +120,8 @@ class Debugger : public ThreadDevice
 
  private:
 	void Close();
-	void RxCallback();
-	void AcceptCallback();
+	void RxCallback(uint32);
+	void AcceptCallback(uint32);
 	void Input(int);
 	void EnterPrompt();
 	void LeavePrompt(bool trace);
@@ -170,8 +170,16 @@ class Debugger : public ThreadDevice
 	CmdAct cmd_z();
 
 	bool Check(DebuggerMD *);
+	bool ParseOptBreakAddr(const std::string&);
+	bool ParseOptBreakInst(const std::string&);
+	bool ParseOptBreakVector(const std::string&);
+	bool IsCPUStr(const std::string&) const;
 	DebuggerMD *ParseCPU(const std::string&) const;
-	int AddBreakpoint(const breakpoint_t&, const std::string&);
+	int AddBreakInst(const std::string& cpustr, const std::string& inststr,
+		const std::string& skipstr, std::string *errstr);
+	int AddBreakVector(const std::string& cpustr, const std::string& vecstr,
+		const std::string& skipstr, std::string *errstr);
+	int AddBreakpoint(const breakpoint_t&);
 	void RecalcInstMask();
 	bool GetAddr(busaddr *addr, bool);
 	CmdAct cmd_d_common(busaddr access_mode);
@@ -224,7 +232,7 @@ class Debugger : public ThreadDevice
 	const char *prompt {};		// プロンプト文字列
 	std::string cmdbuf {};		// 現在のコマンドライン
 	std::string last_cmdbuf {};	// 直前のコマンドライン
-	std::vector<std::string> args {};
+	std::vector<std::string> cmdargs {};
 
 	uint32 pc {};
 	std::array<breakpoint_t, MAX_BREAKPOINTS> bpoint {};