X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgldbg.h;h=dd6d60c6d8f1a97c13078d6da3fe51e82498228a;hb=81f1ddee977603293d0c5710f2db69130dac6a96;hp=da5664eddf749102f4a996bdab12e14f35983fdc;hpb=ea3d851aa52e999b1c5a5fa52c97ff5019756c0e;p=gldbg.git

diff --git a/source/gldbg.h b/source/gldbg.h
index da5664e..dd6d60c 100644
--- a/source/gldbg.h
+++ b/source/gldbg.h
@@ -1,35 +1,56 @@
 /* $Id$
 
 This file is part of gldbg
-Copyright © 2009-2010  Mikko Rasa, Mikkosoft Productions
+Copyright © 2009-2011  Mikko Rasa, Mikkosoft Productions
 Distributed under the GPL
 */
 
 #ifndef GLDBG_H_
 #define GLDBG_H_
 
+#include <list>
 #include <string>
 #include <vector>
-#include <msp/core/application.h>
-#include <msp/fs/path.h>
 #include "commandinterpreter.h"
+#include "packet.h"
 #include "process.h"
 
 class Tool;
 
-class GlDbg: public Msp::Application
+class GlDbg
 {
 private:
+	typedef std::list<Tool *> ToolList;
+
+	struct Breakpoint
+	{
+		unsigned short function;
+		unsigned char flag;
+		ToolList owners;
+
+		Breakpoint(unsigned short, unsigned char);
+
+		void add_owner(Tool *);
+		bool has_owner(Tool *) const;
+		void remove_owner(Tool *);
+	};
+
+	typedef std::list<Breakpoint> BreakList;
+
 	CommandInterpreter cmd_interp;
 	Process process;
 	int sock_fd;
 	std::string buffer;
 	unsigned buf_offset;
 	bool flushing;
-	std::list<Tool *> tools;
+	ToolList tools;
 	bool got_sigchld;
+	int stop_reason;
+	BreakList breakpoints;
+	const Breakpoint *current_break;
+	ToolList break_holders;
 
-	static RegApp<GlDbg> reg;
+	static GlDbg *instance;
 
 public:
 	GlDbg(int, char **);
@@ -39,14 +60,19 @@ public:
 	CommandInterpreter &get_command_interpreter() { return cmd_interp; }
 	Process &get_process() { return process; }
 	void launch();
-	void set_breakpoint(unsigned short, char);
-	void clear_breakpoint(unsigned short, char);
+	void send(GlPacket *);
+	void hold();
+	void set_breakpoint(unsigned short, unsigned char, Tool *);
+	void clear_breakpoint(unsigned short, unsigned char, Tool *);
+	void resume_from_break(Tool *);
 	void quit(bool);
 private:
 	void tick();
 	void check_child();
 	void read_stream();
-	virtual void sighandler(int);
+	Breakpoint *get_breakpoint(unsigned short, unsigned char);
+
+	static void sighandler(int);
 };
 
 #endif