From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: =?utf-8?Q?Gerd_M=C3=B6llmann?= Newsgroups: gmane.emacs.devel Subject: Re: MPS: Change some macros to functions Date: Thu, 11 Jul 2024 15:01:53 +0200 Message-ID: References: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="23674"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: Emacs Devel , Helmut Eller To: Pip Cet Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Jul 11 15:03:30 2024 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sRtSM-000616-Fv for ged-emacs-devel@m.gmane-mx.org; Thu, 11 Jul 2024 15:03:30 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sRtQx-0002E9-C5; Thu, 11 Jul 2024 09:02:03 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sRtQu-0002C5-M1 for emacs-devel@gnu.org; Thu, 11 Jul 2024 09:02:00 -0400 Original-Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sRtQs-0006pd-Gi for emacs-devel@gnu.org; Thu, 11 Jul 2024 09:02:00 -0400 Original-Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-57cf8880f95so1043003a12.3 for ; Thu, 11 Jul 2024 06:01:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720702915; x=1721307715; darn=gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=2JVd5KTXL5PPtF6ICRB0uPL9OdAqA5kH6hqkxM5C6Jg=; b=Fj2FMQqYjfivtkt8wWrB+d6INfsww/F3jjuiJJv8T9VRHKzNUjoG8mqlLOMR6RoeNu /mUgCAvBOwUhUpp3mkiFqMN84i5Z7rlKMFRTYfVWcju6jJy0ugP6pxUqpLKw9eNVvNI2 63vyQEjGMXabjbZ3Vk+XCxy5QBQ6NulJPMq91fsT0kTlVBLWApJR8mK6cGDyI7Jj4HPr R20RIWKwbaCsN0fmcv33qN7O5McjKayfo29u76pWeGMwodgGfzisAVK03tz5xgwtwPoQ IFIC8AWCmyhNosSV6CeGV4YrfZgKnvxIWa/FlrvA0HastyKGZcAzsds9iqugbkNiIU5Y /E+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720702915; x=1721307715; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=2JVd5KTXL5PPtF6ICRB0uPL9OdAqA5kH6hqkxM5C6Jg=; b=H61blf1Uj+yKUIXQ4PkdCMRHXmHthyKvjpdXARAA7oyl1Mex1PnDJnlBX8Mepq2tKe MeuhybR2D5HDhuH55X8xopUE6P7rHXfXfs8x8XUxaIH0z2CmFYhsOFhXTNnFXAN36MbC sVVAa0QgtXvhjDqHBonOtz+p/8klzylv9knYs7JTxYtH6XxK3NUVsBPuPFmxQKcWkpUR HALAWg4aemdTyMADtsmh4HmCCusA6EjR3WWzD4zfRJ9yJosFX+ICbVg/Q7AjfFQ2888p GXIxcpWS8hjpK3pgDFGqFIXr1BipeIB4qb8R7EkVEswlGG6fqXdKA3sZombDOtUaKy7W Jdnw== X-Gm-Message-State: AOJu0Yy5Zzgh3+7Dyb52S5IlFDV5DT5kPsGOonhbTkvU9zBrUXZJ/9pT Nba+zcS/HOyAtbW7qW9LDcKjqDPBOTKisGUh/0ObFwLIdKbLYqun X-Google-Smtp-Source: AGHT+IF6+joc9mItRmk7fdGs2jziGVV9A3VFOJmBngrzfrq8COpHhyoUBGupkI+I3vSFhajG9LDaLQ== X-Received: by 2002:a05:6402:1d56:b0:595:71c7:39dd with SMTP id 4fb4d7f45d1cf-59571c73a66mr6205710a12.34.1720702914926; Thu, 11 Jul 2024 06:01:54 -0700 (PDT) Original-Received: from pro2.fritz.box (p4fe3a547.dip0.t-ipconnect.de. [79.227.165.71]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-594bd459e08sm3399668a12.69.2024.07.11.06.01.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jul 2024 06:01:54 -0700 (PDT) In-Reply-To: ("Gerd =?utf-8?Q?M=C3=B6llman?= =?utf-8?Q?n=22's?= message of "Thu, 11 Jul 2024 14:35:45 +0200") Received-SPF: pass client-ip=2a00:1450:4864:20::533; envelope-from=gerd.moellmann@gmail.com; helo=mail-ed1-x533.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:321587 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Gerd M=C3=B6llmann writes: > Any objections against changing these to functions? > > #define IGC_HEADER_NWORDS(h) ((h)->v >> IGC_HEADER_NWORDS_SHIFT) > #define IGC_HEADER_HASH(h) (((h)->v >> IGC_HEADER_HASH_SHIFT) & IGC_HEA= DER_HASH_MASK) > #define IGC_HEADER_TYPE(h) (((h)->v >> IGC_HEADER_TYPE_SHIFT) & IGC_HEA= DER_TYPE_MASK) > #define IGC_HEADER_TAG(h) ((h)->v & IGC_HEADER_TAG_MASK) > > LLDB can't handle macros, and having return types would also be nice. > > I can do that if you agree. Something like --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=x.diff Content-Description: x.diff 1 file changed, 60 insertions(+), 37 deletions(-) src/igc.c | 97 +++++++++++++++++++++++++++++++++++++++------------------------ modified src/igc.c @@ -501,10 +501,29 @@ static_assert (IGC_OBJ_NUM_TYPES - 1 < (1 << IGC_HEADER_TYPE_BITS)); uint64_t v; }; -#define IGC_HEADER_NWORDS(h) ((h)->v >> IGC_HEADER_NWORDS_SHIFT) -#define IGC_HEADER_HASH(h) (((h)->v >> IGC_HEADER_HASH_SHIFT) & IGC_HEADER_HASH_MASK) -#define IGC_HEADER_TYPE(h) (((h)->v >> IGC_HEADER_TYPE_SHIFT) & IGC_HEADER_TYPE_MASK) -#define IGC_HEADER_TAG(h) ((h)->v & IGC_HEADER_TAG_MASK) +static unsigned +header_nwords (const struct igc_header *h) +{ + return h->v >> IGC_HEADER_NWORDS_SHIFT; +} + +static unsigned +header_hash (const struct igc_header *h) +{ + return (h->v >> IGC_HEADER_HASH_SHIFT) & IGC_HEADER_HASH_MASK; +} + +static enum igc_obj_type +header_type (const struct igc_header *h) +{ + return (h->v >> IGC_HEADER_TYPE_SHIFT) & IGC_HEADER_TYPE_MASK; +} + +static uint64_t +header_tag (const struct igc_header *h) +{ + return h->v & IGC_HEADER_TAG_MASK; +} struct igc_exthdr { @@ -514,7 +533,11 @@ #define IGC_HEADER_TAG(h) ((h)->v & IGC_HEADER_TAG_MASK) Lisp_Object extra_dependency; }; -#define IGC_HEADER_EXTHDR(h) ((struct igc_exthdr *)(intptr_t)((h)->v & ~IGC_HEADER_TAG_MASK)) +static struct igc_exthdr * +header_exthdr (const struct igc_header *h) +{ + return ((struct igc_exthdr *)(intptr_t)(h->v & ~IGC_HEADER_TAG_MASK)); +} enum igc_tag { @@ -526,25 +549,25 @@ #define IGC_HEADER_EXTHDR(h) ((struct igc_exthdr *)(intptr_t)((h)->v & ~IGC_HEAD static enum igc_obj_type igc_header_type (struct igc_header *h) { - if (IGC_HEADER_TAG (h) == IGC_TAG_EXTHDR) - return IGC_HEADER_EXTHDR (h)->obj_type; - return IGC_HEADER_TYPE (h); + if (header_tag (h) == IGC_TAG_EXTHDR) + return header_exthdr (h)->obj_type; + return header_type (h); } static unsigned igc_header_hash (struct igc_header *h) { - if (IGC_HEADER_TAG (h) == IGC_TAG_EXTHDR) - return IGC_HEADER_EXTHDR (h)->hash; - return IGC_HEADER_HASH (h); + if (header_tag (h) == IGC_TAG_EXTHDR) + return header_exthdr (h)->hash; + return header_hash (h); } static size_t igc_header_nwords (const struct igc_header *h) { - if (IGC_HEADER_TAG (h) == IGC_TAG_EXTHDR) - return IGC_HEADER_EXTHDR (h)->nwords; - return IGC_HEADER_NWORDS (h); + if (header_tag (h) == IGC_TAG_EXTHDR) + return header_exthdr (h)->nwords; + return header_nwords (h); } struct igc_fwd @@ -575,7 +598,7 @@ to_bytes (mps_word_t nwords) obj_size (const struct igc_header *h) { mps_word_t nbytes = to_bytes (igc_header_nwords (h)); - igc_assert (IGC_HEADER_TYPE (h) == IGC_OBJ_PAD || nbytes >= sizeof (struct igc_fwd)); + igc_assert (header_type (h) == IGC_OBJ_PAD || nbytes >= sizeof (struct igc_fwd)); return nbytes; } @@ -595,10 +618,10 @@ obj_client_size (const struct igc_header *h) set_header (struct igc_header *h, enum igc_obj_type type, mps_word_t nbytes, mps_word_t hash) { -#if IGC_HEADER_NWORDS_BITS >= 32 && INTPTR_MAX > INT_MAX +#if header_nwords_BITS >= 32 && INTPTR_MAX > INT_MAX /* On 32-bit architecture the assertion below is redundant and causes compiler warnings. */ - igc_assert (nbytes < ((size_t) 1 << IGC_HEADER_NWORDS_BITS)); + igc_assert (nbytes < ((size_t) 1 << header_nwords_BITS)); #endif igc_assert (type == IGC_OBJ_PAD || nbytes >= sizeof (struct igc_fwd)); uint64_t tag = IGC_TAG_OBJ; @@ -678,7 +701,7 @@ igc_check_fwd (void *client) if (has_header (client, true)) { struct igc_header *h = client_to_base (client); - igc_assert (IGC_HEADER_TYPE (h) != IGC_OBJ_FWD); + igc_assert (header_type (h) != IGC_OBJ_FWD); igc_assert (obj_size (h) >= sizeof (struct igc_fwd)); } } @@ -1438,7 +1461,7 @@ dflt_fwd (mps_addr_t old_base_addr, mps_addr_t new_base_addr) { struct igc_header *h = old_base_addr; igc_assert (obj_size (h) >= sizeof (struct igc_fwd)); - igc_assert (IGC_HEADER_TYPE (h) != IGC_OBJ_PAD); + igc_assert (header_type (h) != IGC_OBJ_PAD); struct igc_fwd *f = old_base_addr; set_header (&f->header, IGC_OBJ_FWD, to_bytes (igc_header_nwords (h)), 0); f->new_base_addr = new_base_addr; @@ -1448,7 +1471,7 @@ dflt_fwd (mps_addr_t old_base_addr, mps_addr_t new_base_addr) is_dflt_fwd (mps_addr_t base_addr) { struct igc_fwd *f = base_addr; - if (IGC_HEADER_TYPE (&f->header) == IGC_OBJ_FWD) + if (header_type (&f->header) == IGC_OBJ_FWD) return f->new_base_addr; return NULL; } @@ -1701,9 +1724,9 @@ dflt_scan_obj (mps_ss_t ss, mps_addr_t base_start, mps_addr_t base_limit, } } - if (IGC_HEADER_TAG (header) == IGC_TAG_EXTHDR) + if (header_tag (header) == IGC_TAG_EXTHDR) { - struct igc_exthdr *exthdr = IGC_HEADER_EXTHDR (header); + struct igc_exthdr *exthdr = header_exthdr (header); IGC_FIX12_OBJ (ss, &exthdr->extra_dependency); } @@ -3199,9 +3222,9 @@ finalize (struct igc *gc, mps_addr_t base) { mps_addr_t client = base_to_client (base); struct igc_header *h = base; - if (IGC_HEADER_TAG (h) == IGC_TAG_EXTHDR) + if (header_tag (h) == IGC_TAG_EXTHDR) { - struct igc_exthdr *exthdr = IGC_HEADER_EXTHDR (h); + struct igc_exthdr *exthdr = header_exthdr (h); set_header (h, exthdr->obj_type, to_bytes (exthdr->nwords), exthdr->hash); xfree (exthdr); } @@ -3238,7 +3261,7 @@ maybe_finalize (mps_addr_t client, enum pvec_type tag) { mps_addr_t ref = client_to_base (client); struct igc_header *h = ref; - if (IGC_HEADER_TAG (h) == IGC_TAG_EXTHDR) + if (header_tag (h) == IGC_TAG_EXTHDR) { mps_res_t res = mps_finalize (global_igc->arena, &ref); IGC_CHECK_RES (res); @@ -4274,12 +4297,12 @@ DEFUN ("igc--roots", Figc__roots, Sigc__roots, 0, 0, 0, doc : /* */) static struct igc_exthdr * igc_external_header (struct igc_header *h) { - if (IGC_HEADER_TAG (h) != IGC_TAG_EXTHDR) + if (header_tag (h) != IGC_TAG_EXTHDR) { struct igc_exthdr *exthdr = xmalloc (sizeof *exthdr); - exthdr->nwords = IGC_HEADER_NWORDS (h); - exthdr->hash = IGC_HEADER_HASH (h); - exthdr->obj_type = IGC_HEADER_TYPE (h); + exthdr->nwords = header_nwords (h); + exthdr->hash = header_hash (h); + exthdr->obj_type = header_type (h); exthdr->extra_dependency = Qnil; /* On IA-32, the upper 32-bit word is 0 after this, which is okay. */ h->v = (intptr_t)exthdr + IGC_TAG_EXTHDR; @@ -4289,7 +4312,7 @@ igc_external_header (struct igc_header *h) return exthdr; } - return IGC_HEADER_EXTHDR (h); + return header_exthdr (h); } static void @@ -4559,7 +4582,7 @@ igc_dump_finish_obj (void *client, enum igc_obj_type type, if (igc_header_type (h) == IGC_OBJ_MARKER_VECTOR) igc_assert ((type == IGC_OBJ_VECTOR && igc_header_type (h) == IGC_OBJ_MARKER_VECTOR) - || IGC_HEADER_TYPE (h) == type); + || header_type (h) == type); igc_assert (base + obj_size (h) >= end); *out = *h; return base + obj_size (h); @@ -4622,7 +4645,7 @@ check_dump (mps_addr_t start, mps_addr_t end) { eassert (p < end); struct igc_header *h = p; - if (IGC_HEADER_TYPE (h) != IGC_OBJ_PAD) + if (header_type (h) != IGC_OBJ_PAD) { mps_addr_t obj = pdumper_next_object (&it); eassert (p == obj); @@ -4646,13 +4669,13 @@ igc_on_pdump_loaded (void *dump_base, void *hot_start, void *hot_end, { igc_assert (global_igc->park_count > 0); igc_assert (base_to_client (hot_start) == charset_table); - igc_assert (IGC_HEADER_TYPE ((struct igc_header *) hot_start) + igc_assert (header_type ((struct igc_header *) hot_start) == IGC_OBJ_DUMPED_CHARSET_TABLE); - igc_assert (IGC_HEADER_TYPE ((struct igc_header *) cold_start) + igc_assert (header_type ((struct igc_header *) cold_start) == IGC_OBJ_DUMPED_CODE_SPACE_MASKS); - igc_assert (IGC_HEADER_TYPE ((struct igc_header *) cold_user_data_start) + igc_assert (header_type ((struct igc_header *) cold_user_data_start) == IGC_OBJ_DUMPED_BYTES); - igc_assert (IGC_HEADER_TYPE ((struct igc_header *) heap_end) + igc_assert (header_type ((struct igc_header *) heap_end) == IGC_OBJ_DUMPED_BYTES); size_t discardable_size = (uint8_t *)cold_start - (uint8_t *)hot_end; @@ -4661,7 +4684,7 @@ igc_on_pdump_loaded (void *dump_base, void *hot_start, void *hot_end, size_t relocs_size = (uint8_t *)cold_end - (uint8_t *)heap_end; struct igc_header *h = client_to_base (dump_base); - igc_assert (IGC_HEADER_TYPE (h) == IGC_OBJ_INVALID); + igc_assert (header_type (h) == IGC_OBJ_INVALID); igc_assert (obj_size (h) == sizeof *h + (uint8_t *)cold_end - (uint8_t *)dump_base); igc_assert (discardable_size > 2 * sizeof *h); --=-=-=--