*** empty log message ***

[binutils-gdb.git] / gdb / scm-lang.c

diff --git a/gdb/scm-lang.c b/gdb/scm-lang.c
index de348940bab1ba64057d8f9eaefa0a97bdd5cc04..870b1e447b949d1b247b79652d5a5384be814941 100644 (file)
--- a/gdb/scm-lang.c
+++ b/gdb/scm-lang.c
@@ -1,7 +1,7 @@
 /* Scheme/Guile language support routines for GDB, the GNU debugger.
 
    Copyright (C) 1995, 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2007,
-   2008, 2009 Free Software Foundation, Inc.
+   2008, 2009, 2010 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -35,8 +35,6 @@
 #include "objfiles.h"
 
 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 (struct gdbarch *, char *);
 static int in_eval_c (void);
 
@@ -48,7 +46,7 @@ scm_printchar (int c, struct type *type, struct ui_file *stream)
 
 static void
 scm_printstr (struct ui_file *stream, struct type *type, const gdb_byte *string,
-             unsigned int length, int force_ellipses,
+             unsigned int length, const char *encoding, int force_ellipses,
              const struct value_print_options *options)
 {
   fprintf_filtered (stream, "\"%s\"", string);
@@ -72,6 +70,7 @@ scm_get_field (LONGEST svalue, int index, int size,
               enum bfd_endian byte_order)
 {
   gdb_byte buffer[20];
+
   read_memory (SCM2PTR (svalue) + index * size, buffer, size);
   return extract_signed_integer (buffer, size, byte_order);
 }
@@ -137,6 +136,7 @@ in_eval_c (void)
     {
       char *filename = cursal.symtab->filename;
       int len = strlen (filename);
+
       if (len >= 6 && strcmp (filename + len - 6, "eval.c") == 0)
        return 1;
     }
@@ -190,6 +190,7 @@ scm_evaluate_string (char *str, int len)
   struct value *func;
   struct value *addr = value_allocate_space_in_inferior (len + 1);
   LONGEST iaddr = value_as_long (addr);
+
   write_memory (iaddr, (gdb_byte *) str, len);
   /* FIXME - should find and pass env */
   write_memory (iaddr + len, (gdb_byte *) "", 1);
@@ -204,6 +205,7 @@ evaluate_exp (struct type *expect_type, struct expression *exp,
   enum exp_opcode op = exp->elts[*pos].opcode;
   int len, pc;
   char *str;
+
   switch (op)
     {
     case OP_NAME:
@@ -233,6 +235,7 @@ const struct exp_descriptor exp_descriptor_scm =
 {
   print_subexp_standard,
   operator_length_standard,
+  operator_check_standard,
   op_name_standard,
   dump_subexp_body_standard,
   evaluate_exp