espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-05-30 15:56:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

2005-11-15 Andrew Stubbs <andrew.stubbs@st.com>

Browse Source 
* cli/cli-script.c: Include gdb_assert.h.
	(locate_arg): Detect $argc.
	(insert_args): Substitute $argc.
	* Makefile.in (cli-script.o): Add dependency on gdb_assert.h.

doc/
	* gdb.texinfo (User-defined commands): Add $argc. Add missing 'end'.
	Change @var{$arg0 to @code{$arg0.
This commit is contained in:
Andrew Stubbs
2005-11-15 12:03:08 +00:00
parent 1637cd900b
commit c03c782ff0
5 changed files with 61 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
gdb/cli/cli-script.c
View File

@ -33,6 +33,7 @@
#include "cli/cli-cmds.h"
#include "cli/cli-decode.h"
#include "cli/cli-script.h"
#include "gdb_assert.h"
/* Prototypes for local functions */
@ -572,7 +573,8 @@ locate_arg (char *p)
{
while ((p = strchr (p, '$')))
{
if (strncmp (p, "$arg", 4) == 0 && isdigit (p[4]))
if (strncmp (p, "$arg", 4) == 0
&& (isdigit (p[4]) || p[4] == 'c'))
return p;
p++;
}
@ -596,12 +598,20 @@ insert_args (char *line)
len += p - line;
i = p[4] - '0';
if (i >= user_args->count)
if (p[4] == 'c')
{
/* $argc. Number will be <=10. */
len += user_args->count == 10 ? 2 : 1;
}
else if (i >= user_args->count)
{
error (_("Missing argument %d in user function."), i);
return NULL;
}
len += user_args->a[i].len;
else
{
len += user_args->a[i].len;
}
line = p + 5;
}
@ -625,13 +635,27 @@ insert_args (char *line)
memcpy (new_line, line, p - line);
new_line += p - line;
i = p[4] - '0';
len = user_args->a[i].len;
if (len)
if (p[4] == 'c')
{
memcpy (new_line, user_args->a[i].arg, len);
new_line += len;
gdb_assert (user_args->count >= 0 && user_args->count <= 10);
if (user_args->count == 10)
{
*(new_line++) = '1';
*(new_line++) = '0';
}
else
*(new_line++) = user_args->count + '0';
}
else
{
i = p[4] - '0';
len = user_args->a[i].len;
if (len)
{
memcpy (new_line, user_args->a[i].arg, len);
new_line += len;
}
}
line = p + 5;
}