X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=GdbTerminal.py;h=7341cae049379a2f9342e887f482f43acef56fdf;hb=7689c8fe779e388f85d3122e77d990414f9097f3;hp=3656701e5619e383a8e1a2d776ca4a2854235a4e;hpb=054679cd2c3372717bf7982407e2453428193581;p=pygdb.git

diff --git a/GdbTerminal.py b/GdbTerminal.py
index 3656701..7341cae 100755
--- a/GdbTerminal.py
+++ b/GdbTerminal.py
@@ -17,8 +17,8 @@ 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]]
@@ -34,7 +34,6 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 		self.feed_child("run " + argv + "\n")
 		return self.waitForActivation(his)
 
-
 	def setContinue(self):
 		his = self.getHistoryLen()
 		self.feed_child("cont\n");
@@ -63,22 +62,22 @@ 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)
 
-		print his, response
-
 		if response[0:10] == "Breakpoint":
 			return string.split(response)[1].strip()
-		if response[0:5] == "(gdb)":
-			return None
+
 		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
+		if response[0:5] != "(gdb)":
+			his, response = self.waitForRx(rx,his)
+
+		return None
+
 
 	def delBreakpoint(self, breakpoint):
 		self.feed_child("del breakpoint %s\n" % (breakpoint,))
@@ -91,8 +90,9 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 		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]
@@ -102,17 +102,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")
@@ -142,16 +148,20 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 		return string.join(split[1:], "=").strip()
 
 
-	def waitForActivation(self, his=None):
+	def waitForActivation(self, starthis=None):
+
+		if starthis == None:
+			starthis = self.getHistoryLen()
 
 		self.setActive(False)
 		rx = re.compile("^\(gdb\) $")
-		his, reponse = self.waitForRx(rx,his)
+		endhis, reponse = self.waitForRx(rx,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