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

diff --git a/GdbTerminal.py b/GdbTerminal.py
index 6218d64..842f768 100644
--- a/GdbTerminal.py
+++ b/GdbTerminal.py
@@ -95,8 +95,8 @@ 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+\S+:\d+$")
+		rxcond = re.compile("^\s+stop only if")
 
 		bpnts = []
 		i = 1
@@ -113,13 +113,19 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 			no = string.split(line)[0]
 
 			#This line does not contain the file!
+			#Check for next line...
 			if not rxpos.search(line):
+				i += 1
+				line = bplines[i]
+			if not rxpos.search(line):
+				i += 1
 				continue
 
 			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]
@@ -148,7 +154,53 @@ 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):
+					print "Warning: '", line, "' does not match file pos marker."
+					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\)"