espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-01 11:59:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

* c-exp.y (yylex): Add tempbuf, tempbufindex, and tempbufsize,

Browse Source 
which together maintain a dynamically expandable static buffer
	for the lexer to use when translating C strings to their internal
	form (other future uses possible).  Fix parsing of C style strings
	to do the normal C style input conversions of escaped character
	sequences.
	* valops.c (value_string):  Remove translation of escaped
	character sequences, now done in C expression parser.
This commit is contained in:
Fred Fish
1992-11-24 03:02:10 +00:00
parent 0d44b3d1f0
commit bac89d6ca8
3 changed files with 94 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
gdb/valops.c
View File

@ -43,7 +43,7 @@ static value
search_struct_field PARAMS ((char *, value, int, struct type *, int));
static value
search_struct_method PARAMS ((char *, value, value *, int, int *,
search_struct_method PARAMS ((char *, value *, value *, int, int *,
struct type *));
static int
@ -234,7 +234,7 @@ value_assign (toval, fromval)
fromval = value_cast (REGISTER_VIRTUAL_TYPE (regno), fromval);
memcpy (virtual_buffer, VALUE_CONTENTS (fromval),
REGISTER_VIRTUAL_SIZE (regno));
target_convert_from_virtual (regno, virtual_buffer, raw_buffer);
REGISTER_CONVERT_TO_RAW (regno, virtual_buffer, raw_buffer);
use_buffer = REGISTER_RAW_SIZE (regno);
}
@ -913,7 +913,8 @@ call_function_by_hand (function, nargs, args)
Call the function malloc in the inferior to get space for it,
then copy the data into that space
and then return the address with type char *.
PTR points to the string constant data; LEN is number of characters. */
PTR points to the string constant data; LEN is number of characters.
Note that the string may contain embedded null bytes. */
value
value_string (ptr, len)
@ -923,36 +924,11 @@ value_string (ptr, len)
register value val;
register struct symbol *sym;
value blocklen;
register char *copy = (char *) alloca (len + 1);
char *i = ptr;
register char *o = copy, *ibeg = ptr;
register int c;
/* Copy the string into COPY, processing escapes.
We could not conveniently process them in the parser
because the string there wants to be a substring of the input. */
while (i - ibeg < len)
{
c = *i++;
if (c == '\\')
{
c = parse_escape (&i);
if (c == -1)
continue;
}
*o++ = c;
}
*o = 0;
/* Get the length of the string after escapes are processed. */
len = o - copy;
/* Find the address of malloc in the inferior. */
sym = lookup_symbol ("malloc", 0, VAR_NAMESPACE, 0, NULL);
if (sym != 0)
if (sym != NULL)
{
if (SYMBOL_CLASS (sym) != LOC_BLOCK)
error ("\"malloc\" exists in this program but is not a function.");
@ -973,9 +949,9 @@ value_string (ptr, len)
blocklen = value_from_longest (builtin_type_int, (LONGEST) (len + 1));
val = call_function_by_hand (val, 1, &blocklen);
if (value_zerop (val))
if (value_logical_not (val))
error ("No memory available for string constant.");
write_memory (value_as_pointer (val), copy, len + 1);
write_memory (value_as_pointer (val), ptr, len + 1);
VALUE_TYPE (val) = lookup_pointer_type (builtin_type_char);
return val;
}
@ -1038,6 +1014,7 @@ search_struct_field (name, arg1, offset, type, looking_for_baseclass)
if (BASETYPE_VIA_VIRTUAL (type, i))
{
value v2;
/* Fix to use baseclass_offset instead. FIXME */
baseclass_addr (type, i, VALUE_CONTENTS (arg1) + offset,
&v2, (int *)NULL);
if (v2 == 0)
@ -1065,9 +1042,9 @@ search_struct_field (name, arg1, offset, type, looking_for_baseclass)
If found, return value, else return NULL. */
static value
search_struct_method (name, arg1, args, offset, static_memfuncp, type)
search_struct_method (name, arg1p, args, offset, static_memfuncp, type)
char *name;
register value arg1, *args;
register value *arg1p, *args;
int offset, *static_memfuncp;
register struct type *type;
{
@ -1092,10 +1069,10 @@ search_struct_method (name, arg1, args, offset, static_memfuncp, type)
TYPE_FN_FIELD_ARGS (f, j), args))
{
if (TYPE_FN_FIELD_VIRTUAL_P (f, j))
return (value)value_virtual_fn_field (arg1, f, j, type);
return (value)value_virtual_fn_field (arg1p, f, j, type, offset);
if (TYPE_FN_FIELD_STATIC_P (f, j) && static_memfuncp)
*static_memfuncp = 1;
return (value)value_fn_field (f, j);
return (value)value_fn_field (arg1p, f, j, type, offset);
}
j--;
}
@ -1104,25 +1081,28 @@ search_struct_method (name, arg1, args, offset, static_memfuncp, type)
for (i = TYPE_N_BASECLASSES (type) - 1; i >= 0; i--)
{
value v, v2;
value v;
int base_offset;
if (BASETYPE_VIA_VIRTUAL (type, i))
{
baseclass_addr (type, i, VALUE_CONTENTS (arg1) + offset,
&v2, (int *)NULL);
if (v2 == 0)
base_offset =
baseclass_offset (type, i, *arg1p, offset);
if (base_offset == -1)
error ("virtual baseclass botch");
base_offset = 0;
}
else
{
v2 = arg1;
base_offset = TYPE_BASECLASS_BITPOS (type, i) / 8;
}
v = search_struct_method (name, v2, args, base_offset,
v = search_struct_method (name, arg1p, args, base_offset + offset,
static_memfuncp, TYPE_BASECLASS (type, i));
if (v) return v;
if (v)
{
/* FIXME-bothner: Why is this commented out? Why is it here? */
/* *arg1p = arg1_tmp;*/
return v;
}
}
return NULL;
}
@ -1193,7 +1173,7 @@ value_struct_elt (argp, args, name, static_memfuncp, err)
if (destructor_name_p (name, t))
error ("Cannot get value of destructor");
v = search_struct_method (name, *argp, args, 0, static_memfuncp, t);
v = search_struct_method (name, argp, args, 0, static_memfuncp, t);
if (v == 0)
{
@ -1210,8 +1190,9 @@ value_struct_elt (argp, args, name, static_memfuncp, err)
if (!args[1])
{
/* destructors are a special case. */
return (value)value_fn_field (TYPE_FN_FIELDLIST1 (t, 0),
TYPE_FN_FIELDLIST_LENGTH (t, 0));
return (value)value_fn_field (NULL, TYPE_FN_FIELDLIST1 (t, 0),
TYPE_FN_FIELDLIST_LENGTH (t, 0),
0, 0);
}
else
{
@ -1219,7 +1200,7 @@ value_struct_elt (argp, args, name, static_memfuncp, err)
}
}
else
v = search_struct_method (name, *argp, args, 0, static_memfuncp, t);
v = search_struct_method (name, argp, args, 0, static_memfuncp, t);
if (v == 0)
{
@ -1414,7 +1395,8 @@ value_struct_elt_for_reference (domain, offset, curtype, name, intype)
(lookup_reference_type
(lookup_member_type (TYPE_FN_FIELD_TYPE (f, j),
domain)),
(LONGEST) TYPE_FN_FIELD_VOFFSET (f, j));
(LONGEST) METHOD_PTR_FROM_VOFFSET
(TYPE_FN_FIELD_VOFFSET (f, j)));
}
else
{