From patchwork Fri Jul 26 17:49:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 11061627 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F33DE13AC for ; Fri, 26 Jul 2019 17:54:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DFE3128AAE for ; Fri, 26 Jul 2019 17:54:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D471328AE3; Fri, 26 Jul 2019 17:54:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 82EA028AAE for ; Fri, 26 Jul 2019 17:54:51 +0000 (UTC) Received: from localhost ([::1]:42342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hr4Qc-0002fT-C5 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 26 Jul 2019 13:54:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57491) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hr4Mo-0002Yi-3y for qemu-devel@nongnu.org; Fri, 26 Jul 2019 13:50:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hr4Mm-0007p5-Vw for qemu-devel@nongnu.org; Fri, 26 Jul 2019 13:50:53 -0400 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]:33404) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hr4Mm-0007Vn-Qh for qemu-devel@nongnu.org; Fri, 26 Jul 2019 13:50:52 -0400 Received: by mail-pg1-x543.google.com with SMTP id f20so15877252pgj.0 for ; Fri, 26 Jul 2019 10:50:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Za01uaUS+E1JffTVMwXCPiCzGTAwavbcztjEMPVjIIo=; b=HTQ12VGSu11D/hpOGCcoiE8mxbiVZ3ioQ3SLZdSbQEZH39gCfmq0Mh5LPP8IieKPXp 0isbaob2Qo4YwKI6fZVEtrdoD8ztCbcZGEtg8pMg/d4o18VvoF8xfao3HEFjMbdVYf9Q mfy4XWlk/VlSJQbiP1T8QlHLUbK/1k5ORD96UxIbYWkz9qg6PnvZ89eFsHrBSwzSLmFg g3xkzZf86Ctk+l9grsBxtF4joI1GtQ2uqIOUrOVYdrbtgh4Ud1hhsGvZ0ABp3OOCuPuG hazMVjv5wzqDF+g6/aPVeebrWcoJLlw5BdXdigpaO07muKqZG7XRnfc0Pfv9OJwQ8u7k fHBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Za01uaUS+E1JffTVMwXCPiCzGTAwavbcztjEMPVjIIo=; b=T9/Jmf7tc6MOiXe0bjFx+Rt/f8ALuLZjwS1rNNegojUwqj1X2Pjz+RrOBbPosb5Wpp xBSfx50Iy/fIuS3eUsQvf3n6hBtfYTejebmfJ3yPz4dCf/DaUpyYRD0aGP6OMgOkLz9p +Uvt8FYk3oaDDKTBwLZFZKyvjlwUcBgY5sLbzS8YrXJ2COHnnivAIs0USES1ZtnKyUC1 ZAma92Oa9OrRU29aAtKIH8RyNO3WwRnnlLuVMZ0a8OtpvhgRGuQwh3ykiTlL5v+fv5QG Fb6Ya8MHQ9KTnusNrrxkAtnZp9SlGzxYp4dWrgbyAammXc1e5uPAMLot66LNs0Ja7vEF LqEg== X-Gm-Message-State: APjAAAWHBOtBKnPAFixVH0g/hiwn5eevBFvYd/RkoqmeTFlEYCox0r3o eMt12sRv00hau6LSb0Bpw9Sqc+9S4yQ= X-Google-Smtp-Source: APXvYqwBWcHYIwS/IdbUWVqFtATsgzmUsVfYjdZWMUAXDkCDDdDlgl6R6/jLMKRS8nmuubRpdnRF6A== X-Received: by 2002:a63:b904:: with SMTP id z4mr90747529pge.388.1564163444774; Fri, 26 Jul 2019 10:50:44 -0700 (PDT) Received: from localhost.localdomain (97-126-117-207.tukw.qwest.net. [97.126.117.207]) by smtp.gmail.com with ESMTPSA id o24sm104287919pfp.135.2019.07.26.10.50.43 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 26 Jul 2019 10:50:44 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 26 Jul 2019 10:49:34 -0700 Message-Id: <20190726175032.6769-10-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190726175032.6769-1-richard.henderson@linaro.org> References: <20190726175032.6769-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::543 Subject: [Qemu-devel] [PATCH 09/67] target/arm: Fold a pc load into load_reg X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- target/arm/translate.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/target/arm/translate.c b/target/arm/translate.c index e316eeb312..53c46fcdc4 100644 --- a/target/arm/translate.c +++ b/target/arm/translate.c @@ -9161,11 +9161,7 @@ static void disas_arm_insn(DisasContext *s, unsigned int insn) } } else { /* store */ - if (i == 15) { - /* special case: r15 = PC + 8 */ - tmp = tcg_temp_new_i32(); - tcg_gen_movi_i32(tmp, s->pc_read); - } else if (user) { + if (user && i != 15) { tmp = tcg_temp_new_i32(); tmp2 = tcg_const_i32(i); gen_helper_get_user_reg(tmp, cpu_env, tmp2);