From patchwork Wed Nov 15 12:35:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 10059313 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 04F2E60231 for ; Wed, 15 Nov 2017 12:38:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EDA0526E47 for ; Wed, 15 Nov 2017 12:38:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E201129F54; Wed, 15 Nov 2017 12:38:25 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 87CAC26E47 for ; Wed, 15 Nov 2017 12:38:25 +0000 (UTC) Received: from localhost ([::1]:35831 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eEwxU-0006tW-P9 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 15 Nov 2017 07:38:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34503) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eEwwc-0006rE-OS for qemu-devel@nongnu.org; Wed, 15 Nov 2017 07:37:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eEwwb-0006PW-QA for qemu-devel@nongnu.org; Wed, 15 Nov 2017 07:37:30 -0500 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:49235) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eEwwb-0006Ou-KN for qemu-devel@nongnu.org; Wed, 15 Nov 2017 07:37:29 -0500 Received: by mail-wr0-x242.google.com with SMTP id o88so20312517wrb.6 for ; Wed, 15 Nov 2017 04:37:29 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=q4cHOET0RjremJACS4BvBGqPid2KGrIo6RRafDt62mw=; b=VYWKkn4v1yXsA+G+eXikdWPoZP2HHOH0zWlfVo9aiv6/Qy79YJTTqGk2XsYfV8FPUC WbQh6/oZj/2yCXo/lkKVB5foxEa/SONEtwinUGU9Lm5PZCrQ5EqLrSDRRCa87jkdGu4m 79i9bK9FkscW7SDVIsqjQHD/pXUe99YQ1DyzY= 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:mime-version:content-transfer-encoding; bh=q4cHOET0RjremJACS4BvBGqPid2KGrIo6RRafDt62mw=; b=VWDxap7weHvsG/FH2PDy2b7pP83wr9Rvs4vT9pf236vF8+xhZfX14+El4X92g9A9L5 XoCXKoFC6la4WnhiS+66wdRetpILOOpgJj/LJxKSXn+pNGb1olN2Q8uLbowvsdLeSMdp oKjalkg/ij3J1tX0BPd88JD2gYBAy/exTErMbH3+z8BniptKDr2mdmGZDubNpmOmJbLH ifTnoqRXete7ZuW+xMjlG0P4ndPVShDQV0TZ1Nr6xaaFT5Wby9BCYvS6q3J3+Pnix1t6 Kbss6bW9VhIn8ngPXuSXoNz43jBd4ZTSUW6ZXGk0bKlXW47blVnlAosQMkiU+Osw0078 9wXg== X-Gm-Message-State: AJaThX4TWBZEkNefeTxFDZlHCQi3vvTv8T8/xttoB+4s3oCVu4kXgiVd oAC5u17efFUY9i4nJ4AiPQP8czv44FU= X-Google-Smtp-Source: AGs4zMYrCZWGh8ZSZMM6VGk5KY0VCGl2obLVdhijoJf1U2uSTe0rTaARnkqIDhEBsU5IumXum0o55A== X-Received: by 10.223.164.206 with SMTP id h14mr9495106wrb.221.1510749448338; Wed, 15 Nov 2017 04:37:28 -0800 (PST) Received: from cloudburst.twiddle.net (18.red-37-10-242.dynamicip.rima-tde.net. [37.10.242.18]) by smtp.gmail.com with ESMTPSA id 29sm21828608wrz.77.2017.11.15.04.37.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Nov 2017 04:37:27 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 15 Nov 2017 13:35:20 +0100 Message-Id: <20171115123520.7464-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171115123520.7464-1-richard.henderson@linaro.org> References: <20171115123520.7464-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::242 Subject: [Qemu-devel] [PULL for-2.11 3/3] target/arm: Fix GETPC usage in do_paired_cmpxchg64_l/be X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Use of GETPC must be restricted to those functions that are directly called from TCG generated code. Reviewed-by: Alex Bennée Fixes: 2399d4e7cec22ecf1c51062d2ebfd45220dbaace Signed-off-by: Richard Henderson --- target/arm/helper-a64.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/target/arm/helper-a64.c b/target/arm/helper-a64.c index 96a3ecf707..b84ebcae6e 100644 --- a/target/arm/helper-a64.c +++ b/target/arm/helper-a64.c @@ -432,9 +432,8 @@ uint64_t HELPER(crc32c_64)(uint64_t acc, uint64_t val, uint32_t bytes) /* Returns 0 on success; 1 otherwise. */ static uint64_t do_paired_cmpxchg64_le(CPUARMState *env, uint64_t addr, uint64_t new_lo, uint64_t new_hi, - bool parallel) + bool parallel, uintptr_t ra) { - uintptr_t ra = GETPC(); Int128 oldv, cmpv, newv; bool success; @@ -491,20 +490,19 @@ static uint64_t do_paired_cmpxchg64_le(CPUARMState *env, uint64_t addr, uint64_t HELPER(paired_cmpxchg64_le)(CPUARMState *env, uint64_t addr, uint64_t new_lo, uint64_t new_hi) { - return do_paired_cmpxchg64_le(env, addr, new_lo, new_hi, false); + return do_paired_cmpxchg64_le(env, addr, new_lo, new_hi, false, GETPC()); } uint64_t HELPER(paired_cmpxchg64_le_parallel)(CPUARMState *env, uint64_t addr, uint64_t new_lo, uint64_t new_hi) { - return do_paired_cmpxchg64_le(env, addr, new_lo, new_hi, true); + return do_paired_cmpxchg64_le(env, addr, new_lo, new_hi, true, GETPC()); } static uint64_t do_paired_cmpxchg64_be(CPUARMState *env, uint64_t addr, uint64_t new_lo, uint64_t new_hi, - bool parallel) + bool parallel, uintptr_t ra) { - uintptr_t ra = GETPC(); Int128 oldv, cmpv, newv; bool success; @@ -561,11 +559,11 @@ static uint64_t do_paired_cmpxchg64_be(CPUARMState *env, uint64_t addr, uint64_t HELPER(paired_cmpxchg64_be)(CPUARMState *env, uint64_t addr, uint64_t new_lo, uint64_t new_hi) { - return do_paired_cmpxchg64_be(env, addr, new_lo, new_hi, false); + return do_paired_cmpxchg64_be(env, addr, new_lo, new_hi, false, GETPC()); } uint64_t HELPER(paired_cmpxchg64_be_parallel)(CPUARMState *env, uint64_t addr, uint64_t new_lo, uint64_t new_hi) { - return do_paired_cmpxchg64_be(env, addr, new_lo, new_hi, true); + return do_paired_cmpxchg64_be(env, addr, new_lo, new_hi, true, GETPC()); }