From nobody Wed Apr 9 05:50:07 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1735841794; cv=none; d=zohomail.com; s=zohoarc; b=Doq1LHiO5U+Q2xlAB03892FlwQRDs5RlLcJh0x8es5D4vxeMvYJ0s1N4rjJM0PcUOWxytmJAIqkwE2INEz9qU0qM1HT2uWLYfkRMctZWNww91rG08VxVRZ+V2NTt2j2v+F/2M/tB56L8T5SWl+romm4NhEST/iqHWRb8lIRz9yg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1735841794; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=lzsP+UWMx/D13Dq3Gtzq1OLFMQJVWY+dBn5HNIxlV40=; b=QBqgDJNWwNXxraIOt2Pp6WEpUXMrEshSPI1sMUokOKC++aaza4UDuxs7ukhvoc/Hsap4qyXkmWTzfQME3yHlO2h4aCWKIjHKF8AlobUXwDGLX0LvdVA4xuMBLO7PaxELhIGiZIMN3TGsfBG7m32zGtcpnDGIgiSo73KfR1nRQvo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1735841794522266.7686293169605; Thu, 2 Jan 2025 10:16:34 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tTPfa-00059Q-8E; Thu, 02 Jan 2025 13:11:43 -0500 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 1tTPeX-0007Lm-BQ for qemu-devel@nongnu.org; Thu, 02 Jan 2025 13:10:43 -0500 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tTPeU-0006Dm-Mb for qemu-devel@nongnu.org; Thu, 02 Jan 2025 13:10:37 -0500 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-2161eb95317so163094495ad.1 for ; Thu, 02 Jan 2025 10:10:34 -0800 (PST) Received: from stoup.. ([63.239.63.212]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72aad8dbaf1sm24620827b3a.112.2025.01.02.10.10.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jan 2025 10:10:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1735841433; x=1736446233; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=lzsP+UWMx/D13Dq3Gtzq1OLFMQJVWY+dBn5HNIxlV40=; b=YBkZUOmwnJork8BenriF7ynEk9KoqBoNpADCG+qNFH5CjoCcNVY0crGTECWi/cYjPB bsCXNxV634v+2PQr+unM8YVBoEeUzUw+rgw1jLfWaWttHUW1oViECX3K8V6Aqr58Afbb HvKZLWTczhpiRN2ZTAIeceQaeBP/yICU6MlbpM4xfwuKjPvNbWKhXRm2AIaYqtx6yMVM o1ljM7+SEoDRv3vQ+Yo8XCOnmgqd0EOT2nSpp5Kh9PCbp6ZYuMnZh7hzDjD8ltc7+bVn FXuFeNFTAs9yzCL4dQjXa2+osXhjAcK76J0GhQhHU+m/oDBB7aNB1/0sh9i9Hn6kkZ3l gt2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735841433; x=1736446233; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lzsP+UWMx/D13Dq3Gtzq1OLFMQJVWY+dBn5HNIxlV40=; b=DfB8dHm5RiAktMR5fX44+aXVH+3tLoywCIwrDfBB/lNajh46VkgE/RSreOHGIkRbac JyAeL4macUPElr+Mya2bO7fyikWu5YhWANWxPmvZxMEP7m0WvMOUVdMyrLipivrRc8PC wTYPGeL8IqWNmHFaTy41oaMBZ44mWXW3A2M9BrHjiTPxaZjtg74EV/xQkMGjTkbLMmaw vEC0zIVHhrKNWobOgSXnLMI2D4zw7+7TRavWVzWY4crbuucZNBXbM4HVfmK4PCMnJXjT c5cycuVjwwzPvOiD95MvlJpfI+jHOmQyziXWWaGpDw5PG6RVLEf9X3wKkxRnEsN8YoBv /f/g== X-Gm-Message-State: AOJu0YwnkhKsXX9KRJwTxDvx1pKZ66vs/eKmByH21abLcEC/15ouJ3K3 oEOY1iwgdXzAleEelgBgYfChzvFhmktGOkoSvj5h43Ue3wXniLKwv5ObalfvLSjhrVSW+auQYu9 I X-Gm-Gg: ASbGncvdR41XkwzQxbL3ZhUb8yKR2YBlrVOH4qhBtwM47DXRVy/9HS1Yjy0epc+PjJD vZDJpNHuPd36+bD0i7Iy0hFLW31TTQv1HoZQWxsEguUQrlCJXOC+teJYSYmXz4mJw2rI2u70Ayg +mQ1XdWlrrXP8lpdV9v5f2EzktjzqmLAseUDuADen68D/YEanzZHCuUrRjJVl3kSy72qb2YUuMp qZF6FF0l3ZBwQXHF8/5GcZytouhTDokZD+67iQze0e+mlaNcALJSCo8+rh3Kw== X-Google-Smtp-Source: AGHT+IHtmFD4BZdha8wphR+nzr4Q9GSsKXf56xG55lbyyt9JScnrwY0MNIvJ+e5W2wMSWOSGvcGj+A== X-Received: by 2002:a05:6a00:410d:b0:728:fab1:edbb with SMTP id d2e1a72fcca58-72abde8fd62mr70179128b3a.20.1735841433205; Thu, 02 Jan 2025 10:10:33 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 49/73] tcg: Reorg process_op_defs Date: Thu, 2 Jan 2025 10:06:29 -0800 Message-ID: <20250102180654.1420056-50-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250102180654.1420056-1-richard.henderson@linaro.org> References: <20250102180654.1420056-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::62a; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62a.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, 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: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1735841796448116600 Content-Type: text/plain; charset="utf-8" Process each TCGConstraintSetIndex first. Allocate TCGArgConstraint arrays based on those. Only afterward process the TCGOpcodes and share those TCGArgConstraint arrays. Signed-off-by: Richard Henderson --- include/tcg/tcg.h | 7 +- tcg/tcg.c | 273 +++++++++++++++++++++++----------------------- 2 files changed, 139 insertions(+), 141 deletions(-) diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h index ee4785d33b..d589dbe02b 100644 --- a/include/tcg/tcg.h +++ b/include/tcg/tcg.h @@ -710,17 +710,12 @@ typedef struct TCGOpDef { const char *name; uint8_t nb_oargs, nb_iargs, nb_cargs, nb_args; uint8_t flags; - TCGArgConstraint *args_ct; + const TCGArgConstraint *args_ct; } TCGOpDef; =20 extern TCGOpDef tcg_op_defs[]; extern const size_t tcg_op_defs_max; =20 -typedef struct TCGTargetOpDef { - TCGOpcode op; - const char *args_ct_str[TCG_MAX_OP_ARGS]; -} TCGTargetOpDef; - bool tcg_op_supported(TCGOpcode op, TCGType type); bool tcg_op_deposit_valid(TCGType type, unsigned ofs, unsigned len); =20 diff --git a/tcg/tcg.c b/tcg/tcg.c index 775d51953c..343da162a5 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -895,31 +895,35 @@ static TCGConstraintSetIndex tcg_target_op_def(TCGOpc= ode); =20 /* Put all of the constraint sets into an array, indexed by the enum. */ =20 -#define C_O0_I1(I1) { .args_ct_str =3D { #I1 } }, -#define C_O0_I2(I1, I2) { .args_ct_str =3D { #I1, #I2 } }, -#define C_O0_I3(I1, I2, I3) { .args_ct_str =3D { #I1, #I2, #I3= } }, -#define C_O0_I4(I1, I2, I3, I4) { .args_ct_str =3D { #I1, #I2, #I3= , #I4 } }, +typedef struct TCGConstraintSet { + uint8_t nb_oargs, nb_iargs; + const char *args_ct_str[TCG_MAX_OP_ARGS]; +} TCGConstraintSet; =20 -#define C_O1_I1(O1, I1) { .args_ct_str =3D { #O1, #I1 } }, -#define C_O1_I2(O1, I1, I2) { .args_ct_str =3D { #O1, #I1, #I2= } }, -#define C_O1_I3(O1, I1, I2, I3) { .args_ct_str =3D { #O1, #I1, #I2= , #I3 } }, -#define C_O1_I4(O1, I1, I2, I3, I4) { .args_ct_str =3D { #O1, #I1, #I2= , #I3, #I4 } }, +#define C_O0_I1(I1) { 0, 1, { #I1 } }, +#define C_O0_I2(I1, I2) { 0, 2, { #I1, #I2 } }, +#define C_O0_I3(I1, I2, I3) { 0, 3, { #I1, #I2, #I3 } }, +#define C_O0_I4(I1, I2, I3, I4) { 0, 4, { #I1, #I2, #I3, #I4 } }, =20 -#define C_N1_I2(O1, I1, I2) { .args_ct_str =3D { "&" #O1, #I1,= #I2 } }, -#define C_N1O1_I1(O1, O2, I1) { .args_ct_str =3D { "&" #O1, #O2,= #I1 } }, -#define C_N2_I1(O1, O2, I1) { .args_ct_str =3D { "&" #O1, "&" = #O2, #I1 } }, +#define C_O1_I1(O1, I1) { 1, 1, { #O1, #I1 } }, +#define C_O1_I2(O1, I1, I2) { 1, 2, { #O1, #I1, #I2 } }, +#define C_O1_I3(O1, I1, I2, I3) { 1, 3, { #O1, #I1, #I2, #I3 } }, +#define C_O1_I4(O1, I1, I2, I3, I4) { 1, 4, { #O1, #I1, #I2, #I3, #I4 = } }, =20 -#define C_O2_I1(O1, O2, I1) { .args_ct_str =3D { #O1, #O2, #I1= } }, -#define C_O2_I2(O1, O2, I1, I2) { .args_ct_str =3D { #O1, #O2, #I1= , #I2 } }, -#define C_O2_I3(O1, O2, I1, I2, I3) { .args_ct_str =3D { #O1, #O2, #I1= , #I2, #I3 } }, -#define C_O2_I4(O1, O2, I1, I2, I3, I4) { .args_ct_str =3D { #O1, #O2, #I1= , #I2, #I3, #I4 } }, -#define C_N1_O1_I4(O1, O2, I1, I2, I3, I4) { .args_ct_str =3D { "&" #O1, #= O2, #I1, #I2, #I3, #I4 } }, +#define C_N1_I2(O1, I1, I2) { 1, 2, { "&" #O1, #I1, #I2 } }, +#define C_N1O1_I1(O1, O2, I1) { 2, 1, { "&" #O1, #O2, #I1 } }, +#define C_N2_I1(O1, O2, I1) { 2, 1, { "&" #O1, "&" #O2, #I1 } = }, =20 -static const TCGTargetOpDef constraint_sets[] =3D { +#define C_O2_I1(O1, O2, I1) { 2, 1, { #O1, #O2, #I1 } }, +#define C_O2_I2(O1, O2, I1, I2) { 2, 2, { #O1, #O2, #I1, #I2 } }, +#define C_O2_I3(O1, O2, I1, I2, I3) { 2, 3, { #O1, #O2, #I1, #I2, #I3 = } }, +#define C_O2_I4(O1, O2, I1, I2, I3, I4) { 2, 4, { #O1, #O2, #I1, #I2, #I3,= #I4 } }, +#define C_N1_O1_I4(O1, O2, I1, I2, I3, I4) { 2, 4, { "&" #O1, #O2, #I1, #I= 2, #I3, #I4 } }, + +static const TCGConstraintSet constraint_sets[] =3D { #include "tcg-target-con-set.h" }; =20 - #undef C_O0_I1 #undef C_O0_I2 #undef C_O0_I3 @@ -1514,32 +1518,12 @@ static TCGTemp *tcg_global_reg_new_internal(TCGCont= ext *s, TCGType type, static void tcg_context_init(unsigned max_cpus) { TCGContext *s =3D &tcg_init_ctx; - int op, total_args, n, i; - TCGOpDef *def; - TCGArgConstraint *args_ct; + int n, i; TCGTemp *ts; =20 memset(s, 0, sizeof(*s)); s->nb_globals =3D 0; =20 - /* Count total number of arguments and allocate the corresponding - space */ - total_args =3D 0; - for(op =3D 0; op < NB_OPS; op++) { - def =3D &tcg_op_defs[op]; - n =3D def->nb_iargs + def->nb_oargs; - total_args +=3D n; - } - - args_ct =3D g_new0(TCGArgConstraint, total_args); - - for(op =3D 0; op < NB_OPS; op++) { - def =3D &tcg_op_defs[op]; - def->args_ct =3D args_ct; - n =3D def->nb_iargs + def->nb_oargs; - args_ct +=3D n; - } - init_call_layout(&info_helper_ld32_mmu); init_call_layout(&info_helper_ld64_mmu); init_call_layout(&info_helper_ld128_mmu); @@ -3090,10 +3074,12 @@ void tcg_dump_ops(TCGContext *s, FILE *f, bool have= _prefs) } =20 /* we give more priority to constraints with less registers */ -static int get_constraint_priority(const TCGOpDef *def, int k) +static int get_constraint_priority(const TCGArgConstraint *arg_ct, int k) { - const TCGArgConstraint *arg_ct =3D &def->args_ct[k]; - int n =3D ctpop64(arg_ct->regs); + int n; + + arg_ct +=3D k; + n =3D ctpop64(arg_ct->regs); =20 /* * Sort constraints of a single register first, which includes output @@ -3122,10 +3108,9 @@ static int get_constraint_priority(const TCGOpDef *d= ef, int k) } =20 /* sort from highest priority to lowest */ -static void sort_constraints(TCGOpDef *def, int start, int n) +static void sort_constraints(TCGArgConstraint *a, int start, int n) { int i, j; - TCGArgConstraint *a =3D def->args_ct; =20 for (i =3D 0; i < n; i++) { a[start + i].sort_index =3D start + i; @@ -3135,8 +3120,8 @@ static void sort_constraints(TCGOpDef *def, int start= , int n) } for (i =3D 0; i < n - 1; i++) { for (j =3D i + 1; j < n; j++) { - int p1 =3D get_constraint_priority(def, a[start + i].sort_inde= x); - int p2 =3D get_constraint_priority(def, a[start + j].sort_inde= x); + int p1 =3D get_constraint_priority(a, a[start + i].sort_index); + int p2 =3D get_constraint_priority(a, a[start + j].sort_index); if (p1 < p2) { int tmp =3D a[start + i].sort_index; a[start + i].sort_index =3D a[start + j].sort_index; @@ -3146,56 +3131,43 @@ static void sort_constraints(TCGOpDef *def, int sta= rt, int n) } } =20 +static const TCGArgConstraint empty_cts[TCG_MAX_OP_ARGS]; +static TCGArgConstraint all_args_cts[ARRAY_SIZE(constraint_sets)][TCG_MAX_= OP_ARGS]; + static void process_op_defs(TCGContext *s) { - TCGOpcode op; + /* + * Process each constraint set. + */ =20 - for (op =3D 0; op < NB_OPS; op++) { - TCGOpDef *def =3D &tcg_op_defs[op]; - const TCGTargetOpDef *tdefs; + for (size_t c =3D 0; c < ARRAY_SIZE(constraint_sets); ++c) { + const TCGConstraintSet *tdefs =3D &constraint_sets[c]; + TCGArgConstraint *args_ct =3D all_args_cts[c]; + int nb_oargs =3D tdefs->nb_oargs; + int nb_iargs =3D tdefs->nb_iargs; + int nb_args =3D nb_oargs + nb_iargs; bool saw_alias_pair =3D false; - int i, o, i2, o2, nb_args; =20 - if (def->flags & TCG_OPF_NOT_PRESENT) { - continue; - } - - nb_args =3D def->nb_iargs + def->nb_oargs; - if (nb_args =3D=3D 0) { - continue; - } - - /* - * Macro magic should make it impossible, but double-check that - * the array index is in range. Since the signness of an enum - * is implementation defined, force the result to unsigned. - */ - unsigned con_set =3D tcg_target_op_def(op); - tcg_debug_assert(con_set < ARRAY_SIZE(constraint_sets)); - tdefs =3D &constraint_sets[con_set]; - - for (i =3D 0; i < nb_args; i++) { + for (int i =3D 0; i < nb_args; i++) { const char *ct_str =3D tdefs->args_ct_str[i]; - bool input_p =3D i >=3D def->nb_oargs; - - /* Incomplete TCGTargetOpDef entry. */ - tcg_debug_assert(ct_str !=3D NULL); + bool input_p =3D i >=3D nb_oargs; + int o; =20 switch (*ct_str) { case '0' ... '9': o =3D *ct_str - '0'; tcg_debug_assert(input_p); - tcg_debug_assert(o < def->nb_oargs); - tcg_debug_assert(def->args_ct[o].regs !=3D 0); - tcg_debug_assert(!def->args_ct[o].oalias); - def->args_ct[i] =3D def->args_ct[o]; + tcg_debug_assert(o < nb_oargs); + tcg_debug_assert(args_ct[o].regs !=3D 0); + tcg_debug_assert(!args_ct[o].oalias); + args_ct[i] =3D args_ct[o]; /* The output sets oalias. */ - def->args_ct[o].oalias =3D 1; - def->args_ct[o].alias_index =3D i; + args_ct[o].oalias =3D 1; + args_ct[o].alias_index =3D i; /* The input sets ialias. */ - def->args_ct[i].ialias =3D 1; - def->args_ct[i].alias_index =3D o; - if (def->args_ct[i].pair) { + args_ct[i].ialias =3D 1; + args_ct[i].alias_index =3D o; + if (args_ct[i].pair) { saw_alias_pair =3D true; } tcg_debug_assert(ct_str[1] =3D=3D '\0'); @@ -3203,41 +3175,41 @@ static void process_op_defs(TCGContext *s) =20 case '&': tcg_debug_assert(!input_p); - def->args_ct[i].newreg =3D true; + args_ct[i].newreg =3D true; ct_str++; break; =20 case 'p': /* plus */ /* Allocate to the register after the previous. */ - tcg_debug_assert(i > (input_p ? def->nb_oargs : 0)); + tcg_debug_assert(i > (input_p ? nb_oargs : 0)); o =3D i - 1; - tcg_debug_assert(!def->args_ct[o].pair); - tcg_debug_assert(!def->args_ct[o].ct); - def->args_ct[i] =3D (TCGArgConstraint){ + tcg_debug_assert(!args_ct[o].pair); + tcg_debug_assert(!args_ct[o].ct); + args_ct[i] =3D (TCGArgConstraint){ .pair =3D 2, .pair_index =3D o, - .regs =3D def->args_ct[o].regs << 1, - .newreg =3D def->args_ct[o].newreg, + .regs =3D args_ct[o].regs << 1, + .newreg =3D args_ct[o].newreg, }; - def->args_ct[o].pair =3D 1; - def->args_ct[o].pair_index =3D i; + args_ct[o].pair =3D 1; + args_ct[o].pair_index =3D i; tcg_debug_assert(ct_str[1] =3D=3D '\0'); continue; =20 case 'm': /* minus */ /* Allocate to the register before the previous. */ - tcg_debug_assert(i > (input_p ? def->nb_oargs : 0)); + tcg_debug_assert(i > (input_p ? nb_oargs : 0)); o =3D i - 1; - tcg_debug_assert(!def->args_ct[o].pair); - tcg_debug_assert(!def->args_ct[o].ct); - def->args_ct[i] =3D (TCGArgConstraint){ + tcg_debug_assert(!args_ct[o].pair); + tcg_debug_assert(!args_ct[o].ct); + args_ct[i] =3D (TCGArgConstraint){ .pair =3D 1, .pair_index =3D o, - .regs =3D def->args_ct[o].regs >> 1, - .newreg =3D def->args_ct[o].newreg, + .regs =3D args_ct[o].regs >> 1, + .newreg =3D args_ct[o].newreg, }; - def->args_ct[o].pair =3D 2; - def->args_ct[o].pair_index =3D i; + args_ct[o].pair =3D 2; + args_ct[o].pair_index =3D i; tcg_debug_assert(ct_str[1] =3D=3D '\0'); continue; } @@ -3245,16 +3217,16 @@ static void process_op_defs(TCGContext *s) do { switch (*ct_str) { case 'i': - def->args_ct[i].ct |=3D TCG_CT_CONST; + args_ct[i].ct |=3D TCG_CT_CONST; break; =20 /* Include all of the target-specific constraints. */ =20 #undef CONST #define CONST(CASE, MASK) \ - case CASE: def->args_ct[i].ct |=3D MASK; break; + case CASE: args_ct[i].ct |=3D MASK; break; #define REGS(CASE, MASK) \ - case CASE: def->args_ct[i].regs |=3D MASK; break; + case CASE: args_ct[i].regs |=3D MASK; break; =20 #include "tcg-target-con-str.h" =20 @@ -3265,15 +3237,12 @@ static void process_op_defs(TCGContext *s) case '&': case 'p': case 'm': - /* Typo in TCGTargetOpDef constraint. */ + /* Typo in TCGConstraintSet constraint. */ g_assert_not_reached(); } } while (*++ct_str !=3D '\0'); } =20 - /* TCGTargetOpDef entry with too much information? */ - tcg_debug_assert(i =3D=3D TCG_MAX_OP_ARGS || tdefs->args_ct_str[i]= =3D=3D NULL); - /* * Fix up output pairs that are aliased with inputs. * When we created the alias, we copied pair from the output. @@ -3294,51 +3263,53 @@ static void process_op_defs(TCGContext *s) * first output to pair=3D3, and the pair_index'es to match. */ if (saw_alias_pair) { - for (i =3D def->nb_oargs; i < nb_args; i++) { + for (int i =3D nb_oargs; i < nb_args; i++) { + int o, o2, i2; + /* * Since [0-9pm] must be alone in the constraint string, * the only way they can both be set is if the pair comes * from the output alias. */ - if (!def->args_ct[i].ialias) { + if (!args_ct[i].ialias) { continue; } - switch (def->args_ct[i].pair) { + switch (args_ct[i].pair) { case 0: break; case 1: - o =3D def->args_ct[i].alias_index; - o2 =3D def->args_ct[o].pair_index; - tcg_debug_assert(def->args_ct[o].pair =3D=3D 1); - tcg_debug_assert(def->args_ct[o2].pair =3D=3D 2); - if (def->args_ct[o2].oalias) { + o =3D args_ct[i].alias_index; + o2 =3D args_ct[o].pair_index; + tcg_debug_assert(args_ct[o].pair =3D=3D 1); + tcg_debug_assert(args_ct[o2].pair =3D=3D 2); + if (args_ct[o2].oalias) { /* Case 1a */ - i2 =3D def->args_ct[o2].alias_index; - tcg_debug_assert(def->args_ct[i2].pair =3D=3D 2); - def->args_ct[i2].pair_index =3D i; - def->args_ct[i].pair_index =3D i2; + i2 =3D args_ct[o2].alias_index; + tcg_debug_assert(args_ct[i2].pair =3D=3D 2); + args_ct[i2].pair_index =3D i; + args_ct[i].pair_index =3D i2; } else { /* Case 1b */ - def->args_ct[i].pair_index =3D i; + args_ct[i].pair_index =3D i; } break; case 2: - o =3D def->args_ct[i].alias_index; - o2 =3D def->args_ct[o].pair_index; - tcg_debug_assert(def->args_ct[o].pair =3D=3D 2); - tcg_debug_assert(def->args_ct[o2].pair =3D=3D 1); - if (def->args_ct[o2].oalias) { + o =3D args_ct[i].alias_index; + o2 =3D args_ct[o].pair_index; + tcg_debug_assert(args_ct[o].pair =3D=3D 2); + tcg_debug_assert(args_ct[o2].pair =3D=3D 1); + if (args_ct[o2].oalias) { /* Case 1a */ - i2 =3D def->args_ct[o2].alias_index; - tcg_debug_assert(def->args_ct[i2].pair =3D=3D 1); - def->args_ct[i2].pair_index =3D i; - def->args_ct[i].pair_index =3D i2; + i2 =3D args_ct[o2].alias_index; + tcg_debug_assert(args_ct[i2].pair =3D=3D 1); + args_ct[i2].pair_index =3D i; + args_ct[i].pair_index =3D i2; } else { /* Case 2 */ - def->args_ct[i].pair =3D 3; - def->args_ct[o2].pair =3D 3; - def->args_ct[i].pair_index =3D o2; - def->args_ct[o2].pair_index =3D i; + args_ct[i].pair =3D 3; + args_ct[o2].pair =3D 3; + args_ct[i].pair_index =3D o2; + args_ct[o2].pair_index =3D i; } break; default: @@ -3348,8 +3319,40 @@ static void process_op_defs(TCGContext *s) } =20 /* sort the constraints (XXX: this is just an heuristic) */ - sort_constraints(def, 0, def->nb_oargs); - sort_constraints(def, def->nb_oargs, def->nb_iargs); + sort_constraints(args_ct, 0, nb_oargs); + sort_constraints(args_ct, nb_oargs, nb_iargs); + } + + for (TCGOpcode op =3D 0; op < NB_OPS; op++) { + TCGOpDef *def =3D &tcg_op_defs[op]; + const TCGConstraintSet *tdefs; + unsigned con_set; + int nb_args; + + nb_args =3D def->nb_iargs + def->nb_oargs; + if (nb_args =3D=3D 0) { + continue; + } + + if (def->flags & TCG_OPF_NOT_PRESENT) { + def->args_ct =3D empty_cts; + continue; + } + + /* + * Macro magic should make it impossible, but double-check that + * the array index is in range. Since the signness of an enum + * is implementation defined, force the result to unsigned. + */ + con_set =3D tcg_target_op_def(op); + tcg_debug_assert(con_set < ARRAY_SIZE(constraint_sets)); + + /* The constraint arguments must match TCGOpcode arguments. */ + tdefs =3D &constraint_sets[con_set]; + tcg_debug_assert(tdefs->nb_oargs =3D=3D def->nb_oargs); + tcg_debug_assert(tdefs->nb_iargs =3D=3D def->nb_iargs); + + def->args_ct =3D all_args_cts[con_set]; } } =20 --=20 2.43.0