From patchwork Tue Jul 3 05:57:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 140896 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp764076ljj; Mon, 2 Jul 2018 23:05:13 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfXcsAdsLH99tIQ+VDuLmbrNM9ljNS812R7NtpF93FlqZdRyJPCeqBOYAoaNOHFoWrPSgK7 X-Received: by 2002:a37:6301:: with SMTP id x1-v6mr24379647qkb.403.1530597913374; Mon, 02 Jul 2018 23:05:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530597913; cv=none; d=google.com; s=arc-20160816; b=YPJYoGj/8HzRoWptm+L1MjXOh8DPpzzAetHHlkopiXm93wjcgivLpC7SkDT5V7yahE ksSSGYLNlERTAv6jwGkD/kFGLeuJga8aBiEPv8r/q80Za7yWFltdLGIJrBlvg7lwpi0Q 1dBxKpHsMBldT3Otwbba/wbNZH0byxyFXtoWMfEvATjPmXSbDHIqrFdjNxsSz5+1i//j OE/SwJ44jW2hKSTAMziH1HYUTxsltUWmPJdSfFVUf0aEw91xNZVJZ3VHOPErw56bpzXk 67jeL0A4gUMbENHsS5kB1LziLsnUFX/Nm1matDAbw7ySt/LZJ8+dJ5/I2rY6bLN3tmqQ 9zyw== 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=ziMsUkJ+Txm8dbTb8YU94Glc+CC1pemqXBLKgkbGmN4=; b=xQoc43Q3u3xhBPE9dxoZdskOOfohVxL91tfSuXeqjF4Fi3y3FiNKytgxKJSvDIraPX sszOcG106wwZt8h2UmwTLbYdiuzbikgqDAxcegVIRMFWdwG6Okkz9qhv+PiSeLEQU1MB +lEro6G0Hb6U72NATnfeSZp8Ee6hZvicbhNoNfaGjfdDpbVloTUBpR4tCuAxK7+MPoda 0St6lBPATJLqHyYKWQa52AJXhzpUKy/+BRH1HguozR67FZfi32IbEl5ozrX5HzqN5UiX 3K8JLQ1lDjVA4hnEw2vpEAAsDRUtf/wGi1nu/FBSXL7bT1me13nP+lHcmJdlAU+PCft2 dyng== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gibson.dropbear.id.au header.s=201602 header.b=FXkkjx29; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id b4-v6si330922qto.332.2018.07.02.23.05.13 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 02 Jul 2018 23:05:13 -0700 (PDT) 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=@gibson.dropbear.id.au header.s=201602 header.b=FXkkjx29; 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" Received: from localhost ([::1]:37963 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faER6-0007y6-Lz for patch@linaro.org; Tue, 03 Jul 2018 02:05:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39733) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faEKU-0002pt-3c for qemu-devel@nongnu.org; Tue, 03 Jul 2018 01:58:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faEKS-0006xV-B2 for qemu-devel@nongnu.org; Tue, 03 Jul 2018 01:58:22 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:56759) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1faEKR-0006ty-PB; Tue, 03 Jul 2018 01:58:20 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 41KYM92HsWz9sBb; Tue, 3 Jul 2018 15:58:11 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1530597493; bh=56GIdrD5g+BR6+2TQKBJx3WZ9W4j3UkpY4pjY0N6cZ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FXkkjx29b7g1IxcwuGqYyW1kE9UhUFIbmRejtgsYyjTZ7+TOhGoUY/mow9LWq/EI+ l9SCRPzMYLNKK9wVTf85194doV8UHkW+7OQWOWpVU1jRvjeSi4OEGXF2V/74wVIdaY EHq1c3ww6p+JukIg/2lcOaIfPoDeiXMk7YtmKAoc= From: David Gibson To: peter.maydell@linaro.org Date: Tue, 3 Jul 2018 15:57:45 +1000 Message-Id: <20180703055804.13449-17-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180703055804.13449-1-david@gibson.dropbear.id.au> References: <20180703055804.13449-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 16/35] target/ppc: Tidy gen_conditional_store 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: qemu-devel@nongnu.org, Richard Henderson , mdroth@linux.vnet.ibm.com, agraf@suse.de, aik@ozlabs.ru, groug@kaod.org, qemu-ppc@nongnu.org, clg@kaod.org, David Gibson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Leave only the minimal amount of code within the STCX macro, moving the rest of the code into gen_conditional_store. Remove the explicit call to gen_check_align; the matching LDAX will have already checked alignment, and we verify the same address. Signed-off-by: Richard Henderson Signed-off-by: David Gibson --- target/ppc/translate.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) -- 2.17.1 diff --git a/target/ppc/translate.c b/target/ppc/translate.c index 03e8c5df03..e751072404 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -3201,14 +3201,17 @@ ST_ATOMIC(stwat, DEF_MEMOP(MO_UL), i32, trunc_tl_i32) ST_ATOMIC(stdat, DEF_MEMOP(MO_Q), i64, mov_i64) #endif -static void gen_conditional_store(DisasContext *ctx, TCGv EA, - int reg, int memop) +static void gen_conditional_store(DisasContext *ctx, TCGMemOp memop) { TCGLabel *l1 = gen_new_label(); TCGLabel *l2 = gen_new_label(); - TCGv t0; + TCGv t0 = tcg_temp_new(); + int reg = rS(ctx->opcode); - tcg_gen_brcond_tl(TCG_COND_NE, EA, cpu_reserve, l1); + gen_set_access_type(ctx, ACCESS_RES); + gen_addr_reg_index(ctx, t0); + tcg_gen_brcond_tl(TCG_COND_NE, t0, cpu_reserve, l1); + tcg_temp_free(t0); t0 = tcg_temp_new(); tcg_gen_atomic_cmpxchg_tl(t0, cpu_reserve, cpu_reserve_val, @@ -3232,19 +3235,10 @@ static void gen_conditional_store(DisasContext *ctx, TCGv EA, tcg_gen_movi_tl(cpu_reserve, -1); } -#define STCX(name, memop) \ -static void gen_##name(DisasContext *ctx) \ -{ \ - TCGv t0; \ - int len = MEMOP_GET_SIZE(memop); \ - gen_set_access_type(ctx, ACCESS_RES); \ - t0 = tcg_temp_local_new(); \ - gen_addr_reg_index(ctx, t0); \ - if (len > 1) { \ - gen_check_align(ctx, t0, (len) - 1); \ - } \ - gen_conditional_store(ctx, t0, rS(ctx->opcode), memop); \ - tcg_temp_free(t0); \ +#define STCX(name, memop) \ +static void gen_##name(DisasContext *ctx) \ +{ \ + gen_conditional_store(ctx, memop); \ } STCX(stbcx_, DEF_MEMOP(MO_UB))