From patchwork Tue Aug 13 17:05:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 818842 Delivered-To: patch@linaro.org Received: by 2002:adf:cd01:0:b0:367:895a:4699 with SMTP id w1csp363997wrm; Tue, 13 Aug 2024 10:07:41 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW2dSD87unV5DbHhNXpwKDkXdpUa3mwOUtnYkV7MJFG0C9QvHGF3W/LjUKQ8VKmbutx4ResOP4GNom9daHSBcE6 X-Google-Smtp-Source: AGHT+IGA2N0NvgurojNEnCp/1HdYQfbasUfafT3mMMO/nvznKYtkywkjrfMd7fjQgNh6hTb1u5rb X-Received: by 2002:a05:620a:2729:b0:7a2:32e:3c41 with SMTP id af79cd13be357-7a4ee3ee24dmr26457585a.60.1723568861639; Tue, 13 Aug 2024 10:07:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1723568861; cv=none; d=google.com; s=arc-20160816; b=nk8dPyi/NzfYErCGO657zzr7T5FQcgQ3ZSqUFSGeHBVIRVeVF9m5iF82e+pYQtmxss f2qBVGQBbuDu+XIIHhPaZoc8h9+ozg6hPW/LSMKV0i1TE3Fxuf6PYQs6VAiQsOQUqdn3 TTWkoFXdiYuU8iFDNNnV94ehcADlfPxR9xtMTED7pM/EQvqqZMLoouTeBrLrZulM/C1a wLMOqBr6aGECalNWI8aI3zblHYjcm7e4hlbqYN7jZqKj80T/+9tH/dO27FcWKQmVrGmC 1UrJVjIpkdRvD5+YByyFShsW8mKwo24l8cMQ++beQIJkxn51heXq40Bvp+Sa2GgiYq0q N9Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=pZXlzV39Bim9cmuseTRKv20dsdOW1fHZ/3mxSLQ2cMk=; fh=VjvH2dnEqcO4/q63J5z14goRKEsM9S8mfNHbNHV7E9o=; b=FK7+DsntX0hdUqZs0Jdz5RP2iDQwQ5KjcF6kfzQP/T7aBfcasKtKRh7l+hrV/GCj57 Hlnk5ZZ+lF2isKKuwz4iZVwlEeYqMF1cIHd0pf0C9LQVC4mPtqHxGTOFhV7ctaCGDluB WY+WJwQ4QtuEDOmp8aVQuGIhjrkhMl8/Sfvag/6A5+4aTko6kYYNlQbyvdludt6HtjVx m8YMMN7ThVXRkRf3nDNlXBfrZefRFsqXlIlKGJZwseQVOL27772hydwZHeHw0pFxCwQv A70YBsabmC34BGLk9h+innYCRitFwWpLWDUGn1F+BYQ+6KXjUS4RIWMVBUovHu7jkNpO CmIA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=REKM8EGo; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7a4c7dfa18esi876902585a.330.2024.08.13.10.07.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Aug 2024 10:07:41 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=REKM8EGo; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sduyL-0005ds-Ht; Tue, 13 Aug 2024 13:06:13 -0400 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 1sduyJ-0005TV-6R for qemu-devel@nongnu.org; Tue, 13 Aug 2024 13:06:11 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sduyH-00037U-IG for qemu-devel@nongnu.org; Tue, 13 Aug 2024 13:06:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1723568769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pZXlzV39Bim9cmuseTRKv20dsdOW1fHZ/3mxSLQ2cMk=; b=REKM8EGoH7nPwn/8cVfy8/tGRh0hWh6E0HXSqKJMPj8XyHcGBnEqHVroOlAeCsETe1ubb3 BkwqytkoXMYJhph9RASW9xb0IDuoY9JlOWuhVtPruii2k1IONSFrntB7ea8zOKAgPVf3Tw 3Om889GCZdmZdWL6K0N60MRnfHBLLWs= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-642-YraP02siNiqVeUZJZFXBEw-1; Tue, 13 Aug 2024 13:06:07 -0400 X-MC-Unique: YraP02siNiqVeUZJZFXBEw-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-a7aa56d8b14so408128566b.1 for ; Tue, 13 Aug 2024 10:06:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723568766; x=1724173566; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pZXlzV39Bim9cmuseTRKv20dsdOW1fHZ/3mxSLQ2cMk=; b=TwZVaXh/2Ltp64m+GyZo+K8Iu2vrx3ByXDojqdEVTp6zEksdGvyg31vpkUyMB1EeBM UFefW26q75MCqCarwxQWhobnGBOOO/O6GA/+JQ7lyYTLx68UiuT/4KQbx7nMFpRC0Uy8 XnxU3CcBfyKxGtLn1bB0ZIsiEL24PPzAS2nP5IHLimfA2iP+YzTsUR/3hem0FojXp6+M t4WN+DaDuBdBHB2ieuVyfoVVCTd8iXynBqAHCG/CdbGMa7//cARpg4obka1O9+1vgWPT rfPMq7+G6T42XSedLO5BgtUbw7BfRcnIjoz0W2Z32mrKDj22j/Lbawi4cxfklc8F/r7O vQJA== X-Gm-Message-State: AOJu0YxqXTxCAAQbujPXzaTbKvUh9eBXWzH/FvVoSTValBUdqzte2LlV e0Ykz8KfxZJ4CHoX8feylTCUmLxLlm9tfHcRT4Cnfday6bz6LNMAZXkxET6TvIbcqCXgcgVBnXx v8/jB2r8BpnyzVUWAeY6uKilbsozR3QGBiv/laKe5MmtCPwy64WXrq4977/xdHr5rd38QPJB+3R 6GvdD+L60HGEGNd/0JtI5A9KngxL1lfxMtcP1M X-Received: by 2002:a17:906:d7e7:b0:a7a:a30b:7b95 with SMTP id a640c23a62f3a-a8366c26253mr2075566b.2.1723568765648; Tue, 13 Aug 2024 10:06:05 -0700 (PDT) X-Received: by 2002:a17:906:d7e7:b0:a7a:a30b:7b95 with SMTP id a640c23a62f3a-a8366c26253mr2071566b.2.1723568765084; Tue, 13 Aug 2024 10:06:05 -0700 (PDT) Received: from avogadro.local ([151.95.101.29]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a80f3f48ed5sm84047766b.29.2024.08.13.10.06.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Aug 2024 10:06:03 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Richard Henderson , qemu-stable@nongnu.org Subject: [PULL 2/6] target/i386: Do not apply REX to MMX operands Date: Tue, 13 Aug 2024 19:05:51 +0200 Message-ID: <20240813170556.104193-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240813170556.104193-1-pbonzini@redhat.com> References: <20240813170556.104193-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.125, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson Cc: qemu-stable@nongnu.org Fixes: b3e22b2318a ("target/i386: add core of new i386 decoder") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2495 Signed-off-by: Richard Henderson Link: https://lore.kernel.org/r/20240812025844.58956-2-richard.henderson@linaro.org Signed-off-by: Paolo Bonzini --- target/i386/tcg/decode-new.c.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/target/i386/tcg/decode-new.c.inc b/target/i386/tcg/decode-new.c.inc index b22210f45d9..03138b3876d 100644 --- a/target/i386/tcg/decode-new.c.inc +++ b/target/i386/tcg/decode-new.c.inc @@ -1979,7 +1979,10 @@ static bool decode_op(DisasContext *s, CPUX86State *env, X86DecodedInsn *decode, op->unit = X86_OP_SSE; } get_reg: - op->n = ((get_modrm(s, env) >> 3) & 7) | REX_R(s); + op->n = ((get_modrm(s, env) >> 3) & 7); + if (op->unit != X86_OP_MMX) { + op->n |= REX_R(s); + } break; case X86_TYPE_E: /* ALU modrm operand */ From patchwork Tue Aug 13 17:05:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 818844 Delivered-To: patch@linaro.org Received: by 2002:adf:cd01:0:b0:367:895a:4699 with SMTP id w1csp364558wrm; Tue, 13 Aug 2024 10:08:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUshNV5HhptjONqqBwJEs+HE+PkESw4NxvxEyaNVFg7Ph4alzGfRjW1u3aoKesKvXOuzwFM797MDRUquw+NufX2 X-Google-Smtp-Source: AGHT+IE4svTo/ao9MMLCoUMrPPfJEDdDYIA5K2OxanlzmeW1/FYvv9CR0VgG3JObIOMIHCwih4Ob X-Received: by 2002:a05:622a:4ac4:b0:453:47a5:3352 with SMTP id d75a77b69052e-4535bb279dbmr78491cf.36.1723568849976; Tue, 13 Aug 2024 10:07:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1723568849; cv=none; d=google.com; s=arc-20160816; b=z4xJxFwVIq7xc1t6A00YM9jZ8s1fUvq0wbAW9n2/6M9XgKyCoA6vt6XLynyYA4sMvG qGy6AOOeYCFf0aorH0r731ntIcC/COpXiUw7JNrt7Sef1M0GbTrFwY9mLNLDN1JWy+Dy iC3KlfdAkk2/JFkmh6LXL3Pa1Pgj+fzS8o1wZZSq5tW2oJilubTF/FwUE6dK8jpto94a CHaQNaypywMYm6bManLH85jSLmUHpNKB8k+ShSVhMz8timyERS4fHrWHlqvKmzEv6fiq Pua9xjT9rZ4SEa0JoHAXM/XwP4YaEHDttPiF9sCpgjdUVRHy+NqNKXv+EwXL0d7bzEnF W+WQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=B3AoGWxUBf1bbBzxz0nTsWOl3v83/0it+wu2Qc+Vsvg=; fh=ZXDWg7hKG7Hj19AbRuutTLw+Zvn/B9RsGUUw/YagpFI=; b=DP8kmDPdV+nLbiHMbV9Rrc6usSC/ogqj06FF8h0CK7Np4/mh/mKtWyTNYz0d6AgU/m c4BvVguZ2x8LAqXvTvpTUL9vUvP+7wozFnN/QWWLQ3mf03X6dK0dddZnQyAla3J1CnVN 7fmF3s/d1oUNa4jc4xDYiv5oiDnob/dH70k7Kli2W/c3qV22ZKN6PlRfNfttC5x+a3+o MN0WZ7IgEiR8BrYozIgL6/UNdGE6sXHgq3K9hrwceyGYKUoLhZcxGxGyIGNaldiUbTvV oaXwqPPcQah2mLg1W6Xdlxw6GgRNuolQv4ZET7JBJu1akbVUdQbZRPqEzEvQlp55s60a TFhg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=UkNkCRRb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4531c265b84si86526501cf.300.2024.08.13.10.07.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Aug 2024 10:07:29 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=UkNkCRRb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sduyP-0005rp-7u; Tue, 13 Aug 2024 13:06:17 -0400 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 1sduyM-0005jJ-WD for qemu-devel@nongnu.org; Tue, 13 Aug 2024 13:06:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sduyL-00037q-Ai for qemu-devel@nongnu.org; Tue, 13 Aug 2024 13:06:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1723568772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=B3AoGWxUBf1bbBzxz0nTsWOl3v83/0it+wu2Qc+Vsvg=; b=UkNkCRRbUF+xS5cUTKYDzwyiHTvV2vu7rfQS/KrdPZ8Qh75a8cDaDEODoZ2papDnoSYVBv WfCbAkvC9yZQn+T4UeY1bm9U39bTj9ytWBrfXBg+SbFbfUSEemsXEpvJXcE4GVUtrNEHdI /TbxLrl2Rxp5cc/6llgxWPT9DF7KlxA= Received: from mail-lj1-f197.google.com (mail-lj1-f197.google.com [209.85.208.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-397-UdQqbakUO0SHUM2SD4mJsQ-1; Tue, 13 Aug 2024 13:06:11 -0400 X-MC-Unique: UdQqbakUO0SHUM2SD4mJsQ-1 Received: by mail-lj1-f197.google.com with SMTP id 38308e7fff4ca-2ef3157ae4cso63359621fa.2 for ; Tue, 13 Aug 2024 10:06:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723568769; x=1724173569; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=B3AoGWxUBf1bbBzxz0nTsWOl3v83/0it+wu2Qc+Vsvg=; b=uAVnKcZdibFKlXZWTyuD848p3s0TV0AnShALHmB6XE0npdj293bhoxkoW4NKkD4FLf 2fwfGC5xSIVTRbPm4s7jHtnu6Xn/IWuRJgPji1gUgXt+lGRl+z2aIY82YrB5el4TnK1B XMTxA9iM6gX1KkjO52rrt2AsBTN0CkUwPnuPHDDksLn2V5J7mgYFe4UHiBIZL3xCGvkh jnYK+nkznGpgurnjH/W57J5bIvcR7Plge7E0DpL3cXTcNIcyZwD8ashMRDyfrf5xz5Ry kexwOsUDbQg4nEhBhgfR2M8xO75B1fKyUG8+MU8KuqKl8U2ZtWALXmYUz6zyjeFodVa4 VrKg== X-Gm-Message-State: AOJu0YwpBuolLkiBU73vNoumssZBXCirA2mb0T34YRB78ALdEyDpW9MI rA0UuwCs+gVdHKg94/AWDsk4qg2vcz58jXN255RXWztOGfVLJN/SgAjekhE15kBUP1yURSwA/t/ SCI7dyD3uOiQz9yw3sr5dRGDHzCVd29pTfhYzEXRmlMKyF0BSZ5Eea1NaAE5Anwx+wexYevyZ05 Scm5aINcwg2ksI/J4JAG8JWimn982JYlJEL9gC X-Received: by 2002:a2e:9bc5:0:b0:2f1:67de:b536 with SMTP id 38308e7fff4ca-2f3aa1f0788mr272781fa.24.1723568769424; Tue, 13 Aug 2024 10:06:09 -0700 (PDT) X-Received: by 2002:a2e:9bc5:0:b0:2f1:67de:b536 with SMTP id 38308e7fff4ca-2f3aa1f0788mr272501fa.24.1723568768858; Tue, 13 Aug 2024 10:06:08 -0700 (PDT) Received: from avogadro.local ([151.95.101.29]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a80f3f475ccsm85779966b.14.2024.08.13.10.06.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Aug 2024 10:06:07 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Richard Henderson , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= Subject: [PULL 3/6] target/i386: Use unit not type in decode_modrm Date: Tue, 13 Aug 2024 19:05:52 +0200 Message-ID: <20240813170556.104193-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240813170556.104193-1-pbonzini@redhat.com> References: <20240813170556.104193-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.125, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson Rather that enumerating the types that can produce MMX operands, examine the unit. No functional change. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Link: https://lore.kernel.org/r/20240812025844.58956-3-richard.henderson@linaro.org Signed-off-by: Paolo Bonzini --- target/i386/tcg/decode-new.c.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/i386/tcg/decode-new.c.inc b/target/i386/tcg/decode-new.c.inc index 03138b3876d..30be9237c31 100644 --- a/target/i386/tcg/decode-new.c.inc +++ b/target/i386/tcg/decode-new.c.inc @@ -1799,13 +1799,13 @@ static void decode_root(DisasContext *s, CPUX86State *env, X86OpEntry *entry, ui } -static int decode_modrm(DisasContext *s, CPUX86State *env, X86DecodedInsn *decode, - X86DecodedOp *op, X86OpType type) +static int decode_modrm(DisasContext *s, CPUX86State *env, + X86DecodedInsn *decode, X86DecodedOp *op) { int modrm = get_modrm(s, env); if ((modrm >> 6) == 3) { op->n = (modrm & 7); - if (type != X86_TYPE_Q && type != X86_TYPE_N) { + if (op->unit != X86_OP_MMX) { op->n |= REX_B(s); } } else { @@ -2040,7 +2040,7 @@ static bool decode_op(DisasContext *s, CPUX86State *env, X86DecodedInsn *decode, /* fall through */ case X86_TYPE_nop: /* modrm operand decoded but not fetched */ get_modrm: - decode_modrm(s, env, decode, op, type); + decode_modrm(s, env, decode, op); break; case X86_TYPE_O: /* Absolute address encoded in the instruction */ From patchwork Tue Aug 13 17:05:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 818843 Delivered-To: patch@linaro.org Received: by 2002:adf:cd01:0:b0:367:895a:4699 with SMTP id w1csp364054wrm; Tue, 13 Aug 2024 10:07:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVjdNErKYsjhFYX3PqXJTnfmgroHpdplmJybL6oBPD+IiT1fvNiHVOfp880fR1+xS7SjEMRez0mag9V/2Mvk4yF X-Google-Smtp-Source: AGHT+IGn1IqbKiFaBry5WlAHOW5drb/3hqte+GH0OQogYE/P/yBJoz48jPXZZRyDhzH/qNR86fBC X-Received: by 2002:a05:620a:4154:b0:7a3:51ed:38ad with SMTP id af79cd13be357-7a4ee32e5camr29488585a.21.1723568870390; Tue, 13 Aug 2024 10:07:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1723568870; cv=none; d=google.com; s=arc-20160816; b=wj8rM/Dhbjd6pIhVPLQ36FupRXDmayfovH+Jjy6B1fN6YhzggIzDIBisOm9y2YZ6BQ k6k/OVZ3SFHVRVAXV065VmR/nL8ihjOB21YkbRYq3bhRru+5i5B9G9e0215rWJ3QG99Z 8+IDY8pQxezxwFcyhpJ/XiwrTjnpeZE0V/TKUHrHC+gAI7PYQOCZQgZQ00nOPSrSWBFm 7Jm4xYashcZNftuCkk5Ig1Dkg1bcWXvaztdoifhh8dopMBJaN7+oSMMnXqTyU5gr7Kw9 dvaL83ZtFUHkvlZO746IZvms/PGIA2TqcuTBZ5cLTMbDPt+uxavzKKOSGs+xwIPESURW cOgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=HtuZZEJtTULFZZPJE3He16hpHtco94gG0U5/hl5SQmY=; fh=ZXDWg7hKG7Hj19AbRuutTLw+Zvn/B9RsGUUw/YagpFI=; b=IELCCR9rJ7THDq79d1w890iC29SXdXVM2Ol8d4ec1C/rHMotMN2u719De6sddJ2snv SusOYAqcTzwSqgeQNpoNzO6VtJCUvtAwOy4QU9xQZhQh0wiOAdqYkQSeV1XaKDP3uPn1 jybIOqfTYO2iG4UoX7n6ElvMTf22R6QBj+CnqioRD9gjooYojhOKAT5yhAK+fMB+rtCt iGz1zeg2V5MMWoifG0d6KIcx8uASYkLMEM0kWPJo5VKC76Allyh54Bdap6sbnSUOwCsV 7rPf/uG36es12lQqbsMy2qEAi3P3SiO7qjGvPyAKwRksy7WBj4nowEnAtkJ4BMlDXR9B i8tQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=a0ntNwS9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7a4c7e255d0si932188085a.763.2024.08.13.10.07.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Aug 2024 10:07:50 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=a0ntNwS9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sduye-0006xH-RY; Tue, 13 Aug 2024 13:06:34 -0400 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 1sduyY-0006Vx-9o for qemu-devel@nongnu.org; Tue, 13 Aug 2024 13:06:27 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sduyP-00038B-79 for qemu-devel@nongnu.org; Tue, 13 Aug 2024 13:06:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1723568776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HtuZZEJtTULFZZPJE3He16hpHtco94gG0U5/hl5SQmY=; b=a0ntNwS9faLIx2z/MIvyq3wOGOUiupeb9pUvukWVl6ssV6DN7VM4qFTJZVj/zTnfbc/zut wBouWMhWoUYu0/VQeNRMgQWU2Je6huYiXejZ/o1aTfVnYp9HADf5vWJihioeGDvlsCJJE9 b7lOB/7zLcLH5EvLNK6tM8BQdEy3aA4= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-144-4qC13e5zPDeOYU7MPEU9yA-1; Tue, 13 Aug 2024 13:06:15 -0400 X-MC-Unique: 4qC13e5zPDeOYU7MPEU9yA-1 Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-5a766a51b0dso4662124a12.1 for ; Tue, 13 Aug 2024 10:06:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723568772; x=1724173572; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HtuZZEJtTULFZZPJE3He16hpHtco94gG0U5/hl5SQmY=; b=WDutkj29O/9tJ27c1Z52eEW8wb/1bKDXpY5LoafaW2YiMuhBRPxHzDNrLyA2E2jDO4 jJT8PdYZQa+tJjOkVZpy/H+HaVq2ETE7oL2wFQpzOiV2PYh7IXhwZzDgGQJ7rNNGCPLZ luWr8CcMoUoBX0PHlXtgwhX5YP6MSWE1cJuhTsorUTxEsR+8fQedKA1HE+UR5hj4uZAb HoeBTqPAPUq/uWL+fXGWCxiM0goXTDrR5/qeqWtct3oCbrTdVcgFhpxAHmJPrw3Md2gD r/2SX1aqYrTBGNqEKu/ZKpvvpp5rcc0TZzy+QT/z+hhU0Soigpd65yB1WnTOYLDqBfFh U+cw== X-Gm-Message-State: AOJu0YzMBIKf1CGCH8ogbxmsBT8pI3poZD87tJSz4kH5zBse/koNYTJl /iX8NW+e1ZM6ukQqGTSM645xZ2HYGGHNIIAeuvNkSs5lkj1ICrzQUFG22CO0XFvk2BMrM7C7SBO tQ9CqD7/4ASeBY/tF7lewiWWFuc8tehVZv9igYeJ29bQykiyV81Gk5V4wSfds3/SpcGyUALbmJO N4eREB4lP9qiiAzrrIBo7jBdlnQS31lo14vrgy X-Received: by 2002:a05:6402:42d1:b0:5a3:5218:3f91 with SMTP id 4fb4d7f45d1cf-5bea1cadcf2mr142082a12.24.1723568772236; Tue, 13 Aug 2024 10:06:12 -0700 (PDT) X-Received: by 2002:a05:6402:42d1:b0:5a3:5218:3f91 with SMTP id 4fb4d7f45d1cf-5bea1cadcf2mr142033a12.24.1723568771511; Tue, 13 Aug 2024 10:06:11 -0700 (PDT) Received: from avogadro.local ([151.95.101.29]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5bd1a5e04e1sm3036790a12.77.2024.08.13.10.06.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Aug 2024 10:06:11 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Richard Henderson , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= Subject: [PULL 4/6] target/i386: Assert MMX and XMM registers in range Date: Tue, 13 Aug 2024 19:05:53 +0200 Message-ID: <20240813170556.104193-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240813170556.104193-1-pbonzini@redhat.com> References: <20240813170556.104193-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.125, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_TEMPERROR=0.01 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson The mmx assert would fire without the fix for #2495. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Link: https://lore.kernel.org/r/20240812025844.58956-4-richard.henderson@linaro.org Signed-off-by: Paolo Bonzini --- target/i386/tcg/emit.c.inc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/target/i386/tcg/emit.c.inc b/target/i386/tcg/emit.c.inc index 016dce81464..22a06897fb7 100644 --- a/target/i386/tcg/emit.c.inc +++ b/target/i386/tcg/emit.c.inc @@ -33,8 +33,13 @@ #define TCG_TARGET_extract_tl_valid TCG_TARGET_extract_i32_valid #endif +#define MMX_OFFSET(reg) \ + ({ assert((reg) >= 0 && (reg) <= 7); \ + offsetof(CPUX86State, fpregs[reg].mmx); }) -#define ZMM_OFFSET(reg) offsetof(CPUX86State, xmm_regs[reg]) +#define ZMM_OFFSET(reg) \ + ({ assert((reg) >= 0 && (reg) <= 15); \ + offsetof(CPUX86State, xmm_regs[reg]); }) typedef void (*SSEFunc_i_ep)(TCGv_i32 val, TCGv_ptr env, TCGv_ptr reg); typedef void (*SSEFunc_l_ep)(TCGv_i64 val, TCGv_ptr env, TCGv_ptr reg); @@ -168,7 +173,7 @@ static int vector_elem_offset(X86DecodedOp *op, MemOp ot, int n) static void compute_mmx_offset(X86DecodedOp *op) { if (!op->has_ea) { - op->offset = offsetof(CPUX86State, fpregs[op->n].mmx) + mmx_offset(op->ot); + op->offset = MMX_OFFSET(op->n) + mmx_offset(op->ot); } else { op->offset = offsetof(CPUX86State, mmx_t0) + mmx_offset(op->ot); }