/* Multiple source language support for GDB.
- Copyright 1991 Free Software Foundation, Inc.
+ Copyright 1991, 1992 Free Software Foundation, Inc.
Contributed by the Department of Computer Science at the State University
of New York at Buffalo.
return data out of a "language-specific" struct pointer that is set
whenever the working language changes. That would be a lot faster. */
-#include <stdio.h>
+#include "defs.h"
#include <string.h>
#include <varargs.h>
-#include "defs.h"
#include "symtab.h"
+#include "gdbtypes.h"
#include "value.h"
#include "gdbcmd.h"
#include "frame.h"
-#include "language.h"
#include "expression.h"
+#include "language.h"
#include "target.h"
#include "parser-defs.h"
-/* Forward function declarations */
-static void set_type_range ();
+static void
+show_language_command PARAMS ((char *, int));
-/* Forward declaration */
-extern struct language_defn unknown_language_defn;
+static void
+set_language_command PARAMS ((char *, int));
+
+static void
+show_type_command PARAMS ((char *, int));
+
+static void
+set_type_command PARAMS ((char *, int));
+
+static void
+show_range_command PARAMS ((char *, int));
+
+static void
+set_range_command PARAMS ((char *, int));
+
+static void
+set_range_str PARAMS ((void));
+static void
+set_type_str PARAMS ((void));
+
+static void
+set_lang_str PARAMS ((void));
+
+static void
+unk_lang_error PARAMS ((char *));
+
+static int
+unk_lang_parser PARAMS ((void));
+
+static void
+show_check PARAMS ((char *, int));
+
+static void
+set_check PARAMS ((char *, int));
+
+static void
+set_type_range PARAMS ((void));
+
+/* Forward declaration */
+extern const struct language_defn unknown_language_defn;
+extern char *warning_pre_print;
+
/* The current (default at startup) state of type and range checking.
(If the modes are set to "auto", though, these are changed based
on the default language at startup, and then again based on the
/* The current language and language_mode (see language.h) */
-struct language_defn *current_language = &unknown_language_defn;
+const struct language_defn *current_language = &unknown_language_defn;
enum language_mode language_mode = language_mode_auto;
/* The list of supported languages. The list itself is malloc'd. */
-static struct language_defn **languages;
+static const struct language_defn **languages;
static unsigned languages_size;
static unsigned languages_allocsize;
#define DEFAULT_ALLOCSIZE 3
char lang_frame_mismatch_warn[] =
"Warning: the current language does not match this frame.";
-void set_lang_str();
-void set_type_str();
-void set_range_str();
\f
/* This page contains the functions corresponding to GDB commands
and their helpers. */
/* Show command. Display a warning if the language set
does not match the frame. */
-void
-show_language_command (str, from_tty)
- char *str;
+static void
+show_language_command (ignore, from_tty)
+ char *ignore;
int from_tty;
{
enum language flang; /* The language of the current frame */
}
/* Set command. Change the current working language. */
-void
-set_language_command (str, from_tty)
- char *str;
+static void
+set_language_command (ignore, from_tty)
+ char *ignore;
int from_tty;
{
int i;
/* FIXME -- do this from the list, with HELP. */
if (!language || !language[0]) {
- printf("The currently understood settings are:\n\n\
+ printf_filtered ("The currently understood settings are:\n\n\
local or auto Automatic setting based on source file\n\
-c or cc Always parse in C syntax\n\
-mod or m2 Always parse in Modula-2 syntax\n");
+c Use the C language\n\
+c++ Use the C++ language\n\
+modula-2 Use the Modula-2 language\n");
+ /* Restore the silly string. */
+ set_language(current_language->la_language);
return;
}
/* Show command. Display a warning if the type setting does
not match the current language. */
-void
-show_type_command(str, from_tty)
- char *str;
+static void
+show_type_command(ignore, from_tty)
+ char *ignore;
int from_tty;
{
if (type_check != current_language->la_type_check)
- printf(
+ printf_filtered(
"Warning: the current type check setting does not match the language.\n");
}
/* Set command. Change the setting for type checking. */
-void
-set_type_command(str, from_tty)
- char *str;
+static void
+set_type_command(ignore, from_tty)
+ char *ignore;
int from_tty;
{
if (!strcmp(type,"on"))
return;
}
set_type_str();
- show_type_command();
+ show_type_command((char *)NULL, from_tty);
}
/* Show command. Display a warning if the range setting does
not match the current language. */
-void
-show_range_command(str, from_tty)
- char *str;
+static void
+show_range_command(ignore, from_tty)
+ char *ignore;
int from_tty;
{
if (range_check != current_language->la_range_check)
- printf(
+ printf_filtered(
"Warning: the current range check setting does not match the language.\n");
}
/* Set command. Change the setting for range checking. */
-void
-set_range_command(str, from_tty)
- char *str;
+static void
+set_range_command(ignore, from_tty)
+ char *ignore;
int from_tty;
{
if (!strcmp(range,"on"))
return;
}
set_range_str();
- show_range_command();
+ show_range_command((char *)0, from_tty);
}
/* Set the status of range and type checking based on
static void
set_type_range()
{
- char *rtmp, *ttmp;
if (range_mode == range_mode_auto)
range_check = current_language->la_range_check;
current_language = languages[i];
set_type_range ();
set_lang_str();
+ break;
}
}
}
\f
/* This page contains functions that update the global vars
language, type and range. */
-void
+static void
set_lang_str()
{
- char *tmp, *prefix = "";
+ char *prefix = "";
free (language);
if (language_mode == language_mode_auto)
prefix = "auto; currently ";
- language = concat(prefix, current_language->la_name, "");
+ language = concat(prefix, current_language->la_name, NULL);
}
-void
+static void
set_type_str()
{
char *tmp, *prefix = "";
error ("Unrecognized type check setting.");
}
- type = concat(prefix,tmp,"");
+ type = concat(prefix,tmp,NULL);
}
-void
+static void
set_range_str()
{
char *tmp, *pref = "";
error ("Unrecognized range check setting.");
}
- range = concat(pref,tmp,"");
+ range = concat(pref,tmp,NULL);
}
/* Print out the current language settings: language, range and
- type checking. */
+ type checking. If QUIETLY, print only what has changed. */
void
-language_info ()
+language_info (quietly)
+ int quietly;
{
- printf("Current Language: %s\n",language);
- show_language_command();
- printf("Type checking: %s\n",type);
- show_type_command();
- printf("Range checking: %s\n",range);
- show_range_command();
+ /* FIXME: quietly is ignored at the moment. */
+ printf_filtered("Current Language: %s\n",language);
+ show_language_command((char *)0, 1);
+ printf_filtered("Type checking: %s\n",type);
+ show_type_command((char *)0, 1);
+ printf_filtered("Range checking: %s\n",range);
+ show_range_command((char *)0, 1);
}
\f
/* Return the result of a binary operation. */
+
+#if 0 /* Currently unused */
+
struct type *
binop_result_type(v1,v2)
value v1,v2;
{
int l1,l2,size,uns;
- l1=TYPE_LENGTH(VALUE_TYPE(v1));
- l2=TYPE_LENGTH(VALUE_TYPE(v2));
- size = l1 > l2 ? l1 : l2;
- uns = TYPE_UNSIGNED(VALUE_TYPE(v1)) || TYPE_UNSIGNED(VALUE_TYPE(v2));
+ l1 = TYPE_LENGTH(VALUE_TYPE(v1));
+ l2 = TYPE_LENGTH(VALUE_TYPE(v2));
switch(current_language->la_language)
{
case language_c:
+ case language_cplus:
if (TYPE_CODE(VALUE_TYPE(v1))==TYPE_CODE_FLT)
return TYPE_CODE(VALUE_TYPE(v2)) == TYPE_CODE_FLT && l2 > l1 ?
VALUE_TYPE(v2) : VALUE_TYPE(v1);
return l1 > l2 ? VALUE_TYPE(v1) : VALUE_TYPE(v2);
break;
}
+ abort();
+ return (struct type *)0; /* For lint */
}
+
+#endif /* 0 */
+
\f
/* This page contains functions that return format strings for
printf for printing out numbers in different formats */
switch(current_language->la_language)
{
case language_c:
+ case language_cplus:
return (TYPE_CODE(type) != TYPE_CODE_INT) &&
(TYPE_CODE(type) != TYPE_CODE_ENUM) ? 0 : 1;
case language_m2:
return TYPE_CODE(type) != TYPE_CODE_CHAR ? 0 : 1;
case language_c:
+ case language_cplus:
return (TYPE_CODE(type) == TYPE_CODE_INT) &&
TYPE_LENGTH(type) == sizeof(char)
? 1 : 0;
+ default:
+ return (0);
}
}
return TYPE_CODE(type) != TYPE_CODE_BOOL ? 0 : 1;
case language_c:
+ case language_cplus:
return TYPE_CODE(type) != TYPE_CODE_INT ? 0 : 1;
+ default:
+ return (0);
}
}
switch(current_language->la_language)
{
case language_c:
+ case language_cplus:
return (TYPE_CODE(type) == TYPE_CODE_STRUCT) ||
(TYPE_CODE(type) == TYPE_CODE_UNION) ||
(TYPE_CODE(type) == TYPE_CODE_ARRAY);
return (TYPE_CODE(type) == TYPE_CODE_STRUCT) ||
(TYPE_CODE(type) == TYPE_CODE_SET) ||
(TYPE_CODE(type) == TYPE_CODE_ARRAY);
+ default:
+ return (0);
}
}
\f
switch (current_language->la_language) {
case language_c:
+ case language_cplus:
return !value_zerop (val);
case language_m2:
\f
/* Returns non-zero if the operator OP is defined on
the values ARG1 and ARG2. */
+
+#if 0 /* Currently unused */
+
void
binop_type_check(arg1,arg2,op)
value arg1,arg2;
if ((numeric_type(t1) && pointer_type(t2)) ||
(pointer_type(t1) && numeric_type(t2)))
{
- printf("warning: combining pointer and integer.\n");
+ warning ("combining pointer and integer.\n");
break;
}
case BINOP_MUL:
else if ((pointer_type(t1) && integral_type(t2)) ||
(integral_type(t1) && pointer_type(t2)))
{
- printf("warning: combining integer and pointer.\n");
+ warning ("combining integer and pointer.\n");
break;
}
else if (!simple_type(t1) || !simple_type(t2))
type_op_error ("A pointer can only be assigned an integer.",op);
else if (pointer_type(t1) && integral_type(t2))
{
- printf("warning: combining integer and pointer.");
+ warning ("combining integer and pointer.");
break;
}
else if (!simple_type(t1) || !simple_type(t2))
case UNOP_IND:
if (integral_type(t1))
{
- printf("warning: combining pointer and integer.\n");
+ warning ("combining pointer and integer.\n");
break;
}
else if (!pointer_type(t1))
{
#ifdef _LANG_c
case language_c:
+ case language_cplus:
switch(op)
{
case BINOP_DIV:
}
}
}
+
+#endif /* 0 */
+
\f
/* This page contains functions for the printing out of
error messages that occur during type- and range-
error (fmt,op_string(op));
else
{
- printf("warning: ");
- printf(fmt,op_string(op));
- printf("\n");
+ warning (fmt,op_string(op));
}
}
the rest of the arguments should be its arguments. If
[type|range]_check is [type|range]_check_on, then return_to_top_level()
is called in the style of error (). Otherwise, the message is prefixed
- by "warning: " and we do not return to the top level. */
+ by the value of warning_pre_print and we do not return to the top level. */
+
void
type_error (va_alist)
- va_dcl
+ va_dcl
{
va_list args;
char *string;
if (type_check==type_check_warn)
- fprintf(stderr,"warning: ");
+ fprintf_filtered(stderr,warning_pre_print);
else
target_terminal_ours();
va_start (args);
string = va_arg (args, char *);
- vfprintf (stderr, string, args);
- fprintf (stderr, "\n");
+ vfprintf_filtered (stderr, string, args);
+ fprintf_filtered (stderr, "\n");
va_end (args);
if (type_check==type_check_on)
return_to_top_level();
void
range_error (va_alist)
- va_dcl
+ va_dcl
{
va_list args;
char *string;
if (range_check==range_check_warn)
- fprintf(stderr,"warning: ");
+ fprintf_filtered(stderr,warning_pre_print);
else
target_terminal_ours();
va_start (args);
string = va_arg (args, char *);
- vfprintf (stderr, string, args);
- fprintf (stderr, "\n");
+ vfprintf_filtered (stderr, string, args);
+ fprintf_filtered (stderr, "\n");
va_end (args);
if (range_check==range_check_on)
return_to_top_level();
return "Unknown";
}
-struct cmd_list_element *setchecklist = NULL;
-struct cmd_list_element *showchecklist = NULL;
-
static void
-set_check (arg, from_tty)
- char *arg;
+set_check (ignore, from_tty)
+ char *ignore;
int from_tty;
{
- printf(
+ printf_filtered(
"\"set check\" must be followed by the name of a check subcommand.\n");
help_list(setchecklist, "set check ", -1, stdout);
}
static void
-show_check (arg, from_tty)
- char *arg;
+show_check (ignore, from_tty)
+ char *ignore;
int from_tty;
{
cmd_show_list(showchecklist, from_tty, "");
void
add_language (lang)
- struct language_defn *lang;
+ const struct language_defn *lang;
{
if (lang->la_magic != LANG_MAGIC)
{
- fprintf(stderr, "Magic number of %s language struct wrong\n",
+ fprintf_filtered(stderr, "Magic number of %s language struct wrong\n",
lang->la_name);
abort();
}
if (!languages)
{
languages_allocsize = DEFAULT_ALLOCSIZE;
- languages = (struct language_defn **) xmalloc
+ languages = (const struct language_defn **) xmalloc
(languages_allocsize * sizeof (*languages));
}
if (languages_size >= languages_allocsize)
{
languages_allocsize *= 2;
- languages = (struct language_defn **) xrealloc (languages,
+ languages = (const struct language_defn **) xrealloc ((char *) languages,
languages_allocsize * sizeof (*languages));
}
languages[languages_size++] = lang;
-
-#if FIXME
- if (targetlist == NULL)
- add_prefix_cmd ("target", class_run, target_command,
- "Connect to a target machine or process.\n\
-The first argument is the type or protocol of the target machine.\n\
-Remaining arguments are interpreted by the target protocol. For more\n\
-information on the arguments for a particular protocol, type\n\
-`help target ' followed by the protocol name.",
- &targetlist, "target ", 0, &cmdlist);
- add_cmd (t->to_shortname, no_class, t->to_open, t->to_doc, &targetlist);
-#endif FIXME
}
/* Define the language that is no language. */
-int
+static int
unk_lang_parser ()
{
return 1;
}
-void
-unk_lang_error ()
+static void
+unk_lang_error (msg)
+ char *msg;
{
error ("Attempted to parse an expression with unknown language");
}
set = add_set_cmd ("language", class_support, var_string_noescape,
(char *)&language,
- "Set the current working language.",
+ "Set the current source language.",
&setlist);
show = add_show_from_set (set, &showlist);
- set->function = set_language_command;
- show->function = show_language_command;
+ set->function.cfunc = set_language_command;
+ show->function.cfunc = show_language_command;
add_prefix_cmd ("check", no_class, set_check,
"Set the status of the type/range checker",
"Set type checking. (on/warn/off/auto)",
&setchecklist);
show = add_show_from_set (set, &showchecklist);
- set->function = set_type_command;
- show->function = show_type_command;
+ set->function.cfunc = set_type_command;
+ show->function.cfunc = show_type_command;
set = add_set_cmd ("range", class_support, var_string_noescape,
(char *)&range,
"Set range checking. (on/warn/off/auto)",
&setchecklist);
show = add_show_from_set (set, &showchecklist);
- set->function = set_range_command;
- show->function = show_range_command;
+ set->function.cfunc = set_range_command;
+ show->function.cfunc = show_range_command;
add_language (&unknown_language_defn);
add_language (&local_language_defn);