From 9431f01f65cb7aeab38e91453f477e6c7d12189c Mon Sep 17 00:00:00 2001
From: Greg Clayton <gclayton@apple.com>
Date: Wed, 25 Jan 2012 03:20:34 +0000
Subject: [PATCH] Handle 's' packets correctly when disassembling GDB packet
 output.

llvm-svn: 148911
---
 lldb/scripts/disasm-gdb-remote.pl | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/lldb/scripts/disasm-gdb-remote.pl b/lldb/scripts/disasm-gdb-remote.pl
index 9a431a9077f3..4de98d149ee7 100755
--- a/lldb/scripts/disasm-gdb-remote.pl
+++ b/lldb/scripts/disasm-gdb-remote.pl
@@ -506,7 +506,9 @@ our %cmd_callbacks =
 	'k' => \&dump_kill_cmd,
 	'A' => \&dump_A_command,
 	'c' => \&dump_continue_cmd,
+	's' => \&dump_continue_cmd,
 	'C' => \&dump_continue_with_signal_cmd,
+	'S' => \&dump_continue_with_signal_cmd,
 	'_M' => \&dump_allocate_memory_cmd,
 	'_m' => \&dump_deallocate_memory_cmd,
 	# extended commands
@@ -521,6 +523,7 @@ our %cmd_callbacks =
 our %rsp_callbacks = 
 (
 	'c' => \&dump_stop_reply_packet,
+	's' => \&dump_stop_reply_packet,
 	'C' => \&dump_stop_reply_packet,
 	'?' => \&dump_stop_reply_packet,
 	'T' => \&dump_thread_is_alive_rsp,
@@ -1060,30 +1063,37 @@ sub dump_read_mem_rsp
 }
 
 #----------------------------------------------------------------------
-# 'c' command
+# 'c' or 's' command
 #----------------------------------------------------------------------
 sub dump_continue_cmd
 {	
 	my $cmd = shift;
+	my $cmd_str;
+	$cmd eq 'c' and $cmd_str = 'continue';
+	$cmd eq 's' and $cmd_str = 'step';
 	my $address = -1;
 	if (@_)
 	{
 		my $address = get_addr(\@_);
-		printf("continue ($addr_format)\n", $address);
+		printf("%s ($addr_format)\n", $cmd_str, $address);
 	}
 	else
 	{
-		printf("continue ()\n");
+		printf("%s ()\n", $cmd_str);
 	}
 }
 
 #----------------------------------------------------------------------
 # 'Css' continue (C) with signal (ss where 'ss' is two hex digits)
+# 'Sss' step (S) with signal (ss where 'ss' is two hex digits)
 #----------------------------------------------------------------------
 sub dump_continue_with_signal_cmd
 {	
 	my $cmd = shift;
 	my $address = -1;
+	my $cmd_str;
+	$cmd eq 'c' and $cmd_str = 'continue';
+	$cmd eq 's' and $cmd_str = 'step';
 	my $signal = get_hex(\@_);
 	if (@_)
 	{
@@ -1097,11 +1107,11 @@ sub dump_continue_with_signal_cmd
 
 	if ($address != -1)
 	{
-		printf("continue_with_signal (signal = 0x%2.2x, address = $addr_format)\n", $signal, $address);
+		printf("%s_with_signal (signal = 0x%2.2x, address = $addr_format)\n", $cmd_str, $signal, $address);
 	}
 	else
 	{
-		printf("continue_with_signal (signal = 0x%2.2x)\n", $signal);
+		printf("%s_with_signal (signal = 0x%2.2x)\n", $cmd_str, $signal);
 	}
 }