gdb/expprint.c - Issue 124383005: GDB 7.6.50

Unified Diff: gdb/expprint.c

Issue 124383005: GDB 7.6.50 (Closed) Base URL: http://git.chromium.org/native_client/nacl-gdb.git@upstream

Patch Set: Created 6 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: gdb/expprint.c

diff --git a/gdb/expprint.c b/gdb/expprint.c

index 6915d43f03e42ae1967e54246135762d8a9072a2..c385bf01d4976c16d0682855ca9daacc661e4950 100644

--- a/gdb/expprint.c

+++ b/gdb/expprint.c

@@ -1,7 +1,6 @@

/* Print in infix form a struct expression.

- Software Foundation, Inc.

This file is part of GDB.

@@ -27,15 +26,13 @@

#include "parser-defs.h"

#include "user-regs.h" /* For user_reg_map_regnum_to_name. */

#include "target.h"

-#include "gdb_string.h"

+#include <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)

@@ -83,6 +80,11 @@ print_subexp_standard (struct expression *exp, int *pos,

{

/* Common ops */

+ case OP_TYPE:

+ (*pos) += 2;

+ type_print (exp->elts[pc + 1].type, "", stream, 0);

+ return;

case OP_SCOPE:

myprec = PREC_PREFIX;

assoc = 0;

@@ -97,7 +99,7 @@ print_subexp_standard (struct expression *exp, int *pos,

{

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),

@@ -109,7 +111,7 @@ print_subexp_standard (struct expression *exp, int *pos,

{

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),

@@ -119,7 +121,7 @@ print_subexp_standard (struct expression *exp, int *pos,

case OP_VAR_VALUE:

{

- struct block *b;

+ const struct block *b;

(*pos) += 3;

b = exp->elts[pc + 1].block;

@@ -201,17 +203,11 @@ print_subexp_standard (struct expression *exp, int *pos,

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;

- case OP_BITSTRING:

- nargs = longest_to_int (exp->elts[pc + 1].longconst);

- (*pos)

- += 3 + BYTES_TO_EXP_ELEM ((nargs + HOST_CHAR_BIT - 1) / HOST_CHAR_BIT);

- fprintf_unfiltered (stream, "B'<unimplemented>'");

- return;

case OP_OBJC_NSSTRING: /* Objective-C Foundation Class

NSString constant. */

{

@@ -222,7 +218,8 @@ print_subexp_standard (struct expression *exp, int *pos,

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;

@@ -312,7 +309,7 @@ print_subexp_standard (struct expression *exp, int *pos,

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

@@ -330,21 +327,6 @@ print_subexp_standard (struct expression *exp, int *pos,

}

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);

@@ -362,7 +344,6 @@ print_subexp_standard (struct expression *exp, int *pos,

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);

@@ -429,13 +410,23 @@ print_subexp_standard (struct expression *exp, int *pos,

fputs_filtered (")", stream);

return;

+ case UNOP_CAST_TYPE:

+ if ((int) prec > (int) PREC_PREFIX)

+ fputs_filtered ("(", stream);

+ print_subexp (exp, pos, stream, PREC_PREFIX);

+ fputs_filtered (") ", stream);

+ print_subexp (exp, pos, stream, PREC_PREFIX);

+ if ((int) prec > (int) PREC_PREFIX)

+ fputs_filtered (")", stream);

+ return;

case UNOP_DYNAMIC_CAST:

case UNOP_REINTERPRET_CAST:

fputs_filtered (opcode == UNOP_DYNAMIC_CAST ? "dynamic_cast"

: "reinterpret_cast", stream);

fputs_filtered ("<", stream);

- (*pos) += 2;

- type_print (exp->elts[pc + 1].type, "", stream, 0);

+ print_subexp (exp, pos, stream, PREC_PREFIX);

fputs_filtered ("> (", stream);

print_subexp (exp, pos, stream, PREC_PREFIX);

fputs_filtered (")", stream);

@@ -457,7 +448,7 @@ print_subexp_standard (struct expression *exp, int *pos,

(*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

@@ -471,6 +462,17 @@ print_subexp_standard (struct expression *exp, int *pos,

fputs_filtered (")", stream);

return;

+ case UNOP_MEMVAL_TYPE:

+ if ((int) prec > (int) PREC_PREFIX)

+ fputs_filtered ("(", stream);

+ fputs_filtered ("{", stream);

+ print_subexp (exp, pos, stream, PREC_PREFIX);

+ fputs_filtered ("} ", stream);

+ print_subexp (exp, pos, stream, PREC_PREFIX);

+ if ((int) prec > (int) PREC_PREFIX)

+ fputs_filtered (")", stream);

+ return;

case UNOP_MEMVAL_TLS:

(*pos) += 3;

if ((int) prec > (int) PREC_PREFIX)

@@ -667,7 +669,7 @@ op_name_standard (enum exp_opcode opcode)

{

static char buf[30];

- sprintf (buf, "<unknown %d>", opcode);

+ xsnprintf (buf, sizeof (buf), "<unknown %d>", opcode);

return buf;

}

#define OP(name) \

@@ -768,7 +770,6 @@ dump_subexp_body_standard (struct expression *exp,

{

case TERNOP_COND:

case TERNOP_SLICE:

- case TERNOP_SLICE_COUNT:

elt = dump_subexp (exp, stream, elt);

/* FALL THROUGH */

case BINOP_ADD:

@@ -910,10 +911,17 @@ dump_subexp_body_standard (struct expression *exp,

elt = dump_subexp (exp, stream, elt);

}

break;

- case UNOP_MEMVAL:

- case UNOP_CAST:

case UNOP_DYNAMIC_CAST:

case UNOP_REINTERPRET_CAST:

+ case UNOP_CAST_TYPE:

+ case UNOP_MEMVAL_TYPE:

+ fprintf_filtered (stream, " (");

+ elt = dump_subexp (exp, stream, elt);

+ fprintf_filtered (stream, ")");

+ elt = dump_subexp (exp, stream, elt);

+ break;

+ case UNOP_MEMVAL:

+ case UNOP_CAST:

fprintf_filtered (stream, "Type @");

gdb_print_host_address (exp->elts[elt].type, stream);

fprintf_filtered (stream, " (");

@@ -926,7 +934,7 @@ dump_subexp_body_standard (struct expression *exp,

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);

@@ -939,6 +947,17 @@ dump_subexp_body_standard (struct expression *exp,

fprintf_filtered (stream, ")");

elt += 2;

break;

+ case OP_TYPEOF:

+ case OP_DECLTYPE:

+ fprintf_filtered (stream, "Typeof (");

+ 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:

{

@@ -998,11 +1017,9 @@ dump_subexp_body_standard (struct expression *exp,

case OP_F77_UNDETERMINED_ARGLIST:

case OP_COMPLEX:

case OP_STRING:

- case OP_BITSTRING:

case OP_BOOL:

case OP_M2_STRING:

case OP_THIS:

- case OP_LABELED:

case OP_NAME:

fprintf_filtered (stream, "Unknown format");

}

@@ -1018,10 +1035,7 @@ dump_prefix_expression (struct expression *exp, struct ui_file *stream)

fprintf_filtered (stream, "Dump of expression @ ");

gdb_print_host_address (exp, stream);

fputs_filtered (", after conversion to prefix form:\nExpression: `", stream);

- if (exp->elts[0].opcode != OP_TYPE)

- print_expression (exp, stream);

- else

- fputs_filtered ("Type printing not yet supported....", stream);

+ print_expression (exp, stream);

fprintf_filtered (stream, "'\n\tLanguage %s, %d elements, %ld bytes each.\n",

exp->language_defn->la_name, exp->nelts,

(long) sizeof (union exp_element));

« no previous file with comments | « gdb/exec.c ('k') | gdb/expression.h » ('j') | no next file with comments »