X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=GdbTerminal.py;h=f468f89fe1f718fb99e870bf3b21abe0b10ff2b9;hb=505db8dd1b2862d460c7442e98c0c14ac776a4db;hp=bcd857ac5ef5428fdc0fc435a57a0cba5d8b7047;hpb=e3403072dbc8f31817f6492dea70ebdf5128fcb2;p=pygdb.git

diff --git a/GdbTerminal.py b/GdbTerminal.py
index bcd857a..f468f89 100755
--- a/GdbTerminal.py
+++ b/GdbTerminal.py
@@ -25,47 +25,118 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 
 	def setPty(self, pty):
 		ttyname = os.ttyname(pty)
-		self.feed_dbg("set inferior-tty %s\n" % (ttyname,))
+		his = self.getHistoryLen()
+		self.feed_child("set inferior-tty %s\n" % (ttyname,))
+		self.waitForActivation(his)
 
 	def setRun(self):
-
 		his = self.getHistoryLen()
 		argv = string.join(string.split(self.clientCmd)[1:])
-		self.feed_dbg("run " + argv + "\n")
+		self.feed_child("run " + argv + "\n")
 		return self.waitForActivation(his)
 
-
 	def setContinue(self):
 		his = self.getHistoryLen()
-		self.feed_dbg("cont\n");
+		self.feed_child("cont\n");
 		return self.waitForActivation(his)
 
 	def setStepover(self):
 		his = self.getHistoryLen()
-		self.feed_dbg("next\n");
+		self.feed_child("next\n");
 		return self.waitForActivation(his)
 
 	def setStepin(self):
 		his = self.getHistoryLen()
-		self.feed_dbg("step\n");
+		self.feed_child("step\n");
 		return self.waitForActivation(his)
 
 	def setQuit(self):
-		self.feed_dbg("quit\n")
+		self.feed_child("quit\n")
 		self.waitForNewline()
-		self.feed_dbg("y\n");
+		self.feed_child("y\n");
 
-	def setBreakpoint(self, file, lineno):
-		self.feed_dbg("break %s:%d\n" % (file, lineno))
+	def setBreakpoint(self, file, lineno, condition=None):
+		his = self.getHistoryLen()
+		if condition==None:
+			self.feed_child("break %s:%s\n" % (file, str(lineno)))
+		else:
+			self.feed_child("break %s:%s if %s\n" % \
+					(file, str(lineno), condition))
 
-	def getExpression(self, expr):
+		rx = re.compile("^Breakpoint |^No |^\(gdb\) ")
+		his, response = self.waitForRx(rx, his)
+
+		answer = None
 
+		if response[0:10] == "Breakpoint":
+			answer = string.split(response)[1].strip()
+		
+		#Wants an answer: "No"
+		if response[0:14] == "No source file":
+			self.feed_child("n\n");
+
+		#Wait again for (gdb)...
+		self.waitForActivation(his)
+
+		return answer
+
+
+	def delBreakpoint(self, breakpoint):
 		his = self.getHistoryLen()
-		self.feed_dbg("print " + expr + "\n")
+		self.feed_child("del breakpoint %s\n" % (breakpoint,))
+		self.waitForActivation(his)
 
-		rx = re.compile("^\(gdb\) $")
-		his, response = self.waitForRx(rx, his)
+	def getBreakpoints(self):
+		starthis = self.getHistoryLen()
+		self.feed_child("info breakpoints\n")
+		endhis, response = self.__waitForPrompt(starthis)
+
+		rxbp = re.compile("^\d+\s+breakpoint")
+		rxpos = re.compile("^.* at \S+:\d+$")
+		rxcond = re.compile("^\tstop only if")
+
+		bpnts = []
+		bplines = self.history[starthis+1:endhis]
+		i = 0
 
+		#Parse the resulting lines
+		while i<len(bplines):
+			line = bplines[i]
+
+			if not rxbp.search(line):
+				i += 1
+				continue
+	
+			#Get number of breakpoint
+			no = string.split(line)[0]
+
+			#This line does not contain the file!
+			if not rxpos.search(line):
+				i += 1
+				line = bplines[i]
+
+			pos = string.split(line)[-1]
+			[file,lineno] = string.split(pos,":")
+			cond = None
+
+			if i+1<len(bplines) and rxcond.search(bplines[i+1]):
+				i +=1
+				line = bplines[i]
+				pre,cond = string.split(line,"if")
+				cond = cond.strip()
+
+			bpnts += [[no, file, lineno, cond]]
+			i += 1
+
+		return bpnts
+		
+
+
+	def getExpression(self, expr):
+
+		his = self.getHistoryLen()
+		self.feed_child("print " + expr + "\n")
+		his, response = self.__waitForPrompt(his)
 		answer = self.history[his-1]
 
 		if len(string.split(answer, "=")) == 1:
@@ -75,20 +146,26 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 		return string.join(split[1:], "=").strip()
 
 
-	def waitForActivation(self, his):
+	def waitForActivation(self, starthis):
 
 		self.setActive(False)
-		rx = re.compile("^\(gdb\) $")
-		his, reponse = self.waitForRx(rx,his)
+		endhis, response = self.__waitForPrompt(starthis)
 		self.setActive(True)
 
-		if self.history[his-1][0:2]=="\x1a\x1a":
-			tuples = string.split(self.history[his-1][2:], ":")
-			return tuples[0:2]
+		for his in reversed(range(starthis+1,endhis)):
+			if self.history[his][0:2]=="\x1a\x1a":
+				tuples = string.split(self.history[his][2:], ":")
+				return tuples[0:2]
 
 		return None
 
 
+	def __waitForPrompt(self, his):
+		rx = re.compile("^\(gdb\) ")
+		return self.waitForRx(rx,his)
+
+
+
 
 if __name__ == "__main__":
 
@@ -96,7 +173,6 @@ if __name__ == "__main__":
 	dbgterm = GdbTerminal(string.join(sys.argv[1:]))
 	dbgwnd = DbgTerminal.DbgWindow(dbgterm)
 
-	DbgTerminal.launchDebugger(dbgwnd, dbgterm)
 	gtk.main()