/* Print in infix form a struct expression.
- Copyright (C) 1986, 1988-1989, 1991-2000, 2003, 2007-2012 Free
- Software Foundation, Inc.
+ Copyright (C) 1986-2017 Free Software Foundation, Inc.
This file is part of GDB.
#include "parser-defs.h"
#include "user-regs.h" /* For user_reg_map_regnum_to_name. */
#include "target.h"
-#include "gdb_string.h"
#include "block.h"
#include "objfiles.h"
-#include "gdb_assert.h"
#include "valprint.h"
-#ifdef HAVE_CTYPE_H
#include <ctype.h>
-#endif
void
print_expression (struct expression *exp, struct ui_file *stream)
{
struct value_print_options opts;
- get_raw_print_options (&opts);
+ get_no_prettyformat_print_options (&opts);
(*pos) += 3;
value_print (value_from_longest (exp->elts[pc + 1].type,
exp->elts[pc + 2].longconst),
{
struct value_print_options opts;
- get_raw_print_options (&opts);
+ get_no_prettyformat_print_options (&opts);
(*pos) += 3;
value_print (value_from_double (exp->elts[pc + 1].type,
exp->elts[pc + 2].doubleconst),
case OP_VAR_VALUE:
{
- struct block *b;
+ const struct block *b;
(*pos) += 3;
b = exp->elts[pc + 1].block;
additional parameter to LA_PRINT_STRING. -fnf */
get_user_print_options (&opts);
LA_PRINT_STRING (stream, builtin_type (exp->gdbarch)->builtin_char,
- &exp->elts[pc + 2].string, nargs, NULL, 0, &opts);
+ (gdb_byte *) &exp->elts[pc + 2].string, nargs,
+ NULL, 0, &opts);
}
return;
fputs_filtered ("@\"", stream);
get_user_print_options (&opts);
LA_PRINT_STRING (stream, builtin_type (exp->gdbarch)->builtin_char,
- &exp->elts[pc + 2].string, nargs, NULL, 0, &opts);
+ (gdb_byte *) &exp->elts[pc + 2].string, nargs,
+ NULL, 0, &opts);
fputs_filtered ("\"", stream);
}
return;
{
char *s, *nextS;
- s = alloca (strlen (selector) + 1);
+ s = (char *) alloca (strlen (selector) + 1);
strcpy (s, selector);
for (tem = 0; tem < nargs; tem++)
{
a simple string, revert back to array printing. Note that
the last expression element is an explicit null terminator
byte, which doesn't get printed. */
- tempstr = alloca (nargs);
+ tempstr = (char *) alloca (nargs);
pc += 4;
while (tem < nargs)
{
get_user_print_options (&opts);
LA_PRINT_STRING (stream, builtin_type (exp->gdbarch)->builtin_char,
- tempstr, nargs - 1, NULL, 0, &opts);
+ (gdb_byte *) tempstr, nargs - 1, NULL, 0, &opts);
(*pos) = pc;
}
else
}
return;
- case OP_LABELED:
- tem = longest_to_int (exp->elts[pc + 1].longconst);
- (*pos) += 3 + BYTES_TO_EXP_ELEM (tem + 1);
- /* Gcc support both these syntaxes. Unsure which is preferred. */
-#if 1
- fputs_filtered (&exp->elts[pc + 2].string, stream);
- fputs_filtered (": ", stream);
-#else
- fputs_filtered (".", stream);
- fputs_filtered (&exp->elts[pc + 2].string, stream);
- fputs_filtered ("=", stream);
-#endif
- print_subexp (exp, pos, stream, PREC_SUFFIX);
- return;
-
case TERNOP_COND:
if ((int) prec > (int) PREC_COMMA)
fputs_filtered ("(", stream);
return;
case TERNOP_SLICE:
- case TERNOP_SLICE_COUNT:
print_subexp (exp, pos, stream, PREC_SUFFIX);
fputs_filtered ("(", stream);
print_subexp (exp, pos, stream, PREC_ABOVE_COMMA);
(*pos) += 4;
val = value_at_lazy (exp->elts[pc + 1].type,
(CORE_ADDR) exp->elts[pc + 5].longconst);
- get_raw_print_options (&opts);
+ get_no_prettyformat_print_options (&opts);
value_print (val, stream, &opts);
}
else
return;
}
+ case OP_RANGE:
+ {
+ enum range_type range_type;
+
+ range_type = (enum range_type)
+ longest_to_int (exp->elts[pc + 1].longconst);
+ *pos += 2;
+
+ fputs_filtered ("RANGE(", stream);
+ if (range_type == HIGH_BOUND_DEFAULT
+ || range_type == NONE_BOUND_DEFAULT)
+ print_subexp (exp, pos, stream, PREC_ABOVE_COMMA);
+ fputs_filtered ("..", stream);
+ if (range_type == LOW_BOUND_DEFAULT
+ || range_type == NONE_BOUND_DEFAULT)
+ print_subexp (exp, pos, stream, PREC_ABOVE_COMMA);
+ fputs_filtered (")", stream);
+ return;
+ }
+
/* Default ops */
default:
{
static char buf[30];
- sprintf (buf, "<unknown %d>", opcode);
+ xsnprintf (buf, sizeof (buf), "<unknown %d>", opcode);
return buf;
}
#define OP(name) \
{
case TERNOP_COND:
case TERNOP_SLICE:
- case TERNOP_SLICE_COUNT:
elt = dump_subexp (exp, stream, elt);
/* FALL THROUGH */
case BINOP_ADD:
case BINOP_ASSIGN_MODIFY:
case BINOP_VAL:
case BINOP_CONCAT:
- case BINOP_IN:
- case BINOP_RANGE:
case BINOP_END:
case STRUCTOP_MEMBER:
case STRUCTOP_MPTR:
gdb_print_host_address (exp->elts[elt + 1].type, stream);
fprintf_filtered (stream, " (__thread /* \"%s\" */ ",
(exp->elts[elt].objfile == NULL ? "(null)"
- : exp->elts[elt].objfile->name));
+ : objfile_name (exp->elts[elt].objfile)));
type_print (exp->elts[elt + 1].type, NULL, stream, 0);
fprintf_filtered (stream, ")");
elt = dump_subexp (exp, stream, elt + 3);
elt = dump_subexp (exp, stream, elt);
fprintf_filtered (stream, ")");
break;
+ case OP_TYPEID:
+ fprintf_filtered (stream, "typeid (");
+ elt = dump_subexp (exp, stream, elt);
+ fprintf_filtered (stream, ")");
+ break;
case STRUCTOP_STRUCT:
case STRUCTOP_PTR:
{
elt = dump_subexp (exp, stream, elt);
}
break;
+ case OP_STRING:
+ {
+ LONGEST len = exp->elts[elt].longconst;
+ LONGEST type = exp->elts[elt + 1].longconst;
+
+ fprintf_filtered (stream, "Language-specific string type: %s",
+ plongest (type));
+
+ /* Skip length. */
+ elt += 1;
+
+ /* Skip string content. */
+ elt += BYTES_TO_EXP_ELEM (len);
+
+ /* Skip length and ending OP_STRING. */
+ elt += 2;
+ }
+ break;
+ case OP_RANGE:
+ {
+ enum range_type range_type;
+
+ range_type = (enum range_type)
+ longest_to_int (exp->elts[elt].longconst);
+ elt += 2;
+
+ switch (range_type)
+ {
+ case BOTH_BOUND_DEFAULT:
+ fputs_filtered ("Range '..'", stream);
+ break;
+ case LOW_BOUND_DEFAULT:
+ fputs_filtered ("Range '..EXP'", stream);
+ break;
+ case HIGH_BOUND_DEFAULT:
+ fputs_filtered ("Range 'EXP..'", stream);
+ break;
+ case NONE_BOUND_DEFAULT:
+ fputs_filtered ("Range 'EXP..EXP'", stream);
+ break;
+ default:
+ fputs_filtered ("Invalid Range!", stream);
+ break;
+ }
+
+ if (range_type == HIGH_BOUND_DEFAULT
+ || range_type == NONE_BOUND_DEFAULT)
+ elt = dump_subexp (exp, stream, elt);
+ if (range_type == LOW_BOUND_DEFAULT
+ || range_type == NONE_BOUND_DEFAULT)
+ elt = dump_subexp (exp, stream, elt);
+ }
+ break;
+
default:
case OP_NULL:
case MULTI_SUBSCRIPT:
case OP_F77_UNDETERMINED_ARGLIST:
case OP_COMPLEX:
- case OP_STRING:
case OP_BOOL:
case OP_M2_STRING:
case OP_THIS:
- case OP_LABELED:
case OP_NAME:
fprintf_filtered (stream, "Unknown format");
}