From patchwork Sun Oct 22 05:59:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 736944 Delivered-To: patch@linaro.org Received: by 2002:adf:dd81:0:b0:32d:baff:b0ca with SMTP id x1csp1004111wrl; Sat, 21 Oct 2023 23:05:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE5tU/8BXtbJUiY+4ZLPBDgA2WWHHoKg71AdjLfOSN92577YwH+umNzfQClPBUSTFrzUlW7 X-Received: by 2002:a05:6214:19cf:b0:66d:9e62:7fc9 with SMTP id j15-20020a05621419cf00b0066d9e627fc9mr5565267qvc.24.1697954736449; Sat, 21 Oct 2023 23:05:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697954736; cv=none; d=google.com; s=arc-20160816; b=Ddil7Q6nfoA63kv0WRDZ39OYxU9oaMe1UQkchsk0iDjEThKUQLH6abGzqkSOEUfdca qB2onDGBp3eP0IdW6xaJt+gbNc8DwfWsksfBGjl1wedLiEz9SW/T+hP/wWCu2X7zQIcR dPGgDzdyfNVAqbMwvwoFGe1C3bcQSh7iDjFW3jBfFZKOUOO0SVib+oHjnqsN8FZPoSqG EJzYEZyhzuuMT70sO5zJ5WmsYu5PXF4n5Ky7nDkgEn41+gaW3LIZRvJc3s1jn7fDXoev dsbFqXoUUDNQQVDbDXTXZ6DpebSy3wDt0MQ607esHaFH8yAwGLL3akmjlX7ES8pNThDz qKqw== 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=CzYqIAe/hPtmLAqL3h5jbLKf5tJAkAbl6Tgcozc9Vko=; fh=tZJ625WOV7jgOfp8Y+f3bhkxwtNCMo5ecPunHzXn1rY=; b=P6CC5pUHPQK0Eg3DYgTeJEK800Mem4wMA3iEoB/x4Qffkk/gOtOn08Mr1Xptu6jeKA YvyOOQRoRmZjo4QWxukB6yXPONzgpbumEKs6h8lcJCuTZI+jis+5lUsMVWNPTI372DJy DLywxGCUPEZbDIoSoxu27JYnHpH/XUiLZpFMMMURCxWqYTIw6yK3yyB7wUfHCvEKfYVS 2kMdSTPrzSKExiRYexk8fn99P3U+CR6KzYMQac1TxS14G/w4GJGw2NgEi/ctJXt794md v8BQSZgywJASV9yK/Fj3ZQWqHIdEKJSEIYbGGVl06SC439mjEKLn1YYDGpbx2AL8Us74 hNdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lNIKAva6; 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=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k19-20020ad44513000000b006561f4b120asi3877817qvu.52.2023.10.21.23.05.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 21 Oct 2023 23:05:36 -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=@linaro.org header.s=google header.b=lNIKAva6; 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=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quRVz-0000RI-Pz; Sun, 22 Oct 2023 02:00:43 -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 1quRVu-0000HZ-C7 for qemu-devel@nongnu.org; Sun, 22 Oct 2023 02:00:38 -0400 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1quRVs-0001Tk-20 for qemu-devel@nongnu.org; Sun, 22 Oct 2023 02:00:38 -0400 Received: by mail-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-27d3ede72f6so1933983a91.1 for ; Sat, 21 Oct 2023 23:00:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697954434; x=1698559234; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CzYqIAe/hPtmLAqL3h5jbLKf5tJAkAbl6Tgcozc9Vko=; b=lNIKAva6NiL/wpUSWNSFVUvZSO3R8SnrlhHsAo1eqzrMlqguLdVwciv3XR7QGzivrw Bceq00DtmqmZ6+6MiDqeg3inmsXK/sdb/fgi8YP1QCOKFfYdMm0vc0AoU3tIC1EF+4xj hSTxRdAVFtpMDvVLQpjhzC5MqO8D7c5/lme0FH+NeSsN2HqGIO+RiYSy8fjYpsxuDuzc 9gM7XmBUp7rIbrpGLUVbg+nhZYriWzYXJE9FQKQrD7PwaEfeZHkvsdYPZvp8IfxePZoI jZ688Dr5ZOIXzZR0oPoM7Wcr7yqhAzp06QRSH8BmOLas+SlKoA+rI3O+NhFImtB73xz1 mzFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697954434; x=1698559234; 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=CzYqIAe/hPtmLAqL3h5jbLKf5tJAkAbl6Tgcozc9Vko=; b=RNHtWJ5y/by8M4HR2udSE20h30Somv8ALEX6poVO3I9SQegKfGv1b+DMmz88ziQPy9 YFW2yfuO4cT16duqMpstEp7b2vrJj8o+w2zbp3+/TqNvJ/GPnHOcAta2Fwa2yHdEgIgg iDz8lR+oCvFow4jlcpDx+yS32VF8RGFzrAupQ0vxjKmEYBj2fTmgMcVarAMB9dgseQAz 7YXdObNJvH7eNBYkUwou3R5Xd49jCpIt8UvYB+wL7my/aowTH15gZolq9di1vxJR/Yx4 AOq9sLGjUVtkiNQQljGPFP3/Lio3necUzkDAwL0Sombjm0O4iEnGnvkxVN7jCl+Xnxg+ Um/g== X-Gm-Message-State: AOJu0YzAmo8StKUqthWMRB+qfSivcnKJ4timbgX1/0Fy4m5XgAs+yjO0 GjGPyJ55ertZo8Kq4zTNdbp0ZcO9sL0hzydYx2U= X-Received: by 2002:a17:902:f0d5:b0:1ca:18a3:a49b with SMTP id v21-20020a170902f0d500b001ca18a3a49bmr5302287pla.37.1697954433978; Sat, 21 Oct 2023 23:00:33 -0700 (PDT) Received: from stoup.. ([71.212.149.95]) by smtp.gmail.com with ESMTPSA id je17-20020a170903265100b001c728609574sm3999887plb.6.2023.10.21.23.00.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 21 Oct 2023 23:00:33 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: mark.cave-ayland@ilande.co.uk, qemu-stable@nongnu.org Subject: [PATCH v4 01/90] target/sparc: Clear may_lookup for npc == DYNAMIC_PC Date: Sat, 21 Oct 2023 22:59:02 -0700 Message-Id: <20231022060031.490251-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231022060031.490251-1-richard.henderson@linaro.org> References: <20231022060031.490251-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102a; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102a.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=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 With pairs of jmp+rett, pc == DYNAMIC_PC_LOOKUP and npc == DYNAMIC_PC. Make sure that we exit for interrupts. Cc: qemu-stable@nongnu.org Fixes: 633c42834c7 ("target/sparc: Introduce DYNAMIC_PC_LOOKUP") Tested-by: Mark Cave-Ayland Signed-off-by: Richard Henderson --- target/sparc/translate.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/target/sparc/translate.c b/target/sparc/translate.c index f92ff80ac8..8fabed28fd 100644 --- a/target/sparc/translate.c +++ b/target/sparc/translate.c @@ -5654,10 +5654,10 @@ static void sparc_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs) break; } + may_lookup = true; if (dc->pc & 3) { switch (dc->pc) { case DYNAMIC_PC_LOOKUP: - may_lookup = true; break; case DYNAMIC_PC: may_lookup = false; @@ -5667,10 +5667,24 @@ static void sparc_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs) } } else { tcg_gen_movi_tl(cpu_pc, dc->pc); - may_lookup = true; } - save_npc(dc); + if (dc->npc & 3) { + switch (dc->npc) { + case JUMP_PC: + gen_generic_branch(dc); + break; + case DYNAMIC_PC: + may_lookup = false; + break; + case DYNAMIC_PC_LOOKUP: + break; + default: + g_assert_not_reached(); + } + } else { + tcg_gen_movi_tl(cpu_npc, dc->npc); + } if (may_lookup) { tcg_gen_lookup_and_goto_ptr(); } else {