* infrun.c (handle_inferior_event): If

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

diff --git a/gdb/scm-lang.c b/gdb/scm-lang.c
index 5ffa233603aecdfd234aeb5c349b5280a928f024..a42f87f7a7d35ae001635c51a22db74073b11122 100644 (file)
--- a/gdb/scm-lang.c
+++ b/gdb/scm-lang.c
@@ -1,13 +1,13 @@
 /* Scheme/Guile language support routines for GDB, the GNU debugger.
 
-   Copyright 1995, 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 Free
-   Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2007,
+   2008 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -16,9 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #include "symtab.h"
@@ -59,8 +57,7 @@ scm_printstr (struct ui_file *stream, const gdb_byte *string,
 int
 is_scmvalue_type (struct type *type)
 {
-  if (TYPE_CODE (type) == TYPE_CODE_INT
-      && TYPE_NAME (type) && strcmp (TYPE_NAME (type), "SCM") == 0)
+  if (TYPE_NAME (type) && strcmp (TYPE_NAME (type), "SCM") == 0)
     {
       return 1;
     }
@@ -197,8 +194,8 @@ scm_evaluate_string (char *str, int len)
 }
 
 static struct value *
-evaluate_subexp_scm (struct type *expect_type, struct expression *exp,
-                    int *pos, enum noside noside)
+evaluate_exp (struct type *expect_type, struct expression *exp,
+             int *pos, enum noside noside)
 {
   enum exp_opcode op = exp->elts[*pos].opcode;
   int len, pc;
@@ -213,7 +210,7 @@ evaluate_subexp_scm (struct type *expect_type, struct expression *exp,
        goto nosideret;
       str = &exp->elts[pc + 2].string;
       return scm_lookup_name (str);
-    case OP_EXPRSTRING:
+    case OP_STRING:
       pc = (*pos)++;
       len = longest_to_int (exp->elts[pc + 1].longconst);
       (*pos) += 3 + BYTES_TO_EXP_ELEM (len + 1);
@@ -234,14 +231,13 @@ const struct exp_descriptor exp_descriptor_scm =
   operator_length_standard,
   op_name_standard,
   dump_subexp_body_standard,
-  evaluate_subexp_scm
+  evaluate_exp
 };
 
 const struct language_defn scm_language_defn =
 {
   "scheme",                    /* Language name */
   language_scm,
-  NULL,
   range_check_off,
   type_check_off,
   case_sensitive_off,
@@ -253,7 +249,6 @@ const struct language_defn scm_language_defn =
   scm_printchar,               /* Print a character constant */
   scm_printstr,                        /* Function to print string constant */
   NULL,                                /* Function to print a single character */
-  NULL,                                /* Create fundamental type in this language */
   c_print_type,                        /* Print a type using appropriate syntax */
   scm_val_print,               /* Print a value using appropriate syntax */
   scm_value_print,             /* Print a top-level value */
@@ -266,9 +261,10 @@ const struct language_defn scm_language_defn =
   NULL,                                /* expression operators for printing */
   1,                           /* c-style arrays */
   0,                           /* String lower bound */
-  NULL,
   default_word_break_characters,
   c_language_arch_info,
+  default_print_array_index,
+  default_pass_by_reference,
   LANG_MAGIC
 };
 
@@ -276,7 +272,8 @@ void
 _initialize_scheme_language (void)
 {
   add_language (&scm_language_defn);
-  builtin_type_scm = init_type (TYPE_CODE_INT,
-                               TARGET_LONG_BIT / TARGET_CHAR_BIT,
-                               0, "SCM", (struct objfile *) NULL);
+  builtin_type_scm =
+    init_type (TYPE_CODE_INT,
+              gdbarch_long_bit (current_gdbarch) / TARGET_CHAR_BIT,
+              0, "SCM", (struct objfile *) NULL);
 }