From patchwork Tue Nov 14 13:41:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 10057667 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 BC87F60231 for ; Tue, 14 Nov 2017 13:44:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A276D2972F for ; Tue, 14 Nov 2017 13:44:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9734F29799; Tue, 14 Nov 2017 13:44:36 +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 2F6322972F for ; Tue, 14 Nov 2017 13:44:36 +0000 (UTC) Received: from localhost ([::1]:59824 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eEbVy-00034p-PN for patchwork-qemu-devel@patchwork.kernel.org; Tue, 14 Nov 2017 08:44:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40151) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eEbVQ-00034R-HJ for qemu-devel@nongnu.org; Tue, 14 Nov 2017 08:44:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eEbVN-0002rd-Vp for qemu-devel@nongnu.org; Tue, 14 Nov 2017 08:44:00 -0500 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:35706) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eEbVN-0002oz-OQ for qemu-devel@nongnu.org; Tue, 14 Nov 2017 08:43:57 -0500 Received: by mail-wm0-x242.google.com with SMTP id y80so21364046wmd.0 for ; Tue, 14 Nov 2017 05:43:57 -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; bh=4hTT0KQlSicoXtG1hgSqzyoNEsN2iExd0Bmp2GECoy4=; b=UOPs8D8l5MQ6MyOJx5IatQ6RLj/8QQ3mo/gT5KSfD7BwWgKc1iVPohzGF+tbQvfg4t kYlEUIK7jmoh7d/n5QQVkJBR9CCSnjcIG0LmA87CPNsFmFOjZHGmIStPEe6HZY1IbX1m pysdBnOAj+BfMgRdYXmjPwkDBomJhT/ENoxEk= 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=4hTT0KQlSicoXtG1hgSqzyoNEsN2iExd0Bmp2GECoy4=; b=OVCoTj7YiSYY9GtClDNsl4tM0DVjCwSd9ciDyzMnWJok2kuqz3lFT7L9584TWSX7IO 5GD5kfPw2XgstB5yJpC8oFFJkyxWc1rTNTOHoSZLsqi5X792WeKuZLkTNUgsPJaP01Sn eEmcGNjNRzQikaWiOOSSp73riwgaZJrDQKEmRfPox2nj3uYS1j3iL/fh3i0m6XlVcUkx Q33RKA3sf8gbUowXio6DxBlMw2x9RjpT6KmL0HxEWKsGA0NOocR/6f1n5W7vL4AtVQX8 UorvDaBBo6dlBtIkWrTtj3kyjsG6+zJ2fKSVgu+r9poVpG/Hb3JJVo1c6mvo0Q1HpfBk Q4mQ== X-Gm-Message-State: AJaThX6S473EeaxWS+gEp9ZqgVbmgLofn5PwdH+2lZi2s01Z5WmnHJI5 M6LjhrOHnB1pgFrSt5B0I5CMWM2tVCA= X-Google-Smtp-Source: AGs4zMbPDYRyhkq5htQALZVdl0r/oczGUQiSc8JvFRAhPAhAQdNyLtGYD3qYkJcljb2lw9gihXsWaQ== X-Received: by 10.28.239.12 with SMTP id n12mr8069702wmh.140.1510667036205; Tue, 14 Nov 2017 05:43:56 -0800 (PST) Received: from cloudburst.twiddle.net (176.red-213-99-135.dynamicip.rima-tde.net. [213.99.135.176]) by smtp.gmail.com with ESMTPSA id n43sm19462578wrb.93.2017.11.14.05.43.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 Nov 2017 05:43:55 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 14 Nov 2017 14:41:53 +0100 Message-Id: <20171114134153.11167-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171114094203.28030-1-richard.henderson@linaro.org> References: <20171114094203.28030-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PATCH 3/1] 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. Fixes: 2399d4e7cec22ecf1c51062d2ebfd45220dbaace Signed-off-by: Richard Henderson Reviewed-by: Alex Bennée --- 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()); }