From patchwork Thu Nov 13 12:54:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Evans X-Patchwork-Id: 3693 Received: (qmail 8791 invoked by alias); 13 Nov 2014 12:55:12 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 8747 invoked by uid 89); 13 Nov 2014 12:55:12 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, MSGID_FROM_MTA_HEADER, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-pa0-f53.google.com Received: from mail-pa0-f53.google.com (HELO mail-pa0-f53.google.com) (209.85.220.53) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Thu, 13 Nov 2014 12:55:09 +0000 Received: by mail-pa0-f53.google.com with SMTP id kx10so15010571pab.26 for ; Thu, 13 Nov 2014 04:55:07 -0800 (PST) X-Received: by 10.70.131.199 with SMTP id oo7mr2479232pdb.138.1415883307476; Thu, 13 Nov 2014 04:55:07 -0800 (PST) Received: from sspiff.org (173-13-178-53-sfba.hfc.comcastbusiness.net. [173.13.178.53]) by mx.google.com with ESMTPSA id ip1sm24881926pbc.0.2014.11.13.04.55.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Nov 2014 04:55:07 -0800 (PST) Message-ID: <5464aa2b.e1c4440a.4005.ffff8ae3@mx.google.com> Received: by sspiff.org (sSMTP sendmail emulation); Thu, 13 Nov 2014 04:54:14 -0800 Date: Thu, 13 Nov 2014 04:54:14 -0800 From: Doug Evans To: gdb-patches@sourceware.org Subject: [PATCH 10/21] struct symtab split part 2: guile/scm-block.c X-IsSubscribed: yes This patch contains the changes to the guile support. Full ChangeLog: https://sourceware.org/ml/gdb-patches/2014-11/msg00233.html 2014-11-12 Doug Evans * guile/scm-block.c (bkscm_print_block_syms_progress_smob): Update to use struct compunit_symtab. diff --git a/gdb/guile/scm-block.c b/gdb/guile/scm-block.c index bbde77e..23bab01 100644 --- a/gdb/guile/scm-block.c +++ b/gdb/guile/scm-block.c @@ -542,17 +542,19 @@ bkscm_print_block_syms_progress_smob (SCM self, SCM port, case GLOBAL_BLOCK: case STATIC_BLOCK: { - struct symtab *s; + struct compunit_symtab *cust; gdbscm_printf (port, " %s", i_smob->iter.which == GLOBAL_BLOCK ? "global" : "static"); if (i_smob->iter.idx != -1) gdbscm_printf (port, " @%d", i_smob->iter.idx); - s = (i_smob->iter.idx == -1 - ? i_smob->iter.d.symtab - : i_smob->iter.d.symtab->includes[i_smob->iter.idx]); - gdbscm_printf (port, " %s", symtab_to_filename_for_display (s)); + cust = (i_smob->iter.idx == -1 + ? i_smob->iter.d.compunit_symtab + : i_smob->iter.d.compunit_symtab->includes[i_smob->iter.idx]); + gdbscm_printf (port, " %s", + symtab_to_filename_for_display + (compunit_primary_filetab (cust))); break; } case FIRST_LOCAL_BLOCK: @@ -675,30 +677,28 @@ gdbscm_lookup_block (SCM pc_scm) { CORE_ADDR pc; const struct block *block = NULL; - struct obj_section *section = NULL; - struct symtab *symtab = NULL; + struct compunit_symtab *cust = NULL; volatile struct gdb_exception except; gdbscm_parse_function_args (FUNC_NAME, SCM_ARG1, NULL, "U", pc_scm, &pc); TRY_CATCH (except, RETURN_MASK_ALL) { - section = find_pc_mapped_section (pc); - symtab = find_pc_sect_symtab (pc, section); + cust = find_pc_compunit_symtab (pc); - if (symtab != NULL && SYMTAB_OBJFILE (symtab) != NULL) + if (cust != NULL && COMPUNIT_OBJFILE (cust) != NULL) block = block_for_pc (pc); } GDBSCM_HANDLE_GDB_EXCEPTION (except); - if (symtab == NULL || SYMTAB_OBJFILE (symtab) == NULL) + if (cust == NULL || COMPUNIT_OBJFILE (cust) == NULL) { gdbscm_out_of_range_error (FUNC_NAME, SCM_ARG1, pc_scm, _("cannot locate object file for block")); } if (block != NULL) - return bkscm_scm_from_block (block, SYMTAB_OBJFILE (symtab)); + return bkscm_scm_from_block (block, COMPUNIT_OBJFILE (cust)); return SCM_BOOL_F; }