From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id 8679A385454D for ; Wed, 14 Dec 2022 03:41:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8679A385454D Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=polymtl.ca Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=polymtl.ca Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 2BE3etL0031184 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 13 Dec 2022 22:40:59 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 2BE3etL0031184 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1670989260; bh=cPOJh8+RQFgf2xlDFMYaii+e7KLqBwixuwjBoSpDlOg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EFLgeUGStd1879PPlyLcqd7U21HvGl5aejVhVMG/J6mPagjkGojPRLInha9rMLqw0 k+9pURs7E0wJLL3ObZy5rTUhQ4a7YMLRGVk2dD+FSZFd79U+6eG/r+JPNJgJmE8Ons kV0Tm4N3eC/OiVf6Sv9CaDy//9W0m0wsJroN6OTM= Received: from simark.localdomain (unknown [217.28.27.60]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id CE8A71E129; Tue, 13 Dec 2022 22:34:43 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH v2 04/13] gdb: move sect_offset and cu_offset to dwarf2/types.h Date: Tue, 13 Dec 2022 22:34:32 -0500 Message-Id: <20221214033441.499512-5-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221214033441.499512-1-simon.marchi@polymtl.ca> References: <20221214033441.499512-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Wed, 14 Dec 2022 03:40:55 +0000 X-Spam-Status: No, score=-3189.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS,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: From: Simon Marchi I want to move the call_site stuff out of gdbtypes.h, to a new header file, to break some cyclic include problem. The call_site stuff uses cu_offset, also defined in gdbtypes.h, so cu_offset also needs to move somewhere else (otherwise, call-site.h will need to include gdbtypes.h, and we are back to square 1). I could move cu_offset to the future new file dwarf2/call-site.h, but it doesn't sound like a good place for it, at cu_offset is not specific to call sites, it's used throughout dwarf2/. So, move it to its own file, dwarf2/types.h. For now, gdbtypes.h includes dwarf2/types.h, but that will be removed once the call site stuff is moved to its own file. Move sect_offset with it too. sect_offset is not a DWARF-specific concept, but for the moment it is only used in dwarf2/. Change-Id: I1fd2a3b7b67dee789c4874244b044bde7db43d8e --- gdb/dwarf2/types.h | 39 +++++++++++++++++++++++++++++++++++++++ gdb/gdbtypes.h | 18 +----------------- 2 files changed, 40 insertions(+), 17 deletions(-) create mode 100644 gdb/dwarf2/types.h diff --git a/gdb/dwarf2/types.h b/gdb/dwarf2/types.h new file mode 100644 index 000000000000..463dc485925f --- /dev/null +++ b/gdb/dwarf2/types.h @@ -0,0 +1,39 @@ +/* Common internal types for the DWARF reader + + Copyright (C) 2017-2022 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 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + 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, see . */ + +#ifndef DWARF2_TYPES_H +#define DWARF2_TYPES_H + +#include "gdbsupport/offset-type.h" + +/* Offset relative to the start of its containing CU (compilation + unit). */ +DEFINE_OFFSET_TYPE (cu_offset, unsigned int); + +/* Offset relative to the start of its .debug_info or .debug_types + section. */ +DEFINE_OFFSET_TYPE (sect_offset, uint64_t); + +static inline char * +sect_offset_str (sect_offset offset) +{ + return hex_string (to_underlying (offset)); +} + +#endif /* DWARF2_TYPES_H */ diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h index 8fc5c97c95aa..fbe46323216f 100644 --- a/gdb/gdbtypes.h +++ b/gdb/gdbtypes.h @@ -57,6 +57,7 @@ #include "gdbsupport/gdb_obstack.h" #include "gmp-utils.h" #include "frame-info.h" +#include "dwarf2/types.h" /* Forward declarations for prototypes. */ struct field; @@ -66,23 +67,6 @@ struct language_defn; struct dwarf2_per_cu_data; struct dwarf2_per_objfile; -/* These declarations are DWARF-specific as some of the gdbtypes.h data types - are already DWARF-specific. */ - -/* * Offset relative to the start of its containing CU (compilation - unit). */ -DEFINE_OFFSET_TYPE (cu_offset, unsigned int); - -/* * Offset relative to the start of its .debug_info or .debug_types - section. */ -DEFINE_OFFSET_TYPE (sect_offset, uint64_t); - -static inline char * -sect_offset_str (sect_offset offset) -{ - return hex_string (to_underlying (offset)); -} - /* Some macros for char-based bitfields. */ #define B_SET(a,x) ((a)[(x)>>3] |= (1 << ((x)&7))) -- 2.38.1