/* Scheme/Guile language support routines for GDB, the GNU debugger.
- Copyright 1995, 2000 Free Software Foundation, Inc.
+ Copyright 1995, 1996, 1998, 2000, 2001, 2002
+ Free Software Foundation, Inc.
This file is part of GDB.
#include "c-lang.h"
#include "scm-lang.h"
#include "scm-tags.h"
+#include "source.h"
#include "gdb_string.h"
#include "gdbcore.h"
-extern void _initialize_scheme_language PARAMS ((void));
-static value_ptr evaluate_subexp_scm PARAMS ((struct type *, struct expression *,
- int *, enum noside));
-static value_ptr scm_lookup_name PARAMS ((char *));
-static int in_eval_c PARAMS ((void));
+extern void _initialize_scheme_language (void);
+static struct value *evaluate_subexp_scm (struct type *, struct expression *,
+ int *, enum noside);
+static struct value *scm_lookup_name (char *);
+static int in_eval_c (void);
static void scm_printstr (struct ui_file * stream, char *string,
unsigned int length, int width,
int force_ellipses);
-extern struct type **CONST_PTR (c_builtin_types[]);
+extern struct type **const (c_builtin_types[]);
struct type *builtin_type_scm;
void
-scm_printchar (c, stream)
- int c;
- struct ui_file *stream;
+scm_printchar (int c, struct ui_file *stream)
{
fprintf_filtered (stream, "#\\%c", c);
}
static void
-scm_printstr (stream, string, length, width, force_ellipses)
- struct ui_file *stream;
- char *string;
- unsigned int length;
- int width;
- int force_ellipses;
+scm_printstr (struct ui_file *stream, char *string, unsigned int length,
+ int width, int force_ellipses)
{
fprintf_filtered (stream, "\"%s\"", string);
}
int
-is_scmvalue_type (type)
- struct type *type;
+is_scmvalue_type (struct type *type)
{
if (TYPE_CODE (type) == TYPE_CODE_INT
&& TYPE_NAME (type) && strcmp (TYPE_NAME (type), "SCM") == 0)
of the 0'th one. */
LONGEST
-scm_get_field (svalue, index)
- LONGEST svalue;
- int index;
+scm_get_field (LONGEST svalue, int index)
{
char buffer[20];
read_memory (SCM2PTR (svalue) + index * TYPE_LENGTH (builtin_type_scm),
or Boolean (CONTEXT == TYPE_CODE_BOOL). */
LONGEST
-scm_unpack (type, valaddr, context)
- struct type *type;
- char *valaddr;
- enum type_code context;
+scm_unpack (struct type *type, char *valaddr, enum type_code context)
{
if (is_scmvalue_type (type))
{
/* True if we're correctly in Guile's eval.c (the evaluator and apply). */
static int
-in_eval_c ()
+in_eval_c (void)
{
- if (current_source_symtab && current_source_symtab->filename)
+ struct symtab_and_line cursal =
+ get_current_or_default_source_symtab_and_line ();
+
+ if (cursal.symtab && cursal.symtab->filename)
{
- char *filename = current_source_symtab->filename;
+ char *filename = cursal.symtab->filename;
int len = strlen (filename);
if (len >= 6 && strcmp (filename + len - 6, "eval.c") == 0)
return 1;
First lookup in Scheme context (using the scm_lookup_cstr inferior
function), then try lookup_symbol for compiled variables. */
-static value_ptr
-scm_lookup_name (str)
- char *str;
+static struct value *
+scm_lookup_name (char *str)
{
- value_ptr args[3];
+ struct value *args[3];
int len = strlen (str);
- value_ptr func, val;
+ struct value *func;
+ struct value *val;
struct symbol *sym;
args[0] = value_allocate_space_in_inferior (len);
args[1] = value_from_longest (builtin_type_int, len);
(struct symtab **) NULL);
if (sym)
return value_of_variable (sym, NULL);
- error ("No symbol \"%s\" in current context.");
+ error ("No symbol \"%s\" in current context.", str);
}
-value_ptr
-scm_evaluate_string (str, len)
- char *str;
- int len;
+struct value *
+scm_evaluate_string (char *str, int len)
{
- value_ptr func;
- value_ptr addr = value_allocate_space_in_inferior (len + 1);
+ struct value *func;
+ struct value *addr = value_allocate_space_in_inferior (len + 1);
LONGEST iaddr = value_as_long (addr);
write_memory (iaddr, str, len);
/* FIXME - should find and pass env */
return call_function_by_hand (func, 1, &addr);
}
-static value_ptr
-evaluate_subexp_scm (expect_type, exp, pos, noside)
- struct type *expect_type;
- register struct expression *exp;
- register int *pos;
- enum noside noside;
+static struct value *
+evaluate_subexp_scm (struct type *expect_type, register struct expression *exp,
+ register int *pos, enum noside noside)
{
enum exp_opcode op = exp->elts[*pos].opcode;
int len, pc;
c_builtin_types,
range_check_off,
type_check_off,
+ case_sensitive_off,
scm_parse,
c_error,
evaluate_subexp_scm,
};
void
-_initialize_scheme_language ()
+_initialize_scheme_language (void)
{
add_language (&scm_language_defn);
builtin_type_scm = init_type (TYPE_CODE_INT,