Fixes, tweaks, z80 linear disassembly in cli

Author: lwerdna

cli.py

@@ -15,6 +15,7 @@
 import colorama
 
 sys.path.append('..')
+import debugger.gdblike as gdblike
 import debugger.gdb as gdb
 import debugger.utils as utils
 import debugger.DebugAdapter as DebugAdapter
@@ -72,11 +73,22 @@ def disasm(data, addr):
 	if arch == 'z80':
 		from z80dis import z80
 		lines = []
-		while data:
-			decoded = z80.decode(data, addr)
-			lines.append(z80.disasm(decoded))
-			data = data[decoded.len:]
+
+		offset = 0
+		while offset < len(data):
+			try:
+				decoded = z80.decode(data[offset:], addr)
+			except Exception:
+				break
+
+			addrstr = '%s%04X%s' % (GREEN, addr+offset, NORMAL)
+			bytestr = hexlify(data[offset:offset+decoded.len]).decode('utf-8').ljust(8)
+			asmstr = z80.disasm(decoded)
+			lines.append('%s: %s %s' % (addrstr, bytestr, asmstr))
+
 			addr += decoded.len
+			offset += decoded.len
+
 		return '\n'.join(lines)
 	else:
 		import capstone
@@ -265,9 +277,7 @@ def adjust_ctrl_c():
 	arg1 = sys.argv[1]
 	if re.match(r'^.*:\d+$', arg1):
 		(host, port) = arg1.split(':')
-		adapter = gdb.DebugAdapterGdb()
-		adapter.setup()
-		adapter.connect(host, int(port))
+		adapter = gdblike.connect_sense(host, int(port))
 	else:
 		if '~' in arg1:
 			arg1 = os.expanduser(arg1)
@@ -405,6 +415,8 @@ def adjust_ctrl_c():
 			else:
 				print('unrecognized: %s' % text)
 
+		except NotImplementedError:
+			print('not implemented')
 		except KeyboardInterrupt as e:
 			print("ctrl+c detected! breaking in!\n")
 			break_into()

gdblike.py

@@ -8,6 +8,7 @@
 import socket
 import binascii
 import xml.parsers.expat
+import xml.etree.ElementTree as ET
 
 from . import rsp
 from . import DebugAdapter
@@ -50,7 +51,7 @@ def connect(host, port):
 
 def connect_sense(address, port):
 	# connect to gdbserver, sense environment, return appropriate adapter
-	sock = gdblike.connect(address, port)
+	sock = connect(address, port)
 	rsp_conn = rsp.RspConnection(sock)
 
 	adapt = None
@@ -69,12 +70,15 @@ def connect_sense(address, port):
 			if feature_name:
 				# select adapter type based on feature name
 				if feature_name == 'mame.z80':
+					from . import mame_coleco
 					adapt = mame_coleco.DebugAdapterMameColeco()
-				elif feature_name == 'com.apple.debugserver.x86_64':
+				elif feature_name.startswith('com.apple.debugserver'): # eg 'com.apple.debugserver.x86_64'
+					from . import lldb
 					adapt = lldb.DebugAdapterLLDB
 				else:
 					return None
 		if not adapt:
+			# TODO: can we "see" this if we're positioned above?
 			adapt = gdblike.DebugAdapterGdbLike
 
 		adapt.setup()
@@ -83,7 +87,7 @@ def connect_sense(address, port):
 		return adapt
 
 	finally:
-		if not ok:
+		if not adapt:
 			sock.close()
 
 def preexec():
@@ -447,9 +451,9 @@ def handle_stop(self, reason, data):
 
 		reply = self.rspConn.tx_rx('?')
 		context = rsp.packet_T_to_dict(reply)
-		if not 'thread' in context:
-			raise DebugAdapter.GeneralError('determing thread responsible for stop')
-		self.tid = context.get('thread')
+		#if not 'thread' in context:
+		#	raise DebugAdapter.GeneralError('determing thread responsible for stop')
+		self.tid = context.get('thread', 0)
 
 	def get_remote_file(self, fpath):
 		#print('get_remote_file(%s)' % fpath)
@@ -633,7 +637,7 @@ def go_generic(self, gotype, handler_async_pkt=None):
 			# https://sourceware.org/gdb/current/onlinedocs/gdb/Stop-Reply-Packets.html#Stop-Reply-Packets
 			if reply[0] == 'T':
 				tdict = rsp.packet_T_to_dict(reply)
-				self.active_thread_tid = tdict['thread']
+				self.active_thread_tid = tdict.get('thread', 0)
 				(reason, reason_data) = self.thread_stop_pkt_to_reason(tdict)
 
 			# exit status