X-Git-Url: https://git.sthu.org/?p=pygdb.git;a=blobdiff_plain;f=GdbTerminal.py;h=58c3bbe13cdcad7b05ca023d6d172f4a38f938d5;hp=6218d64780e18e7b2e0f515e3ecf7d90bd34ac3a;hb=HEAD;hpb=32cf025183d25d3ab1f8e398ef391f6b3616d980

diff --git a/GdbTerminal.py b/GdbTerminal.py
index 6218d64..58c3bbe 100644
--- a/GdbTerminal.py
+++ b/GdbTerminal.py
@@ -95,39 +95,47 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 		bplines = self.__getAnswerFromCmd("info breakpoints\n")
 
 		rxbp = re.compile("^\d+\s+breakpoint")
-		rxpos = re.compile("^.* at \S+:\d+$")
-		rxcond = re.compile("^\tstop only if")
+		rxpos = re.compile("at \S+:\d+$")
+		rxcond = re.compile("^\s+stop only if")
 
 		bpnts = []
-		i = 1
 
-		#Parse the resulting lines
-		while i<len(bplines):
-			line = bplines[i]
+		try:
+			i = 1
 
-			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):
-				continue
+			#Parse the resulting lines
+			while i<len(bplines):
 
-			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]
-				cond = string.join(string.split(line," if ")[1:], " if ")
-				cond = cond.strip()
+				while not rxbp.search(line):
+					i += 1
+					line = bplines[i]
+		
+				#Get number of breakpoint
+				no = string.split(line)[0]
+
+				#This line does not contain the file!
+				#Check for next line...
+				while not rxpos.search(line):
+					i += 1
+					line = bplines[i]
+
+				pos = string.split(line)[-1]
+				[file,lineno] = string.split(pos,":")
+				cond = None
+
+				#Look for conditions
+				if i+1<len(bplines) and rxcond.search(bplines[i+1]):
+					i +=1
+					line = bplines[i]
+					cond = string.join(string.split(line," if ")[1:], " if ")
+					cond = cond.strip()
+
+				bpnts += [[no, file, lineno, cond]]
+				i += 1
 
-			bpnts += [[no, file, lineno, cond]]
-			i += 1
+		except IndexError:
+			pass
 
 		return bpnts
 		
@@ -148,7 +156,52 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 		return self.__getAnswerFromCmd("list\n")
 
 	def getBacktrace(self):
-		return self.__getAnswerFromCmd("bt\n")
+
+		stack = []
+		answ = self.__getAnswerFromCmd("bt\n")
+
+		rxstartfull = re.compile("^\#\d+\s+0x[0-9a-f]+\s+in\s+\S+\s+\(")
+		rxstartshort = re.compile("^\#\d+\s+\S+\s+\(")
+		rxpos = re.compile("at \S+:\d+$")
+
+		try:
+
+			i=0
+			while i<len(answ):
+				line = answ[i]
+
+				while not rxstartfull.search(line) and not rxstartshort.search(line):
+					print "Warning: '", line, "' does not match bt entry."
+					i+=1
+					line = answ[i]
+
+				parts = line.split()
+
+				if rxstartfull.search(line):
+					func = parts[3]
+					addr = parts[1]
+				else:
+					func = parts[1]
+					addr = None
+
+
+				#Search for file position
+				while not rxpos.search(line):
+					i+=1
+					line = answ[i]
+
+				parts = line.split()
+				pos = parts[-1]
+				[file,lineno] = pos.split(":")
+
+				stack += [[addr,func,file,lineno]]
+
+				i+=1
+
+		except IndexError:
+			pass
+
+		return stack
 
 	def waitForPrompt(self, his):
 		rx = "^\(gdb\)"