1991-09-19 10:31:00 +00:00
|
|
|
|
/* Parse expressions for GDB.
|
1998-10-14 01:15:00 +00:00
|
|
|
|
Copyright (C) 1986, 89, 90, 91, 94, 1998 Free Software Foundation, Inc.
|
1991-09-19 10:31:00 +00:00
|
|
|
|
Modified from expread.y by the Department of Computer Science at the
|
|
|
|
|
State University of New York at Buffalo, 1991.
|
|
|
|
|
|
|
|
|
|
This file is part of GDB.
|
|
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
|
along with this program; if not, write to the Free Software
|
1995-08-02 03:41:12 +00:00
|
|
|
|
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
1991-09-19 10:31:00 +00:00
|
|
|
|
|
|
|
|
|
/* Parse an expression from text in a string,
|
|
|
|
|
and return the result as a struct expression pointer.
|
|
|
|
|
That structure contains arithmetic operations in reverse polish,
|
|
|
|
|
with constants represented by operations that are followed by special data.
|
|
|
|
|
See expression.h for the details of the format.
|
|
|
|
|
What is important here is that it can be built up sequentially
|
|
|
|
|
during the process of parsing; the lower levels of the tree always
|
|
|
|
|
come first in the result. */
|
|
|
|
|
|
|
|
|
|
#include "defs.h"
|
* configure.in: Check for working mmap, ansi headers, string.h,
strings.h, and memory.h.
* configure: Regenerated.
* gdb_stat.h: New file, "portable" <sys/stat.h>.
* gdb_string.h: New file, "portable" <string.h>.
* altos-xdep.c, arm-tdep.c, arm-xdep.c, convex-tdep.c,
convex-xdep.c, coredep.c, cxux-nat.c, dbxread.c, exec.c,
gould-xdep.c, hppa-tdep.c, i386aix-nat.c, i386b-nat.c,
i386mach-nat.c, i386v-nat.c, infptrace.c, m88k-nat.c, main.c,
mdebugread.c, objfiles.c, os9kread.c, procfs.c, pyr-xdep.c,
rs6000-nat.c, source.c, standalone.c, stuff.c, sun386-nat.c,
symfile.c, symm-nat.c, symm-tdep.c, symtab.c, top.c, ultra3-nat.c,
ultra3-xdep.c, umax-xdep.c, xcoffread.c: Include "gdb_stat.h"
instead of <sys/stat.h>.
* alpha-tdep.c, breakpoint.c, buildsym.c, c-typeprint.c,
ch-typeprint.c, coffread.c, command.c, core-sol2.c, core-svr4.c,
core.c, corelow.c, cp-valprint.c, dbxread.c, dcache.c, demangle.c,
dpx2-nat.c, dstread.c, dwarfread.c, elfread.c, environ.c, eval.c,
exec.c, f-lang.c, f-typeprint.c, f-valprint.c, findvar.c,
fork-child.c, gdbtypes.c, hpread.c, i386-tdep.c, infcmd.c,
inflow.c, infptrace.c, infrun.c, irix5-nat.c, language.c,
m2-typeprint.c, main.c, mdebugread.c, minsyms.c, mipsread.c,
monitor.c, nlmread.c, objfiles.c, os9kread.c, osfsolib.c, parse.c,
printcmd.c, procfs.c, regex.c, remote-adapt.c, remote-arc.c,
remote-array.c, remote-bug.c, remote-e7000.c, remote-eb.c,
remote-es.c, remote-hms.c, remote-mm.c, remote-os9k.c,
remote-pa.c, remote-sim.c, remote-st.c, remote-udi.c,
remote-utils.c, remote-vx.c, remote-vx29k.c, remote-vx68.c,
remote-vx960.c, remote-vxmips.c, remote-vxsparc.c, remote.c,
solib.c, somread.c, source.c, stabsread.c, stack.c, symfile.c,
symmisc.c, symtab.c, target.c, top.c, typeprint.c, utils.c,
valarith.c, valops.c, valprint.c, values.c, xcoffread.c: Include
"gdb_string.h" instead of <string.h>.
* gdbtk.c: Likewise.
* config/xm-sysv4.h, i386/xm-ptx.h, m68k/xm-sun3os4.h,
sparc/xm-sun4os4.h (HAVE_MMAP): Removed.
* config/xm-lynx.h, config/i386/xm-ptx.h,
config/m68k/nm-apollo68b.h, config/m68k/xm-hp300hpux.h,
config/mips/xm-irix3.h, config/mips/xm-mips.h,
config/mips/xm-news-mips.h, config/mips/xm-riscos.h,
config/pa/hppah.h, config/rs6000/xm-rs6000.h,
config/sparc/xm-sun4os4.h, config/sparc/xm-sun4sol2.h,
config/vax/xm-vaxbsd.h, config/vax/xm-vaxult.h,
config/vax/xm-vaxult2.h (MEM_FNS_DECLARED): Removed.
* config/mips/xm-irix3.h, config/mips/xm-mips.h,
config/pa/xm-hppah.h (memcpy, memset): Removed declarations.
1995-08-01 20:14:27 +00:00
|
|
|
|
#include "gdb_string.h"
|
1991-09-19 10:31:00 +00:00
|
|
|
|
#include "symtab.h"
|
1992-02-22 01:46:16 +00:00
|
|
|
|
#include "gdbtypes.h"
|
1991-09-19 10:31:00 +00:00
|
|
|
|
#include "frame.h"
|
|
|
|
|
#include "expression.h"
|
|
|
|
|
#include "value.h"
|
|
|
|
|
#include "command.h"
|
|
|
|
|
#include "language.h"
|
|
|
|
|
#include "parser-defs.h"
|
1998-08-12 15:50:59 +00:00
|
|
|
|
#include "gdbcmd.h"
|
1998-07-17 15:29:11 +00:00
|
|
|
|
#include "symfile.h" /* for overlay functions */
|
1994-03-08 15:25:00 +00:00
|
|
|
|
|
|
|
|
|
/* Global variables declared in parser-defs.h (and commented there). */
|
|
|
|
|
struct expression *expout;
|
|
|
|
|
int expout_size;
|
|
|
|
|
int expout_ptr;
|
|
|
|
|
struct block *expression_context_block;
|
|
|
|
|
struct block *innermost_block;
|
|
|
|
|
int arglist_len;
|
|
|
|
|
union type_stack_elt *type_stack;
|
|
|
|
|
int type_stack_depth, type_stack_size;
|
|
|
|
|
char *lexptr;
|
|
|
|
|
char *namecopy;
|
|
|
|
|
int paren_depth;
|
|
|
|
|
int comma_terminates;
|
|
|
|
|
|
1998-08-12 15:50:59 +00:00
|
|
|
|
#ifdef MAINTENANCE_CMDS
|
|
|
|
|
static int expressiondebug = 0;
|
|
|
|
|
#endif
|
|
|
|
|
|
1998-12-31 21:58:30 +00:00
|
|
|
|
extern int hp_som_som_object_present;
|
|
|
|
|
|
1993-02-03 00:28:54 +00:00
|
|
|
|
static void
|
|
|
|
|
free_funcalls PARAMS ((void));
|
|
|
|
|
|
1992-02-22 01:46:16 +00:00
|
|
|
|
static void
|
|
|
|
|
prefixify_expression PARAMS ((struct expression *));
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
prefixify_subexp PARAMS ((struct expression *, struct expression *, int, int));
|
|
|
|
|
|
1993-02-03 00:28:54 +00:00
|
|
|
|
/* Data structure for saving values of arglist_len for function calls whose
|
|
|
|
|
arguments contain other function calls. */
|
|
|
|
|
|
|
|
|
|
struct funcall
|
|
|
|
|
{
|
|
|
|
|
struct funcall *next;
|
|
|
|
|
int arglist_len;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static struct funcall *funcall_chain;
|
|
|
|
|
|
1991-09-19 10:31:00 +00:00
|
|
|
|
/* Assign machine-independent names to certain registers
|
|
|
|
|
(unless overridden by the REGISTER_NAMES table) */
|
|
|
|
|
|
1993-02-01 22:53:24 +00:00
|
|
|
|
#ifdef NO_STD_REGS
|
|
|
|
|
unsigned num_std_regs = 0;
|
|
|
|
|
struct std_regs std_regs[1];
|
|
|
|
|
#else
|
1991-09-19 10:31:00 +00:00
|
|
|
|
struct std_regs std_regs[] = {
|
1993-02-01 22:53:24 +00:00
|
|
|
|
|
1991-09-19 10:31:00 +00:00
|
|
|
|
#ifdef PC_REGNUM
|
|
|
|
|
{ "pc", PC_REGNUM },
|
|
|
|
|
#endif
|
|
|
|
|
#ifdef FP_REGNUM
|
|
|
|
|
{ "fp", FP_REGNUM },
|
|
|
|
|
#endif
|
|
|
|
|
#ifdef SP_REGNUM
|
|
|
|
|
{ "sp", SP_REGNUM },
|
|
|
|
|
#endif
|
|
|
|
|
#ifdef PS_REGNUM
|
|
|
|
|
{ "ps", PS_REGNUM },
|
|
|
|
|
#endif
|
1993-02-01 22:53:24 +00:00
|
|
|
|
|
1991-09-19 10:31:00 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
unsigned num_std_regs = (sizeof std_regs / sizeof std_regs[0]);
|
|
|
|
|
|
1993-02-01 22:53:24 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
1998-12-10 23:07:24 +00:00
|
|
|
|
/* The generic method for targets to specify how their registers are
|
|
|
|
|
named. The mapping can be derived from three sources:
|
|
|
|
|
REGISTER_NAME; std_regs; or a target specific alias hook. */
|
1998-02-15 21:30:02 +00:00
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
target_map_name_to_register (str, len)
|
|
|
|
|
char *str;
|
|
|
|
|
int len;
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
1998-06-17 21:53:20 +00:00
|
|
|
|
/* First try target specific aliases. We try these first because on some
|
|
|
|
|
systems standard names can be context dependent (eg. $pc on a
|
|
|
|
|
multiprocessor can be could be any of several PCs). */
|
|
|
|
|
#ifdef REGISTER_NAME_ALIAS_HOOK
|
|
|
|
|
i = REGISTER_NAME_ALIAS_HOOK (str, len);
|
|
|
|
|
if (i >= 0)
|
|
|
|
|
return i;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* Search architectural register name space. */
|
1998-02-15 21:30:02 +00:00
|
|
|
|
for (i = 0; i < NUM_REGS; i++)
|
1998-12-10 06:10:03 +00:00
|
|
|
|
if (REGISTER_NAME (i) && len == strlen (REGISTER_NAME (i))
|
|
|
|
|
&& STREQN (str, REGISTER_NAME (i), len))
|
1998-02-15 21:30:02 +00:00
|
|
|
|
{
|
|
|
|
|
return i;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Try standard aliases */
|
|
|
|
|
for (i = 0; i < num_std_regs; i++)
|
|
|
|
|
if (std_regs[i].name && len == strlen (std_regs[i].name)
|
|
|
|
|
&& STREQN (str, std_regs[i].name, len))
|
|
|
|
|
{
|
|
|
|
|
return std_regs[i].regnum;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
1991-09-19 10:31:00 +00:00
|
|
|
|
|
|
|
|
|
/* Begin counting arguments for a function call,
|
|
|
|
|
saving the data about any containing call. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
start_arglist ()
|
|
|
|
|
{
|
1993-02-03 00:28:54 +00:00
|
|
|
|
register struct funcall *new;
|
1991-09-19 10:31:00 +00:00
|
|
|
|
|
1993-02-03 00:28:54 +00:00
|
|
|
|
new = (struct funcall *) xmalloc (sizeof (struct funcall));
|
1991-09-19 10:31:00 +00:00
|
|
|
|
new->next = funcall_chain;
|
|
|
|
|
new->arglist_len = arglist_len;
|
|
|
|
|
arglist_len = 0;
|
|
|
|
|
funcall_chain = new;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the number of arguments in a function call just terminated,
|
|
|
|
|
and restore the data for the containing function call. */
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
end_arglist ()
|
|
|
|
|
{
|
|
|
|
|
register int val = arglist_len;
|
|
|
|
|
register struct funcall *call = funcall_chain;
|
|
|
|
|
funcall_chain = call->next;
|
|
|
|
|
arglist_len = call->arglist_len;
|
1992-03-29 23:26:47 +00:00
|
|
|
|
free ((PTR)call);
|
1991-09-19 10:31:00 +00:00
|
|
|
|
return val;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Free everything in the funcall chain.
|
|
|
|
|
Used when there is an error inside parsing. */
|
|
|
|
|
|
1993-02-03 00:28:54 +00:00
|
|
|
|
static void
|
1991-09-19 10:31:00 +00:00
|
|
|
|
free_funcalls ()
|
|
|
|
|
{
|
|
|
|
|
register struct funcall *call, *next;
|
|
|
|
|
|
|
|
|
|
for (call = funcall_chain; call; call = next)
|
|
|
|
|
{
|
|
|
|
|
next = call->next;
|
1992-03-29 23:26:47 +00:00
|
|
|
|
free ((PTR)call);
|
1991-09-19 10:31:00 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This page contains the functions for adding data to the struct expression
|
|
|
|
|
being constructed. */
|
|
|
|
|
|
|
|
|
|
/* Add one element to the end of the expression. */
|
|
|
|
|
|
|
|
|
|
/* To avoid a bug in the Sun 4 compiler, we pass things that can fit into
|
|
|
|
|
a register through here */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
write_exp_elt (expelt)
|
|
|
|
|
union exp_element expelt;
|
|
|
|
|
{
|
|
|
|
|
if (expout_ptr >= expout_size)
|
|
|
|
|
{
|
|
|
|
|
expout_size *= 2;
|
* defs.h (HOST_CHAR_BIT): New macro, defaults to either CHAR_BIT
from a configuration file (typically including <limits.h>), or to
TARGET_CHAR_BIT if CHAR_BIT is not defined.
* eval.c (evaluate_subexp): Use new BYTES_TO_EXP_ELEM macro.
* eval.c (evaluate_subexp): Add case for OP_BITSTRING.
* expprint.c (print_subexp): Use new BYTES_TO_EXP_ELEM macro.
* exppritn.c (print_subexp, dump_expression): Add case for
OP_BITSTRING.
* expression.h (OP_BITSTRING): New expression element type for
packed bitstrings.
* expression.h (EXP_ELEM_TO_BYTES, BYTES_TO_EXP_ELEM): New
macros to convert between number of expression elements and bytes
to store that many elements.
* i960-tdep.c (leafproc_return): Use new macros to access
minimal symbol name and address fields.
* m88k-pinsn.c (sprint_address): Use new macros to access
minimal symbol name and address fields.
* nindy-tdep.c (nindy_frame_chain_valid): Use new macro to access
minimal symbol address field.
* parse.c (write_exp_elt, write_exp_string, prefixify_expression,
parse_exp_1): Use new EXP_ELEM_TO_BYTES macro.
* parse.c (write_exp_string, length_of_subexp, prefixify_expression):
Use new BYTES_TO_EXP_ELEM macro.
* parse.c (write_exp_bitstring): New function to write packed
bitstrings into the expression element vector.
* parse.c (length_of_subexp, prefixify_subexp): Add case for
OP_BITSTRING.
* parser-defs.h (struct stoken): Document that it is used for
OP_BITSTRING as well as OP_STRING.
* parser-defs.h (write_exp_bitstring): Add prototype.
**** start-sanitize-chill ****
* ch-exp.y (BIT_STRING_LITERAL): Change token type to sval.
* ch-exp.y (NUM, PRED, SUCC, ABS, CARD, MAX, MIN, SIZE, UPPER,
LOWER, LENGTH): New tokens for keywords.
* ch-exp.y (chill_value_built_in_routine_call, mode_argument,
upper_lower_argument, length_argument, array_mode_name,
string_mode_name, variant_structure_mode_name): New non-terminals
and productions.
* ch-exp.y (literal): Useful production for BIT_STRING_LITERAL.
* ch-exp.y (match_bitstring_literal): New lexer support function
to recognize bitstring literals.
* ch-exp.y (tokentab6): New token table for 6 character keywords.
* ch-exp.y (tokentab5): Add LOWER, UPPER.
* ch-exp.y (tokentab4): Add PRED, SUCC, CARD, SIZE.
* ch-exp.y (tokentab3): Add NUM, ABS, MIN, MAX.
* ch-exp.y (yylex): Check tokentab6.
* ch-exp.y (yylex): Call match_bitstring_literal.
**** end-sanitize-chill ****
1993-01-06 16:52:10 +00:00
|
|
|
|
expout = (struct expression *)
|
|
|
|
|
xrealloc ((char *) expout, sizeof (struct expression)
|
|
|
|
|
+ EXP_ELEM_TO_BYTES (expout_size));
|
1991-09-19 10:31:00 +00:00
|
|
|
|
}
|
|
|
|
|
expout->elts[expout_ptr++] = expelt;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
write_exp_elt_opcode (expelt)
|
|
|
|
|
enum exp_opcode expelt;
|
|
|
|
|
{
|
|
|
|
|
union exp_element tmp;
|
|
|
|
|
|
|
|
|
|
tmp.opcode = expelt;
|
|
|
|
|
|
|
|
|
|
write_exp_elt (tmp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
write_exp_elt_sym (expelt)
|
|
|
|
|
struct symbol *expelt;
|
|
|
|
|
{
|
|
|
|
|
union exp_element tmp;
|
|
|
|
|
|
|
|
|
|
tmp.symbol = expelt;
|
|
|
|
|
|
|
|
|
|
write_exp_elt (tmp);
|
|
|
|
|
}
|
|
|
|
|
|
1993-08-18 19:33:39 +00:00
|
|
|
|
void
|
|
|
|
|
write_exp_elt_block (b)
|
|
|
|
|
struct block *b;
|
|
|
|
|
{
|
|
|
|
|
union exp_element tmp;
|
|
|
|
|
tmp.block = b;
|
|
|
|
|
write_exp_elt (tmp);
|
|
|
|
|
}
|
|
|
|
|
|
1991-09-19 10:31:00 +00:00
|
|
|
|
void
|
|
|
|
|
write_exp_elt_longcst (expelt)
|
|
|
|
|
LONGEST expelt;
|
|
|
|
|
{
|
|
|
|
|
union exp_element tmp;
|
|
|
|
|
|
|
|
|
|
tmp.longconst = expelt;
|
|
|
|
|
|
|
|
|
|
write_exp_elt (tmp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
write_exp_elt_dblcst (expelt)
|
* Add native support for long double data type.
* c-exp.y (%union): Change dval to typed_val_float. Use DOUBLEST
to store actual data. Change types of INT and FLOAT tokens to
typed_val_int and typed_val_float respectively. Create new token
DOUBLE_KEYWORD to specify the string `double'. Make production
for FLOAT use type determined by parse_number. Add production for
"long double" data type.
* (parse_number): Use sscanf to parse numbers as float, double or
long double depending upon the type of typed_val_float.dval. Also
allow user to specify `f' or `l' suffix to explicitly specify
float or long double constants. Change typed_val to
typed_val_int.
* (yylex): Change typed_val to typed_val_int. Also, scan for
"double" keyword.
* coffread.c (decode_base_type): Add support for T_LNGDBL basic
type.
* configure, configure.in: Add check for long double support in
the host compiler.
* defs.h: Define DOUBLEST appropriatly depending on whether
HAVE_LONG_DOUBLE (from autoconf) is defined. Also, fix prototypes
for functions that handle this type.
* expression.h (union exp_element): doubleconst is now type
DOUBLEST.
* m2-exp.y f-exp.y (%union): dval becomes type DOUBLEST.
* findvar.c (extract_floating): Make return value be DOUBLEST.
Also, add support for numbers with size of long double.
* (store_floating): Arg `val' is now type DOUBLEST. Handle all
floating types.
* parser-defs.h parse.c (write_exp_elt_dblcst): Arg expelt is now
DOUBLEST.
* valarith.c (value_binop): Change temp variables v1, v2 and v to
type DOUBLEST. Coerce type of result to long double if either op
was of that type.
* valops.c (value_arg_coerce): If argument type is bigger than
double, coerce to long double.
* (call_function_by_hand): If REG_STRUCT_HAS_ADDR is defined, and
arg type is float and > 8 bytes, then use pointer-to-object
calling conventions.
* valprint.c (print_floating): Arg doub is now type DOUBLEST.
Use appropriate format and precision to print out floating point
values.
* value.h: Fixup prototypes for value_as_double,
value_from_double, and unpack_double to use DOUBLEST.
* values.c (record_latest_value): Remove check for invalid
floats. Allow history to store them so that people may examine
them in hex if they want.
* (value_as_double unpack_double): Change return value to DOUBLEST.
* (value_from_double): Arg `num' is now DOUBLEST.
* (using_struct_return): Use RETURN_VALUE_ON_STACK macro (target
specific) to expect certain types to always be returned on the stack.
1996-02-17 00:07:35 +00:00
|
|
|
|
DOUBLEST expelt;
|
1991-09-19 10:31:00 +00:00
|
|
|
|
{
|
|
|
|
|
union exp_element tmp;
|
|
|
|
|
|
|
|
|
|
tmp.doubleconst = expelt;
|
|
|
|
|
|
|
|
|
|
write_exp_elt (tmp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
write_exp_elt_type (expelt)
|
|
|
|
|
struct type *expelt;
|
|
|
|
|
{
|
|
|
|
|
union exp_element tmp;
|
|
|
|
|
|
|
|
|
|
tmp.type = expelt;
|
|
|
|
|
|
|
|
|
|
write_exp_elt (tmp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
write_exp_elt_intern (expelt)
|
|
|
|
|
struct internalvar *expelt;
|
|
|
|
|
{
|
|
|
|
|
union exp_element tmp;
|
|
|
|
|
|
|
|
|
|
tmp.internalvar = expelt;
|
|
|
|
|
|
|
|
|
|
write_exp_elt (tmp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Add a string constant to the end of the expression.
|
* parse.c (write_exp_string): Complete rewrite to store string
contants as a leading explicit length, followed by the string data,
followed by a trailing explicit length.
* eval.c (evaluate_subexp), expprint.c (print_subexp),
parse.c (length_of_subexp), parse.c (prefixify_subexp):
Use recorded explicit length of strings in expression elements,
rather than strlen. Adjust code to skip over strings stored in
expression elements, and code to access strings, to account for
new leading explicit size expression element.
* parse.c (length_of_subexp): Test for minimum endpos of 1, not
0, to avoid negative expression element indices.
* valops.c (search_struct_method): Minor whitespace change.
1992-11-25 15:46:57 +00:00
|
|
|
|
|
|
|
|
|
String constants are stored by first writing an expression element
|
|
|
|
|
that contains the length of the string, then stuffing the string
|
|
|
|
|
constant itself into however many expression elements are needed
|
|
|
|
|
to hold it, and then writing another expression element that contains
|
|
|
|
|
the length of the string. I.E. an expression element at each end of
|
|
|
|
|
the string records the string length, so you can skip over the
|
|
|
|
|
expression elements containing the actual string bytes from either
|
|
|
|
|
end of the string. Note that this also allows gdb to handle
|
|
|
|
|
strings with embedded null bytes, as is required for some languages.
|
|
|
|
|
|
|
|
|
|
Don't be fooled by the fact that the string is null byte terminated,
|
|
|
|
|
this is strictly for the convenience of debugging gdb itself. Gdb
|
|
|
|
|
Gdb does not depend up the string being null terminated, since the
|
|
|
|
|
actual length is recorded in expression elements at each end of the
|
|
|
|
|
string. The null byte is taken into consideration when computing how
|
|
|
|
|
many expression elements are required to hold the string constant, of
|
|
|
|
|
course. */
|
|
|
|
|
|
1991-09-19 10:31:00 +00:00
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
write_exp_string (str)
|
|
|
|
|
struct stoken str;
|
|
|
|
|
{
|
|
|
|
|
register int len = str.length;
|
* parse.c (write_exp_string): Complete rewrite to store string
contants as a leading explicit length, followed by the string data,
followed by a trailing explicit length.
* eval.c (evaluate_subexp), expprint.c (print_subexp),
parse.c (length_of_subexp), parse.c (prefixify_subexp):
Use recorded explicit length of strings in expression elements,
rather than strlen. Adjust code to skip over strings stored in
expression elements, and code to access strings, to account for
new leading explicit size expression element.
* parse.c (length_of_subexp): Test for minimum endpos of 1, not
0, to avoid negative expression element indices.
* valops.c (search_struct_method): Minor whitespace change.
1992-11-25 15:46:57 +00:00
|
|
|
|
register int lenelt;
|
|
|
|
|
register char *strdata;
|
1991-09-19 10:31:00 +00:00
|
|
|
|
|
* parse.c (write_exp_string): Complete rewrite to store string
contants as a leading explicit length, followed by the string data,
followed by a trailing explicit length.
* eval.c (evaluate_subexp), expprint.c (print_subexp),
parse.c (length_of_subexp), parse.c (prefixify_subexp):
Use recorded explicit length of strings in expression elements,
rather than strlen. Adjust code to skip over strings stored in
expression elements, and code to access strings, to account for
new leading explicit size expression element.
* parse.c (length_of_subexp): Test for minimum endpos of 1, not
0, to avoid negative expression element indices.
* valops.c (search_struct_method): Minor whitespace change.
1992-11-25 15:46:57 +00:00
|
|
|
|
/* Compute the number of expression elements required to hold the string
|
|
|
|
|
(including a null byte terminator), along with one expression element
|
|
|
|
|
at each end to record the actual string length (not including the
|
|
|
|
|
null byte terminator). */
|
1991-09-19 10:31:00 +00:00
|
|
|
|
|
* defs.h (HOST_CHAR_BIT): New macro, defaults to either CHAR_BIT
from a configuration file (typically including <limits.h>), or to
TARGET_CHAR_BIT if CHAR_BIT is not defined.
* eval.c (evaluate_subexp): Use new BYTES_TO_EXP_ELEM macro.
* eval.c (evaluate_subexp): Add case for OP_BITSTRING.
* expprint.c (print_subexp): Use new BYTES_TO_EXP_ELEM macro.
* exppritn.c (print_subexp, dump_expression): Add case for
OP_BITSTRING.
* expression.h (OP_BITSTRING): New expression element type for
packed bitstrings.
* expression.h (EXP_ELEM_TO_BYTES, BYTES_TO_EXP_ELEM): New
macros to convert between number of expression elements and bytes
to store that many elements.
* i960-tdep.c (leafproc_return): Use new macros to access
minimal symbol name and address fields.
* m88k-pinsn.c (sprint_address): Use new macros to access
minimal symbol name and address fields.
* nindy-tdep.c (nindy_frame_chain_valid): Use new macro to access
minimal symbol address field.
* parse.c (write_exp_elt, write_exp_string, prefixify_expression,
parse_exp_1): Use new EXP_ELEM_TO_BYTES macro.
* parse.c (write_exp_string, length_of_subexp, prefixify_expression):
Use new BYTES_TO_EXP_ELEM macro.
* parse.c (write_exp_bitstring): New function to write packed
bitstrings into the expression element vector.
* parse.c (length_of_subexp, prefixify_subexp): Add case for
OP_BITSTRING.
* parser-defs.h (struct stoken): Document that it is used for
OP_BITSTRING as well as OP_STRING.
* parser-defs.h (write_exp_bitstring): Add prototype.
**** start-sanitize-chill ****
* ch-exp.y (BIT_STRING_LITERAL): Change token type to sval.
* ch-exp.y (NUM, PRED, SUCC, ABS, CARD, MAX, MIN, SIZE, UPPER,
LOWER, LENGTH): New tokens for keywords.
* ch-exp.y (chill_value_built_in_routine_call, mode_argument,
upper_lower_argument, length_argument, array_mode_name,
string_mode_name, variant_structure_mode_name): New non-terminals
and productions.
* ch-exp.y (literal): Useful production for BIT_STRING_LITERAL.
* ch-exp.y (match_bitstring_literal): New lexer support function
to recognize bitstring literals.
* ch-exp.y (tokentab6): New token table for 6 character keywords.
* ch-exp.y (tokentab5): Add LOWER, UPPER.
* ch-exp.y (tokentab4): Add PRED, SUCC, CARD, SIZE.
* ch-exp.y (tokentab3): Add NUM, ABS, MIN, MAX.
* ch-exp.y (yylex): Check tokentab6.
* ch-exp.y (yylex): Call match_bitstring_literal.
**** end-sanitize-chill ****
1993-01-06 16:52:10 +00:00
|
|
|
|
lenelt = 2 + BYTES_TO_EXP_ELEM (len + 1);
|
* parse.c (write_exp_string): Complete rewrite to store string
contants as a leading explicit length, followed by the string data,
followed by a trailing explicit length.
* eval.c (evaluate_subexp), expprint.c (print_subexp),
parse.c (length_of_subexp), parse.c (prefixify_subexp):
Use recorded explicit length of strings in expression elements,
rather than strlen. Adjust code to skip over strings stored in
expression elements, and code to access strings, to account for
new leading explicit size expression element.
* parse.c (length_of_subexp): Test for minimum endpos of 1, not
0, to avoid negative expression element indices.
* valops.c (search_struct_method): Minor whitespace change.
1992-11-25 15:46:57 +00:00
|
|
|
|
|
|
|
|
|
/* Ensure that we have enough available expression elements to store
|
|
|
|
|
everything. */
|
|
|
|
|
|
|
|
|
|
if ((expout_ptr + lenelt) >= expout_size)
|
1991-09-19 10:31:00 +00:00
|
|
|
|
{
|
* parse.c (write_exp_string): Complete rewrite to store string
contants as a leading explicit length, followed by the string data,
followed by a trailing explicit length.
* eval.c (evaluate_subexp), expprint.c (print_subexp),
parse.c (length_of_subexp), parse.c (prefixify_subexp):
Use recorded explicit length of strings in expression elements,
rather than strlen. Adjust code to skip over strings stored in
expression elements, and code to access strings, to account for
new leading explicit size expression element.
* parse.c (length_of_subexp): Test for minimum endpos of 1, not
0, to avoid negative expression element indices.
* valops.c (search_struct_method): Minor whitespace change.
1992-11-25 15:46:57 +00:00
|
|
|
|
expout_size = max (expout_size * 2, expout_ptr + lenelt + 10);
|
1991-09-19 10:31:00 +00:00
|
|
|
|
expout = (struct expression *)
|
1992-02-22 01:46:16 +00:00
|
|
|
|
xrealloc ((char *) expout, (sizeof (struct expression)
|
* defs.h (HOST_CHAR_BIT): New macro, defaults to either CHAR_BIT
from a configuration file (typically including <limits.h>), or to
TARGET_CHAR_BIT if CHAR_BIT is not defined.
* eval.c (evaluate_subexp): Use new BYTES_TO_EXP_ELEM macro.
* eval.c (evaluate_subexp): Add case for OP_BITSTRING.
* expprint.c (print_subexp): Use new BYTES_TO_EXP_ELEM macro.
* exppritn.c (print_subexp, dump_expression): Add case for
OP_BITSTRING.
* expression.h (OP_BITSTRING): New expression element type for
packed bitstrings.
* expression.h (EXP_ELEM_TO_BYTES, BYTES_TO_EXP_ELEM): New
macros to convert between number of expression elements and bytes
to store that many elements.
* i960-tdep.c (leafproc_return): Use new macros to access
minimal symbol name and address fields.
* m88k-pinsn.c (sprint_address): Use new macros to access
minimal symbol name and address fields.
* nindy-tdep.c (nindy_frame_chain_valid): Use new macro to access
minimal symbol address field.
* parse.c (write_exp_elt, write_exp_string, prefixify_expression,
parse_exp_1): Use new EXP_ELEM_TO_BYTES macro.
* parse.c (write_exp_string, length_of_subexp, prefixify_expression):
Use new BYTES_TO_EXP_ELEM macro.
* parse.c (write_exp_bitstring): New function to write packed
bitstrings into the expression element vector.
* parse.c (length_of_subexp, prefixify_subexp): Add case for
OP_BITSTRING.
* parser-defs.h (struct stoken): Document that it is used for
OP_BITSTRING as well as OP_STRING.
* parser-defs.h (write_exp_bitstring): Add prototype.
**** start-sanitize-chill ****
* ch-exp.y (BIT_STRING_LITERAL): Change token type to sval.
* ch-exp.y (NUM, PRED, SUCC, ABS, CARD, MAX, MIN, SIZE, UPPER,
LOWER, LENGTH): New tokens for keywords.
* ch-exp.y (chill_value_built_in_routine_call, mode_argument,
upper_lower_argument, length_argument, array_mode_name,
string_mode_name, variant_structure_mode_name): New non-terminals
and productions.
* ch-exp.y (literal): Useful production for BIT_STRING_LITERAL.
* ch-exp.y (match_bitstring_literal): New lexer support function
to recognize bitstring literals.
* ch-exp.y (tokentab6): New token table for 6 character keywords.
* ch-exp.y (tokentab5): Add LOWER, UPPER.
* ch-exp.y (tokentab4): Add PRED, SUCC, CARD, SIZE.
* ch-exp.y (tokentab3): Add NUM, ABS, MIN, MAX.
* ch-exp.y (yylex): Check tokentab6.
* ch-exp.y (yylex): Call match_bitstring_literal.
**** end-sanitize-chill ****
1993-01-06 16:52:10 +00:00
|
|
|
|
+ EXP_ELEM_TO_BYTES (expout_size)));
|
1991-09-19 10:31:00 +00:00
|
|
|
|
}
|
* parse.c (write_exp_string): Complete rewrite to store string
contants as a leading explicit length, followed by the string data,
followed by a trailing explicit length.
* eval.c (evaluate_subexp), expprint.c (print_subexp),
parse.c (length_of_subexp), parse.c (prefixify_subexp):
Use recorded explicit length of strings in expression elements,
rather than strlen. Adjust code to skip over strings stored in
expression elements, and code to access strings, to account for
new leading explicit size expression element.
* parse.c (length_of_subexp): Test for minimum endpos of 1, not
0, to avoid negative expression element indices.
* valops.c (search_struct_method): Minor whitespace change.
1992-11-25 15:46:57 +00:00
|
|
|
|
|
|
|
|
|
/* Write the leading length expression element (which advances the current
|
|
|
|
|
expression element index), then write the string constant followed by a
|
|
|
|
|
terminating null byte, and then write the trailing length expression
|
|
|
|
|
element. */
|
|
|
|
|
|
|
|
|
|
write_exp_elt_longcst ((LONGEST) len);
|
|
|
|
|
strdata = (char *) &expout->elts[expout_ptr];
|
|
|
|
|
memcpy (strdata, str.ptr, len);
|
|
|
|
|
*(strdata + len) = '\0';
|
|
|
|
|
expout_ptr += lenelt - 2;
|
1991-09-19 10:31:00 +00:00
|
|
|
|
write_exp_elt_longcst ((LONGEST) len);
|
|
|
|
|
}
|
* defs.h (HOST_CHAR_BIT): New macro, defaults to either CHAR_BIT
from a configuration file (typically including <limits.h>), or to
TARGET_CHAR_BIT if CHAR_BIT is not defined.
* eval.c (evaluate_subexp): Use new BYTES_TO_EXP_ELEM macro.
* eval.c (evaluate_subexp): Add case for OP_BITSTRING.
* expprint.c (print_subexp): Use new BYTES_TO_EXP_ELEM macro.
* exppritn.c (print_subexp, dump_expression): Add case for
OP_BITSTRING.
* expression.h (OP_BITSTRING): New expression element type for
packed bitstrings.
* expression.h (EXP_ELEM_TO_BYTES, BYTES_TO_EXP_ELEM): New
macros to convert between number of expression elements and bytes
to store that many elements.
* i960-tdep.c (leafproc_return): Use new macros to access
minimal symbol name and address fields.
* m88k-pinsn.c (sprint_address): Use new macros to access
minimal symbol name and address fields.
* nindy-tdep.c (nindy_frame_chain_valid): Use new macro to access
minimal symbol address field.
* parse.c (write_exp_elt, write_exp_string, prefixify_expression,
parse_exp_1): Use new EXP_ELEM_TO_BYTES macro.
* parse.c (write_exp_string, length_of_subexp, prefixify_expression):
Use new BYTES_TO_EXP_ELEM macro.
* parse.c (write_exp_bitstring): New function to write packed
bitstrings into the expression element vector.
* parse.c (length_of_subexp, prefixify_subexp): Add case for
OP_BITSTRING.
* parser-defs.h (struct stoken): Document that it is used for
OP_BITSTRING as well as OP_STRING.
* parser-defs.h (write_exp_bitstring): Add prototype.
**** start-sanitize-chill ****
* ch-exp.y (BIT_STRING_LITERAL): Change token type to sval.
* ch-exp.y (NUM, PRED, SUCC, ABS, CARD, MAX, MIN, SIZE, UPPER,
LOWER, LENGTH): New tokens for keywords.
* ch-exp.y (chill_value_built_in_routine_call, mode_argument,
upper_lower_argument, length_argument, array_mode_name,
string_mode_name, variant_structure_mode_name): New non-terminals
and productions.
* ch-exp.y (literal): Useful production for BIT_STRING_LITERAL.
* ch-exp.y (match_bitstring_literal): New lexer support function
to recognize bitstring literals.
* ch-exp.y (tokentab6): New token table for 6 character keywords.
* ch-exp.y (tokentab5): Add LOWER, UPPER.
* ch-exp.y (tokentab4): Add PRED, SUCC, CARD, SIZE.
* ch-exp.y (tokentab3): Add NUM, ABS, MIN, MAX.
* ch-exp.y (yylex): Check tokentab6.
* ch-exp.y (yylex): Call match_bitstring_literal.
**** end-sanitize-chill ****
1993-01-06 16:52:10 +00:00
|
|
|
|
|
|
|
|
|
/* Add a bitstring constant to the end of the expression.
|
|
|
|
|
|
|
|
|
|
Bitstring constants are stored by first writing an expression element
|
|
|
|
|
that contains the length of the bitstring (in bits), then stuffing the
|
|
|
|
|
bitstring constant itself into however many expression elements are
|
|
|
|
|
needed to hold it, and then writing another expression element that
|
|
|
|
|
contains the length of the bitstring. I.E. an expression element at
|
|
|
|
|
each end of the bitstring records the bitstring length, so you can skip
|
|
|
|
|
over the expression elements containing the actual bitstring bytes from
|
|
|
|
|
either end of the bitstring. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
write_exp_bitstring (str)
|
|
|
|
|
struct stoken str;
|
|
|
|
|
{
|
|
|
|
|
register int bits = str.length; /* length in bits */
|
|
|
|
|
register int len = (bits + HOST_CHAR_BIT - 1) / HOST_CHAR_BIT;
|
|
|
|
|
register int lenelt;
|
|
|
|
|
register char *strdata;
|
|
|
|
|
|
|
|
|
|
/* Compute the number of expression elements required to hold the bitstring,
|
|
|
|
|
along with one expression element at each end to record the actual
|
|
|
|
|
bitstring length in bits. */
|
|
|
|
|
|
|
|
|
|
lenelt = 2 + BYTES_TO_EXP_ELEM (len);
|
|
|
|
|
|
|
|
|
|
/* Ensure that we have enough available expression elements to store
|
|
|
|
|
everything. */
|
|
|
|
|
|
|
|
|
|
if ((expout_ptr + lenelt) >= expout_size)
|
|
|
|
|
{
|
|
|
|
|
expout_size = max (expout_size * 2, expout_ptr + lenelt + 10);
|
|
|
|
|
expout = (struct expression *)
|
|
|
|
|
xrealloc ((char *) expout, (sizeof (struct expression)
|
|
|
|
|
+ EXP_ELEM_TO_BYTES (expout_size)));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Write the leading length expression element (which advances the current
|
|
|
|
|
expression element index), then write the bitstring constant, and then
|
|
|
|
|
write the trailing length expression element. */
|
|
|
|
|
|
|
|
|
|
write_exp_elt_longcst ((LONGEST) bits);
|
|
|
|
|
strdata = (char *) &expout->elts[expout_ptr];
|
|
|
|
|
memcpy (strdata, str.ptr, len);
|
|
|
|
|
expout_ptr += lenelt - 2;
|
|
|
|
|
write_exp_elt_longcst ((LONGEST) bits);
|
|
|
|
|
}
|
1993-10-24 23:42:02 +00:00
|
|
|
|
|
|
|
|
|
/* Add the appropriate elements for a minimal symbol to the end of
|
1995-01-17 16:16:20 +00:00
|
|
|
|
the expression. The rationale behind passing in text_symbol_type and
|
|
|
|
|
data_symbol_type was so that Modula-2 could pass in WORD for
|
|
|
|
|
data_symbol_type. Perhaps it still is useful to have those types vary
|
|
|
|
|
based on the language, but they no longer have names like "int", so
|
|
|
|
|
the initial rationale is gone. */
|
|
|
|
|
|
|
|
|
|
static struct type *msym_text_symbol_type;
|
|
|
|
|
static struct type *msym_data_symbol_type;
|
|
|
|
|
static struct type *msym_unknown_symbol_type;
|
1993-10-24 23:42:02 +00:00
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
write_exp_msymbol (msymbol, text_symbol_type, data_symbol_type)
|
|
|
|
|
struct minimal_symbol *msymbol;
|
|
|
|
|
struct type *text_symbol_type;
|
|
|
|
|
struct type *data_symbol_type;
|
|
|
|
|
{
|
1998-07-17 15:29:11 +00:00
|
|
|
|
CORE_ADDR addr;
|
|
|
|
|
|
1993-10-24 23:42:02 +00:00
|
|
|
|
write_exp_elt_opcode (OP_LONG);
|
1994-12-02 20:55:16 +00:00
|
|
|
|
write_exp_elt_type (lookup_pointer_type (builtin_type_void));
|
1998-07-17 15:29:11 +00:00
|
|
|
|
|
|
|
|
|
addr = SYMBOL_VALUE_ADDRESS (msymbol);
|
|
|
|
|
if (overlay_debugging)
|
|
|
|
|
addr = symbol_overlayed_address (addr, SYMBOL_BFD_SECTION (msymbol));
|
|
|
|
|
write_exp_elt_longcst ((LONGEST) addr);
|
|
|
|
|
|
1993-10-24 23:42:02 +00:00
|
|
|
|
write_exp_elt_opcode (OP_LONG);
|
|
|
|
|
|
|
|
|
|
write_exp_elt_opcode (UNOP_MEMVAL);
|
|
|
|
|
switch (msymbol -> type)
|
|
|
|
|
{
|
|
|
|
|
case mst_text:
|
|
|
|
|
case mst_file_text:
|
1994-03-15 21:46:32 +00:00
|
|
|
|
case mst_solib_trampoline:
|
1995-01-17 16:16:20 +00:00
|
|
|
|
write_exp_elt_type (msym_text_symbol_type);
|
1993-10-24 23:42:02 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case mst_data:
|
|
|
|
|
case mst_file_data:
|
|
|
|
|
case mst_bss:
|
|
|
|
|
case mst_file_bss:
|
1995-01-17 16:16:20 +00:00
|
|
|
|
write_exp_elt_type (msym_data_symbol_type);
|
1993-10-24 23:42:02 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
1995-01-17 16:16:20 +00:00
|
|
|
|
write_exp_elt_type (msym_unknown_symbol_type);
|
1993-10-24 23:42:02 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
write_exp_elt_opcode (UNOP_MEMVAL);
|
|
|
|
|
}
|
1991-09-19 10:31:00 +00:00
|
|
|
|
|
1995-10-05 22:15:49 +00:00
|
|
|
|
/* Recognize tokens that start with '$'. These include:
|
|
|
|
|
|
|
|
|
|
$regname A native register name or a "standard
|
|
|
|
|
register name".
|
|
|
|
|
|
|
|
|
|
$variable A convenience variable with a name chosen
|
|
|
|
|
by the user.
|
|
|
|
|
|
|
|
|
|
$digits Value history with index <digits>, starting
|
|
|
|
|
from the first value which has index 1.
|
|
|
|
|
|
|
|
|
|
$$digits Value history with index <digits> relative
|
|
|
|
|
to the last value. I.E. $$0 is the last
|
|
|
|
|
value, $$1 is the one previous to that, $$2
|
|
|
|
|
is the one previous to $$1, etc.
|
|
|
|
|
|
|
|
|
|
$ | $0 | $$0 The last value in the value history.
|
|
|
|
|
|
|
|
|
|
$$ An abbreviation for the second to the last
|
|
|
|
|
value in the value history, I.E. $$1
|
|
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
write_dollar_variable (str)
|
|
|
|
|
struct stoken str;
|
|
|
|
|
{
|
|
|
|
|
/* Handle the tokens $digits; also $ (short for $0) and $$ (short for $$1)
|
|
|
|
|
and $$digits (equivalent to $<-digits> if you could type that). */
|
|
|
|
|
|
1998-12-31 21:58:30 +00:00
|
|
|
|
struct symbol * sym = NULL;
|
|
|
|
|
struct minimal_symbol * msym = NULL;
|
|
|
|
|
|
1995-10-05 22:15:49 +00:00
|
|
|
|
int negate = 0;
|
|
|
|
|
int i = 1;
|
|
|
|
|
/* Double dollar means negate the number and add -1 as well.
|
|
|
|
|
Thus $$ alone means -1. */
|
|
|
|
|
if (str.length >= 2 && str.ptr[1] == '$')
|
|
|
|
|
{
|
|
|
|
|
negate = 1;
|
|
|
|
|
i = 2;
|
|
|
|
|
}
|
|
|
|
|
if (i == str.length)
|
|
|
|
|
{
|
|
|
|
|
/* Just dollars (one or two) */
|
|
|
|
|
i = - negate;
|
|
|
|
|
goto handle_last;
|
|
|
|
|
}
|
|
|
|
|
/* Is the rest of the token digits? */
|
|
|
|
|
for (; i < str.length; i++)
|
|
|
|
|
if (!(str.ptr[i] >= '0' && str.ptr[i] <= '9'))
|
|
|
|
|
break;
|
|
|
|
|
if (i == str.length)
|
|
|
|
|
{
|
|
|
|
|
i = atoi (str.ptr + 1 + negate);
|
|
|
|
|
if (negate)
|
|
|
|
|
i = - i;
|
|
|
|
|
goto handle_last;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Handle tokens that refer to machine registers:
|
|
|
|
|
$ followed by a register name. */
|
1998-02-15 21:30:02 +00:00
|
|
|
|
i = target_map_name_to_register( str.ptr + 1, str.length - 1 );
|
|
|
|
|
if( i >= 0 )
|
|
|
|
|
goto handle_register;
|
1995-10-05 22:15:49 +00:00
|
|
|
|
|
1998-12-31 21:58:30 +00:00
|
|
|
|
/* On HP-UX, certain system routines (millicode) have names beginning
|
|
|
|
|
with $ or $$, e.g. $$dyncall, which handles inter-space procedure
|
|
|
|
|
calls on PA-RISC. Check for those, first. */
|
|
|
|
|
|
|
|
|
|
sym = lookup_symbol (copy_name (str), (struct block *) NULL,
|
|
|
|
|
VAR_NAMESPACE, (int *) NULL, (struct symtab **) NULL);
|
|
|
|
|
if (sym)
|
|
|
|
|
{
|
|
|
|
|
write_exp_elt_opcode (OP_VAR_VALUE);
|
|
|
|
|
write_exp_elt_block (block_found); /* set by lookup_symbol */
|
|
|
|
|
write_exp_elt_sym (sym);
|
|
|
|
|
write_exp_elt_opcode (OP_VAR_VALUE);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
msym = lookup_minimal_symbol (copy_name (str), NULL, NULL);
|
|
|
|
|
if (msym)
|
|
|
|
|
{
|
|
|
|
|
write_exp_msymbol (msym,
|
|
|
|
|
lookup_function_type (builtin_type_int),
|
|
|
|
|
builtin_type_int);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
1995-10-05 22:15:49 +00:00
|
|
|
|
/* Any other names starting in $ are debugger internal variables. */
|
|
|
|
|
|
|
|
|
|
write_exp_elt_opcode (OP_INTERNALVAR);
|
|
|
|
|
write_exp_elt_intern (lookup_internalvar (copy_name (str) + 1));
|
|
|
|
|
write_exp_elt_opcode (OP_INTERNALVAR);
|
|
|
|
|
return;
|
|
|
|
|
handle_last:
|
|
|
|
|
write_exp_elt_opcode (OP_LAST);
|
|
|
|
|
write_exp_elt_longcst ((LONGEST) i);
|
|
|
|
|
write_exp_elt_opcode (OP_LAST);
|
|
|
|
|
return;
|
|
|
|
|
handle_register:
|
|
|
|
|
write_exp_elt_opcode (OP_REGISTER);
|
|
|
|
|
write_exp_elt_longcst (i);
|
|
|
|
|
write_exp_elt_opcode (OP_REGISTER);
|
|
|
|
|
return;
|
|
|
|
|
}
|
1998-12-31 21:58:30 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Parse a string that is possibly a namespace / nested class
|
|
|
|
|
specification, i.e., something of the form A::B::C::x. Input
|
|
|
|
|
(NAME) is the entire string; LEN is the current valid length; the
|
|
|
|
|
output is a string, TOKEN, which points to the largest recognized
|
|
|
|
|
prefix which is a series of namespaces or classes. CLASS_PREFIX is
|
|
|
|
|
another output, which records whether a nested class spec was
|
|
|
|
|
recognized (= 1) or a fully qualified variable name was found (=
|
|
|
|
|
0). ARGPTR is side-effected (if non-NULL) to point to beyond the
|
|
|
|
|
string recognized and consumed by this routine.
|
|
|
|
|
|
|
|
|
|
The return value is a pointer to the symbol for the base class or
|
|
|
|
|
variable if found, or NULL if not found. Callers must check this
|
|
|
|
|
first -- if NULL, the outputs may not be correct.
|
|
|
|
|
|
|
|
|
|
This function is used c-exp.y. This is used specifically to get
|
|
|
|
|
around HP aCC (and possibly other compilers), which insists on
|
|
|
|
|
generating names with embedded colons for namespace or nested class
|
|
|
|
|
members.
|
|
|
|
|
|
|
|
|
|
(Argument LEN is currently unused. 1997-08-27)
|
|
|
|
|
|
|
|
|
|
Callers must free memory allocated for the output string TOKEN. */
|
|
|
|
|
|
|
|
|
|
static const char coloncolon[2] = {':',':'};
|
|
|
|
|
|
|
|
|
|
struct symbol *
|
|
|
|
|
parse_nested_classes_for_hpacc (name, len, token, class_prefix, argptr)
|
|
|
|
|
char * name;
|
|
|
|
|
int len;
|
|
|
|
|
char ** token;
|
|
|
|
|
int * class_prefix;
|
|
|
|
|
char ** argptr;
|
|
|
|
|
{
|
|
|
|
|
/* Comment below comes from decode_line_1 which has very similar
|
|
|
|
|
code, which is called for "break" command parsing. */
|
|
|
|
|
|
|
|
|
|
/* We have what looks like a class or namespace
|
|
|
|
|
scope specification (A::B), possibly with many
|
|
|
|
|
levels of namespaces or classes (A::B::C::D).
|
|
|
|
|
|
|
|
|
|
Some versions of the HP ANSI C++ compiler (as also possibly
|
|
|
|
|
other compilers) generate class/function/member names with
|
|
|
|
|
embedded double-colons if they are inside namespaces. To
|
|
|
|
|
handle this, we loop a few times, considering larger and
|
|
|
|
|
larger prefixes of the string as though they were single
|
|
|
|
|
symbols. So, if the initially supplied string is
|
|
|
|
|
A::B::C::D::foo, we have to look up "A", then "A::B",
|
|
|
|
|
then "A::B::C", then "A::B::C::D", and finally
|
|
|
|
|
"A::B::C::D::foo" as single, monolithic symbols, because
|
|
|
|
|
A, B, C or D may be namespaces.
|
|
|
|
|
|
|
|
|
|
Note that namespaces can nest only inside other
|
|
|
|
|
namespaces, and not inside classes. So we need only
|
|
|
|
|
consider *prefixes* of the string; there is no need to look up
|
|
|
|
|
"B::C" separately as a symbol in the previous example. */
|
|
|
|
|
|
|
|
|
|
register char * p;
|
|
|
|
|
char * start, * end;
|
|
|
|
|
char * prefix = NULL;
|
|
|
|
|
char * tmp;
|
|
|
|
|
struct symbol * sym_class = NULL;
|
|
|
|
|
struct symbol * sym_var = NULL;
|
|
|
|
|
struct type * t;
|
|
|
|
|
register int i;
|
|
|
|
|
int colons_found = 0;
|
|
|
|
|
int prefix_len = 0;
|
|
|
|
|
int done = 0;
|
|
|
|
|
char * q;
|
|
|
|
|
|
|
|
|
|
/* Check for HP-compiled executable -- in other cases
|
|
|
|
|
return NULL, and caller must default to standard GDB
|
|
|
|
|
behaviour. */
|
|
|
|
|
|
|
|
|
|
if (!hp_som_som_object_present)
|
|
|
|
|
return (struct symbol *) NULL;
|
|
|
|
|
|
|
|
|
|
p = name;
|
|
|
|
|
|
|
|
|
|
/* Skip over whitespace and possible global "::" */
|
|
|
|
|
while (*p && (*p == ' ' || *p == '\t')) p++;
|
|
|
|
|
if (p[0] == ':' && p[1] == ':')
|
|
|
|
|
p += 2;
|
|
|
|
|
while (*p && (*p == ' ' || *p == '\t')) p++;
|
|
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
|
{
|
|
|
|
|
/* Get to the end of the next namespace or class spec. */
|
|
|
|
|
/* If we're looking at some non-token, fail immediately */
|
|
|
|
|
start = p;
|
|
|
|
|
if (!(isalpha (*p) || *p == '$' || *p == '_'))
|
|
|
|
|
return (struct symbol *) NULL;
|
|
|
|
|
p++;
|
|
|
|
|
while (*p && (isalnum (*p) || *p == '$' || *p == '_')) p++;
|
|
|
|
|
|
|
|
|
|
if (*p == '<')
|
|
|
|
|
{
|
|
|
|
|
/* If we have the start of a template specification,
|
|
|
|
|
scan right ahead to its end */
|
|
|
|
|
q = find_template_name_end (p);
|
|
|
|
|
if (q)
|
|
|
|
|
p = q;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
end = p;
|
|
|
|
|
|
|
|
|
|
/* Skip over "::" and whitespace for next time around */
|
|
|
|
|
while (*p && (*p == ' ' || *p == '\t')) p++;
|
|
|
|
|
if (p[0] == ':' && p[1] == ':')
|
|
|
|
|
p += 2;
|
|
|
|
|
while (*p && (*p == ' ' || *p == '\t')) p++;
|
|
|
|
|
|
|
|
|
|
/* Done with tokens? */
|
|
|
|
|
if (!*p || !(isalpha (*p) || *p == '$' || *p == '_'))
|
|
|
|
|
done = 1;
|
|
|
|
|
|
|
|
|
|
tmp = (char *) alloca (prefix_len + end - start + 3);
|
|
|
|
|
if (prefix)
|
|
|
|
|
{
|
|
|
|
|
memcpy (tmp, prefix, prefix_len);
|
|
|
|
|
memcpy (tmp + prefix_len, coloncolon, 2);
|
|
|
|
|
memcpy (tmp + prefix_len + 2, start, end - start);
|
|
|
|
|
tmp[prefix_len + 2 + end - start] = '\000';
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
memcpy (tmp, start, end - start);
|
|
|
|
|
tmp[end - start] = '\000';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
prefix = tmp;
|
|
|
|
|
prefix_len = strlen (prefix);
|
|
|
|
|
|
|
|
|
|
#if 0 /* DEBUGGING */
|
|
|
|
|
printf ("Searching for nested class spec: Prefix is %s\n", prefix);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
/* See if the prefix we have now is something we know about */
|
|
|
|
|
|
|
|
|
|
if (!done)
|
|
|
|
|
{
|
|
|
|
|
/* More tokens to process, so this must be a class/namespace */
|
|
|
|
|
sym_class = lookup_symbol (prefix, 0, STRUCT_NAMESPACE,
|
|
|
|
|
0, (struct symtab **) NULL);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* No more tokens, so try as a variable first */
|
|
|
|
|
sym_var = lookup_symbol (prefix, 0, VAR_NAMESPACE,
|
|
|
|
|
0, (struct symtab **) NULL);
|
|
|
|
|
/* If failed, try as class/namespace */
|
|
|
|
|
if (!sym_var)
|
|
|
|
|
sym_class = lookup_symbol (prefix, 0, STRUCT_NAMESPACE,
|
|
|
|
|
0, (struct symtab **) NULL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (sym_var ||
|
|
|
|
|
(sym_class &&
|
|
|
|
|
(t = check_typedef (SYMBOL_TYPE (sym_class)),
|
|
|
|
|
(TYPE_CODE (t) == TYPE_CODE_STRUCT
|
|
|
|
|
|| TYPE_CODE (t) == TYPE_CODE_UNION))))
|
|
|
|
|
{
|
|
|
|
|
/* We found a valid token */
|
|
|
|
|
*token = (char *) xmalloc (prefix_len + 1 );
|
|
|
|
|
memcpy (*token, prefix, prefix_len);
|
|
|
|
|
(*token)[prefix_len] = '\000';
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* No variable or class/namespace found, no more tokens */
|
|
|
|
|
if (done)
|
|
|
|
|
return (struct symbol *) NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Out of loop, so we must have found a valid token */
|
|
|
|
|
if (sym_var)
|
|
|
|
|
*class_prefix = 0;
|
|
|
|
|
else
|
|
|
|
|
*class_prefix = 1;
|
|
|
|
|
|
|
|
|
|
if (argptr)
|
|
|
|
|
*argptr = done ? p : end;
|
|
|
|
|
|
|
|
|
|
#if 0 /* DEBUGGING */
|
|
|
|
|
printf ("Searching for nested class spec: Token is %s, class_prefix %d\n", *token, *class_prefix);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
return sym_var ? sym_var : sym_class; /* found */
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
char *
|
|
|
|
|
find_template_name_end (p)
|
|
|
|
|
char * p;
|
|
|
|
|
{
|
|
|
|
|
int depth = 1;
|
|
|
|
|
int just_seen_right = 0;
|
|
|
|
|
int just_seen_colon = 0;
|
|
|
|
|
int just_seen_space = 0;
|
|
|
|
|
|
|
|
|
|
if (!p || (*p != '<'))
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
while (*++p)
|
|
|
|
|
{
|
|
|
|
|
switch (*p)
|
|
|
|
|
{
|
|
|
|
|
case '\'': case '\"':
|
|
|
|
|
case '{': case '}':
|
|
|
|
|
/* In future, may want to allow these?? */
|
|
|
|
|
return 0;
|
|
|
|
|
case '<':
|
|
|
|
|
depth++; /* start nested template */
|
|
|
|
|
if (just_seen_colon || just_seen_right || just_seen_space)
|
|
|
|
|
return 0; /* but not after : or :: or > or space */
|
|
|
|
|
break;
|
|
|
|
|
case '>':
|
|
|
|
|
if (just_seen_colon || just_seen_right)
|
|
|
|
|
return 0; /* end a (nested?) template */
|
|
|
|
|
just_seen_right = 1; /* but not after : or :: */
|
|
|
|
|
if (--depth == 0) /* also disallow >>, insist on > > */
|
|
|
|
|
return ++p; /* if outermost ended, return */
|
|
|
|
|
break;
|
|
|
|
|
case ':':
|
|
|
|
|
if (just_seen_space || (just_seen_colon > 1))
|
|
|
|
|
return 0; /* nested class spec coming up */
|
|
|
|
|
just_seen_colon++; /* we allow :: but not :::: */
|
|
|
|
|
break;
|
|
|
|
|
case ' ':
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
if (!((*p >= 'a' && *p <= 'z') || /* allow token chars */
|
|
|
|
|
(*p >= 'A' && *p <= 'Z') ||
|
|
|
|
|
(*p >= '0' && *p <= '9') ||
|
|
|
|
|
(*p == '_') || (*p == ',') || /* commas for template args */
|
|
|
|
|
(*p == '&') || (*p == '*') || /* pointer and ref types */
|
|
|
|
|
(*p == '(') || (*p == ')') || /* function types */
|
|
|
|
|
(*p == '[') || (*p == ']') )) /* array types */
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
if (*p != ' ')
|
|
|
|
|
just_seen_space = 0;
|
|
|
|
|
if (*p != ':')
|
|
|
|
|
just_seen_colon = 0;
|
|
|
|
|
if (*p != '>')
|
|
|
|
|
just_seen_right = 0;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
1995-10-05 22:15:49 +00:00
|
|
|
|
|
1991-09-19 10:31:00 +00:00
|
|
|
|
/* Return a null-terminated temporary copy of the name
|
|
|
|
|
of a string token. */
|
|
|
|
|
|
|
|
|
|
char *
|
|
|
|
|
copy_name (token)
|
|
|
|
|
struct stoken token;
|
|
|
|
|
{
|
* breakpoint.c, buildsym.c, c-exp.y, coffread.c, command.c,
core.c, cplus-dem.c, dbxread.c, dwarfread.c, elfread.c, environ.c,
eval.c, findvar.c, gdbtypes.c, hppabsd-tdep.c, hppahpux-tdep.c,
i386-tdep.c, ieee-float.c, infcmd.c, inflow.c, infptrace.c,
infrun.c, m2-exp.y, mipsread.c, objfiles.c, parse.c, procfs.c,
putenv.c, remote-mm.c, remote-vx.c, solib.c, sparc-tdep.c,
sparc-xdep.c, stack.c, symfile.c, symtab.c, symtab.h, target.c,
tm-i386v.h, tm-sparc.h, utils.c, valarith.c, valops.c, valprint.c,
values.c, xcoffread.c:
Remove "(void)" casts from function calls where the return value
is ignored, in accordance with GNU coding standards.
1992-07-04 03:22:08 +00:00
|
|
|
|
memcpy (namecopy, token.ptr, token.length);
|
1991-09-19 10:31:00 +00:00
|
|
|
|
namecopy[token.length] = 0;
|
|
|
|
|
return namecopy;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Reverse an expression from suffix form (in which it is constructed)
|
|
|
|
|
to prefix form (in which we can conveniently print or execute it). */
|
|
|
|
|
|
1992-02-22 01:46:16 +00:00
|
|
|
|
static void
|
1991-09-19 10:31:00 +00:00
|
|
|
|
prefixify_expression (expr)
|
|
|
|
|
register struct expression *expr;
|
|
|
|
|
{
|
* defs.h (HOST_CHAR_BIT): New macro, defaults to either CHAR_BIT
from a configuration file (typically including <limits.h>), or to
TARGET_CHAR_BIT if CHAR_BIT is not defined.
* eval.c (evaluate_subexp): Use new BYTES_TO_EXP_ELEM macro.
* eval.c (evaluate_subexp): Add case for OP_BITSTRING.
* expprint.c (print_subexp): Use new BYTES_TO_EXP_ELEM macro.
* exppritn.c (print_subexp, dump_expression): Add case for
OP_BITSTRING.
* expression.h (OP_BITSTRING): New expression element type for
packed bitstrings.
* expression.h (EXP_ELEM_TO_BYTES, BYTES_TO_EXP_ELEM): New
macros to convert between number of expression elements and bytes
to store that many elements.
* i960-tdep.c (leafproc_return): Use new macros to access
minimal symbol name and address fields.
* m88k-pinsn.c (sprint_address): Use new macros to access
minimal symbol name and address fields.
* nindy-tdep.c (nindy_frame_chain_valid): Use new macro to access
minimal symbol address field.
* parse.c (write_exp_elt, write_exp_string, prefixify_expression,
parse_exp_1): Use new EXP_ELEM_TO_BYTES macro.
* parse.c (write_exp_string, length_of_subexp, prefixify_expression):
Use new BYTES_TO_EXP_ELEM macro.
* parse.c (write_exp_bitstring): New function to write packed
bitstrings into the expression element vector.
* parse.c (length_of_subexp, prefixify_subexp): Add case for
OP_BITSTRING.
* parser-defs.h (struct stoken): Document that it is used for
OP_BITSTRING as well as OP_STRING.
* parser-defs.h (write_exp_bitstring): Add prototype.
**** start-sanitize-chill ****
* ch-exp.y (BIT_STRING_LITERAL): Change token type to sval.
* ch-exp.y (NUM, PRED, SUCC, ABS, CARD, MAX, MIN, SIZE, UPPER,
LOWER, LENGTH): New tokens for keywords.
* ch-exp.y (chill_value_built_in_routine_call, mode_argument,
upper_lower_argument, length_argument, array_mode_name,
string_mode_name, variant_structure_mode_name): New non-terminals
and productions.
* ch-exp.y (literal): Useful production for BIT_STRING_LITERAL.
* ch-exp.y (match_bitstring_literal): New lexer support function
to recognize bitstring literals.
* ch-exp.y (tokentab6): New token table for 6 character keywords.
* ch-exp.y (tokentab5): Add LOWER, UPPER.
* ch-exp.y (tokentab4): Add PRED, SUCC, CARD, SIZE.
* ch-exp.y (tokentab3): Add NUM, ABS, MIN, MAX.
* ch-exp.y (yylex): Check tokentab6.
* ch-exp.y (yylex): Call match_bitstring_literal.
**** end-sanitize-chill ****
1993-01-06 16:52:10 +00:00
|
|
|
|
register int len =
|
|
|
|
|
sizeof (struct expression) + EXP_ELEM_TO_BYTES (expr->nelts);
|
1991-09-19 10:31:00 +00:00
|
|
|
|
register struct expression *temp;
|
|
|
|
|
register int inpos = expr->nelts, outpos = 0;
|
|
|
|
|
|
|
|
|
|
temp = (struct expression *) alloca (len);
|
|
|
|
|
|
|
|
|
|
/* Copy the original expression into temp. */
|
* breakpoint.c, buildsym.c, c-exp.y, coffread.c, command.c,
core.c, cplus-dem.c, dbxread.c, dwarfread.c, elfread.c, environ.c,
eval.c, findvar.c, gdbtypes.c, hppabsd-tdep.c, hppahpux-tdep.c,
i386-tdep.c, ieee-float.c, infcmd.c, inflow.c, infptrace.c,
infrun.c, m2-exp.y, mipsread.c, objfiles.c, parse.c, procfs.c,
putenv.c, remote-mm.c, remote-vx.c, solib.c, sparc-tdep.c,
sparc-xdep.c, stack.c, symfile.c, symtab.c, symtab.h, target.c,
tm-i386v.h, tm-sparc.h, utils.c, valarith.c, valops.c, valprint.c,
values.c, xcoffread.c:
Remove "(void)" casts from function calls where the return value
is ignored, in accordance with GNU coding standards.
1992-07-04 03:22:08 +00:00
|
|
|
|
memcpy (temp, expr, len);
|
1991-09-19 10:31:00 +00:00
|
|
|
|
|
|
|
|
|
prefixify_subexp (temp, expr, inpos, outpos);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return the number of exp_elements in the subexpression of EXPR
|
|
|
|
|
whose last exp_element is at index ENDPOS - 1 in EXPR. */
|
|
|
|
|
|
1997-10-03 23:05:12 +00:00
|
|
|
|
int
|
1991-09-19 10:31:00 +00:00
|
|
|
|
length_of_subexp (expr, endpos)
|
|
|
|
|
register struct expression *expr;
|
|
|
|
|
register int endpos;
|
|
|
|
|
{
|
|
|
|
|
register int oplen = 1;
|
|
|
|
|
register int args = 0;
|
|
|
|
|
register int i;
|
|
|
|
|
|
* parse.c (write_exp_string): Complete rewrite to store string
contants as a leading explicit length, followed by the string data,
followed by a trailing explicit length.
* eval.c (evaluate_subexp), expprint.c (print_subexp),
parse.c (length_of_subexp), parse.c (prefixify_subexp):
Use recorded explicit length of strings in expression elements,
rather than strlen. Adjust code to skip over strings stored in
expression elements, and code to access strings, to account for
new leading explicit size expression element.
* parse.c (length_of_subexp): Test for minimum endpos of 1, not
0, to avoid negative expression element indices.
* valops.c (search_struct_method): Minor whitespace change.
1992-11-25 15:46:57 +00:00
|
|
|
|
if (endpos < 1)
|
1991-09-19 10:31:00 +00:00
|
|
|
|
error ("?error in length_of_subexp");
|
|
|
|
|
|
|
|
|
|
i = (int) expr->elts[endpos - 1].opcode;
|
|
|
|
|
|
|
|
|
|
switch (i)
|
|
|
|
|
{
|
|
|
|
|
/* C++ */
|
|
|
|
|
case OP_SCOPE:
|
* defs.h (HOST_CHAR_BIT): New macro, defaults to either CHAR_BIT
from a configuration file (typically including <limits.h>), or to
TARGET_CHAR_BIT if CHAR_BIT is not defined.
* eval.c (evaluate_subexp): Use new BYTES_TO_EXP_ELEM macro.
* eval.c (evaluate_subexp): Add case for OP_BITSTRING.
* expprint.c (print_subexp): Use new BYTES_TO_EXP_ELEM macro.
* exppritn.c (print_subexp, dump_expression): Add case for
OP_BITSTRING.
* expression.h (OP_BITSTRING): New expression element type for
packed bitstrings.
* expression.h (EXP_ELEM_TO_BYTES, BYTES_TO_EXP_ELEM): New
macros to convert between number of expression elements and bytes
to store that many elements.
* i960-tdep.c (leafproc_return): Use new macros to access
minimal symbol name and address fields.
* m88k-pinsn.c (sprint_address): Use new macros to access
minimal symbol name and address fields.
* nindy-tdep.c (nindy_frame_chain_valid): Use new macro to access
minimal symbol address field.
* parse.c (write_exp_elt, write_exp_string, prefixify_expression,
parse_exp_1): Use new EXP_ELEM_TO_BYTES macro.
* parse.c (write_exp_string, length_of_subexp, prefixify_expression):
Use new BYTES_TO_EXP_ELEM macro.
* parse.c (write_exp_bitstring): New function to write packed
bitstrings into the expression element vector.
* parse.c (length_of_subexp, prefixify_subexp): Add case for
OP_BITSTRING.
* parser-defs.h (struct stoken): Document that it is used for
OP_BITSTRING as well as OP_STRING.
* parser-defs.h (write_exp_bitstring): Add prototype.
**** start-sanitize-chill ****
* ch-exp.y (BIT_STRING_LITERAL): Change token type to sval.
* ch-exp.y (NUM, PRED, SUCC, ABS, CARD, MAX, MIN, SIZE, UPPER,
LOWER, LENGTH): New tokens for keywords.
* ch-exp.y (chill_value_built_in_routine_call, mode_argument,
upper_lower_argument, length_argument, array_mode_name,
string_mode_name, variant_structure_mode_name): New non-terminals
and productions.
* ch-exp.y (literal): Useful production for BIT_STRING_LITERAL.
* ch-exp.y (match_bitstring_literal): New lexer support function
to recognize bitstring literals.
* ch-exp.y (tokentab6): New token table for 6 character keywords.
* ch-exp.y (tokentab5): Add LOWER, UPPER.
* ch-exp.y (tokentab4): Add PRED, SUCC, CARD, SIZE.
* ch-exp.y (tokentab3): Add NUM, ABS, MIN, MAX.
* ch-exp.y (yylex): Check tokentab6.
* ch-exp.y (yylex): Call match_bitstring_literal.
**** end-sanitize-chill ****
1993-01-06 16:52:10 +00:00
|
|
|
|
oplen = longest_to_int (expr->elts[endpos - 2].longconst);
|
|
|
|
|
oplen = 5 + BYTES_TO_EXP_ELEM (oplen + 1);
|
1991-09-19 10:31:00 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OP_LONG:
|
|
|
|
|
case OP_DOUBLE:
|
1993-08-18 19:33:39 +00:00
|
|
|
|
case OP_VAR_VALUE:
|
1991-09-19 10:31:00 +00:00
|
|
|
|
oplen = 4;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OP_TYPE:
|
|
|
|
|
case OP_BOOL:
|
|
|
|
|
case OP_LAST:
|
|
|
|
|
case OP_REGISTER:
|
|
|
|
|
case OP_INTERNALVAR:
|
|
|
|
|
oplen = 3;
|
|
|
|
|
break;
|
|
|
|
|
|
* eval.c (evaluate_subexp): Clean up handling of
OP_UNDETERMINED_ARGLIST (no backtracking, more general).
* f-valprint.c (f_val_print): Print TYPE_CODE_STRING using
LA_PRINT_STRING, and not val_print_string (which reads from inferior).
* ch-lang.c (chill_is_varying_struct), ch-lang.h: Remve function
duplicate function made redundant by chill_varying_type.
Re-write of f77 string and complex number support:
* language.h (struct language_defn): New fields string_lower_bound
and string_char_type.
* c-lang.c (c_language_defn, cplus_language_defn, asm_language_defn),
language.c (unknown_language_defn, auto_language_defn,
local_language_defn), m2-lang.c (m2_language_defn), f-lang.c
(f_language_defn), ch-lang.c (chill_language_defn): Set new fields.
* gdbtypes.c (create_string_type): Use new string_char_type field.
* valops.c (value_string): Use new string_lower_bound field.
* defs.h (TARGET_COMPLEX_BIT, TARGET_DOUBLE_COMPLEX_BIT): Removed.
* f-lang.c (f_create_fundamental_type, _initialize_f_language),
m2-lang.c (m2_create_fundamental_type),
gdbtypes.c (_initialize_gdbtypes): Set TYPE_TARGET_TYPE of complex
types. Set their TYPE_CODEs to TYPE_CODE_COMPLEX.
* mdebugread.c (mdebug_type_complex, mdebug_type_double_complex):
Removed. Use builtin_type_complex and builtin_type_double_complex.
* gdbtypes.h (enum type_code): Removed TYPE_CODE_LITERAL_STRING
and TYPE_CODE_LITERAL_COMPLEX.
* c-typeprint.c, f-typeprint.c, f-valprint.c, eval.c: Removed uses of
TYPE_CODE_LITERAL_STRING and TYPE_CODE_LITERAL_COMPLEX.
* gdbtypes.c, gdbtypes.h (f77_create_literal_complex_type,
f77_create_literal_string_type): Removed.
* value.h (VALUE_LITERAL_DATA, VALUE_SUBSTRING_MEMADDR,
VALUE_SUBSTRING_MYADDR): Removed.
* expression.h (enum exp_opcode): Rename OP_F77_LITERAL_COMPLEX to
OP_COMPLEX.
* parse.c: Update accordingly.
* f-valprint.c (f77_print_cmplx): Removed.
(f_val_print case TYPE_CODE_COMPLEX): Re-write to use print_floating.
* f-exp.y (STRING_LITERAL): Use OP_STRING instead of OP_ARRAY.
* eval.c (evaluate_subexp): For case OP_ARRAY, don't call
f77_value_literal_string.
* valops.c, value.h (f77_value_literal_string, f77_value_substring,
f77_assign_from_literal_string, f77_assign_from_literal_complex):
Removed.
(value_assign): No longer need to handle literal types.
* valops.c (f77_value_literal_complex), value.h: Re-written and
renamed to value_literal_complex. Last arg is now a (complex) type.
* valops.c (f77_cast_into_complex): Re-written and renamed to
cast_into_complex.
* eval.c (evaluate_subexp): Update accordingly.
1995-02-02 03:37:26 +00:00
|
|
|
|
case OP_COMPLEX:
|
Initial Fortran language support, adapted from work by Farooq Butt
(fmbutt@engage.sps.mot.com).
* Makefile.in: Add Fortran-related files and dependencies.
* defs.h (language_fortran): New language enum.
* language.h (_LANG_fortran): Define.
(MAX_FORTRAN_DIMS): Define.
* expression.h: Reformat to standard.
(MULTI_F77_SUBSCRIPT, OP_F77_UNDETERMINED_ARGLIST,
OP_F77_LITERAL_COMPLEX, OP_F77_SUBSTR): New expression opcodes.
* gdbtypes.h (TYPE_CODE_COMPLEX, TYPE_CODE_LITERAL_COMPLEX,
TYPE_CODE_LITERAL_STRING): New type codes.
(type): New fields upper_bound_type and lower_bound_type.
(TYPE_ARRAY_UPPER_BOUND_TYPE, TYPE_ARRAY_LOWER_BOUND_TYPE,
TYPE_ARRAY_UPPER_BOUND_VALUE, TYPE_ARRAY_LOWER_BOUND_VALUE): New
macros.
(builtin_type_f_character, etc): Declare.
* value.h (VALUE_LITERAL_DATA, VALUE_SUBSTRING_START): Define.
* f-exp.y: New file, Fortran expression grammar.
* f-lang.c: New file, Fortran language support functions.
* f-lang.h: New file, Fortran language support declarations.
* f-typeprint.c: New file, Fortran type printing.
* f-valprint.c: New file, Fortran value printing.
* eval.c (evaluate_subexp): Add code for new expression opcodes,
fix wording of error message.
* gdbtypes.c (f77_create_literal_complex_type,
f77_create_literal_string_type): New functions.
* language.c (set_language_command): Add Fortran info.
(calc_f77_array_dims): New function.
* parse.c (length_of_subexp, prefixify_subexp): Add cases for new
expression opcodes.
* symfile.c (deduce_language_from_filename): Recognize .f and .F
as Fortran source files.
* valops.c (f77_value_literal_string, f77_value_substring,
f77_value_literal_complex): New functions.
1994-08-19 21:59:05 +00:00
|
|
|
|
oplen = 1;
|
|
|
|
|
args = 2;
|
|
|
|
|
break;
|
|
|
|
|
|
1991-09-19 10:31:00 +00:00
|
|
|
|
case OP_FUNCALL:
|
Initial Fortran language support, adapted from work by Farooq Butt
(fmbutt@engage.sps.mot.com).
* Makefile.in: Add Fortran-related files and dependencies.
* defs.h (language_fortran): New language enum.
* language.h (_LANG_fortran): Define.
(MAX_FORTRAN_DIMS): Define.
* expression.h: Reformat to standard.
(MULTI_F77_SUBSCRIPT, OP_F77_UNDETERMINED_ARGLIST,
OP_F77_LITERAL_COMPLEX, OP_F77_SUBSTR): New expression opcodes.
* gdbtypes.h (TYPE_CODE_COMPLEX, TYPE_CODE_LITERAL_COMPLEX,
TYPE_CODE_LITERAL_STRING): New type codes.
(type): New fields upper_bound_type and lower_bound_type.
(TYPE_ARRAY_UPPER_BOUND_TYPE, TYPE_ARRAY_LOWER_BOUND_TYPE,
TYPE_ARRAY_UPPER_BOUND_VALUE, TYPE_ARRAY_LOWER_BOUND_VALUE): New
macros.
(builtin_type_f_character, etc): Declare.
* value.h (VALUE_LITERAL_DATA, VALUE_SUBSTRING_START): Define.
* f-exp.y: New file, Fortran expression grammar.
* f-lang.c: New file, Fortran language support functions.
* f-lang.h: New file, Fortran language support declarations.
* f-typeprint.c: New file, Fortran type printing.
* f-valprint.c: New file, Fortran value printing.
* eval.c (evaluate_subexp): Add code for new expression opcodes,
fix wording of error message.
* gdbtypes.c (f77_create_literal_complex_type,
f77_create_literal_string_type): New functions.
* language.c (set_language_command): Add Fortran info.
(calc_f77_array_dims): New function.
* parse.c (length_of_subexp, prefixify_subexp): Add cases for new
expression opcodes.
* symfile.c (deduce_language_from_filename): Recognize .f and .F
as Fortran source files.
* valops.c (f77_value_literal_string, f77_value_substring,
f77_value_literal_complex): New functions.
1994-08-19 21:59:05 +00:00
|
|
|
|
case OP_F77_UNDETERMINED_ARGLIST:
|
1991-09-19 10:31:00 +00:00
|
|
|
|
oplen = 3;
|
* parse.c (write_exp_string): Complete rewrite to store string
contants as a leading explicit length, followed by the string data,
followed by a trailing explicit length.
* eval.c (evaluate_subexp), expprint.c (print_subexp),
parse.c (length_of_subexp), parse.c (prefixify_subexp):
Use recorded explicit length of strings in expression elements,
rather than strlen. Adjust code to skip over strings stored in
expression elements, and code to access strings, to account for
new leading explicit size expression element.
* parse.c (length_of_subexp): Test for minimum endpos of 1, not
0, to avoid negative expression element indices.
* valops.c (search_struct_method): Minor whitespace change.
1992-11-25 15:46:57 +00:00
|
|
|
|
args = 1 + longest_to_int (expr->elts[endpos - 2].longconst);
|
1991-09-19 10:31:00 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case UNOP_MAX:
|
|
|
|
|
case UNOP_MIN:
|
|
|
|
|
oplen = 3;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case BINOP_VAL:
|
|
|
|
|
case UNOP_CAST:
|
|
|
|
|
case UNOP_MEMVAL:
|
|
|
|
|
oplen = 3;
|
|
|
|
|
args = 1;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case UNOP_ABS:
|
|
|
|
|
case UNOP_CAP:
|
|
|
|
|
case UNOP_CHR:
|
|
|
|
|
case UNOP_FLOAT:
|
|
|
|
|
case UNOP_HIGH:
|
|
|
|
|
case UNOP_ODD:
|
|
|
|
|
case UNOP_ORD:
|
|
|
|
|
case UNOP_TRUNC:
|
|
|
|
|
oplen = 1;
|
|
|
|
|
args = 1;
|
|
|
|
|
break;
|
|
|
|
|
|
1995-01-20 23:45:21 +00:00
|
|
|
|
case OP_LABELED:
|
1992-09-10 00:07:06 +00:00
|
|
|
|
case STRUCTOP_STRUCT:
|
|
|
|
|
case STRUCTOP_PTR:
|
|
|
|
|
args = 1;
|
* parse.c (write_exp_string): Complete rewrite to store string
contants as a leading explicit length, followed by the string data,
followed by a trailing explicit length.
* eval.c (evaluate_subexp), expprint.c (print_subexp),
parse.c (length_of_subexp), parse.c (prefixify_subexp):
Use recorded explicit length of strings in expression elements,
rather than strlen. Adjust code to skip over strings stored in
expression elements, and code to access strings, to account for
new leading explicit size expression element.
* parse.c (length_of_subexp): Test for minimum endpos of 1, not
0, to avoid negative expression element indices.
* valops.c (search_struct_method): Minor whitespace change.
1992-11-25 15:46:57 +00:00
|
|
|
|
/* fall through */
|
1991-09-19 10:31:00 +00:00
|
|
|
|
case OP_M2_STRING:
|
|
|
|
|
case OP_STRING:
|
1995-10-05 05:24:41 +00:00
|
|
|
|
case OP_NAME:
|
1995-09-29 01:43:54 +00:00
|
|
|
|
case OP_EXPRSTRING:
|
* defs.h (HOST_CHAR_BIT): New macro, defaults to either CHAR_BIT
from a configuration file (typically including <limits.h>), or to
TARGET_CHAR_BIT if CHAR_BIT is not defined.
* eval.c (evaluate_subexp): Use new BYTES_TO_EXP_ELEM macro.
* eval.c (evaluate_subexp): Add case for OP_BITSTRING.
* expprint.c (print_subexp): Use new BYTES_TO_EXP_ELEM macro.
* exppritn.c (print_subexp, dump_expression): Add case for
OP_BITSTRING.
* expression.h (OP_BITSTRING): New expression element type for
packed bitstrings.
* expression.h (EXP_ELEM_TO_BYTES, BYTES_TO_EXP_ELEM): New
macros to convert between number of expression elements and bytes
to store that many elements.
* i960-tdep.c (leafproc_return): Use new macros to access
minimal symbol name and address fields.
* m88k-pinsn.c (sprint_address): Use new macros to access
minimal symbol name and address fields.
* nindy-tdep.c (nindy_frame_chain_valid): Use new macro to access
minimal symbol address field.
* parse.c (write_exp_elt, write_exp_string, prefixify_expression,
parse_exp_1): Use new EXP_ELEM_TO_BYTES macro.
* parse.c (write_exp_string, length_of_subexp, prefixify_expression):
Use new BYTES_TO_EXP_ELEM macro.
* parse.c (write_exp_bitstring): New function to write packed
bitstrings into the expression element vector.
* parse.c (length_of_subexp, prefixify_subexp): Add case for
OP_BITSTRING.
* parser-defs.h (struct stoken): Document that it is used for
OP_BITSTRING as well as OP_STRING.
* parser-defs.h (write_exp_bitstring): Add prototype.
**** start-sanitize-chill ****
* ch-exp.y (BIT_STRING_LITERAL): Change token type to sval.
* ch-exp.y (NUM, PRED, SUCC, ABS, CARD, MAX, MIN, SIZE, UPPER,
LOWER, LENGTH): New tokens for keywords.
* ch-exp.y (chill_value_built_in_routine_call, mode_argument,
upper_lower_argument, length_argument, array_mode_name,
string_mode_name, variant_structure_mode_name): New non-terminals
and productions.
* ch-exp.y (literal): Useful production for BIT_STRING_LITERAL.
* ch-exp.y (match_bitstring_literal): New lexer support function
to recognize bitstring literals.
* ch-exp.y (tokentab6): New token table for 6 character keywords.
* ch-exp.y (tokentab5): Add LOWER, UPPER.
* ch-exp.y (tokentab4): Add PRED, SUCC, CARD, SIZE.
* ch-exp.y (tokentab3): Add NUM, ABS, MIN, MAX.
* ch-exp.y (yylex): Check tokentab6.
* ch-exp.y (yylex): Call match_bitstring_literal.
**** end-sanitize-chill ****
1993-01-06 16:52:10 +00:00
|
|
|
|
oplen = longest_to_int (expr->elts[endpos - 2].longconst);
|
|
|
|
|
oplen = 4 + BYTES_TO_EXP_ELEM (oplen + 1);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OP_BITSTRING:
|
|
|
|
|
oplen = longest_to_int (expr->elts[endpos - 2].longconst);
|
|
|
|
|
oplen = (oplen + HOST_CHAR_BIT - 1) / HOST_CHAR_BIT;
|
|
|
|
|
oplen = 4 + BYTES_TO_EXP_ELEM (oplen);
|
1991-09-19 10:31:00 +00:00
|
|
|
|
break;
|
|
|
|
|
|
1993-01-16 05:15:58 +00:00
|
|
|
|
case OP_ARRAY:
|
|
|
|
|
oplen = 4;
|
|
|
|
|
args = longest_to_int (expr->elts[endpos - 2].longconst);
|
|
|
|
|
args -= longest_to_int (expr->elts[endpos - 3].longconst);
|
|
|
|
|
args += 1;
|
|
|
|
|
break;
|
|
|
|
|
|
1991-09-19 10:31:00 +00:00
|
|
|
|
case TERNOP_COND:
|
* ch-exp.y (value_string_element, string_primitive_value,
start_element, left_element, right_element, slice_size,
lower_element, upper_element, first_element): Removed.
(value_string_slice, value_array_slice): Replaced by ...
(slice): New non-terminal, with working slice support.
(primitive_value_lparen, rparen): New non-terminals.
(maybe_tuple_elements): New non-terminal, to allow empty tuples.
(idtokentab): Added "up".
* value.h (COERCE_VARYING_ARRAY): New macro.
* valarith.c (value_subscript): Use it.
* valops.c (value_cast): Likewise. Also, do nothing if already
correct type, and allow converting from/to range to/from scalar.
* valops.c, value.h (varying_to_slice, value_slice): New functions.
* eval.c (OP_ARRAY): Add cast for array element.
* expression.h (TERNOP_SLICE, TERNOP_SLICE_COUNT): New exp_opcodes.
* valops.c (chill_varying_type): Moved function frp, here ...
* gdbtypes.c (chill_varying_type), gdbtypes.h: ... to here.
* parse.c (length_of_subexp, prefixify_subexp): Add support
for TERNOP_SLICE, TERNOP_SLICE_COUNT.
* expprint.c (print_subexp, dump_expression): Likewise.
* eval.c (evaluate_subexp): Likewise.
* eval.c (evaluate_subexp case MULTI_SUBSCRIPT): Don't call
value_x_binop on a Chill varying string.
1995-02-01 21:02:51 +00:00
|
|
|
|
case TERNOP_SLICE:
|
|
|
|
|
case TERNOP_SLICE_COUNT:
|
1991-09-19 10:31:00 +00:00
|
|
|
|
args = 3;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* Modula-2 */
|
1993-01-02 20:32:01 +00:00
|
|
|
|
case MULTI_SUBSCRIPT:
|
Initial Fortran language support, adapted from work by Farooq Butt
(fmbutt@engage.sps.mot.com).
* Makefile.in: Add Fortran-related files and dependencies.
* defs.h (language_fortran): New language enum.
* language.h (_LANG_fortran): Define.
(MAX_FORTRAN_DIMS): Define.
* expression.h: Reformat to standard.
(MULTI_F77_SUBSCRIPT, OP_F77_UNDETERMINED_ARGLIST,
OP_F77_LITERAL_COMPLEX, OP_F77_SUBSTR): New expression opcodes.
* gdbtypes.h (TYPE_CODE_COMPLEX, TYPE_CODE_LITERAL_COMPLEX,
TYPE_CODE_LITERAL_STRING): New type codes.
(type): New fields upper_bound_type and lower_bound_type.
(TYPE_ARRAY_UPPER_BOUND_TYPE, TYPE_ARRAY_LOWER_BOUND_TYPE,
TYPE_ARRAY_UPPER_BOUND_VALUE, TYPE_ARRAY_LOWER_BOUND_VALUE): New
macros.
(builtin_type_f_character, etc): Declare.
* value.h (VALUE_LITERAL_DATA, VALUE_SUBSTRING_START): Define.
* f-exp.y: New file, Fortran expression grammar.
* f-lang.c: New file, Fortran language support functions.
* f-lang.h: New file, Fortran language support declarations.
* f-typeprint.c: New file, Fortran type printing.
* f-valprint.c: New file, Fortran value printing.
* eval.c (evaluate_subexp): Add code for new expression opcodes,
fix wording of error message.
* gdbtypes.c (f77_create_literal_complex_type,
f77_create_literal_string_type): New functions.
* language.c (set_language_command): Add Fortran info.
(calc_f77_array_dims): New function.
* parse.c (length_of_subexp, prefixify_subexp): Add cases for new
expression opcodes.
* symfile.c (deduce_language_from_filename): Recognize .f and .F
as Fortran source files.
* valops.c (f77_value_literal_string, f77_value_substring,
f77_value_literal_complex): New functions.
1994-08-19 21:59:05 +00:00
|
|
|
|
oplen = 3;
|
* parse.c (write_exp_string): Complete rewrite to store string
contants as a leading explicit length, followed by the string data,
followed by a trailing explicit length.
* eval.c (evaluate_subexp), expprint.c (print_subexp),
parse.c (length_of_subexp), parse.c (prefixify_subexp):
Use recorded explicit length of strings in expression elements,
rather than strlen. Adjust code to skip over strings stored in
expression elements, and code to access strings, to account for
new leading explicit size expression element.
* parse.c (length_of_subexp): Test for minimum endpos of 1, not
0, to avoid negative expression element indices.
* valops.c (search_struct_method): Minor whitespace change.
1992-11-25 15:46:57 +00:00
|
|
|
|
args = 1 + longest_to_int (expr->elts[endpos- 2].longconst);
|
1991-09-19 10:31:00 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case BINOP_ASSIGN_MODIFY:
|
|
|
|
|
oplen = 3;
|
|
|
|
|
args = 2;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* C++ */
|
|
|
|
|
case OP_THIS:
|
|
|
|
|
oplen = 2;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
args = 1 + (i < (int) BINOP_END);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
while (args > 0)
|
|
|
|
|
{
|
|
|
|
|
oplen += length_of_subexp (expr, endpos - oplen);
|
|
|
|
|
args--;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return oplen;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Copy the subexpression ending just before index INEND in INEXPR
|
|
|
|
|
into OUTEXPR, starting at index OUTBEG.
|
|
|
|
|
In the process, convert it from suffix to prefix form. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
prefixify_subexp (inexpr, outexpr, inend, outbeg)
|
|
|
|
|
register struct expression *inexpr;
|
|
|
|
|
struct expression *outexpr;
|
|
|
|
|
register int inend;
|
|
|
|
|
int outbeg;
|
|
|
|
|
{
|
|
|
|
|
register int oplen = 1;
|
|
|
|
|
register int args = 0;
|
|
|
|
|
register int i;
|
|
|
|
|
int *arglens;
|
|
|
|
|
enum exp_opcode opcode;
|
|
|
|
|
|
|
|
|
|
/* Compute how long the last operation is (in OPLEN),
|
|
|
|
|
and also how many preceding subexpressions serve as
|
|
|
|
|
arguments for it (in ARGS). */
|
|
|
|
|
|
|
|
|
|
opcode = inexpr->elts[inend - 1].opcode;
|
|
|
|
|
switch (opcode)
|
|
|
|
|
{
|
|
|
|
|
/* C++ */
|
|
|
|
|
case OP_SCOPE:
|
* defs.h (HOST_CHAR_BIT): New macro, defaults to either CHAR_BIT
from a configuration file (typically including <limits.h>), or to
TARGET_CHAR_BIT if CHAR_BIT is not defined.
* eval.c (evaluate_subexp): Use new BYTES_TO_EXP_ELEM macro.
* eval.c (evaluate_subexp): Add case for OP_BITSTRING.
* expprint.c (print_subexp): Use new BYTES_TO_EXP_ELEM macro.
* exppritn.c (print_subexp, dump_expression): Add case for
OP_BITSTRING.
* expression.h (OP_BITSTRING): New expression element type for
packed bitstrings.
* expression.h (EXP_ELEM_TO_BYTES, BYTES_TO_EXP_ELEM): New
macros to convert between number of expression elements and bytes
to store that many elements.
* i960-tdep.c (leafproc_return): Use new macros to access
minimal symbol name and address fields.
* m88k-pinsn.c (sprint_address): Use new macros to access
minimal symbol name and address fields.
* nindy-tdep.c (nindy_frame_chain_valid): Use new macro to access
minimal symbol address field.
* parse.c (write_exp_elt, write_exp_string, prefixify_expression,
parse_exp_1): Use new EXP_ELEM_TO_BYTES macro.
* parse.c (write_exp_string, length_of_subexp, prefixify_expression):
Use new BYTES_TO_EXP_ELEM macro.
* parse.c (write_exp_bitstring): New function to write packed
bitstrings into the expression element vector.
* parse.c (length_of_subexp, prefixify_subexp): Add case for
OP_BITSTRING.
* parser-defs.h (struct stoken): Document that it is used for
OP_BITSTRING as well as OP_STRING.
* parser-defs.h (write_exp_bitstring): Add prototype.
**** start-sanitize-chill ****
* ch-exp.y (BIT_STRING_LITERAL): Change token type to sval.
* ch-exp.y (NUM, PRED, SUCC, ABS, CARD, MAX, MIN, SIZE, UPPER,
LOWER, LENGTH): New tokens for keywords.
* ch-exp.y (chill_value_built_in_routine_call, mode_argument,
upper_lower_argument, length_argument, array_mode_name,
string_mode_name, variant_structure_mode_name): New non-terminals
and productions.
* ch-exp.y (literal): Useful production for BIT_STRING_LITERAL.
* ch-exp.y (match_bitstring_literal): New lexer support function
to recognize bitstring literals.
* ch-exp.y (tokentab6): New token table for 6 character keywords.
* ch-exp.y (tokentab5): Add LOWER, UPPER.
* ch-exp.y (tokentab4): Add PRED, SUCC, CARD, SIZE.
* ch-exp.y (tokentab3): Add NUM, ABS, MIN, MAX.
* ch-exp.y (yylex): Check tokentab6.
* ch-exp.y (yylex): Call match_bitstring_literal.
**** end-sanitize-chill ****
1993-01-06 16:52:10 +00:00
|
|
|
|
oplen = longest_to_int (inexpr->elts[inend - 2].longconst);
|
|
|
|
|
oplen = 5 + BYTES_TO_EXP_ELEM (oplen + 1);
|
1991-09-19 10:31:00 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OP_LONG:
|
|
|
|
|
case OP_DOUBLE:
|
1993-08-18 19:33:39 +00:00
|
|
|
|
case OP_VAR_VALUE:
|
1991-09-19 10:31:00 +00:00
|
|
|
|
oplen = 4;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OP_TYPE:
|
|
|
|
|
case OP_BOOL:
|
|
|
|
|
case OP_LAST:
|
|
|
|
|
case OP_REGISTER:
|
|
|
|
|
case OP_INTERNALVAR:
|
|
|
|
|
oplen = 3;
|
|
|
|
|
break;
|
|
|
|
|
|
* eval.c (evaluate_subexp): Clean up handling of
OP_UNDETERMINED_ARGLIST (no backtracking, more general).
* f-valprint.c (f_val_print): Print TYPE_CODE_STRING using
LA_PRINT_STRING, and not val_print_string (which reads from inferior).
* ch-lang.c (chill_is_varying_struct), ch-lang.h: Remve function
duplicate function made redundant by chill_varying_type.
Re-write of f77 string and complex number support:
* language.h (struct language_defn): New fields string_lower_bound
and string_char_type.
* c-lang.c (c_language_defn, cplus_language_defn, asm_language_defn),
language.c (unknown_language_defn, auto_language_defn,
local_language_defn), m2-lang.c (m2_language_defn), f-lang.c
(f_language_defn), ch-lang.c (chill_language_defn): Set new fields.
* gdbtypes.c (create_string_type): Use new string_char_type field.
* valops.c (value_string): Use new string_lower_bound field.
* defs.h (TARGET_COMPLEX_BIT, TARGET_DOUBLE_COMPLEX_BIT): Removed.
* f-lang.c (f_create_fundamental_type, _initialize_f_language),
m2-lang.c (m2_create_fundamental_type),
gdbtypes.c (_initialize_gdbtypes): Set TYPE_TARGET_TYPE of complex
types. Set their TYPE_CODEs to TYPE_CODE_COMPLEX.
* mdebugread.c (mdebug_type_complex, mdebug_type_double_complex):
Removed. Use builtin_type_complex and builtin_type_double_complex.
* gdbtypes.h (enum type_code): Removed TYPE_CODE_LITERAL_STRING
and TYPE_CODE_LITERAL_COMPLEX.
* c-typeprint.c, f-typeprint.c, f-valprint.c, eval.c: Removed uses of
TYPE_CODE_LITERAL_STRING and TYPE_CODE_LITERAL_COMPLEX.
* gdbtypes.c, gdbtypes.h (f77_create_literal_complex_type,
f77_create_literal_string_type): Removed.
* value.h (VALUE_LITERAL_DATA, VALUE_SUBSTRING_MEMADDR,
VALUE_SUBSTRING_MYADDR): Removed.
* expression.h (enum exp_opcode): Rename OP_F77_LITERAL_COMPLEX to
OP_COMPLEX.
* parse.c: Update accordingly.
* f-valprint.c (f77_print_cmplx): Removed.
(f_val_print case TYPE_CODE_COMPLEX): Re-write to use print_floating.
* f-exp.y (STRING_LITERAL): Use OP_STRING instead of OP_ARRAY.
* eval.c (evaluate_subexp): For case OP_ARRAY, don't call
f77_value_literal_string.
* valops.c, value.h (f77_value_literal_string, f77_value_substring,
f77_assign_from_literal_string, f77_assign_from_literal_complex):
Removed.
(value_assign): No longer need to handle literal types.
* valops.c (f77_value_literal_complex), value.h: Re-written and
renamed to value_literal_complex. Last arg is now a (complex) type.
* valops.c (f77_cast_into_complex): Re-written and renamed to
cast_into_complex.
* eval.c (evaluate_subexp): Update accordingly.
1995-02-02 03:37:26 +00:00
|
|
|
|
case OP_COMPLEX:
|
Initial Fortran language support, adapted from work by Farooq Butt
(fmbutt@engage.sps.mot.com).
* Makefile.in: Add Fortran-related files and dependencies.
* defs.h (language_fortran): New language enum.
* language.h (_LANG_fortran): Define.
(MAX_FORTRAN_DIMS): Define.
* expression.h: Reformat to standard.
(MULTI_F77_SUBSCRIPT, OP_F77_UNDETERMINED_ARGLIST,
OP_F77_LITERAL_COMPLEX, OP_F77_SUBSTR): New expression opcodes.
* gdbtypes.h (TYPE_CODE_COMPLEX, TYPE_CODE_LITERAL_COMPLEX,
TYPE_CODE_LITERAL_STRING): New type codes.
(type): New fields upper_bound_type and lower_bound_type.
(TYPE_ARRAY_UPPER_BOUND_TYPE, TYPE_ARRAY_LOWER_BOUND_TYPE,
TYPE_ARRAY_UPPER_BOUND_VALUE, TYPE_ARRAY_LOWER_BOUND_VALUE): New
macros.
(builtin_type_f_character, etc): Declare.
* value.h (VALUE_LITERAL_DATA, VALUE_SUBSTRING_START): Define.
* f-exp.y: New file, Fortran expression grammar.
* f-lang.c: New file, Fortran language support functions.
* f-lang.h: New file, Fortran language support declarations.
* f-typeprint.c: New file, Fortran type printing.
* f-valprint.c: New file, Fortran value printing.
* eval.c (evaluate_subexp): Add code for new expression opcodes,
fix wording of error message.
* gdbtypes.c (f77_create_literal_complex_type,
f77_create_literal_string_type): New functions.
* language.c (set_language_command): Add Fortran info.
(calc_f77_array_dims): New function.
* parse.c (length_of_subexp, prefixify_subexp): Add cases for new
expression opcodes.
* symfile.c (deduce_language_from_filename): Recognize .f and .F
as Fortran source files.
* valops.c (f77_value_literal_string, f77_value_substring,
f77_value_literal_complex): New functions.
1994-08-19 21:59:05 +00:00
|
|
|
|
oplen = 1;
|
|
|
|
|
args = 2;
|
|
|
|
|
break;
|
|
|
|
|
|
1991-09-19 10:31:00 +00:00
|
|
|
|
case OP_FUNCALL:
|
Initial Fortran language support, adapted from work by Farooq Butt
(fmbutt@engage.sps.mot.com).
* Makefile.in: Add Fortran-related files and dependencies.
* defs.h (language_fortran): New language enum.
* language.h (_LANG_fortran): Define.
(MAX_FORTRAN_DIMS): Define.
* expression.h: Reformat to standard.
(MULTI_F77_SUBSCRIPT, OP_F77_UNDETERMINED_ARGLIST,
OP_F77_LITERAL_COMPLEX, OP_F77_SUBSTR): New expression opcodes.
* gdbtypes.h (TYPE_CODE_COMPLEX, TYPE_CODE_LITERAL_COMPLEX,
TYPE_CODE_LITERAL_STRING): New type codes.
(type): New fields upper_bound_type and lower_bound_type.
(TYPE_ARRAY_UPPER_BOUND_TYPE, TYPE_ARRAY_LOWER_BOUND_TYPE,
TYPE_ARRAY_UPPER_BOUND_VALUE, TYPE_ARRAY_LOWER_BOUND_VALUE): New
macros.
(builtin_type_f_character, etc): Declare.
* value.h (VALUE_LITERAL_DATA, VALUE_SUBSTRING_START): Define.
* f-exp.y: New file, Fortran expression grammar.
* f-lang.c: New file, Fortran language support functions.
* f-lang.h: New file, Fortran language support declarations.
* f-typeprint.c: New file, Fortran type printing.
* f-valprint.c: New file, Fortran value printing.
* eval.c (evaluate_subexp): Add code for new expression opcodes,
fix wording of error message.
* gdbtypes.c (f77_create_literal_complex_type,
f77_create_literal_string_type): New functions.
* language.c (set_language_command): Add Fortran info.
(calc_f77_array_dims): New function.
* parse.c (length_of_subexp, prefixify_subexp): Add cases for new
expression opcodes.
* symfile.c (deduce_language_from_filename): Recognize .f and .F
as Fortran source files.
* valops.c (f77_value_literal_string, f77_value_substring,
f77_value_literal_complex): New functions.
1994-08-19 21:59:05 +00:00
|
|
|
|
case OP_F77_UNDETERMINED_ARGLIST:
|
1991-09-19 10:31:00 +00:00
|
|
|
|
oplen = 3;
|
* parse.c (write_exp_string): Complete rewrite to store string
contants as a leading explicit length, followed by the string data,
followed by a trailing explicit length.
* eval.c (evaluate_subexp), expprint.c (print_subexp),
parse.c (length_of_subexp), parse.c (prefixify_subexp):
Use recorded explicit length of strings in expression elements,
rather than strlen. Adjust code to skip over strings stored in
expression elements, and code to access strings, to account for
new leading explicit size expression element.
* parse.c (length_of_subexp): Test for minimum endpos of 1, not
0, to avoid negative expression element indices.
* valops.c (search_struct_method): Minor whitespace change.
1992-11-25 15:46:57 +00:00
|
|
|
|
args = 1 + longest_to_int (inexpr->elts[inend - 2].longconst);
|
1991-09-19 10:31:00 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case UNOP_MIN:
|
|
|
|
|
case UNOP_MAX:
|
|
|
|
|
oplen = 3;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case UNOP_CAST:
|
|
|
|
|
case UNOP_MEMVAL:
|
|
|
|
|
oplen = 3;
|
|
|
|
|
args = 1;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case UNOP_ABS:
|
|
|
|
|
case UNOP_CAP:
|
|
|
|
|
case UNOP_CHR:
|
|
|
|
|
case UNOP_FLOAT:
|
|
|
|
|
case UNOP_HIGH:
|
|
|
|
|
case UNOP_ODD:
|
|
|
|
|
case UNOP_ORD:
|
|
|
|
|
case UNOP_TRUNC:
|
|
|
|
|
oplen=1;
|
|
|
|
|
args=1;
|
|
|
|
|
break;
|
|
|
|
|
|
1993-01-31 13:15:12 +00:00
|
|
|
|
case STRUCTOP_STRUCT:
|
1992-09-10 00:07:06 +00:00
|
|
|
|
case STRUCTOP_PTR:
|
1995-01-20 23:45:21 +00:00
|
|
|
|
case OP_LABELED:
|
1992-09-10 00:07:06 +00:00
|
|
|
|
args = 1;
|
* parse.c (write_exp_string): Complete rewrite to store string
contants as a leading explicit length, followed by the string data,
followed by a trailing explicit length.
* eval.c (evaluate_subexp), expprint.c (print_subexp),
parse.c (length_of_subexp), parse.c (prefixify_subexp):
Use recorded explicit length of strings in expression elements,
rather than strlen. Adjust code to skip over strings stored in
expression elements, and code to access strings, to account for
new leading explicit size expression element.
* parse.c (length_of_subexp): Test for minimum endpos of 1, not
0, to avoid negative expression element indices.
* valops.c (search_struct_method): Minor whitespace change.
1992-11-25 15:46:57 +00:00
|
|
|
|
/* fall through */
|
1991-09-19 10:31:00 +00:00
|
|
|
|
case OP_M2_STRING:
|
|
|
|
|
case OP_STRING:
|
1995-10-05 05:24:41 +00:00
|
|
|
|
case OP_NAME:
|
1995-09-29 01:43:54 +00:00
|
|
|
|
case OP_EXPRSTRING:
|
* defs.h (HOST_CHAR_BIT): New macro, defaults to either CHAR_BIT
from a configuration file (typically including <limits.h>), or to
TARGET_CHAR_BIT if CHAR_BIT is not defined.
* eval.c (evaluate_subexp): Use new BYTES_TO_EXP_ELEM macro.
* eval.c (evaluate_subexp): Add case for OP_BITSTRING.
* expprint.c (print_subexp): Use new BYTES_TO_EXP_ELEM macro.
* exppritn.c (print_subexp, dump_expression): Add case for
OP_BITSTRING.
* expression.h (OP_BITSTRING): New expression element type for
packed bitstrings.
* expression.h (EXP_ELEM_TO_BYTES, BYTES_TO_EXP_ELEM): New
macros to convert between number of expression elements and bytes
to store that many elements.
* i960-tdep.c (leafproc_return): Use new macros to access
minimal symbol name and address fields.
* m88k-pinsn.c (sprint_address): Use new macros to access
minimal symbol name and address fields.
* nindy-tdep.c (nindy_frame_chain_valid): Use new macro to access
minimal symbol address field.
* parse.c (write_exp_elt, write_exp_string, prefixify_expression,
parse_exp_1): Use new EXP_ELEM_TO_BYTES macro.
* parse.c (write_exp_string, length_of_subexp, prefixify_expression):
Use new BYTES_TO_EXP_ELEM macro.
* parse.c (write_exp_bitstring): New function to write packed
bitstrings into the expression element vector.
* parse.c (length_of_subexp, prefixify_subexp): Add case for
OP_BITSTRING.
* parser-defs.h (struct stoken): Document that it is used for
OP_BITSTRING as well as OP_STRING.
* parser-defs.h (write_exp_bitstring): Add prototype.
**** start-sanitize-chill ****
* ch-exp.y (BIT_STRING_LITERAL): Change token type to sval.
* ch-exp.y (NUM, PRED, SUCC, ABS, CARD, MAX, MIN, SIZE, UPPER,
LOWER, LENGTH): New tokens for keywords.
* ch-exp.y (chill_value_built_in_routine_call, mode_argument,
upper_lower_argument, length_argument, array_mode_name,
string_mode_name, variant_structure_mode_name): New non-terminals
and productions.
* ch-exp.y (literal): Useful production for BIT_STRING_LITERAL.
* ch-exp.y (match_bitstring_literal): New lexer support function
to recognize bitstring literals.
* ch-exp.y (tokentab6): New token table for 6 character keywords.
* ch-exp.y (tokentab5): Add LOWER, UPPER.
* ch-exp.y (tokentab4): Add PRED, SUCC, CARD, SIZE.
* ch-exp.y (tokentab3): Add NUM, ABS, MIN, MAX.
* ch-exp.y (yylex): Check tokentab6.
* ch-exp.y (yylex): Call match_bitstring_literal.
**** end-sanitize-chill ****
1993-01-06 16:52:10 +00:00
|
|
|
|
oplen = longest_to_int (inexpr->elts[inend - 2].longconst);
|
|
|
|
|
oplen = 4 + BYTES_TO_EXP_ELEM (oplen + 1);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case OP_BITSTRING:
|
|
|
|
|
oplen = longest_to_int (inexpr->elts[inend - 2].longconst);
|
|
|
|
|
oplen = (oplen + HOST_CHAR_BIT - 1) / HOST_CHAR_BIT;
|
|
|
|
|
oplen = 4 + BYTES_TO_EXP_ELEM (oplen);
|
1991-09-19 10:31:00 +00:00
|
|
|
|
break;
|
|
|
|
|
|
1993-01-16 05:15:58 +00:00
|
|
|
|
case OP_ARRAY:
|
|
|
|
|
oplen = 4;
|
|
|
|
|
args = longest_to_int (inexpr->elts[inend - 2].longconst);
|
|
|
|
|
args -= longest_to_int (inexpr->elts[inend - 3].longconst);
|
|
|
|
|
args += 1;
|
|
|
|
|
break;
|
|
|
|
|
|
1991-09-19 10:31:00 +00:00
|
|
|
|
case TERNOP_COND:
|
* ch-exp.y (value_string_element, string_primitive_value,
start_element, left_element, right_element, slice_size,
lower_element, upper_element, first_element): Removed.
(value_string_slice, value_array_slice): Replaced by ...
(slice): New non-terminal, with working slice support.
(primitive_value_lparen, rparen): New non-terminals.
(maybe_tuple_elements): New non-terminal, to allow empty tuples.
(idtokentab): Added "up".
* value.h (COERCE_VARYING_ARRAY): New macro.
* valarith.c (value_subscript): Use it.
* valops.c (value_cast): Likewise. Also, do nothing if already
correct type, and allow converting from/to range to/from scalar.
* valops.c, value.h (varying_to_slice, value_slice): New functions.
* eval.c (OP_ARRAY): Add cast for array element.
* expression.h (TERNOP_SLICE, TERNOP_SLICE_COUNT): New exp_opcodes.
* valops.c (chill_varying_type): Moved function frp, here ...
* gdbtypes.c (chill_varying_type), gdbtypes.h: ... to here.
* parse.c (length_of_subexp, prefixify_subexp): Add support
for TERNOP_SLICE, TERNOP_SLICE_COUNT.
* expprint.c (print_subexp, dump_expression): Likewise.
* eval.c (evaluate_subexp): Likewise.
* eval.c (evaluate_subexp case MULTI_SUBSCRIPT): Don't call
value_x_binop on a Chill varying string.
1995-02-01 21:02:51 +00:00
|
|
|
|
case TERNOP_SLICE:
|
|
|
|
|
case TERNOP_SLICE_COUNT:
|
1991-09-19 10:31:00 +00:00
|
|
|
|
args = 3;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case BINOP_ASSIGN_MODIFY:
|
|
|
|
|
oplen = 3;
|
|
|
|
|
args = 2;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* Modula-2 */
|
1993-01-02 20:32:01 +00:00
|
|
|
|
case MULTI_SUBSCRIPT:
|
Initial Fortran language support, adapted from work by Farooq Butt
(fmbutt@engage.sps.mot.com).
* Makefile.in: Add Fortran-related files and dependencies.
* defs.h (language_fortran): New language enum.
* language.h (_LANG_fortran): Define.
(MAX_FORTRAN_DIMS): Define.
* expression.h: Reformat to standard.
(MULTI_F77_SUBSCRIPT, OP_F77_UNDETERMINED_ARGLIST,
OP_F77_LITERAL_COMPLEX, OP_F77_SUBSTR): New expression opcodes.
* gdbtypes.h (TYPE_CODE_COMPLEX, TYPE_CODE_LITERAL_COMPLEX,
TYPE_CODE_LITERAL_STRING): New type codes.
(type): New fields upper_bound_type and lower_bound_type.
(TYPE_ARRAY_UPPER_BOUND_TYPE, TYPE_ARRAY_LOWER_BOUND_TYPE,
TYPE_ARRAY_UPPER_BOUND_VALUE, TYPE_ARRAY_LOWER_BOUND_VALUE): New
macros.
(builtin_type_f_character, etc): Declare.
* value.h (VALUE_LITERAL_DATA, VALUE_SUBSTRING_START): Define.
* f-exp.y: New file, Fortran expression grammar.
* f-lang.c: New file, Fortran language support functions.
* f-lang.h: New file, Fortran language support declarations.
* f-typeprint.c: New file, Fortran type printing.
* f-valprint.c: New file, Fortran value printing.
* eval.c (evaluate_subexp): Add code for new expression opcodes,
fix wording of error message.
* gdbtypes.c (f77_create_literal_complex_type,
f77_create_literal_string_type): New functions.
* language.c (set_language_command): Add Fortran info.
(calc_f77_array_dims): New function.
* parse.c (length_of_subexp, prefixify_subexp): Add cases for new
expression opcodes.
* symfile.c (deduce_language_from_filename): Recognize .f and .F
as Fortran source files.
* valops.c (f77_value_literal_string, f77_value_substring,
f77_value_literal_complex): New functions.
1994-08-19 21:59:05 +00:00
|
|
|
|
oplen = 3;
|
* parse.c (write_exp_string): Complete rewrite to store string
contants as a leading explicit length, followed by the string data,
followed by a trailing explicit length.
* eval.c (evaluate_subexp), expprint.c (print_subexp),
parse.c (length_of_subexp), parse.c (prefixify_subexp):
Use recorded explicit length of strings in expression elements,
rather than strlen. Adjust code to skip over strings stored in
expression elements, and code to access strings, to account for
new leading explicit size expression element.
* parse.c (length_of_subexp): Test for minimum endpos of 1, not
0, to avoid negative expression element indices.
* valops.c (search_struct_method): Minor whitespace change.
1992-11-25 15:46:57 +00:00
|
|
|
|
args = 1 + longest_to_int (inexpr->elts[inend - 2].longconst);
|
1991-09-19 10:31:00 +00:00
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
/* C++ */
|
|
|
|
|
case OP_THIS:
|
|
|
|
|
oplen = 2;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
args = 1 + ((int) opcode < (int) BINOP_END);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Copy the final operator itself, from the end of the input
|
|
|
|
|
to the beginning of the output. */
|
|
|
|
|
inend -= oplen;
|
* breakpoint.c, buildsym.c, c-exp.y, coffread.c, command.c,
core.c, cplus-dem.c, dbxread.c, dwarfread.c, elfread.c, environ.c,
eval.c, findvar.c, gdbtypes.c, hppabsd-tdep.c, hppahpux-tdep.c,
i386-tdep.c, ieee-float.c, infcmd.c, inflow.c, infptrace.c,
infrun.c, m2-exp.y, mipsread.c, objfiles.c, parse.c, procfs.c,
putenv.c, remote-mm.c, remote-vx.c, solib.c, sparc-tdep.c,
sparc-xdep.c, stack.c, symfile.c, symtab.c, symtab.h, target.c,
tm-i386v.h, tm-sparc.h, utils.c, valarith.c, valops.c, valprint.c,
values.c, xcoffread.c:
Remove "(void)" casts from function calls where the return value
is ignored, in accordance with GNU coding standards.
1992-07-04 03:22:08 +00:00
|
|
|
|
memcpy (&outexpr->elts[outbeg], &inexpr->elts[inend],
|
* defs.h (HOST_CHAR_BIT): New macro, defaults to either CHAR_BIT
from a configuration file (typically including <limits.h>), or to
TARGET_CHAR_BIT if CHAR_BIT is not defined.
* eval.c (evaluate_subexp): Use new BYTES_TO_EXP_ELEM macro.
* eval.c (evaluate_subexp): Add case for OP_BITSTRING.
* expprint.c (print_subexp): Use new BYTES_TO_EXP_ELEM macro.
* exppritn.c (print_subexp, dump_expression): Add case for
OP_BITSTRING.
* expression.h (OP_BITSTRING): New expression element type for
packed bitstrings.
* expression.h (EXP_ELEM_TO_BYTES, BYTES_TO_EXP_ELEM): New
macros to convert between number of expression elements and bytes
to store that many elements.
* i960-tdep.c (leafproc_return): Use new macros to access
minimal symbol name and address fields.
* m88k-pinsn.c (sprint_address): Use new macros to access
minimal symbol name and address fields.
* nindy-tdep.c (nindy_frame_chain_valid): Use new macro to access
minimal symbol address field.
* parse.c (write_exp_elt, write_exp_string, prefixify_expression,
parse_exp_1): Use new EXP_ELEM_TO_BYTES macro.
* parse.c (write_exp_string, length_of_subexp, prefixify_expression):
Use new BYTES_TO_EXP_ELEM macro.
* parse.c (write_exp_bitstring): New function to write packed
bitstrings into the expression element vector.
* parse.c (length_of_subexp, prefixify_subexp): Add case for
OP_BITSTRING.
* parser-defs.h (struct stoken): Document that it is used for
OP_BITSTRING as well as OP_STRING.
* parser-defs.h (write_exp_bitstring): Add prototype.
**** start-sanitize-chill ****
* ch-exp.y (BIT_STRING_LITERAL): Change token type to sval.
* ch-exp.y (NUM, PRED, SUCC, ABS, CARD, MAX, MIN, SIZE, UPPER,
LOWER, LENGTH): New tokens for keywords.
* ch-exp.y (chill_value_built_in_routine_call, mode_argument,
upper_lower_argument, length_argument, array_mode_name,
string_mode_name, variant_structure_mode_name): New non-terminals
and productions.
* ch-exp.y (literal): Useful production for BIT_STRING_LITERAL.
* ch-exp.y (match_bitstring_literal): New lexer support function
to recognize bitstring literals.
* ch-exp.y (tokentab6): New token table for 6 character keywords.
* ch-exp.y (tokentab5): Add LOWER, UPPER.
* ch-exp.y (tokentab4): Add PRED, SUCC, CARD, SIZE.
* ch-exp.y (tokentab3): Add NUM, ABS, MIN, MAX.
* ch-exp.y (yylex): Check tokentab6.
* ch-exp.y (yylex): Call match_bitstring_literal.
**** end-sanitize-chill ****
1993-01-06 16:52:10 +00:00
|
|
|
|
EXP_ELEM_TO_BYTES (oplen));
|
1991-09-19 10:31:00 +00:00
|
|
|
|
outbeg += oplen;
|
|
|
|
|
|
|
|
|
|
/* Find the lengths of the arg subexpressions. */
|
|
|
|
|
arglens = (int *) alloca (args * sizeof (int));
|
|
|
|
|
for (i = args - 1; i >= 0; i--)
|
|
|
|
|
{
|
|
|
|
|
oplen = length_of_subexp (inexpr, inend);
|
|
|
|
|
arglens[i] = oplen;
|
|
|
|
|
inend -= oplen;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Now copy each subexpression, preserving the order of
|
|
|
|
|
the subexpressions, but prefixifying each one.
|
|
|
|
|
In this loop, inend starts at the beginning of
|
|
|
|
|
the expression this level is working on
|
|
|
|
|
and marches forward over the arguments.
|
|
|
|
|
outbeg does similarly in the output. */
|
|
|
|
|
for (i = 0; i < args; i++)
|
|
|
|
|
{
|
|
|
|
|
oplen = arglens[i];
|
|
|
|
|
inend += oplen;
|
|
|
|
|
prefixify_subexp (inexpr, outexpr, inend, outbeg);
|
|
|
|
|
outbeg += oplen;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This page contains the two entry points to this file. */
|
|
|
|
|
|
|
|
|
|
/* Read an expression from the string *STRINGPTR points to,
|
|
|
|
|
parse it, and return a pointer to a struct expression that we malloc.
|
|
|
|
|
Use block BLOCK as the lexical context for variable names;
|
|
|
|
|
if BLOCK is zero, use the block of the selected stack frame.
|
|
|
|
|
Meanwhile, advance *STRINGPTR to point after the expression,
|
|
|
|
|
at the first nonwhite character that is not part of the expression
|
|
|
|
|
(possibly a null character).
|
|
|
|
|
|
|
|
|
|
If COMMA is nonzero, stop if a comma is reached. */
|
|
|
|
|
|
|
|
|
|
struct expression *
|
|
|
|
|
parse_exp_1 (stringptr, block, comma)
|
|
|
|
|
char **stringptr;
|
|
|
|
|
struct block *block;
|
|
|
|
|
int comma;
|
|
|
|
|
{
|
|
|
|
|
struct cleanup *old_chain;
|
|
|
|
|
|
|
|
|
|
lexptr = *stringptr;
|
|
|
|
|
|
|
|
|
|
paren_depth = 0;
|
|
|
|
|
type_stack_depth = 0;
|
|
|
|
|
|
|
|
|
|
comma_terminates = comma;
|
|
|
|
|
|
|
|
|
|
if (lexptr == 0 || *lexptr == 0)
|
|
|
|
|
error_no_arg ("expression to compute");
|
|
|
|
|
|
1998-10-14 01:15:00 +00:00
|
|
|
|
old_chain = make_cleanup ((make_cleanup_func) free_funcalls, 0);
|
1991-09-19 10:31:00 +00:00
|
|
|
|
funcall_chain = 0;
|
|
|
|
|
|
|
|
|
|
expression_context_block = block ? block : get_selected_block ();
|
|
|
|
|
|
|
|
|
|
namecopy = (char *) alloca (strlen (lexptr) + 1);
|
|
|
|
|
expout_size = 10;
|
|
|
|
|
expout_ptr = 0;
|
|
|
|
|
expout = (struct expression *)
|
* defs.h (HOST_CHAR_BIT): New macro, defaults to either CHAR_BIT
from a configuration file (typically including <limits.h>), or to
TARGET_CHAR_BIT if CHAR_BIT is not defined.
* eval.c (evaluate_subexp): Use new BYTES_TO_EXP_ELEM macro.
* eval.c (evaluate_subexp): Add case for OP_BITSTRING.
* expprint.c (print_subexp): Use new BYTES_TO_EXP_ELEM macro.
* exppritn.c (print_subexp, dump_expression): Add case for
OP_BITSTRING.
* expression.h (OP_BITSTRING): New expression element type for
packed bitstrings.
* expression.h (EXP_ELEM_TO_BYTES, BYTES_TO_EXP_ELEM): New
macros to convert between number of expression elements and bytes
to store that many elements.
* i960-tdep.c (leafproc_return): Use new macros to access
minimal symbol name and address fields.
* m88k-pinsn.c (sprint_address): Use new macros to access
minimal symbol name and address fields.
* nindy-tdep.c (nindy_frame_chain_valid): Use new macro to access
minimal symbol address field.
* parse.c (write_exp_elt, write_exp_string, prefixify_expression,
parse_exp_1): Use new EXP_ELEM_TO_BYTES macro.
* parse.c (write_exp_string, length_of_subexp, prefixify_expression):
Use new BYTES_TO_EXP_ELEM macro.
* parse.c (write_exp_bitstring): New function to write packed
bitstrings into the expression element vector.
* parse.c (length_of_subexp, prefixify_subexp): Add case for
OP_BITSTRING.
* parser-defs.h (struct stoken): Document that it is used for
OP_BITSTRING as well as OP_STRING.
* parser-defs.h (write_exp_bitstring): Add prototype.
**** start-sanitize-chill ****
* ch-exp.y (BIT_STRING_LITERAL): Change token type to sval.
* ch-exp.y (NUM, PRED, SUCC, ABS, CARD, MAX, MIN, SIZE, UPPER,
LOWER, LENGTH): New tokens for keywords.
* ch-exp.y (chill_value_built_in_routine_call, mode_argument,
upper_lower_argument, length_argument, array_mode_name,
string_mode_name, variant_structure_mode_name): New non-terminals
and productions.
* ch-exp.y (literal): Useful production for BIT_STRING_LITERAL.
* ch-exp.y (match_bitstring_literal): New lexer support function
to recognize bitstring literals.
* ch-exp.y (tokentab6): New token table for 6 character keywords.
* ch-exp.y (tokentab5): Add LOWER, UPPER.
* ch-exp.y (tokentab4): Add PRED, SUCC, CARD, SIZE.
* ch-exp.y (tokentab3): Add NUM, ABS, MIN, MAX.
* ch-exp.y (yylex): Check tokentab6.
* ch-exp.y (yylex): Call match_bitstring_literal.
**** end-sanitize-chill ****
1993-01-06 16:52:10 +00:00
|
|
|
|
xmalloc (sizeof (struct expression) + EXP_ELEM_TO_BYTES (expout_size));
|
1991-09-19 10:31:00 +00:00
|
|
|
|
expout->language_defn = current_language;
|
1998-10-14 01:15:00 +00:00
|
|
|
|
make_cleanup ((make_cleanup_func) free_current_contents, &expout);
|
1991-09-19 10:31:00 +00:00
|
|
|
|
|
|
|
|
|
if (current_language->la_parser ())
|
|
|
|
|
current_language->la_error (NULL);
|
|
|
|
|
|
|
|
|
|
discard_cleanups (old_chain);
|
1993-01-02 20:32:01 +00:00
|
|
|
|
|
|
|
|
|
/* Record the actual number of expression elements, and then
|
|
|
|
|
reallocate the expression memory so that we free up any
|
|
|
|
|
excess elements. */
|
|
|
|
|
|
1991-09-19 10:31:00 +00:00
|
|
|
|
expout->nelts = expout_ptr;
|
|
|
|
|
expout = (struct expression *)
|
1992-02-22 01:46:16 +00:00
|
|
|
|
xrealloc ((char *) expout,
|
* defs.h (HOST_CHAR_BIT): New macro, defaults to either CHAR_BIT
from a configuration file (typically including <limits.h>), or to
TARGET_CHAR_BIT if CHAR_BIT is not defined.
* eval.c (evaluate_subexp): Use new BYTES_TO_EXP_ELEM macro.
* eval.c (evaluate_subexp): Add case for OP_BITSTRING.
* expprint.c (print_subexp): Use new BYTES_TO_EXP_ELEM macro.
* exppritn.c (print_subexp, dump_expression): Add case for
OP_BITSTRING.
* expression.h (OP_BITSTRING): New expression element type for
packed bitstrings.
* expression.h (EXP_ELEM_TO_BYTES, BYTES_TO_EXP_ELEM): New
macros to convert between number of expression elements and bytes
to store that many elements.
* i960-tdep.c (leafproc_return): Use new macros to access
minimal symbol name and address fields.
* m88k-pinsn.c (sprint_address): Use new macros to access
minimal symbol name and address fields.
* nindy-tdep.c (nindy_frame_chain_valid): Use new macro to access
minimal symbol address field.
* parse.c (write_exp_elt, write_exp_string, prefixify_expression,
parse_exp_1): Use new EXP_ELEM_TO_BYTES macro.
* parse.c (write_exp_string, length_of_subexp, prefixify_expression):
Use new BYTES_TO_EXP_ELEM macro.
* parse.c (write_exp_bitstring): New function to write packed
bitstrings into the expression element vector.
* parse.c (length_of_subexp, prefixify_subexp): Add case for
OP_BITSTRING.
* parser-defs.h (struct stoken): Document that it is used for
OP_BITSTRING as well as OP_STRING.
* parser-defs.h (write_exp_bitstring): Add prototype.
**** start-sanitize-chill ****
* ch-exp.y (BIT_STRING_LITERAL): Change token type to sval.
* ch-exp.y (NUM, PRED, SUCC, ABS, CARD, MAX, MIN, SIZE, UPPER,
LOWER, LENGTH): New tokens for keywords.
* ch-exp.y (chill_value_built_in_routine_call, mode_argument,
upper_lower_argument, length_argument, array_mode_name,
string_mode_name, variant_structure_mode_name): New non-terminals
and productions.
* ch-exp.y (literal): Useful production for BIT_STRING_LITERAL.
* ch-exp.y (match_bitstring_literal): New lexer support function
to recognize bitstring literals.
* ch-exp.y (tokentab6): New token table for 6 character keywords.
* ch-exp.y (tokentab5): Add LOWER, UPPER.
* ch-exp.y (tokentab4): Add PRED, SUCC, CARD, SIZE.
* ch-exp.y (tokentab3): Add NUM, ABS, MIN, MAX.
* ch-exp.y (yylex): Check tokentab6.
* ch-exp.y (yylex): Call match_bitstring_literal.
**** end-sanitize-chill ****
1993-01-06 16:52:10 +00:00
|
|
|
|
sizeof (struct expression) + EXP_ELEM_TO_BYTES (expout_ptr));;
|
1993-01-02 20:32:01 +00:00
|
|
|
|
|
|
|
|
|
/* Convert expression from postfix form as generated by yacc
|
|
|
|
|
parser, to a prefix form. */
|
|
|
|
|
|
1998-08-12 15:50:59 +00:00
|
|
|
|
#ifdef MAINTENANCE_CMDS
|
|
|
|
|
if (expressiondebug)
|
|
|
|
|
dump_prefix_expression (expout, gdb_stdout,
|
|
|
|
|
"before conversion to prefix form");
|
|
|
|
|
#endif /* MAINTENANCE_CMDS */
|
|
|
|
|
|
1991-09-19 10:31:00 +00:00
|
|
|
|
prefixify_expression (expout);
|
1998-08-12 15:50:59 +00:00
|
|
|
|
|
|
|
|
|
#ifdef MAINTENANCE_CMDS
|
|
|
|
|
if (expressiondebug)
|
|
|
|
|
dump_postfix_expression (expout, gdb_stdout,
|
|
|
|
|
"after conversion to prefix form");
|
|
|
|
|
#endif /* MAINTENANCE_CMDS */
|
1993-01-02 20:32:01 +00:00
|
|
|
|
|
1991-09-19 10:31:00 +00:00
|
|
|
|
*stringptr = lexptr;
|
|
|
|
|
return expout;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Parse STRING as an expression, and complain if this fails
|
|
|
|
|
to use up all of the contents of STRING. */
|
|
|
|
|
|
|
|
|
|
struct expression *
|
|
|
|
|
parse_expression (string)
|
|
|
|
|
char *string;
|
|
|
|
|
{
|
|
|
|
|
register struct expression *exp;
|
|
|
|
|
exp = parse_exp_1 (&string, 0, 0);
|
|
|
|
|
if (*string)
|
|
|
|
|
error ("Junk after end of expression.");
|
|
|
|
|
return exp;
|
|
|
|
|
}
|
1993-10-18 01:10:25 +00:00
|
|
|
|
|
|
|
|
|
/* Stuff for maintaining a stack of types. Currently just used by C, but
|
|
|
|
|
probably useful for any language which declares its types "backwards". */
|
1991-09-19 10:31:00 +00:00
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
push_type (tp)
|
|
|
|
|
enum type_pieces tp;
|
|
|
|
|
{
|
|
|
|
|
if (type_stack_depth == type_stack_size)
|
|
|
|
|
{
|
|
|
|
|
type_stack_size *= 2;
|
|
|
|
|
type_stack = (union type_stack_elt *)
|
1992-02-22 01:46:16 +00:00
|
|
|
|
xrealloc ((char *) type_stack, type_stack_size * sizeof (*type_stack));
|
1991-09-19 10:31:00 +00:00
|
|
|
|
}
|
|
|
|
|
type_stack[type_stack_depth++].piece = tp;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
push_type_int (n)
|
|
|
|
|
int n;
|
|
|
|
|
{
|
|
|
|
|
if (type_stack_depth == type_stack_size)
|
|
|
|
|
{
|
|
|
|
|
type_stack_size *= 2;
|
|
|
|
|
type_stack = (union type_stack_elt *)
|
1992-02-22 01:46:16 +00:00
|
|
|
|
xrealloc ((char *) type_stack, type_stack_size * sizeof (*type_stack));
|
1991-09-19 10:31:00 +00:00
|
|
|
|
}
|
|
|
|
|
type_stack[type_stack_depth++].int_val = n;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
enum type_pieces
|
|
|
|
|
pop_type ()
|
|
|
|
|
{
|
|
|
|
|
if (type_stack_depth)
|
|
|
|
|
return type_stack[--type_stack_depth].piece;
|
|
|
|
|
return tp_end;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
pop_type_int ()
|
|
|
|
|
{
|
|
|
|
|
if (type_stack_depth)
|
|
|
|
|
return type_stack[--type_stack_depth].int_val;
|
|
|
|
|
/* "Can't happen". */
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
1993-10-18 01:10:25 +00:00
|
|
|
|
/* Pop the type stack and return the type which corresponds to FOLLOW_TYPE
|
|
|
|
|
as modified by all the stuff on the stack. */
|
|
|
|
|
struct type *
|
|
|
|
|
follow_types (follow_type)
|
|
|
|
|
struct type *follow_type;
|
|
|
|
|
{
|
|
|
|
|
int done = 0;
|
|
|
|
|
int array_size;
|
|
|
|
|
struct type *range_type;
|
|
|
|
|
|
|
|
|
|
while (!done)
|
|
|
|
|
switch (pop_type ())
|
|
|
|
|
{
|
|
|
|
|
case tp_end:
|
|
|
|
|
done = 1;
|
|
|
|
|
break;
|
|
|
|
|
case tp_pointer:
|
|
|
|
|
follow_type = lookup_pointer_type (follow_type);
|
|
|
|
|
break;
|
|
|
|
|
case tp_reference:
|
|
|
|
|
follow_type = lookup_reference_type (follow_type);
|
|
|
|
|
break;
|
|
|
|
|
case tp_array:
|
|
|
|
|
array_size = pop_type_int ();
|
1995-03-14 14:59:24 +00:00
|
|
|
|
/* FIXME-type-allocation: need a way to free this type when we are
|
|
|
|
|
done with it. */
|
1995-02-17 23:20:29 +00:00
|
|
|
|
range_type =
|
|
|
|
|
create_range_type ((struct type *) NULL,
|
|
|
|
|
builtin_type_int, 0,
|
|
|
|
|
array_size >= 0 ? array_size - 1 : 0);
|
|
|
|
|
follow_type =
|
|
|
|
|
create_array_type ((struct type *) NULL,
|
|
|
|
|
follow_type, range_type);
|
|
|
|
|
if (array_size < 0)
|
|
|
|
|
TYPE_ARRAY_UPPER_BOUND_TYPE(follow_type)
|
|
|
|
|
= BOUND_CANNOT_BE_DETERMINED;
|
1993-10-18 01:10:25 +00:00
|
|
|
|
break;
|
|
|
|
|
case tp_function:
|
1995-03-14 14:59:24 +00:00
|
|
|
|
/* FIXME-type-allocation: need a way to free this type when we are
|
|
|
|
|
done with it. */
|
1993-10-18 01:10:25 +00:00
|
|
|
|
follow_type = lookup_function_type (follow_type);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
return follow_type;
|
|
|
|
|
}
|
|
|
|
|
|
1991-09-19 10:31:00 +00:00
|
|
|
|
void
|
|
|
|
|
_initialize_parse ()
|
|
|
|
|
{
|
|
|
|
|
type_stack_size = 80;
|
|
|
|
|
type_stack_depth = 0;
|
|
|
|
|
type_stack = (union type_stack_elt *)
|
|
|
|
|
xmalloc (type_stack_size * sizeof (*type_stack));
|
1995-01-17 16:16:20 +00:00
|
|
|
|
|
|
|
|
|
msym_text_symbol_type =
|
1995-01-17 21:47:38 +00:00
|
|
|
|
init_type (TYPE_CODE_FUNC, 1, 0, "<text variable, no debug info>", NULL);
|
1995-01-17 16:16:20 +00:00
|
|
|
|
TYPE_TARGET_TYPE (msym_text_symbol_type) = builtin_type_int;
|
|
|
|
|
msym_data_symbol_type =
|
|
|
|
|
init_type (TYPE_CODE_INT, TARGET_INT_BIT / HOST_CHAR_BIT, 0,
|
1995-01-17 21:47:38 +00:00
|
|
|
|
"<data variable, no debug info>", NULL);
|
1995-01-17 16:16:20 +00:00
|
|
|
|
msym_unknown_symbol_type =
|
1995-01-17 21:47:38 +00:00
|
|
|
|
init_type (TYPE_CODE_INT, 1, 0,
|
|
|
|
|
"<variable (not text or data), no debug info>",
|
1995-01-17 16:16:20 +00:00
|
|
|
|
NULL);
|
1998-08-12 15:50:59 +00:00
|
|
|
|
|
|
|
|
|
#ifdef MAINTENANCE_CMDS
|
|
|
|
|
add_show_from_set (
|
|
|
|
|
add_set_cmd ("expressiondebug", class_maintenance, var_zinteger,
|
|
|
|
|
(char *)&expressiondebug,
|
|
|
|
|
"Set expression debugging.\n\
|
|
|
|
|
When non-zero, the internal representation of expressions will be printed.",
|
|
|
|
|
&setlist),
|
|
|
|
|
&showlist);
|
|
|
|
|
#endif
|
1991-09-19 10:31:00 +00:00
|
|
|
|
}
|