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

diff --git a/GdbTerminal.py b/GdbTerminal.py
index 4fb4a35..f468f89 100755
--- a/GdbTerminal.py
+++ b/GdbTerminal.py
@@ -17,24 +17,24 @@ import DbgTerminal
 class GdbTerminal (DbgTerminal.DbgTerminal):
 
 
-	def __init__(self, clientCmd, exitcb=None):
-		DbgTerminal.DbgTerminal.__init__(self, clientCmd, exitcb)
+	def __init__(self, clientCmd):
+		DbgTerminal.DbgTerminal.__init__(self, clientCmd)
 
 	def getArgv(self):
 		return ["gdb", "--fullname", string.split(self.clientCmd)[0]]
 
 	def setPty(self, pty):
 		ttyname = os.ttyname(pty)
+		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_child("run " + argv + "\n")
 		return self.waitForActivation(his)
 
-
 	def setContinue(self):
 		his = self.getHistoryLen()
 		self.feed_child("cont\n");
@@ -63,34 +63,37 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 			self.feed_child("break %s:%s if %s\n" % \
 					(file, str(lineno), condition))
 
-		rx = re.compile("^Breakpoint |^No|^\(gdb\) ")
+		rx = re.compile("^Breakpoint |^No |^\(gdb\) ")
 		his, response = self.waitForRx(rx, his)
 
+		answer = None
+
 		if response[0:10] == "Breakpoint":
-			return string.split(response)[1].strip()
-		if response[0:5] == "(gdb)":
-			return None
+			answer = string.split(response)[1].strip()
+		
+		#Wants an answer: "No"
 		if response[0:14] == "No source file":
 			self.feed_child("n\n");
-			return None
-		if response[0:3] == "No ":
-			return None
-			
-		return NotImplementedError()
+
+		#Wait again for (gdb)...
+		self.waitForActivation(his)
+
+		return answer
+
 
 	def delBreakpoint(self, breakpoint):
+		his = self.getHistoryLen()
 		self.feed_child("del breakpoint %s\n" % (breakpoint,))
+		self.waitForActivation(his)
 
 	def getBreakpoints(self):
 		starthis = self.getHistoryLen()
 		self.feed_child("info breakpoints\n")
+		endhis, response = self.__waitForPrompt(starthis)
 
-		rx = re.compile("^\(gdb\) ")
-		endhis, response = self.waitForRx(rx, starthis)
-
-
-		rxbp1 = re.compile("^\d+\s+breakpoint")
-		rxbp2 = re.compile("^\tstop only if")
+		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]
@@ -100,17 +103,23 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 		while i<len(bplines):
 			line = bplines[i]
 
-			if not rxbp1.search(line):
+			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]
 
-			splits = string.split(line)
-			no = splits[0]
-			pos = splits[-1]
+			pos = string.split(line)[-1]
 			[file,lineno] = string.split(pos,":")
 			cond = None
 
-			if i+1<len(bplines) and rxbp2.search(bplines[i+1]):
+			if i+1<len(bplines) and rxcond.search(bplines[i+1]):
 				i +=1
 				line = bplines[i]
 				pre,cond = string.split(line,"if")
@@ -127,10 +136,7 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 
 		his = self.getHistoryLen()
 		self.feed_child("print " + expr + "\n")
-
-		rx = re.compile("^\(gdb\) $")
-		his, response = self.waitForRx(rx, his)
-
+		his, response = self.__waitForPrompt(his)
 		answer = self.history[his-1]
 
 		if len(string.split(answer, "=")) == 1:
@@ -140,20 +146,26 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 		return string.join(split[1:], "=").strip()
 
 
-	def waitForActivation(self, his=None):
+	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__":