X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fscm-lang.c;h=5898aadad36f214f884a5488feec826666777143;hb=71dee6639e9df74c4a4914b4cf19d53266ca9852;hp=6054920c5d680e4ad4ed342806a688e5091b56df;hpb=fc1a4b4705305014e091a8922aa6cba4127b8dcc;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/scm-lang.c b/gdb/scm-lang.c index 6054920c5d..5898aadad3 100644 --- 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, 2009, 2010 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 . */ #include "defs.h" #include "symtab.h" @@ -34,24 +32,22 @@ #include "gdb_string.h" #include "gdbcore.h" #include "infcall.h" +#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 (char *); +static struct value *scm_lookup_name (struct gdbarch *, char *); static int in_eval_c (void); -struct type *builtin_type_scm; - void -scm_printchar (int c, struct ui_file *stream) +scm_printchar (int c, struct type *type, struct ui_file *stream) { fprintf_filtered (stream, "#\\%c", c); } static void -scm_printstr (struct ui_file *stream, const gdb_byte *string, - unsigned int length, int width, int force_ellipses) +scm_printstr (struct ui_file *stream, struct type *type, const gdb_byte *string, + unsigned int length, const char *encoding, int force_ellipses, + const struct value_print_options *options) { fprintf_filtered (stream, "\"%s\"", string); } @@ -59,8 +55,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; } @@ -71,12 +66,12 @@ is_scmvalue_type (struct type *type) of the 0'th one. */ LONGEST -scm_get_field (LONGEST svalue, int index) +scm_get_field (LONGEST svalue, int index, int size, + enum bfd_endian byte_order) { - char buffer[20]; - read_memory (SCM2PTR (svalue) + index * TYPE_LENGTH (builtin_type_scm), - buffer, TYPE_LENGTH (builtin_type_scm)); - return extract_signed_integer (buffer, TYPE_LENGTH (builtin_type_scm)); + gdb_byte buffer[20]; + read_memory (SCM2PTR (svalue) + index * size, buffer, size); + return extract_signed_integer (buffer, size, byte_order); } /* Unpack a value of type TYPE in buffer VALADDR as an integer @@ -84,11 +79,14 @@ scm_get_field (LONGEST svalue, int index) or Boolean (CONTEXT == TYPE_CODE_BOOL). */ LONGEST -scm_unpack (struct type *type, const char *valaddr, enum type_code context) +scm_unpack (struct type *type, const gdb_byte *valaddr, enum type_code context) { if (is_scmvalue_type (type)) { - LONGEST svalue = extract_signed_integer (valaddr, TYPE_LENGTH (type)); + enum bfd_endian byte_order = gdbarch_byte_order (get_type_arch (type)); + LONGEST svalue + = extract_signed_integer (valaddr, TYPE_LENGTH (type), byte_order); + if (context == TYPE_CODE_BOOL) { if (svalue == SCM_BOOL_F) @@ -148,36 +146,37 @@ in_eval_c (void) function), then try lookup_symbol for compiled variables. */ static struct value * -scm_lookup_name (char *str) +scm_lookup_name (struct gdbarch *gdbarch, char *str) { struct value *args[3]; int len = strlen (str); struct value *func; struct value *val; struct symbol *sym; + + func = find_function_in_inferior ("scm_lookup_cstr", NULL); + args[0] = value_allocate_space_in_inferior (len); - args[1] = value_from_longest (builtin_type_int, len); - write_memory (value_as_long (args[0]), str, len); + args[1] = value_from_longest (builtin_type (gdbarch)->builtin_int, len); + write_memory (value_as_long (args[0]), (gdb_byte *) str, len); if (in_eval_c () && (sym = lookup_symbol ("env", expression_context_block, - VAR_DOMAIN, (int *) NULL, - (struct symtab **) NULL)) != NULL) + VAR_DOMAIN, (int *) NULL)) != NULL) args[2] = value_of_variable (sym, expression_context_block); else /* FIXME in this case, we should try lookup_symbol first */ - args[2] = value_from_longest (builtin_type_scm, SCM_EOL); + args[2] = value_from_longest (builtin_scm_type (gdbarch)->builtin_scm, + SCM_EOL); - func = find_function_in_inferior ("scm_lookup_cstr"); val = call_function_by_hand (func, 3, args); if (!value_logical_not (val)) return value_ind (val); sym = lookup_symbol (str, expression_context_block, - VAR_DOMAIN, (int *) NULL, - (struct symtab **) NULL); + VAR_DOMAIN, (int *) NULL); if (sym) return value_of_variable (sym, NULL); error (_("No symbol \"%s\" in current context."), str); @@ -189,16 +188,16 @@ 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, str, len); + write_memory (iaddr, (gdb_byte *) str, len); /* FIXME - should find and pass env */ - write_memory (iaddr + len, "", 1); - func = find_function_in_inferior ("scm_evstr"); + write_memory (iaddr + len, (gdb_byte *) "", 1); + func = find_function_in_inferior ("scm_evstr", NULL); return call_function_by_hand (func, 1, &addr); } 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; @@ -212,8 +211,8 @@ evaluate_subexp_scm (struct type *expect_type, struct expression *exp, if (noside == EVAL_SKIP) goto nosideret; str = &exp->elts[pc + 2].string; - return scm_lookup_name (str); - case OP_EXPRSTRING: + return scm_lookup_name (exp->gdbarch, str); + case OP_STRING: pc = (*pos)++; len = longest_to_int (exp->elts[pc + 1].longconst); (*pos) += 3 + BYTES_TO_EXP_ELEM (len + 1); @@ -225,7 +224,7 @@ evaluate_subexp_scm (struct type *expect_type, struct expression *exp, } return evaluate_subexp_standard (expect_type, exp, pos, noside); nosideret: - return value_from_longest (builtin_type_long, (LONGEST) 1); + return value_from_longest (builtin_type (exp->gdbarch)->builtin_int, 1); } const struct exp_descriptor exp_descriptor_scm = @@ -234,18 +233,18 @@ 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, array_row_major, + macro_expansion_no, &exp_descriptor_scm, scm_parse, c_error, @@ -253,12 +252,12 @@ 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 */ + default_print_typedef, /* Print a typedef using appropriate syntax */ scm_val_print, /* Print a value using appropriate syntax */ scm_value_print, /* Print a top-level value */ NULL, /* Language specific skip_trampoline */ - value_of_this, /* value_of_this */ + NULL, /* name_of_this */ basic_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */ basic_lookup_transparent_type,/* lookup_transparent_type */ NULL, /* Language specific symbol demangler */ @@ -266,17 +265,39 @@ 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, + default_make_symbol_completion_list, c_language_arch_info, + default_print_array_index, + default_pass_by_reference, + default_get_string, LANG_MAGIC }; +static void * +build_scm_types (struct gdbarch *gdbarch) +{ + struct builtin_scm_type *builtin_scm_type + = GDBARCH_OBSTACK_ZALLOC (gdbarch, struct builtin_scm_type); + + builtin_scm_type->builtin_scm + = arch_integer_type (gdbarch, gdbarch_long_bit (gdbarch), 0, "SCM"); + + return builtin_scm_type; +} + +static struct gdbarch_data *scm_type_data; + +const struct builtin_scm_type * +builtin_scm_type (struct gdbarch *gdbarch) +{ + return gdbarch_data (gdbarch, scm_type_data); +} + void _initialize_scheme_language (void) { + scm_type_data = gdbarch_data_register_post_init (build_scm_types); + add_language (&scm_language_defn); - builtin_type_scm = init_type (TYPE_CODE_INT, - TARGET_LONG_BIT / TARGET_CHAR_BIT, - 0, "SCM", (struct objfile *) NULL); }