From patchwork Fri May 16 15:26:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 964 Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx23.g.dreamhost.com (mx2.sub5.homie.mail.dreamhost.com [208.113.200.128]) by wilcox.dreamhost.com (Postfix) with ESMTP id DE32436007B for ; Fri, 16 May 2014 08:27:19 -0700 (PDT) Received: by homiemail-mx23.g.dreamhost.com (Postfix, from userid 14314964) id A252163A7A333; Fri, 16 May 2014 08:27:19 -0700 (PDT) X-Original-To: gdb@patchwork.siddhesh.in Delivered-To: x14314964@homiemail-mx23.g.dreamhost.com Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by homiemail-mx23.g.dreamhost.com (Postfix) with ESMTPS id 5699363B36DBD for ; Fri, 16 May 2014 08:27:19 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=o4hCV9g0gh8Vd+xpYz7usfSCAXj6M1N FmXlGG0X7MvYAuQeh0Yyx/7p6LP4TswMRseNr9JT0GuztCJT2QN2tx+E9Jn4Ui/N 1uJYZiuXjBMrCiNXerFAD10TUg8Vot3IQdp7u2dR9GI4PIwGpdd/n0G2PV6CBN5D SOQv/B8lnmCA= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; s=default; bh=XncA1bvmSs1hgE9f0vfrMU/f2bQ=; b=nIyyQ BDgVgc4EXQURMneG7UjZCDRVtAW1KOwcTvELZQFvbWF5EQQqan4VOOaZIwWaxMlN DJBr/Om2r2+ILVSrGdpSz5FGnod6jytzeptJMfzWqJo2W74Y7sKsfYimTEexflgZ rLKgYVErubinXgQIzqIPPRG52BuVk06mun8F1A= Received: (qmail 15599 invoked by alias); 16 May 2014 15:26:47 -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 15476 invoked by uid 89); 16 May 2014 15:26:46 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.2 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 16 May 2014 15:26:44 +0000 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s4GFQhaX019083 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 16 May 2014 11:26:43 -0400 Received: from barimba.redhat.com (ovpn-113-182.phx2.redhat.com [10.3.113.182]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s4GFQcV9006849; Fri, 16 May 2014 11:26:42 -0400 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Jan Kratochvil Subject: [PATCH 07/14] add infcall_mmap and gcc_target_options gdbarch methods Date: Fri, 16 May 2014 09:26:28 -0600 Message-Id: <1400253995-12333-8-git-send-email-tromey@redhat.com> In-Reply-To: <1400253995-12333-1-git-send-email-tromey@redhat.com> References: <1400253995-12333-1-git-send-email-tromey@redhat.com> X-DH-Original-To: gdb@patchwork.siddhesh.in From: Jan Kratochvil The compiler needed two new gdbarch methods. The infcall_mmap method allocates memory in the inferior. This is used when inserting the object code. The gcc_target_options method computes some arch-specific gcc options to pass to the compiler. This is used to ensure that gcc generates object code for the correct architecture. 2014-05-16 Jan Kratochvil * arch-utils.c (default_infcall_mmap) (default_gcc_target_options): New functions. * arch-utils.h (default_infcall_mmap, default_gcc_target_options): Declare. * gdbarch.h: Rebuild. * gdbarch.c: Rebuild. * gdbarch.sh (infcall_mmap, gcc_target_options): New methods. --- gdb/ChangeLog | 10 ++++++++++ gdb/arch-utils.c | 13 +++++++++++++ gdb/arch-utils.h | 4 ++++ gdb/gdbarch.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ gdb/gdbarch.h | 18 ++++++++++++++++++ gdb/gdbarch.sh | 12 ++++++++++++ 6 files changed, 103 insertions(+) diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c index bff1a10..e2aea7a 100644 --- a/gdb/arch-utils.c +++ b/gdb/arch-utils.c @@ -819,6 +819,19 @@ int default_insn_is_jump (struct gdbarch *gdbarch, CORE_ADDR addr) return 0; } +CORE_ADDR +default_infcall_mmap (CORE_ADDR size, unsigned prot) +{ + error (_("This target does not support inferior memory allocation by mmap.")); +} + +char * +default_gcc_target_options (struct gdbarch *gdbarch) +{ + return xstrprintf ("-m%d%s", gdbarch_ptr_bit (gdbarch), + gdbarch_ptr_bit (gdbarch) == 64 ? " -mcmodel=large" : ""); +} + /* */ /* -Wmissing-prototypes */ diff --git a/gdb/arch-utils.h b/gdb/arch-utils.h index 46d1573..d4bf353 100644 --- a/gdb/arch-utils.h +++ b/gdb/arch-utils.h @@ -174,4 +174,8 @@ extern int default_return_in_first_hidden_param_p (struct gdbarch *, extern int default_insn_is_call (struct gdbarch *, CORE_ADDR); extern int default_insn_is_ret (struct gdbarch *, CORE_ADDR); extern int default_insn_is_jump (struct gdbarch *, CORE_ADDR); + +extern CORE_ADDR default_infcall_mmap (CORE_ADDR size, unsigned prot); +extern char *default_gcc_target_options (struct gdbarch *gdbarch); + #endif diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 4f82095..b931690 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -319,6 +319,8 @@ struct gdbarch gdbarch_insn_is_ret_ftype *insn_is_ret; gdbarch_insn_is_jump_ftype *insn_is_jump; gdbarch_auxv_parse_ftype *auxv_parse; + gdbarch_infcall_mmap_ftype *infcall_mmap; + gdbarch_gcc_target_options_ftype *gcc_target_options; }; /* Create a new ``struct gdbarch'' based on information provided by @@ -411,6 +413,8 @@ gdbarch_alloc (const struct gdbarch_info *info, gdbarch->insn_is_call = default_insn_is_call; gdbarch->insn_is_ret = default_insn_is_ret; gdbarch->insn_is_jump = default_insn_is_jump; + gdbarch->infcall_mmap = default_infcall_mmap; + gdbarch->gcc_target_options = default_gcc_target_options; /* gdbarch_alloc() */ return gdbarch; @@ -630,6 +634,8 @@ verify_gdbarch (struct gdbarch *gdbarch) /* Skip verify of insn_is_ret, invalid_p == 0 */ /* Skip verify of insn_is_jump, invalid_p == 0 */ /* Skip verify of auxv_parse, has predicate. */ + /* Skip verify of infcall_mmap, invalid_p == 0 */ + /* Skip verify of gcc_target_options, invalid_p == 0 */ buf = ui_file_xstrdup (log, &length); make_cleanup (xfree, buf); if (length > 0) @@ -894,6 +900,9 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: frame_red_zone_size = %s\n", plongest (gdbarch->frame_red_zone_size)); fprintf_unfiltered (file, + "gdbarch_dump: gcc_target_options = <%s>\n", + host_address_to_string (gdbarch->gcc_target_options)); + fprintf_unfiltered (file, "gdbarch_dump: gdbarch_gcore_bfd_target_p() = %d\n", gdbarch_gcore_bfd_target_p (gdbarch)); fprintf_unfiltered (file, @@ -960,6 +969,9 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: in_solib_return_trampoline = <%s>\n", host_address_to_string (gdbarch->in_solib_return_trampoline)); fprintf_unfiltered (file, + "gdbarch_dump: infcall_mmap = <%s>\n", + host_address_to_string (gdbarch->infcall_mmap)); + fprintf_unfiltered (file, "gdbarch_dump: gdbarch_info_proc_p() = %d\n", gdbarch_info_proc_p (gdbarch)); fprintf_unfiltered (file, @@ -4406,6 +4418,40 @@ set_gdbarch_auxv_parse (struct gdbarch *gdbarch, gdbarch->auxv_parse = auxv_parse; } +CORE_ADDR +gdbarch_infcall_mmap (struct gdbarch *gdbarch, CORE_ADDR size, unsigned prot) +{ + gdb_assert (gdbarch != NULL); + gdb_assert (gdbarch->infcall_mmap != NULL); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_infcall_mmap called\n"); + return gdbarch->infcall_mmap (size, prot); +} + +void +set_gdbarch_infcall_mmap (struct gdbarch *gdbarch, + gdbarch_infcall_mmap_ftype infcall_mmap) +{ + gdbarch->infcall_mmap = infcall_mmap; +} + +char * +gdbarch_gcc_target_options (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + gdb_assert (gdbarch->gcc_target_options != NULL); + if (gdbarch_debug >= 2) + fprintf_unfiltered (gdb_stdlog, "gdbarch_gcc_target_options called\n"); + return gdbarch->gcc_target_options (gdbarch); +} + +void +set_gdbarch_gcc_target_options (struct gdbarch *gdbarch, + gdbarch_gcc_target_options_ftype gcc_target_options) +{ + gdbarch->gcc_target_options = gcc_target_options; +} + /* Keep a registry of per-architecture data-pointers required by GDB modules. */ diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index c621091..00fc1ac 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -1316,6 +1316,24 @@ typedef int (gdbarch_auxv_parse_ftype) (struct gdbarch *gdbarch, gdb_byte **read extern int gdbarch_auxv_parse (struct gdbarch *gdbarch, gdb_byte **readptr, gdb_byte *endptr, CORE_ADDR *typep, CORE_ADDR *valp); extern void set_gdbarch_auxv_parse (struct gdbarch *gdbarch, gdbarch_auxv_parse_ftype *auxv_parse); +/* Allocate SIZE bytes of PROT protected page aligned memory in inferior. + PROT has rwx bitmask format - bit 2 (value 4) is for readable memory, bit 1 + (value 2) is for writable memory and bit 0 (value 1) is for executable memory. + Throw an error if it is not possible. Returned address is always valid. */ + +typedef CORE_ADDR (gdbarch_infcall_mmap_ftype) (CORE_ADDR size, unsigned prot); +extern CORE_ADDR gdbarch_infcall_mmap (struct gdbarch *gdbarch, CORE_ADDR size, unsigned prot); +extern void set_gdbarch_infcall_mmap (struct gdbarch *gdbarch, gdbarch_infcall_mmap_ftype *infcall_mmap); + +/* Return string (caller has to use xfree for it) with options for GCC + to produce code for this target, typically "-m64", "-m32" or "-m31". + These options are put before CU's DW_AT_producer compilation options so that + they can override it. Method may also return NULL. */ + +typedef char * (gdbarch_gcc_target_options_ftype) (struct gdbarch *gdbarch); +extern char * gdbarch_gcc_target_options (struct gdbarch *gdbarch); +extern void set_gdbarch_gcc_target_options (struct gdbarch *gdbarch, gdbarch_gcc_target_options_ftype *gcc_target_options); + /* Definition for an unknown syscall, used basically in error-cases. */ #define UNKNOWN_SYSCALL (-1) diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index 9f357b6..6b2bc12 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -1029,6 +1029,18 @@ m:int:insn_is_jump:CORE_ADDR addr:addr::default_insn_is_jump::0 # Return -1 if there is insufficient buffer for a whole entry. # Return 1 if an entry was read into *TYPEP and *VALP. M:int:auxv_parse:gdb_byte **readptr, gdb_byte *endptr, CORE_ADDR *typep, CORE_ADDR *valp:readptr, endptr, typep, valp + +# Allocate SIZE bytes of PROT protected page aligned memory in inferior. +# PROT has rwx bitmask format - bit 2 (value 4) is for readable memory, bit 1 +# (value 2) is for writable memory and bit 0 (value 1) is for executable memory. +# Throw an error if it is not possible. Returned address is always valid. +f:CORE_ADDR:infcall_mmap:CORE_ADDR size, unsigned prot:size, prot::default_infcall_mmap::0 + +# Return string (caller has to use xfree for it) with options for GCC +# to produce code for this target, typically "-m64", "-m32" or "-m31". +# These options are put before CU's DW_AT_producer compilation options so that +# they can override it. Method may also return NULL. +m:char *:gcc_target_options:void:::default_gcc_target_options::0 EOF }