Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.1/patches/2228419/?format=api
{ "id": 2228419, "url": "http://patchwork.ozlabs.org/api/1.1/patches/2228419/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260426134002.865628-31-richard.henderson@linaro.org/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/1.1/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20260426134002.865628-31-richard.henderson@linaro.org>", "date": "2026-04-26T13:39:07", "name": "[30/84] fpu: Drop FRAC_GENERIC_64_128{_256}", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "14ca68874ca746cd6116e09bf0cf5b8af9e318b0", "submitter": { "id": 72104, "url": "http://patchwork.ozlabs.org/api/1.1/people/72104/?format=api", "name": "Richard Henderson", "email": "richard.henderson@linaro.org" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260426134002.865628-31-richard.henderson@linaro.org/mbox/", "series": [ { "id": 501533, "url": "http://patchwork.ozlabs.org/api/1.1/series/501533/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=501533", "date": "2026-04-26T13:38:37", "name": "fpu: Export some internals for targets", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/501533/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2228419/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2228419/checks/", "tags": {}, "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256\n header.s=google header.b=r6RhvPFk;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)" ], "Received": [ "from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g3Sgy1y97z1y2d\n\tfor <incoming@patchwork.ozlabs.org>; Sun, 26 Apr 2026 23:47:58 +1000 (AEST)", "from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1wGzk8-0000I2-L5; Sun, 26 Apr 2026 09:41:54 -0400", "from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <richard.henderson@linaro.org>)\n id 1wGzjp-0008O2-Du\n for qemu-devel@nongnu.org; Sun, 26 Apr 2026 09:41:34 -0400", "from mail-pg1-x529.google.com ([2607:f8b0:4864:20::529])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from <richard.henderson@linaro.org>)\n id 1wGzjk-0000Et-P7\n for qemu-devel@nongnu.org; Sun, 26 Apr 2026 09:41:33 -0400", "by mail-pg1-x529.google.com with SMTP id\n 41be03b00d2f7-c7da372b87eso539663a12.0\n for <qemu-devel@nongnu.org>; Sun, 26 Apr 2026 06:41:28 -0700 (PDT)", "from stoup.. ([180.233.125.15]) by smtp.gmail.com with ESMTPSA id\n d9443c01a7336-2b5fab30f29sm277940375ad.68.2026.04.26.06.41.24\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Sun, 26 Apr 2026 06:41:26 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=linaro.org; s=google; t=1777210887; x=1777815687; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=cWAjKNoEGxxdB5kcvtEjcSc2slMDjvCN3yEwCpVz4fA=;\n b=r6RhvPFk2s2fvSaRGfxNSyI2Yz0ExiSQkmTvyTtWSB+hE3lqQ2iQcSDx9VXBYIZhOx\n hoivP1+4XY88bI19RT3cavpO5oYllzwgV9j3LFOqt+coxqh6FsgE/zfFskEjL19CzphB\n JwyqOglkIjNiw6Y42KxNDQQH9hV2yjpUodfWk7dsI2os5ulTzIVqmdFAf1ZtfWFDeQpK\n NMVM/VNqzxXLsl9o9lwNFhtHf9Ab0/ooLkRw9qWP2wCpUQvzE+YAXwJIdJ7ZG1aP2GEL\n LYoHnAYH2qV5XfsgI+KLL+Q3i0JpAWLx0+BBvRprg2ewp2+2yvhbk3KiGb4UQTSslX8o\n ZlrQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1777210887; x=1777815687;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=cWAjKNoEGxxdB5kcvtEjcSc2slMDjvCN3yEwCpVz4fA=;\n b=PTfLxSXWivV3KigboxXLwl3/BF1Ec3Z5m9KkymxzFnKYUzptPO+9N9tYlOx0fYlqVD\n LG+6IAcuNhHFstvOLrxObmTjFZu9syazWvXbAV7OxCUiJbd+jDfOwour/tdRmqPyxi1Z\n S3QHYv4F1fli/StN/4jUh8eYR6jxUR2araLQPyD+QSCukMGsfcmZyyGRhcLVp4AYBIYE\n CCfqmKpPV3AuAxSbD4mYUhM06A/OJkwsJW7iSFDd1SB3fAka//kej98omPfJBkhXBj4n\n lwC+okF+yu9jfFLkhPgJdzz5OoFQ1Wfzh6Y/F06iBjPD+10klJc7Qop0W3+RXEM6qTXB\n 40yA==", "X-Gm-Message-State": "AOJu0YyapeBPNUPY0O03ngbHY/LKKdpWNEYewEvM6LeYaCOeN+RIxOjZ\n SwRQn9zyaduOLzRkiGsf1wfl1E649fw+pN+yiYeqVD3TMQ7EqjhV2Rqyu2j+ip7RMt1EUf8F//l\n 6kTd12gw=", "X-Gm-Gg": "AeBDietSEJM1dDDl+5x19BRGZmGOOQLg8KjLjnGWjV1hhX42MtGbS750zi2G9VRUgZY\n V2gRNT/T3karpY5B4qzt+eW5gBCOXQMjW8IhWXd1hgViqppw1+V/eTLVLsgUIujtelf7V+Kpd1e\n vjpFeQO9giIYJJR06hEBD89QYBF2qAIKJMtt+QjWlLU3sJs80FWi1a2cTO4dMiC5G0u/ZOK6Q/V\n 7tUnHo7k/TIV4IoMFZXihfETISqoGN1QT3ILT+UHZokI1oCEh4toeG5GCjOm5rBkHMz2LOMuLkf\n h3cVSwlz/oXkW/rxV34cgkKvX/ZXSM5MVikEv7ceh//4bVHDTQRbuLVEerXDdgBBK1szMcd6XSl\n HNhUsibQiGCKUKHJj7Biz2WOCtW8Vbkh/UA/Mk+/Wqxp10beTwXXLp1MaflR6eTmt7XaUSwWFC1\n XEgIONLDuL+zRIR2gSAtORTjbr+OSXfxPGlCxO7bmA", "X-Received": "by 2002:a17:902:ef02:b0:2b2:420a:b48a with SMTP id\n d9443c01a7336-2b5f9fc2eb0mr400825055ad.32.1777210887172;\n Sun, 26 Apr 2026 06:41:27 -0700 (PDT)", "From": "Richard Henderson <richard.henderson@linaro.org>", "To": "qemu-devel@nongnu.org", "Cc": "qemu-arm@nongnu.org,\n\tqemu-s390x@nongnu.org", "Subject": "[PATCH 30/84] fpu: Drop FRAC_GENERIC_64_128{_256}", "Date": "Sun, 26 Apr 2026 23:39:07 +1000", "Message-ID": "<20260426134002.865628-31-richard.henderson@linaro.org>", "X-Mailer": "git-send-email 2.43.0", "In-Reply-To": "<20260426134002.865628-1-richard.henderson@linaro.org>", "References": "<20260426134002.865628-1-richard.henderson@linaro.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Received-SPF": "pass client-ip=2607:f8b0:4864:20::529;\n envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x529.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,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,\n SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no", "X-Spam_action": "no action", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "qemu development <qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org" }, "content": "This requires more complexity to handle const selectors, and\nan indirection macro for each function. Easier to just use\nthe preprocessor.\n\nSigned-off-by: Richard Henderson <richard.henderson@linaro.org>\n---\n fpu/softfloat.c | 69 +++++----------------\n fpu/softfloat-parts-addsub.c.inc | 22 +++----\n fpu/softfloat-parts.c.inc | 102 +++++++++++++++----------------\n 3 files changed, 77 insertions(+), 116 deletions(-)", "diff": "diff --git a/fpu/softfloat.c b/fpu/softfloat.c\nindex d077e8da69..e462fb7d74 100644\n--- a/fpu/softfloat.c\n+++ b/fpu/softfloat.c\n@@ -774,15 +774,6 @@ static float128 QEMU_FLATTEN float128_pack_raw(const FloatParts128 *p)\n * Helper functions for softfloat-parts.c.inc, per-size operations.\n */\n \n-#define FRAC_GENERIC_64_128(NAME, P) \\\n- _Generic((P), FloatParts64 *: frac64_##NAME, \\\n- FloatParts128 *: frac128_##NAME)\n-\n-#define FRAC_GENERIC_64_128_256(NAME, P) \\\n- _Generic((P), FloatParts64 *: frac64_##NAME, \\\n- FloatParts128 *: frac128_##NAME, \\\n- FloatParts256 *: frac256_##NAME)\n-\n static bool frac64_add(FloatParts64 *r, FloatParts64 *a, FloatParts64 *b)\n {\n return uadd64_overflow(a->frac, b->frac, &r->frac);\n@@ -806,8 +797,6 @@ static bool frac256_add(FloatParts256 *r, FloatParts256 *a, FloatParts256 *b)\n return c;\n }\n \n-#define frac_add(R, A, B) FRAC_GENERIC_64_128_256(add, R)(R, A, B)\n-\n static bool frac64_addi(FloatParts64 *r, FloatParts64 *a, uint64_t c)\n {\n return uadd64_overflow(a->frac, c, &r->frac);\n@@ -819,8 +808,6 @@ static bool frac128_addi(FloatParts128 *r, FloatParts128 *a, uint64_t c)\n return uadd64_overflow(a->frac_hi, c, &r->frac_hi);\n }\n \n-#define frac_addi(R, A, C) FRAC_GENERIC_64_128(addi, R)(R, A, C)\n-\n static void frac64_allones(FloatParts64 *a)\n {\n a->frac = -1;\n@@ -831,8 +818,6 @@ static void frac128_allones(FloatParts128 *a)\n a->frac_hi = a->frac_lo = -1;\n }\n \n-#define frac_allones(A) FRAC_GENERIC_64_128(allones, A)(A)\n-\n static FloatRelation frac64_cmp(FloatParts64 *a, FloatParts64 *b)\n {\n return (a->frac == b->frac ? float_relation_equal\n@@ -852,8 +837,6 @@ static FloatRelation frac128_cmp(FloatParts128 *a, FloatParts128 *b)\n return ta < tb ? float_relation_less : float_relation_greater;\n }\n \n-#define frac_cmp(A, B) FRAC_GENERIC_64_128(cmp, A)(A, B)\n-\n static void frac64_clear(FloatParts64 *a)\n {\n a->frac = 0;\n@@ -864,8 +847,6 @@ static void frac128_clear(FloatParts128 *a)\n a->frac_hi = a->frac_lo = 0;\n }\n \n-#define frac_clear(A) FRAC_GENERIC_64_128(clear, A)(A)\n-\n static bool frac64_div(FloatParts64 *a, FloatParts64 *b)\n {\n uint64_t n1, n0, r, q;\n@@ -945,8 +926,6 @@ static bool frac128_div(FloatParts128 *a, FloatParts128 *b)\n return ret;\n }\n \n-#define frac_div(A, B) FRAC_GENERIC_64_128(div, A)(A, B)\n-\n static bool frac64_eqz(FloatParts64 *a)\n {\n return a->frac == 0;\n@@ -957,8 +936,6 @@ static bool frac128_eqz(FloatParts128 *a)\n return (a->frac_hi | a->frac_lo) == 0;\n }\n \n-#define frac_eqz(A) FRAC_GENERIC_64_128(eqz, A)(A)\n-\n static void frac64_mulw(FloatParts128 *r, FloatParts64 *a, FloatParts64 *b)\n {\n mulu64(&r->frac_lo, &r->frac_hi, a->frac, b->frac);\n@@ -970,8 +947,6 @@ static void frac128_mulw(FloatParts256 *r, FloatParts128 *a, FloatParts128 *b)\n &r->frac_hi, &r->frac_hm, &r->frac_lm, &r->frac_lo);\n }\n \n-#define frac_mulw(R, A, B) FRAC_GENERIC_64_128(mulw, A)(R, A, B)\n-\n static void frac64_neg(FloatParts64 *a)\n {\n a->frac = -a->frac;\n@@ -993,8 +968,6 @@ static void frac256_neg(FloatParts256 *a)\n a->frac_hi = usub64_borrow(0, a->frac_hi, &c);\n }\n \n-#define frac_neg(A) FRAC_GENERIC_64_128_256(neg, A)(A)\n-\n static int frac64_normalize(FloatParts64 *a)\n {\n if (a->frac) {\n@@ -1068,8 +1041,6 @@ static int frac256_normalize(FloatParts256 *a)\n return ret;\n }\n \n-#define frac_normalize(A) FRAC_GENERIC_64_128_256(normalize, A)(A)\n-\n static void frac64_modrem(FloatParts64 *a, FloatParts64 *b, uint64_t *mod_quot)\n {\n uint64_t a0, a1, b0, t0, t1, q, quot;\n@@ -1248,8 +1219,6 @@ static void frac128_modrem(FloatParts128 *a, FloatParts128 *b,\n a->frac_lo = a1 | (a2 != 0);\n }\n \n-#define frac_modrem(A, B, Q) FRAC_GENERIC_64_128(modrem, A)(A, B, Q)\n-\n static void frac64_shl(FloatParts64 *a, int c)\n {\n a->frac <<= c;\n@@ -1273,8 +1242,6 @@ static void frac128_shl(FloatParts128 *a, int c)\n a->frac_lo = a1;\n }\n \n-#define frac_shl(A, C) FRAC_GENERIC_64_128(shl, A)(A, C)\n-\n static void frac64_shr(FloatParts64 *a, int c)\n {\n a->frac >>= c;\n@@ -1298,8 +1265,6 @@ static void frac128_shr(FloatParts128 *a, int c)\n a->frac_lo = a1;\n }\n \n-#define frac_shr(A, C) FRAC_GENERIC_64_128(shr, A)(A, C)\n-\n static void frac64_shrjam(FloatParts64 *a, int c)\n {\n uint64_t a0 = a->frac;\n@@ -1388,8 +1353,6 @@ static void frac256_shrjam(FloatParts256 *a, int c)\n a->frac_hi = a0;\n }\n \n-#define frac_shrjam(A, C) FRAC_GENERIC_64_128_256(shrjam, A)(A, C)\n-\n static bool frac64_sub(FloatParts64 *r, FloatParts64 *a, FloatParts64 *b)\n {\n return usub64_overflow(a->frac, b->frac, &r->frac);\n@@ -1413,8 +1376,6 @@ static bool frac256_sub(FloatParts256 *r, FloatParts256 *a, FloatParts256 *b)\n return c;\n }\n \n-#define frac_sub(R, A, B) FRAC_GENERIC_64_128_256(sub, R)(R, A, B)\n-\n static void frac64_truncjam(FloatParts64 *r, FloatParts128 *a)\n {\n r->frac = a->frac_hi | (a->frac_lo != 0);\n@@ -1426,8 +1387,6 @@ static void frac128_truncjam(FloatParts128 *r, FloatParts256 *a)\n r->frac_lo = a->frac_hm | ((a->frac_lm | a->frac_lo) != 0);\n }\n \n-#define frac_truncjam(R, A) FRAC_GENERIC_64_128(truncjam, R)(R, A)\n-\n static void frac64_widen(FloatParts128 *r, FloatParts64 *a)\n {\n r->frac_hi = a->frac;\n@@ -1442,8 +1401,6 @@ static void frac128_widen(FloatParts256 *r, FloatParts128 *a)\n r->frac_lo = 0;\n }\n \n-#define frac_widen(A, B) FRAC_GENERIC_64_128(widen, B)(A, B)\n-\n /*\n * Reciprocal sqrt table. 1 bit of exponent, 6-bits of mantessa.\n * From https://git.musl-libc.org/cgit/musl/tree/src/math/sqrt_data.c\n@@ -1468,6 +1425,8 @@ static const uint16_t rsqrt_tab[128] = {\n 0xba91, 0xb9cc, 0xb90a, 0xb84a, 0xb78c, 0xb6d0, 0xb617, 0xb560,\n };\n \n+#define fracN(NAME) glue(glue(glue(frac,N),_),NAME)\n+#define fracW(NAME) glue(glue(glue(frac,W),_),NAME)\n #define partsN(NAME) glue(glue(glue(parts,N),_),NAME)\n #define partsW(NAME) glue(glue(glue(parts,W),_),NAME)\n #define FloatPartsN glue(FloatParts,N)\n@@ -1494,6 +1453,8 @@ static const uint16_t rsqrt_tab[128] = {\n \n #undef N\n #undef W\n+#undef fracN\n+#undef fracW\n #undef partsN\n #undef partsW\n #undef FloatPartsN\n@@ -1624,19 +1585,19 @@ static float64 float64r32_pack_raw(FloatParts64 *p)\n * The result is denormal for float32, but can be represented\n * in normalized form for float64. Adjust, per canonicalize.\n */\n- int shift = frac_normalize(p);\n+ int shift = frac64_normalize(p);\n p->exp = (float32_params.frac_shift -\n float32_params.exp_bias - shift + 1 +\n float64_params.exp_bias);\n- frac_shr(p, float64_params.frac_shift);\n+ frac64_shr(p, float64_params.frac_shift);\n } else {\n- frac_shl(p, float32_params.frac_shift - float64_params.frac_shift);\n+ frac64_shl(p, float32_params.frac_shift - float64_params.frac_shift);\n p->exp += float64_params.exp_bias - float32_params.exp_bias;\n }\n break;\n case float_class_snan:\n case float_class_qnan:\n- frac_shl(p, float32_params.frac_shift - float64_params.frac_shift);\n+ frac64_shl(p, float32_params.frac_shift - float64_params.frac_shift);\n p->exp = float64_params.exp_max;\n break;\n case float_class_inf:\n@@ -1724,7 +1685,7 @@ static floatx80 floatx80_round_pack_canonical(FloatParts128 *p,\n \n p64.sign = p->sign;\n p64.exp = p->exp;\n- frac_truncjam(&p64, p);\n+ frac64_truncjam(&p64, p);\n parts64_uncanon_normal(&p64, s, fmt, false);\n frac = p64.frac;\n exp = p64.exp;\n@@ -2698,7 +2659,7 @@ static void parts_float_to_float_narrow(FloatParts64 *a, FloatParts128 *b,\n float_raise(float_flag_input_denormal_used, s);\n /* fall through */\n case float_class_normal:\n- frac_truncjam(a, b);\n+ frac64_truncjam(a, b);\n break;\n case float_class_snan:\n case float_class_qnan:\n@@ -2717,7 +2678,7 @@ static void parts_float_to_float_widen(FloatParts128 *a, FloatParts64 *b,\n a->cls = b->cls;\n a->sign = b->sign;\n a->exp = b->exp;\n- frac_widen(a, b);\n+ frac64_widen(a, b);\n \n if (is_nan(a->cls)) {\n parts128_return_nan(a, s);\n@@ -4939,7 +4900,7 @@ static void parts64_log2(FloatParts64 *a, float_status *s, const FloatFmt *fmt)\n FloatParts64 f = {\n .cls = float_class_normal, .frac = r\n };\n- f.exp = f_exp - frac_normalize(&f);\n+ f.exp = f_exp - frac64_normalize(&f);\n \n if (a_exp < 0) {\n parts64_sub_normal(a, &f);\n@@ -5010,7 +4971,7 @@ float128 float128_default_nan(float_status *status)\n FloatParts128 p;\n \n parts128_default_nan(&p, status);\n- frac_shr(&p, float128_params.frac_shift);\n+ frac128_shr(&p, float128_params.frac_shift);\n return float128_pack_raw(&p);\n }\n \n@@ -5076,9 +5037,9 @@ float128 float128_silence_nan(float128 a, float_status *status)\n FloatParts128 p;\n \n float128_unpack_raw(&p, a);\n- frac_shl(&p, float128_params.frac_shift);\n+ frac128_shl(&p, float128_params.frac_shift);\n parts128_silence_nan(&p, status);\n- frac_shr(&p, float128_params.frac_shift);\n+ frac128_shr(&p, float128_params.frac_shift);\n return float128_pack_raw(&p);\n }\n \ndiff --git a/fpu/softfloat-parts-addsub.c.inc b/fpu/softfloat-parts-addsub.c.inc\nindex ae5c1017c5..accf996d7c 100644\n--- a/fpu/softfloat-parts-addsub.c.inc\n+++ b/fpu/softfloat-parts-addsub.c.inc\n@@ -20,14 +20,14 @@ static void partsN(add_normal)(FloatPartsN *a, FloatPartsN *b)\n int exp_diff = a->exp - b->exp;\n \n if (exp_diff > 0) {\n- frac_shrjam(b, exp_diff);\n+ fracN(shrjam)(b, exp_diff);\n } else if (exp_diff < 0) {\n- frac_shrjam(a, -exp_diff);\n+ fracN(shrjam)(a, -exp_diff);\n a->exp = b->exp;\n }\n \n- if (frac_add(a, a, b)) {\n- frac_shrjam(a, 1);\n+ if (fracN(add)(a, a, b)) {\n+ fracN(shrjam)(a, 1);\n a->frac_hi |= DECOMPOSED_IMPLICIT_BIT;\n a->exp += 1;\n }\n@@ -39,20 +39,20 @@ static bool partsN(sub_normal)(FloatPartsN *a, FloatPartsN *b)\n int shift;\n \n if (exp_diff > 0) {\n- frac_shrjam(b, exp_diff);\n- frac_sub(a, a, b);\n+ fracN(shrjam)(b, exp_diff);\n+ fracN(sub)(a, a, b);\n } else if (exp_diff < 0) {\n a->exp = b->exp;\n a->sign ^= 1;\n- frac_shrjam(a, -exp_diff);\n- frac_sub(a, b, a);\n- } else if (frac_sub(a, a, b)) {\n+ fracN(shrjam)(a, -exp_diff);\n+ fracN(sub)(a, b, a);\n+ } else if (fracN(sub)(a, a, b)) {\n /* Overflow means that A was less than B. */\n- frac_neg(a);\n+ fracN(neg)(a);\n a->sign ^= 1;\n }\n \n- shift = frac_normalize(a);\n+ shift = fracN(normalize)(a);\n if (likely(shift < N)) {\n a->exp -= shift;\n \treturn true;\ndiff --git a/fpu/softfloat-parts.c.inc b/fpu/softfloat-parts.c.inc\nindex 5f27efd288..5d344f9afe 100644\n--- a/fpu/softfloat-parts.c.inc\n+++ b/fpu/softfloat-parts.c.inc\n@@ -98,7 +98,7 @@ static FloatPartsN *partsN(pick_nan)(FloatPartsN *a, FloatPartsN *b,\n ret = b;\n break;\n }\n- cmp = frac_cmp(a, b);\n+ cmp = fracN(cmp)(a, b);\n if (cmp == 0) {\n cmp = a->sign < b->sign;\n }\n@@ -215,14 +215,14 @@ static void partsN(canonicalize)(FloatPartsN *p, float_status *status,\n (status->floatx80_behaviour & floatx80_pseudo_denormal_valid);\n \n if (unlikely(p->exp == 0)) {\n- if (likely(frac_eqz(p))) {\n+ if (likely(fracN(eqz)(p))) {\n p->cls = float_class_zero;\n } else if (status->flush_inputs_to_zero) {\n float_raise(float_flag_input_denormal_flushed, status);\n p->cls = float_class_zero;\n- frac_clear(p);\n+ fracN(clear)(p);\n } else {\n- int shift = frac_normalize(p);\n+ int shift = fracN(normalize)(p);\n p->cls = float_class_denormal;\n p->exp = fmt->frac_shift - fmt->exp_bias\n - shift + !has_pseudo_denormals;\n@@ -232,10 +232,10 @@ static void partsN(canonicalize)(FloatPartsN *p, float_status *status,\n if (unlikely(p->exp == fmt->exp_max)) {\n switch (fmt->exp_max_kind) {\n case float_expmax_ieee:\n- if (likely(frac_eqz(p))) {\n+ if (likely(fracN(eqz)(p))) {\n p->cls = float_class_inf;\n } else {\n- frac_shl(p, fmt->frac_shift);\n+ fracN(shl)(p, fmt->frac_shift);\n p->cls = (parts_is_snan_frac(p->frac_hi, status)\n ? float_class_snan : float_class_qnan);\n }\n@@ -244,7 +244,7 @@ static void partsN(canonicalize)(FloatPartsN *p, float_status *status,\n break;\n case float_expmax_e4m3:\n if (p->frac_hi == 0b111) {\n- frac_shl(p, fmt->frac_shift);\n+ fracN(shl)(p, fmt->frac_shift);\n p->cls = (parts_is_snan_frac(p->frac_hi, status)\n ? float_class_snan : float_class_qnan);\n return;\n@@ -258,7 +258,7 @@ static void partsN(canonicalize)(FloatPartsN *p, float_status *status,\n \n p->cls = float_class_normal;\n p->exp -= fmt->exp_bias;\n- frac_shl(p, fmt->frac_shift);\n+ fracN(shl)(p, fmt->frac_shift);\n p->frac_hi |= DECOMPOSED_IMPLICIT_BIT;\n }\n \n@@ -344,8 +344,8 @@ static void partsN(uncanon_normal)(FloatPartsN *p, float_status *s,\n if (likely(exp > 0)) {\n if (p->frac_lo & round_mask) {\n flags |= float_flag_inexact;\n- if (frac_addi(p, p, inc)) {\n- frac_shr(p, 1);\n+ if (fracN(addi)(p, p, inc)) {\n+ fracN(shr)(p, 1);\n p->frac_hi |= DECOMPOSED_IMPLICIT_BIT;\n exp++;\n }\n@@ -361,13 +361,13 @@ static void partsN(uncanon_normal)(FloatPartsN *p, float_status *s,\n } else if (overflow_norm) {\n flags |= float_flag_inexact;\n exp = exp_max - 1;\n- frac_allones(p);\n+ fracN(allones)(p);\n p->frac_lo &= ~round_mask;\n } else {\n flags |= float_flag_inexact;\n p->cls = float_class_inf;\n exp = exp_max;\n- frac_clear(p);\n+ fracN(clear)(p);\n }\n break;\n \n@@ -378,7 +378,7 @@ static void partsN(uncanon_normal)(FloatPartsN *p, float_status *s,\n ? float_flag_invalid\n : float_flag_overflow | float_flag_inexact);\n exp = exp_max;\n- frac_allones(p);\n+ fracN(allones)(p);\n p->frac_lo &= ~round_mask;\n }\n break;\n@@ -395,26 +395,26 @@ static void partsN(uncanon_normal)(FloatPartsN *p, float_status *s,\n g_assert_not_reached();\n }\n }\n- frac_shr(p, frac_shift);\n+ fracN(shr)(p, frac_shift);\n } else if (unlikely(s->rebias_underflow)) {\n flags |= float_flag_underflow;\n exp += fmt->exp_re_bias;\n if (p->frac_lo & round_mask) {\n flags |= float_flag_inexact;\n- if (frac_addi(p, p, inc)) {\n- frac_shr(p, 1);\n+ if (fracN(addi)(p, p, inc)) {\n+ fracN(shr)(p, 1);\n p->frac_hi |= DECOMPOSED_IMPLICIT_BIT;\n exp++;\n }\n p->frac_lo &= ~round_mask;\n }\n- frac_shr(p, frac_shift);\n+ fracN(shr)(p, frac_shift);\n } else if (s->flush_to_zero &&\n s->ftz_detection == float_ftz_before_rounding) {\n flags |= float_flag_output_denormal_flushed;\n p->cls = float_class_zero;\n exp = 0;\n- frac_clear(p);\n+ fracN(clear)(p);\n } else {\n bool is_tiny = s->tininess_before_rounding || exp < 0;\n bool has_pseudo_denormals = fmt->has_explicit_bit &&\n@@ -422,10 +422,10 @@ static void partsN(uncanon_normal)(FloatPartsN *p, float_status *s,\n \n if (!is_tiny) {\n FloatPartsN discard;\n- is_tiny = !frac_addi(&discard, p, inc);\n+ is_tiny = !fracN(addi)(&discard, p, inc);\n }\n \n- frac_shrjam(p, !has_pseudo_denormals - exp);\n+ fracN(shrjam)(p, !has_pseudo_denormals - exp);\n \n if (p->frac_lo & round_mask) {\n /* Need to recompute round-to-even/round-to-odd. */\n@@ -452,12 +452,12 @@ static void partsN(uncanon_normal)(FloatPartsN *p, float_status *s,\n break;\n }\n flags |= float_flag_inexact;\n- frac_addi(p, p, inc);\n+ fracN(addi)(p, p, inc);\n p->frac_lo &= ~round_mask;\n }\n \n exp = (p->frac_hi & DECOMPOSED_IMPLICIT_BIT) && !has_pseudo_denormals;\n- frac_shr(p, frac_shift);\n+ fracN(shr)(p, frac_shift);\n \n if (is_tiny) {\n if (s->flush_to_zero) {\n@@ -465,11 +465,11 @@ static void partsN(uncanon_normal)(FloatPartsN *p, float_status *s,\n flags |= float_flag_output_denormal_flushed;\n p->cls = float_class_zero;\n exp = 0;\n- frac_clear(p);\n+ fracN(clear)(p);\n } else if (flags & float_flag_inexact) {\n flags |= float_flag_underflow;\n }\n- if (exp == 0 && frac_eqz(p)) {\n+ if (exp == 0 && fracN(eqz)(p)) {\n p->cls = float_class_zero;\n }\n }\n@@ -487,17 +487,17 @@ static void partsN(uncanon)(FloatPartsN *p, float_status *s,\n switch (p->cls) {\n case float_class_zero:\n p->exp = 0;\n- frac_clear(p);\n+ fracN(clear)(p);\n return;\n case float_class_inf:\n switch (fmt->exp_max_kind) {\n case float_expmax_ieee:\n p->exp = fmt->exp_max;\n- frac_clear(p);\n+ fracN(clear)(p);\n break;\n case float_expmax_e4m3:\n partsN(uncanon_e4m3_overflow)(p, s, fmt, saturate);\n- frac_shr(p, fmt->frac_shift);\n+ fracN(shr)(p, fmt->frac_shift);\n break;\n case float_expmax_normal:\n default:\n@@ -508,7 +508,7 @@ static void partsN(uncanon)(FloatPartsN *p, float_status *s,\n case float_class_snan:\n assert(fmt->exp_max_kind != float_expmax_normal);\n p->exp = fmt->exp_max;\n- frac_shr(p, fmt->frac_shift);\n+ fracN(shr)(p, fmt->frac_shift);\n return;\n default:\n break;\n@@ -625,12 +625,12 @@ static FloatPartsN *partsN(mul)(FloatPartsN *a, FloatPartsN *b,\n float_raise(float_flag_input_denormal_used, s);\n }\n \n- frac_mulw(&tmp, a, b);\n- frac_truncjam(a, &tmp);\n+ fracN(mulw)(&tmp, a, b);\n+ fracN(truncjam)(a, &tmp);\n \n a->exp += b->exp + 1;\n if (!(a->frac_hi & DECOMPOSED_IMPLICIT_BIT)) {\n- frac_add(a, a, a);\n+ fracN(add)(a, a, a);\n a->exp -= 1;\n }\n \n@@ -747,16 +747,16 @@ static FloatPartsN *partsN(muladd_scalbn)(FloatPartsN *a, FloatPartsN *b,\n /* Perform the multiplication step. */\n p_widen.sign = a->sign;\n p_widen.exp = a->exp + b->exp + 1;\n- frac_mulw(&p_widen, a, b);\n+ fracN(mulw)(&p_widen, a, b);\n if (!(p_widen.frac_hi & DECOMPOSED_IMPLICIT_BIT)) {\n- frac_add(&p_widen, &p_widen, &p_widen);\n+ fracW(add)(&p_widen, &p_widen, &p_widen);\n p_widen.exp -= 1;\n }\n \n /* Perform the addition step. */\n if (c->cls != float_class_zero) {\n /* Zero-extend C to less significant bits. */\n- frac_widen(&c_widen, c);\n+ fracN(widen)(&c_widen, c);\n c_widen.exp = c->exp;\n \n if (a->sign == c->sign) {\n@@ -767,7 +767,7 @@ static FloatPartsN *partsN(muladd_scalbn)(FloatPartsN *a, FloatPartsN *b,\n }\n \n /* Narrow with sticky bit, for proper rounding later. */\n- frac_truncjam(a, &p_widen);\n+ fracN(truncjam)(a, &p_widen);\n a->sign = p_widen.sign;\n a->exp = p_widen.exp;\n \n@@ -816,7 +816,7 @@ static FloatPartsN *partsN(div)(FloatPartsN *a, FloatPartsN *b,\n float_raise(float_flag_input_denormal_used, s);\n }\n a->sign = sign;\n- a->exp -= b->exp + frac_div(a, b);\n+ a->exp -= b->exp + fracN(div)(a, b);\n return a;\n }\n \n@@ -880,7 +880,7 @@ static FloatPartsN *partsN(modrem)(FloatPartsN *a, FloatPartsN *b,\n if (ab_mask & float_cmask_denormal) {\n float_raise(float_flag_input_denormal_used, s);\n }\n- frac_modrem(a, b, mod_quot);\n+ fracN(modrem)(a, b, mod_quot);\n return a;\n }\n \n@@ -969,7 +969,7 @@ static void partsN(sqrt)(FloatPartsN *a, float_status *status,\n exp_odd = a->exp & 1;\n index = extract64(a->frac_hi, 57, 6) | (!exp_odd << 6);\n if (!exp_odd) {\n- frac_shr(a, 1);\n+ fracN(shr)(a, 1);\n }\n \n /*\n@@ -1110,7 +1110,7 @@ static void partsN(sqrt)(FloatPartsN *a, float_status *status,\n /* Convert back from base 4 to base 2. */\n a->exp >>= 1;\n if (!(a->frac_hi & DECOMPOSED_IMPLICIT_BIT)) {\n- frac_add(a, a, a);\n+ fracN(add)(a, a, a);\n } else {\n a->exp += 1;\n }\n@@ -1150,9 +1150,9 @@ static bool partsN(round_to_int_normal)(FloatPartsN *a, FloatRoundMode rmode,\n if (a->exp == -1) {\n FloatPartsN tmp;\n /* Shift left one, discarding DECOMPOSED_IMPLICIT_BIT */\n- frac_add(&tmp, a, a);\n+ fracN(add)(&tmp, a, a);\n /* Anything remaining means frac > 0.5. */\n- one = !frac_eqz(&tmp);\n+ one = !fracN(eqz)(&tmp);\n }\n break;\n case float_round_ties_away:\n@@ -1174,7 +1174,7 @@ static bool partsN(round_to_int_normal)(FloatPartsN *a, FloatRoundMode rmode,\n g_assert_not_reached();\n }\n \n- frac_clear(a);\n+ fracN(clear)(a);\n a->exp = 0;\n if (one) {\n a->frac_hi = DECOMPOSED_IMPLICIT_BIT;\n@@ -1190,7 +1190,7 @@ static bool partsN(round_to_int_normal)(FloatPartsN *a, FloatRoundMode rmode,\n * which leaves room for sticky and rounding bit.\n */\n shift_adj = (N - 1) - (a->exp + 2);\n- frac_shrjam(a, shift_adj);\n+ fracN(shrjam)(a, shift_adj);\n frac_lsb = 1 << 2;\n } else {\n /*\n@@ -1208,7 +1208,7 @@ static bool partsN(round_to_int_normal)(FloatPartsN *a, FloatRoundMode rmode,\n \n if (!(a->frac_lo & rnd_mask)) {\n /* Fractional bits already clear, undo the shift above. */\n- frac_shl(a, shift_adj);\n+ fracN(shl)(a, shift_adj);\n return false;\n }\n \n@@ -1236,21 +1236,21 @@ static bool partsN(round_to_int_normal)(FloatPartsN *a, FloatRoundMode rmode,\n }\n \n if (shift_adj == 0) {\n- if (frac_addi(a, a, inc)) {\n- frac_shr(a, 1);\n+ if (fracN(addi)(a, a, inc)) {\n+ fracN(shr)(a, 1);\n a->frac_hi |= DECOMPOSED_IMPLICIT_BIT;\n a->exp++;\n }\n a->frac_lo &= ~rnd_mask;\n } else {\n- frac_addi(a, a, inc);\n+ fracN(addi)(a, a, inc);\n a->frac_lo &= ~rnd_mask;\n /* Be careful shifting back, not to overflow */\n- frac_shl(a, shift_adj - 1);\n+ fracN(shl)(a, shift_adj - 1);\n if (a->frac_hi & DECOMPOSED_IMPLICIT_BIT) {\n a->exp++;\n } else {\n- frac_add(a, a, a);\n+ fracN(add)(a, a, a);\n }\n }\n return true;\n@@ -1555,7 +1555,7 @@ static FloatPartsN *partsN(minmax)(FloatPartsN *a, FloatPartsN *b,\n /* Compare magnitudes. */\n cmp = a_exp - b_exp;\n if (cmp == 0) {\n- cmp = frac_cmp(a, b);\n+ cmp = fracN(cmp)(a, b);\n }\n \n /*\n@@ -1597,7 +1597,7 @@ static FloatRelation partsN(compare)(FloatPartsN *a, FloatPartsN *b,\n goto a_sign;\n }\n if (a->exp == b->exp) {\n- cmp = frac_cmp(a, b);\n+ cmp = fracN(cmp)(a, b);\n } else if (a->exp < b->exp) {\n cmp = float_relation_less;\n } else {\n", "prefixes": [ "30/84" ] }