From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by sourceware.org (Postfix) with ESMTPS id 37B6A385417E for ; Wed, 22 Mar 2023 17:14:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 37B6A385417E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679505267; x=1711041267; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=NbZdjigHtIAeS5dYz2YdofJy+3WlQ1cx7ZtI4H+wczE=; b=EBSG8yjHyJKXBf1peuJck/8K2iQvYuQvukA2t0O5QA8vGWSzjOSH7Kap ilxCPQ/B6Iadaynp4xryWuDydWvpL3nCsT8Phk8xw3L8SE5LP3/pz6yLB HRHVPecvKIp3cuzqQRse1HFUJrZprqrwTVn/BpXWVFzhQRiQLQMRDcqGX hqNl6REwEhtaGbI6ZcqcEsUhZLHsugTwBacT31yDJYna4/jqgzusS85jF wG067RjzO4+shswW2TcqYe/ryS6lnyZqBhNMLI3KzdVKZ5qBSSbkWkT/q 4HtwjzWwn2qw6EX/0gOoVDUyeoiurZ6ID2m6Zjv6mAWE4e4bXp365BlIC A==; X-IronPort-AV: E=McAfee;i="6600,9927,10657"; a="323124821" X-IronPort-AV: E=Sophos;i="5.98,282,1673942400"; d="scan'208";a="323124821" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Mar 2023 10:14:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10657"; a="675359524" X-IronPort-AV: E=Sophos;i="5.98,282,1673942400"; d="scan'208";a="675359524" Received: from mbouhaou-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.63.83]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Mar 2023 10:14:25 -0700 From: Mohamed Bouhaouel To: gdb-patches@sourceware.org Subject: [PATCH 2/2] gdb, gdbarch, infcall: Add reserve_stack_space method to gdbarch Date: Wed, 22 Mar 2023 18:13:52 +0100 Message-Id: <20230322171352.9087-3-mohamed.bouhaouel@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230322171352.9087-1-mohamed.bouhaouel@intel.com> References: <20230322171352.9087-1-mohamed.bouhaouel@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-10.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Change the 'reserve_stack_space' function from a static common method to a target-dependent method. Signed-off-by: Mohamed Bouhaouel --- gdb/gdbarch-gen.h | 6 ++++++ gdb/gdbarch.c | 22 ++++++++++++++++++++++ gdb/gdbarch_components.py | 10 ++++++++++ gdb/infcall.c | 16 ++++++---------- gdb/infcall.h | 9 +++++++++ 5 files changed, 53 insertions(+), 10 deletions(-) diff --git a/gdb/gdbarch-gen.h b/gdb/gdbarch-gen.h index a9b0fe26837..ca3e074de8f 100644 --- a/gdb/gdbarch-gen.h +++ b/gdb/gdbarch-gen.h @@ -1687,3 +1687,9 @@ extern void set_gdbarch_get_pc_address_flags (struct gdbarch *gdbarch, gdbarch_g typedef void (gdbarch_read_core_file_mappings_ftype) (struct gdbarch *gdbarch, struct bfd *cbfd, read_core_file_mappings_pre_loop_ftype pre_loop_cb, read_core_file_mappings_loop_ftype loop_cb); extern void gdbarch_read_core_file_mappings (struct gdbarch *gdbarch, struct bfd *cbfd, read_core_file_mappings_pre_loop_ftype pre_loop_cb, read_core_file_mappings_loop_ftype loop_cb); extern void set_gdbarch_read_core_file_mappings (struct gdbarch *gdbarch, gdbarch_read_core_file_mappings_ftype *read_core_file_mappings); + +/* Reserve space on the stack for a value of the given type. */ + +typedef CORE_ADDR (gdbarch_reserve_stack_space_ftype) (struct gdbarch *gdbarch, const type *valtype, CORE_ADDR &sp); +extern CORE_ADDR gdbarch_reserve_stack_space (struct gdbarch *gdbarch, const type *valtype, CORE_ADDR &sp); +extern void set_gdbarch_reserve_stack_space (struct gdbarch *gdbarch, gdbarch_reserve_stack_space_ftype *reserve_stack_space); diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index a411e5bbac7..25fdfc6b4c2 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -254,6 +254,7 @@ struct gdbarch gdbarch_type_align_ftype *type_align = default_type_align; gdbarch_get_pc_address_flags_ftype *get_pc_address_flags = default_get_pc_address_flags; gdbarch_read_core_file_mappings_ftype *read_core_file_mappings = default_read_core_file_mappings; + gdbarch_reserve_stack_space_ftype *reserve_stack_space = default_reserve_stack_space; }; /* Create a new ``struct gdbarch'' based on information provided by @@ -518,6 +519,7 @@ verify_gdbarch (struct gdbarch *gdbarch) /* Skip verify of type_align, invalid_p == 0 */ /* Skip verify of get_pc_address_flags, invalid_p == 0 */ /* Skip verify of read_core_file_mappings, invalid_p == 0 */ + /* Skip verify of reserve_stack_space, invalid_p == 0 */ if (!log.empty ()) internal_error (_("verify_gdbarch: the following are invalid ...%s"), log.c_str ()); @@ -1362,6 +1364,9 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) gdb_printf (file, "gdbarch_dump: read_core_file_mappings = <%s>\n", host_address_to_string (gdbarch->read_core_file_mappings)); + gdb_printf (file, + "gdbarch_dump: reserve_stack_space = <%s>\n", + host_address_to_string (gdbarch->reserve_stack_space)); if (gdbarch->dump_tdep != NULL) gdbarch->dump_tdep (gdbarch, file); } @@ -5365,3 +5370,20 @@ set_gdbarch_read_core_file_mappings (struct gdbarch *gdbarch, { gdbarch->read_core_file_mappings = read_core_file_mappings; } + +CORE_ADDR +gdbarch_reserve_stack_space (struct gdbarch *gdbarch, const type *valtype, CORE_ADDR &sp) +{ + gdb_assert (gdbarch != NULL); + gdb_assert (gdbarch->reserve_stack_space != NULL); + if (gdbarch_debug >= 2) + gdb_printf (gdb_stdlog, "gdbarch_reserve_stack_space called\n"); + return gdbarch->reserve_stack_space (gdbarch, valtype, sp); +} + +void +set_gdbarch_reserve_stack_space (struct gdbarch *gdbarch, + gdbarch_reserve_stack_space_ftype reserve_stack_space) +{ + gdbarch->reserve_stack_space = reserve_stack_space; +} diff --git a/gdb/gdbarch_components.py b/gdb/gdbarch_components.py index 10e8c2d52c8..800054a34b4 100644 --- a/gdb/gdbarch_components.py +++ b/gdb/gdbarch_components.py @@ -2683,3 +2683,13 @@ Read core file mappings predefault="default_read_core_file_mappings", invalid=False, ) + +Method( + comment="Reserve space on the stack for a value of the given type.", + type="CORE_ADDR", + name="reserve_stack_space", + params=[("const type *", "valtype"), ("CORE_ADDR &", "sp")], + predefault="default_reserve_stack_space", + predicate=False, + invalid=False, +) diff --git a/gdb/infcall.c b/gdb/infcall.c index b945adebc93..8ef05bec3e0 100644 --- a/gdb/infcall.c +++ b/gdb/infcall.c @@ -702,16 +702,12 @@ run_inferior_call (std::unique_ptr sm, return caught_error; } -/* Reserve space on the stack for a value of the given type. - Return the address of the allocated space. - Make certain that the value is correctly aligned. - The SP argument is modified. */ +/* See infcall.h. */ -static CORE_ADDR -reserve_stack_space (const type *values_type, CORE_ADDR &sp) +CORE_ADDR +default_reserve_stack_space (gdbarch *gdbarch, const type *values_type, + CORE_ADDR &sp) { - frame_info_ptr frame = get_current_frame (); - struct gdbarch *gdbarch = get_frame_arch (frame); CORE_ADDR addr = 0; if (gdbarch_inner_than (gdbarch, 1, 2)) @@ -1116,7 +1112,7 @@ call_function_by_hand_dummy (struct value *function, /* Make a copy of the argument on the stack. If the argument is trivially copy ctor'able, copy bit by bit. Otherwise, call the copy ctor to initialize the clone. */ - CORE_ADDR addr = reserve_stack_space (param_type, sp); + CORE_ADDR addr = gdbarch_reserve_stack_space (gdbarch, param_type, sp); value *clone = value_from_contents_and_address (param_type, nullptr, addr); push_thread_stack_temporary (call_thread.get (), clone); @@ -1201,7 +1197,7 @@ call_function_by_hand_dummy (struct value *function, if (return_method != return_method_normal || (stack_temporaries && class_or_union_p (values_type))) - struct_addr = reserve_stack_space (values_type, sp); + struct_addr = gdbarch_reserve_stack_space (gdbarch, values_type, sp); std::vector new_args; if (return_method == return_method_hidden_param) diff --git a/gdb/infcall.h b/gdb/infcall.h index af3dd49220a..807d86d3989 100644 --- a/gdb/infcall.h +++ b/gdb/infcall.h @@ -79,4 +79,13 @@ extern void error_call_unknown_return_type (const char *func_name); extern value *default_value_arg_coerce (gdbarch *gdbarch, value *arg, type *param_type, int is_prototyped); + +/* Reserve space on the stack for a value of the given type. + Return the address of the allocated space. + Make certain that the value is correctly aligned. + The SP argument is modified. */ + +extern CORE_ADDR default_reserve_stack_space (gdbarch *gdbarch, + const type *values_type, + CORE_ADDR &sp); #endif -- 2.25.1 Intel Deutschland GmbH Registered Address: Am Campeon 10, 85579 Neubiberg, Germany Tel: +49 89 99 8853-0, www.intel.de Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva Chairperson of the Supervisory Board: Nicole Lau Registered Office: Munich Commercial Register: Amtsgericht Muenchen HRB 186928