projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Skip gdb.base/branch-to-self.exp if gdb,nosignals exists
[deliverable/binutils-gdb.git]
/
gdb
/
m2-lang.c
diff --git
a/gdb/m2-lang.c
b/gdb/m2-lang.c
index 30577744170a28e4498120ff58caa9d7006fa987..917da15d8084da571febdc0c52c31e4e81e89071 100644
(file)
--- a/
gdb/m2-lang.c
+++ b/
gdb/m2-lang.c
@@
-1,7
+1,6
@@
/* Modula 2 language support routines for GDB, the GNU debugger.
/* Modula 2 language support routines for GDB, the GNU debugger.
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2002, 2003, 2004,
- 2005, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1992-2016 Free Software Foundation, Inc.
This file is part of GDB.
This file is part of GDB.
@@
-24,6
+23,7
@@
#include "expression.h"
#include "parser-defs.h"
#include "language.h"
#include "expression.h"
#include "parser-defs.h"
#include "language.h"
+#include "varobj.h"
#include "m2-lang.h"
#include "c-lang.h"
#include "valprint.h"
#include "m2-lang.h"
#include "c-lang.h"
#include "valprint.h"
@@
-42,7
+42,7
@@
static void
m2_emit_char (int c, struct type *type, struct ui_file *stream, int quoter)
{
m2_emit_char (int c, struct type *type, struct ui_file *stream, int quoter)
{
- c &= 0xFF; /* Avoid sign bit follies */
+ c &= 0xFF; /* Avoid sign bit follies
.
*/
if (PRINT_LITERAL_FORM (c))
{
if (PRINT_LITERAL_FORM (c))
{
@@
-111,7
+111,6
@@
m2_printstr (struct ui_file *stream, struct type *type, const gdb_byte *string,
unsigned int things_printed = 0;
int in_quotes = 0;
int need_comma = 0;
unsigned int things_printed = 0;
int in_quotes = 0;
int need_comma = 0;
- int width = TYPE_LENGTH (type);
if (length == 0)
{
if (length == 0)
{
@@
-147,10
+146,7
@@
m2_printstr (struct ui_file *stream, struct type *type, const gdb_byte *string,
{
if (in_quotes)
{
{
if (in_quotes)
{
- if (options->inspect_it)
- fputs_filtered ("\\\", ", stream);
- else
- fputs_filtered ("\", ", stream);
+ fputs_filtered ("\", ", stream);
in_quotes = 0;
}
m2_printchar (string[i], type, stream);
in_quotes = 0;
}
m2_printchar (string[i], type, stream);
@@
-163,10
+159,7
@@
m2_printstr (struct ui_file *stream, struct type *type, const gdb_byte *string,
{
if (!in_quotes)
{
{
if (!in_quotes)
{
- if (options->inspect_it)
- fputs_filtered ("\\\"", stream);
- else
- fputs_filtered ("\"", stream);
+ fputs_filtered ("\"", stream);
in_quotes = 1;
}
LA_EMIT_CHAR (string[i], type, stream, '"');
in_quotes = 1;
}
LA_EMIT_CHAR (string[i], type, stream, '"');
@@
-176,12
+169,7
@@
m2_printstr (struct ui_file *stream, struct type *type, const gdb_byte *string,
/* Terminate the quotes if necessary. */
if (in_quotes)
/* Terminate the quotes if necessary. */
if (in_quotes)
- {
- if (options->inspect_it)
- fputs_filtered ("\\\"", stream);
- else
- fputs_filtered ("\"", stream);
- }
+ fputs_filtered ("\"", stream);
if (force_ellipses || i < length)
fputs_filtered ("...", stream);
if (force_ellipses || i < length)
fputs_filtered ("...", stream);
@@
-195,6
+183,7
@@
evaluate_subexp_modula2 (struct type *expect_type, struct expression *exp,
struct value *arg1;
struct value *arg2;
struct type *type;
struct value *arg1;
struct value *arg2;
struct type *type;
+
switch (op)
{
case UNOP_HIGH:
switch (op)
{
case UNOP_HIGH:
@@
-211,6
+200,7
@@
evaluate_subexp_modula2 (struct type *expect_type, struct expression *exp,
if (m2_is_unbounded_array (type))
{
struct value *temp = arg1;
if (m2_is_unbounded_array (type))
{
struct value *temp = arg1;
+
type = TYPE_FIELD_TYPE (type, 1);
/* i18n: Do not translate the "_m2_high" part! */
arg1 = value_struct_elt (&temp, NULL, "_m2_high", NULL,
type = TYPE_FIELD_TYPE (type, 1);
/* i18n: Do not translate the "_m2_high" part! */
arg1 = value_struct_elt (&temp, NULL, "_m2_high", NULL,
@@
-240,10
+230,12
@@
evaluate_subexp_modula2 (struct type *expect_type, struct expression *exp,
{
struct value *temp = arg1;
type = TYPE_FIELD_TYPE (type, 0);
{
struct value *temp = arg1;
type = TYPE_FIELD_TYPE (type, 0);
- if (type == NULL || (TYPE_CODE (type) != TYPE_CODE_PTR)) {
- warning (_("internal error: unbounded array structure is unknown"));
- return evaluate_subexp_standard (expect_type, exp, pos, noside);
- }
+ if (type == NULL || (TYPE_CODE (type) != TYPE_CODE_PTR))
+ {
+ warning (_("internal error: unbounded "
+ "array structure is unknown"));
+ return evaluate_subexp_standard (expect_type, exp, pos, noside);
+ }
/* i18n: Do not translate the "_m2_contents" part! */
arg1 = value_struct_elt (&temp, NULL, "_m2_contents", NULL,
_("unbounded structure "
/* i18n: Do not translate the "_m2_contents" part! */
arg1 = value_struct_elt (&temp, NULL, "_m2_contents", NULL,
_("unbounded structure "
@@
-252,7
+244,7
@@
evaluate_subexp_modula2 (struct type *expect_type, struct expression *exp,
if (value_type (arg1) != type)
arg1 = value_cast (type, arg1);
if (value_type (arg1) != type)
arg1 = value_cast (type, arg1);
-
type =
check_typedef (value_type (arg1));
+ check_typedef (value_type (arg1));
return value_ind (value_ptradd (arg1, value_as_long (arg2)));
}
else
return value_ind (value_ptradd (arg1, value_as_long (arg2)));
}
else
@@
-312,7
+304,7
@@
static const struct op_print m2_op_print_tab[] =
{"MIN", UNOP_MIN, PREC_BUILTIN_FUNCTION, 0},
{"ODD", UNOP_ODD, PREC_BUILTIN_FUNCTION, 0},
{"TRUNC", UNOP_TRUNC, PREC_BUILTIN_FUNCTION, 0},
{"MIN", UNOP_MIN, PREC_BUILTIN_FUNCTION, 0},
{"ODD", UNOP_ODD, PREC_BUILTIN_FUNCTION, 0},
{"TRUNC", UNOP_TRUNC, PREC_BUILTIN_FUNCTION, 0},
- {NULL,
0, 0
, 0}
+ {NULL,
OP_NULL, PREC_BUILTIN_FUNCTION
, 0}
};
\f
/* The built-in types of Modula-2. */
};
\f
/* The built-in types of Modula-2. */
@@
-365,15
+357,15
@@
const struct exp_descriptor exp_descriptor_modula2 =
const struct language_defn m2_language_defn =
{
"modula-2",
const struct language_defn m2_language_defn =
{
"modula-2",
+ "Modula-2",
language_m2,
range_check_on,
language_m2,
range_check_on,
- type_check_on,
case_sensitive_on,
array_row_major,
macro_expansion_no,
&exp_descriptor_modula2,
m2_parse, /* parser */
case_sensitive_on,
array_row_major,
macro_expansion_no,
&exp_descriptor_modula2,
m2_parse, /* parser */
- m2_
error,
/* parser error function */
+ m2_
yyerror,
/* parser error function */
null_post_parser,
m2_printchar, /* Print character constant */
m2_printstr, /* function to print string constant */
null_post_parser,
m2_printchar, /* Print character constant */
m2_printstr, /* function to print string constant */
@@
-382,12
+374,14
@@
const struct language_defn m2_language_defn =
m2_print_typedef, /* Print a typedef using appropriate syntax */
m2_val_print, /* Print a value using appropriate syntax */
c_value_print, /* Print a top-level value */
m2_print_typedef, /* Print a typedef using appropriate syntax */
m2_val_print, /* Print a value using appropriate syntax */
c_value_print, /* Print a top-level value */
+ default_read_var_value, /* la_read_var_value */
NULL, /* Language specific skip_trampoline */
NULL, /* name_of_this */
basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */
basic_lookup_transparent_type,/* lookup_transparent_type */
NULL, /* Language specific symbol demangler */
NULL, /* Language specific skip_trampoline */
NULL, /* name_of_this */
basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */
basic_lookup_transparent_type,/* lookup_transparent_type */
NULL, /* Language specific symbol demangler */
- NULL, /* Language specific class_name_from_physname */
+ NULL, /* Language specific
+ class_name_from_physname */
m2_op_print_tab, /* expression operators for printing */
0, /* arrays are first-class (not c-style) */
0, /* String lower bound */
m2_op_print_tab, /* expression operators for printing */
0, /* arrays are first-class (not c-style) */
0, /* String lower bound */
@@
-397,6
+391,11
@@
const struct language_defn m2_language_defn =
default_print_array_index,
default_pass_by_reference,
default_get_string,
default_print_array_index,
default_pass_by_reference,
default_get_string,
+ NULL, /* la_get_symbol_name_cmp */
+ iterate_over_symbols,
+ &default_varobj_ops,
+ NULL,
+ NULL,
LANG_MAGIC
};
LANG_MAGIC
};
@@
-426,7
+425,7
@@
static struct gdbarch_data *m2_type_data;
const struct builtin_m2_type *
builtin_m2_type (struct gdbarch *gdbarch)
{
const struct builtin_m2_type *
builtin_m2_type (struct gdbarch *gdbarch)
{
- return gdbarch_data (gdbarch, m2_type_data);
+ return
(const struct builtin_m2_type *)
gdbarch_data (gdbarch, m2_type_data);
}
}
This page took
0.02597 seconds
and
4
git commands to generate.