From patchwork Tue Feb 12 04:57:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 1040380 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="lzQCyZkM"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43z9j44p8Vz9s3x for ; Tue, 12 Feb 2019 16:10:48 +1100 (AEDT) Received: from localhost ([127.0.0.1]:33247 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtQLG-0003rA-FB for incoming@patchwork.ozlabs.org; Tue, 12 Feb 2019 00:10:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49652) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtQ8y-0002fL-91 for qemu-devel@nongnu.org; Mon, 11 Feb 2019 23:58:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtQ8n-0001sw-FI for qemu-devel@nongnu.org; Mon, 11 Feb 2019 23:57:56 -0500 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]:33116) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtQ8l-0001kS-UT for qemu-devel@nongnu.org; Mon, 11 Feb 2019 23:57:52 -0500 Received: by mail-pl1-x630.google.com with SMTP id y10so705862plp.0 for ; Mon, 11 Feb 2019 20:57:49 -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=ify8An1F5oEc1E0d7PvrPQjhI7bRHnQasaxWD/TrazQ=; b=lzQCyZkMukTDBiTt+02mJHjooTiWtMmuy2jN+2M2Uow+1eYXtafUlB8JWmZaw5mPRW N0OQQaPIBp0hpZHZHt8p3uMZXPYn7chLU/YnLknNxl+mkF+4QHZ1iscx1X07n7pYPzCA VLZnBrOChRxK9H/77RNQzni9/dORmPDlIUJUK9Pb+tFNvrcNyK7h5SEdL9KPCfhZ2hUg BSHA9oHB6eyksNlzgg1QiWlfR+ZfL6pYK8rA3iDwR8Qc2gXe49BHkJjfBDNISlU83lWZ 6dWnSWOMcJq/+ndzfS34oaeE3wQScpLvpzcc2WOpMvBeMpo7mg8gXYmncShpyW3l539Q EQdQ== 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=ify8An1F5oEc1E0d7PvrPQjhI7bRHnQasaxWD/TrazQ=; b=SHUZaLXxY2labJS/dIwBNtSSiwRGEeF+yBFxDSBHYKDLKfOJ+l0gv9z9djvdQy1LLT 3GyCOAL+Gc/nFCYFvI58Bl7Q9BO39/LkLbR9dXGs1C3Z17Q/DXICGPNidGJOmPBn25WZ Augz1fkq8vhANIoafZ5ii5R88KYhUk5PiqDLalwW1l5DDmVGmXAgz+T0pBqD5FTbr6Jy 7mg5F4XyvQP+ZgrEbICiNfbJ/u/yXzJ0XrSHgr7thXJRnN59xaK1iiJkeUxJVzmoP/CM Fy7XR2iTgzHxlemt4gBToGe2sdlqpwrjaaCtWS2/FJdZw4Nn0GCbT+geBMPxNrwPvsBU Yr/g== X-Gm-Message-State: AHQUAub8lu9WTbxeMk0ID8SLcWhMftLsLqewx9dRQMSCg1PIk9f6Ud7t leCyVcZc9pxR908lfPlLFapqL+ypgcU= X-Google-Smtp-Source: AHgI3IbvqxLjZ6/n1b0WJSMvrtRt0ty1e048+bzeM3wdcXhmOl32YHDbAJW6cK9jRr9c4KeQZw6BYw== X-Received: by 2002:a17:902:2a66:: with SMTP id i93mr1756995plb.128.1549947468268; Mon, 11 Feb 2019 20:57:48 -0800 (PST) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id a90sm22088923pfj.109.2019.02.11.20.57.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Feb 2019 20:57:47 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 11 Feb 2019 20:57:17 -0800 Message-Id: <20190212045721.28041-21-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190212045721.28041-1-richard.henderson@linaro.org> References: <20190212045721.28041-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::630 Subject: [Qemu-devel] [PULL 20/24] target/hppa: move GETPC to HELPER() functions 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, Sven Schnelle Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Sven Schnelle When QEMU is compiled with -O0, these functions are inlined which will cause a wrong restart address generated for the TB. Signed-off-by: Sven Schnelle Message-Id: <20190211181907.2219-2-svens@stackframe.org> Signed-off-by: Richard Henderson --- target/hppa/op_helper.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/target/hppa/op_helper.c b/target/hppa/op_helper.c index 6bf478e7b0..268caaaa20 100644 --- a/target/hppa/op_helper.c +++ b/target/hppa/op_helper.c @@ -81,10 +81,8 @@ static void atomic_store_3(CPUHPPAState *env, target_ulong addr, uint32_t val, } static void do_stby_b(CPUHPPAState *env, target_ulong addr, target_ureg val, - bool parallel) + bool parallel, uintptr_t ra) { - uintptr_t ra = GETPC(); - switch (addr & 3) { case 3: cpu_stb_data_ra(env, addr, val, ra); @@ -109,20 +107,18 @@ static void do_stby_b(CPUHPPAState *env, target_ulong addr, target_ureg val, void HELPER(stby_b)(CPUHPPAState *env, target_ulong addr, target_ureg val) { - do_stby_b(env, addr, val, false); + do_stby_b(env, addr, val, false, GETPC()); } void HELPER(stby_b_parallel)(CPUHPPAState *env, target_ulong addr, target_ureg val) { - do_stby_b(env, addr, val, true); + do_stby_b(env, addr, val, true, GETPC()); } static void do_stby_e(CPUHPPAState *env, target_ulong addr, target_ureg val, - bool parallel) + bool parallel, uintptr_t ra) { - uintptr_t ra = GETPC(); - switch (addr & 3) { case 3: /* The 3 byte store must appear atomic. */ @@ -151,13 +147,13 @@ static void do_stby_e(CPUHPPAState *env, target_ulong addr, target_ureg val, void HELPER(stby_e)(CPUHPPAState *env, target_ulong addr, target_ureg val) { - do_stby_e(env, addr, val, false); + do_stby_e(env, addr, val, false, GETPC()); } void HELPER(stby_e_parallel)(CPUHPPAState *env, target_ulong addr, target_ureg val) { - do_stby_e(env, addr, val, true); + do_stby_e(env, addr, val, true, GETPC()); } target_ureg HELPER(probe)(CPUHPPAState *env, target_ulong addr,