From patchwork Wed Apr 10 05:43:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 787471 Delivered-To: patch@linaro.org Received: by 2002:adf:fdd2:0:b0:346:15ad:a2a with SMTP id i18csp542597wrs; Tue, 9 Apr 2024 22:49:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUkFcN0BoQc/ZFk/02SGIVtAeXiBM87xD7jTh8bjtBuDd/RM0SYbKTYRFL8nypDxHxsL5cfIKDQj4uBThG7WJCP X-Google-Smtp-Source: AGHT+IFDh8DWUPl3IWi0Wo7QwWWapb0LaRz0TjbEziHdIzSrbizuSatnHHjZzjcInT2f+4z5Gq/y X-Received: by 2002:a05:6102:1d:b0:478:89bb:602f with SMTP id j29-20020a056102001d00b0047889bb602fmr1476961vsp.31.1712728193144; Tue, 09 Apr 2024 22:49:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712728193; cv=none; d=google.com; s=arc-20160816; b=eH35x63h9mlrVXjhNxu+CTal4iH1DCkbR2vyxQN298LPPOdTfIXH80dxyl5w9BtPnp FZf7AWYUIimjq/7Rojrk1qPICdZwBiLzbo6ZCYhjz1K9Mv2RyINJu7aT35OxDJGpuZqm 78IzsIf9M3DbP9VgyvJA00DYaWcV4hpVbPw+wYjiPchzLoCLY66hAZmryr0FzUq9SueR /0O5czq5tDwPmmO1eg1Olb+R5NGipofTlpVk9KU6lcHf9jn/arFJnavKJbKhypzfKGtA QXdowjDHlBXJ5qB29pOblDIN11PDXy+TSYLyJyemuuOEqZ9LsfJ+VrSehlupOaIUVdfo 9WVQ== 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; bh=sGzsrVjBZK5Oli7L6ij4KlbrJ9qA3eDl83fT5ULHL4o=; fh=kdk60BKfZ5DgEBtWXo3DTw7OzkP+TNgwcG6z+nAOi8Y=; b=fK9k0jX9UA6QdFS7bxH2CItnppfXXpONIjK1eOHzrr3STmSery1fNycbxukkMLuTgk /5JmuCvwhgHgtUQ2r303AE+SFjjbfM1W1YHUG8DosRvGnuS5QVaUPVJMlyOH7eyVt+JH 9fRzUxwEWJJyVlRypFXbIrk15diplcWEFn0cloHBFSOxuN3ShFf5vNZoILRG5ULn2uCy vx3f0sAQV+OoslOIaFfNQN+GdvIlUEY28cS7djgG3ZdlmPRCRlJMT3RyD9zCxZj1YWxJ JYW2C2pL5mI+or6GTReoHdxGi4Fh03PcMG19ZYvDCO9l7z94CDd4vOFuPpe/emae1kAq Ir4w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id xx13-20020a05620a5d8d00b0078d72d638d8si2406384qkn.712.2024.04.09.22.49.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 09 Apr 2024 22:49:53 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ruQoJ-0004bJ-FO; Wed, 10 Apr 2024 01:47:52 -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 1ruQoH-0004N9-0k; Wed, 10 Apr 2024 01:47:49 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ruQoF-00025t-6c; Wed, 10 Apr 2024 01:47:48 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 241F35D4FD; Wed, 10 Apr 2024 08:46:17 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id DCCFBB0164; Wed, 10 Apr 2024 08:44:18 +0300 (MSK) Received: (nullmailer pid 4182114 invoked by uid 1000); Wed, 10 Apr 2024 05:44:16 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , Sven Schnelle , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Michael Tokarev Subject: [Stable-7.2.11 37/41] target/hppa: Clear psw_n for BE on use_nullify_skip path Date: Wed, 10 Apr 2024 08:43:58 +0300 Message-Id: <20240410054416.4181891-37-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson Along this path we have already skipped the insn to be nullified, so the subsequent insn should be executed. Cc: qemu-stable@nongnu.org Reported-by: Sven Schnelle Tested-by: Sven Schnelle Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson (cherry picked from commit 4a3aa11e1fb25c28c24a43fd2835c429b00a463d) Signed-off-by: Michael Tokarev diff --git a/target/hppa/translate.c b/target/hppa/translate.c index 1af77473da..ee68d2f834 100644 --- a/target/hppa/translate.c +++ b/target/hppa/translate.c @@ -3473,6 +3473,7 @@ static bool trans_be(DisasContext *ctx, arg_be *a) tcg_gen_addi_reg(cpu_iaoq_b, cpu_iaoq_f, 4); tcg_gen_mov_i64(cpu_iasq_f, new_spc); tcg_gen_mov_i64(cpu_iasq_b, cpu_iasq_f); + nullify_set(ctx, 0); } else { copy_iaoq_entry(cpu_iaoq_f, ctx->iaoq_b, cpu_iaoq_b); if (ctx->iaoq_b == -1) {