X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=GdbTerminal.py;h=5be9c05fd165108449fd97150b6712762ee67350;hb=382465d6c2f07b99c0263314405d1d8411072d23;hp=7341cae049379a2f9342e887f482f43acef56fdf;hpb=7689c8fe779e388f85d3122e77d990414f9097f3;p=pygdb.git

diff --git a/GdbTerminal.py b/GdbTerminal.py
old mode 100755
new mode 100644
index 7341cae..5be9c05
--- a/GdbTerminal.py
+++ b/GdbTerminal.py
@@ -23,37 +23,28 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 	def getArgv(self):
 		return ["gdb", "--fullname", string.split(self.clientCmd)[0]]
 
-	def setPty(self, pty):
-		ttyname = os.ttyname(pty)
-		self.feed_child("set inferior-tty %s\n" % (ttyname,))
-
 	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");
-		return self.waitForActivation(his)
 
 	def setStepover(self):
-		his = self.getHistoryLen()
 		self.feed_child("next\n");
-		return self.waitForActivation(his)
 
 	def setStepin(self):
-		his = self.getHistoryLen()
 		self.feed_child("step\n");
-		return self.waitForActivation(his)
 
 	def setQuit(self):
 		self.feed_child("quit\n")
 		self.waitForNewline()
 		self.feed_child("y\n");
 
+	def setPty(self, pty):
+		ttyname = os.ttyname(pty)
+		self.__getAnswerFromCmd("set inferior-tty %s\n" % (ttyname,))
+
 	def setBreakpoint(self, file, lineno, condition=None):
 		his = self.getHistoryLen()
 		if condition==None:
@@ -62,41 +53,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 = "^Breakpoint |^No |^\(gdb\) "
 		his, response = self.waitForRx(rx, his)
 
-		if response[0:10] == "Breakpoint":
-			return string.split(response)[1].strip()
+		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");
-			return None
 
-		#Wait again for gdb
-		if response[0:5] != "(gdb)":
-			his, response = self.waitForRx(rx,his)
+		#Wait again for (gdb)...
+		self.waitForPrompt(his)
 
-		return None
+		return answer
 
 
 	def delBreakpoint(self, breakpoint):
-		self.feed_child("del breakpoint %s\n" % (breakpoint,))
-
-	def getBreakpoints(self):
-		starthis = self.getHistoryLen()
-		self.feed_child("info breakpoints\n")
+		self.__getAnswerFromCmd("del breakpoint %s\n" % (breakpoint,))
 
-		rx = re.compile("^\(gdb\) ")
-		endhis, response = self.waitForRx(rx, starthis)
 
+	def getBreakpoints(self):
+		bplines = self.__getAnswerFromCmd("info breakpoints\n")
 
 		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
+		i = 1
 
 		#Parse the resulting lines
 		while i<len(bplines):
@@ -111,8 +98,7 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 
 			#This line does not contain the file!
 			if not rxpos.search(line):
-				i += 1
-				line = bplines[i]
+				continue
 
 			pos = string.split(line)[-1]
 			[file,lineno] = string.split(pos,":")
@@ -121,7 +107,7 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 			if i+1<len(bplines) and rxcond.search(bplines[i+1]):
 				i +=1
 				line = bplines[i]
-				pre,cond = string.split(line,"if")
+				cond = string.join(string.split(line," if ")[1:], " if ")
 				cond = cond.strip()
 
 			bpnts += [[no, file, lineno, cond]]
@@ -132,14 +118,8 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 
 
 	def getExpression(self, expr):
-
-		his = self.getHistoryLen()
-		self.feed_child("print " + expr + "\n")
-
-		rx = re.compile("^\(gdb\) $")
-		his, response = self.waitForRx(rx, his)
-
-		answer = self.history[his-1]
+		answer = self.__getAnswerFromCmd("print " + expr + "\n")
+		answer = answer[-1]
 
 		if len(string.split(answer, "=")) == 1:
 			return answer.strip()
@@ -147,26 +127,79 @@ class GdbTerminal (DbgTerminal.DbgTerminal):
 		split = string.split(answer, "=")
 		return string.join(split[1:], "=").strip()
 
+	
+	def listCodeSnippet(self):
+		answ = self.__getAnswerFromCmd("list\n")
+		return string.join(answ, "\n")
+
+	def getBacktrace(self):
+		answ = self.__getAnswerFromCmd("bt\n")
+		return string.join(answ, "\n")
+
+	def waitForPrompt(self, his):
+		rx = "^\(gdb\)"
+		return self.waitForRx(rx,his)
+
+	def __getAnswerFromCmd(self, cmd):
+		starthis = self.getHistoryLen()
+		self.feed_child(cmd)
+		endhis, response = self.waitForPrompt(starthis)
+
+		return self.history[starthis:endhis]
+
+
+	def testForActivity(self, his):
+		"""Test whether debugger got active again"""
+			
+		line = self.history[his]
+
+		if string.find(line, "\x1a\x1a") == 0:
+			tuples = string.split(line[2:], ":")
+			tuples[1] = int(tuples[1])
+			return "break", [tuples[0], int(tuples[1])]
+
+		if string.find(line, "Program exited") == 0:
+			code = string.split(line)[-1]
 
-	def waitForActivation(self, starthis=None):
+			codeno = 0
+		
+			#Parse the octal number
+			if code[0] == "O":
+				code = code[1:-1]
+				for c in code:
+					codeno = codeno*8 + int(c)
+
+			return "exited", codeno
+
+		return None
+
+
+	def testForInactivity(self, his):
+		"""Test whether debugger got inactive"""		
+		line = self.history[his]
 
-		if starthis == None:
-			starthis = self.getHistoryLen()
+		if string.find(line, "Starting program:") == 0:
+			prog = string.join( string.split(line)[1:])
+			return "started", prog
 
-		self.setActive(False)
-		rx = re.compile("^\(gdb\) $")
-		endhis, reponse = self.waitForRx(rx,starthis)
-		self.setActive(True)
+		if string.find(line, "Continuing.") == 0:
+			return "continued", None
 
-		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]
+		if string.find(line, "\x1a\x1a") == 0:
+			rxcont = re.compile("^\(gdb\)\s+(cont|step|next|stepi|nexti)")
+
+			if rxcont.search(self.history[his-1]):
+				return "stepped", None
 
 		return None
 
 
 
+
+
+
+
+
 if __name__ == "__main__":