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: 118875 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp3059800qgn; Tue, 14 Nov 2017 05:44:11 -0800 (PST) X-Google-Smtp-Source: AGs4zMapAZMo0BBnpurzTyMs3Ae/k4znQ2Elm669DvbMeUU75VqcyY4IyzFZx9XxhmTELuqKjamM X-Received: by 10.37.139.133 with SMTP id j5mr7565744ybl.4.1510667051899; Tue, 14 Nov 2017 05:44:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510667051; cv=none; d=google.com; s=arc-20160816; b=H8MxApZaDFMFXLk4kfUmLYLZk3pXcO4zBmU4rfno95Ex+MV0Iw8z2RsNiQIqe+hIJ9 rms9D8qgmXQB3ffaBhI2T5snsPjWYk/zxQCU5fm0XF/oiATV8Rf1zmCzhy+68rVgqCGF x8QvL0xiWcjVXNwZPlcMPpUgGDKpcQhAOyRsBQLezYV1OC+6iWNK8PWxnbHBnAZLrNyF TIx8nJEsSRCUYxAcaqQqIgK7e77jjrGJwccJky4IYJ5/zfzCIPhjPUS1EOX0rLg6p+s/ fqbYiDOjImTmM0qnRg1otVZ5LoI39gOJ+nSEYpSchyyfhchPeYsPPR2jLNnhnawkujZA K9TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=4hTT0KQlSicoXtG1hgSqzyoNEsN2iExd0Bmp2GECoy4=; b=eyVwSxbgJ7jzDrbizblSMnB1mAUcse8MagTnKE8vWTrdLvD7f2Lz6weuCjt6URGtye Jxj1j5BlyVYvMLcopI5/I5IOLxqQ+kX2pKr3OLjjNXq6mb7aSrONXX0jxKr7YVuKnRUX +LvTLJJa54Tmj/PK7pUj7CaymHepE1a9heez4dhuI1DYhSROa5q88I6wkm3ywo3kZtkz 998BnoJxLG/9t+dhJPSU/GkZOpYySzO/mQDOs0h9Ggl0mYie/GWgPiEgfCSJvb5m2k9t aTrDHvUA9TAOOMMZEkWKBj5JAeWTWTPyKjqDeERnhEcTDRARm4lTREq18Lw9ocfhW9F3 RVzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UOPs8D8l; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id s205si918666ywc.279.2017.11.14.05.44.11 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 14 Nov 2017 05:44:11 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UOPs8D8l; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59824 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eEbVb-00034p-GJ for patch@linaro.org; Tue, 14 Nov 2017 08:44:11 -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-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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Use of GETPC must be restricted to those functions that are directly called from TCG generated code. Fixes: 2399d4e7cec22ecf1c51062d2ebfd45220dbaace Signed-off-by: Richard Henderson --- target/arm/helper-a64.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) -- 2.12.0 Reviewed-by: Alex Bennée 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()); }