From patchwork Sun Oct 13 22:25:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 176082 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp3784136ill; Sun, 13 Oct 2019 15:29:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqxqlMS64xwwEx12l77IT1WEaCgSHdjRPOCnYmzTCJl4lKzFxKDHCdTtaK8oxrqrNcCewsoA X-Received: by 2002:a17:906:68d5:: with SMTP id y21mr25478409ejr.272.1571005795688; Sun, 13 Oct 2019 15:29:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571005795; cv=none; d=google.com; s=arc-20160816; b=o9qcRj7JLocS9dEcRd9x9Ry2myW/hIyMFYMzotOef5p5RFSpsu/Wcvtk83krT3cmNH VcvvH672oYRZeY1ArueNDUugrtay6FTnqKhoxwiflp17MLpE9ryvl5arW70facdTI2qW RonCnOuHWAvZ6bPZw05/VzvcIIk33/EM7hSTFsHs/kaSThIMBEVOa9Y76m8ZCGdo9A3F 2JL7HoACDBDFGssIrdeMnFD6hDznhkarsFfc9FvSDXK/MfpgMPN0/r8E9AnAA9judw5I xDxyG8nCQVK+HO9tVu0xQj+ByzS0nRDq7luZm4F3TKuw31VPlKAt7SRRUQtuNOqLfjgq LPkA== 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:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=F5Jk4BgYV+IrFiQYLiTJ8dyG7O5cI5KoMzGTShZaza4=; b=T7iH7BX9MayssHCG+p7KlVjA7Y6eQ43POam/QLysOo2ygpCuNeYhuhIqHMkBUgfwhR o8FM48sOEIBoSb75LP8KscJSJLQCNGZwHhs1PrAbJ71Nr1ZyoBtJtenu9OfFE2HvXNf2 WAPxyKhTStPO+z2uXJKgNagIcISC8jjaiZF5Hp9xycxxXnYCgsSHw45B0lJ9qu9fg3eu 9dLkjUH4ZN07gSwzsdxWOEDHmdkNuB9jiYfvihNd30mgu6lHK8yxawTWesXWN/y9CKiq XjfEOaO5NHh/HV8yOD85ynWLJ0YWvsKhWvDlKxuaMmZZCg4nIN/qmxwwybXsaRCxd4vO JeQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=O7fNyZx5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z55si11411482edb.41.2019.10.13.15.29.55 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 13 Oct 2019 15:29:55 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=O7fNyZx5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43096 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iJmN8-0001c0-Ab for patch@linaro.org; Sun, 13 Oct 2019 18:29:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51182) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iJmJI-0006dd-68 for qemu-devel@nongnu.org; Sun, 13 Oct 2019 18:25:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iJmJH-0000qz-4M for qemu-devel@nongnu.org; Sun, 13 Oct 2019 18:25:56 -0400 Received: from mail-pg1-x532.google.com ([2607:f8b0:4864:20::532]:33187) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iJmJG-0000qj-VH for qemu-devel@nongnu.org; Sun, 13 Oct 2019 18:25:55 -0400 Received: by mail-pg1-x532.google.com with SMTP id i76so8944549pgc.0 for ; Sun, 13 Oct 2019 15:25:54 -0700 (PDT) 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=F5Jk4BgYV+IrFiQYLiTJ8dyG7O5cI5KoMzGTShZaza4=; b=O7fNyZx5vHo7PrJt3DpbLgUc/P7v8pPgy0WHGvBFVJ+TxJ/kYDxZDjmCDJXKyB0aez W69vZIK6QVdgzcr73TjL5WjSK/XewLQRuHbJOPiJ368FB+uolYvcRsXkAfZgxi9dwQSu EQrZe3g4XOOm/gP1XdRfm3WNeUjH795frF2Tp+BfNqvZKDEBGWjipCofkh9ImXVYnV7w gwMJpqWWdiFRIQXlgiJXgzCc3EBVWXB1VucXHVqRFIMGOeglBaLgkTLfTHgVyc2WafAA m9qlaexgAxrecz5C6m1Mykt7ZQok+IlVYr3EJSLSw4njFDTR88a2MT7QJYKCUmbvZTFZ y+nQ== 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=F5Jk4BgYV+IrFiQYLiTJ8dyG7O5cI5KoMzGTShZaza4=; b=bByoSOCKrWKuqdihS0CgCwlDHD1cwMQ5zOfuBGk13ib8vUBOX+tssqscSdEzMjDo1W d/VAPPQOvLVtwI/dsyuKBAGZ+y/WDZLbShf4I0ZWJIR+HqV2EqE9Rvkl5SnUOVdcb11U PLesFZ7BqQDpN3mAGx9CLMRL7oTKXTyEde5/27cRjgXz1T5Mzv8Yg4TocWCgIzk8ImrH 65asWggp948Ce+yXD/0HBF0AMDVMc6qwjfjfEIoDrS1zYVBihidjPnEvgLQsPvFyPLOe xYQ4wpKiPjFROuqYeubj/Q/iLDW/M/nZJAw06uCHqrPjIZ5a3CIDskCJLF24VgOHHOdl rYDQ== X-Gm-Message-State: APjAAAUC48+A5nabA0RIXyO4VBgfrAZbBWs/Tc7Xqn0M4wkNkoDdu9K/ T++r8x6W+KCgbn3RQlexII6zhoBWoio= X-Received: by 2002:a63:ff1c:: with SMTP id k28mr30201635pgi.281.1571005553566; Sun, 13 Oct 2019 15:25:53 -0700 (PDT) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id d76sm15940571pfd.185.2019.10.13.15.25.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Oct 2019 15:25:52 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 05/23] tcg/ppc: Replace HAVE_ISA_2_06 Date: Sun, 13 Oct 2019 15:25:26 -0700 Message-Id: <20191013222544.3679-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191013222544.3679-1-richard.henderson@linaro.org> References: <20191013222544.3679-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::532 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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" This is identical to have_isa_2_06, so replace it. Reviewed-by: Aleksandar Markovic Signed-off-by: Richard Henderson --- tcg/ppc/tcg-target.inc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.17.1 diff --git a/tcg/ppc/tcg-target.inc.c b/tcg/ppc/tcg-target.inc.c index 0bfaef9418..7cb0002c14 100644 --- a/tcg/ppc/tcg-target.inc.c +++ b/tcg/ppc/tcg-target.inc.c @@ -66,7 +66,6 @@ static tcg_insn_unit *tb_ret_addr; TCGPowerISA have_isa; -#define HAVE_ISA_2_06 have_isa_2_06 #define HAVE_ISEL have_isa_2_06 #ifndef CONFIG_SOFTMMU @@ -1797,7 +1796,7 @@ static void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, bool is_64) } } else { uint32_t insn = qemu_ldx_opc[opc & (MO_BSWAP | MO_SSIZE)]; - if (!HAVE_ISA_2_06 && insn == LDBRX) { + if (!have_isa_2_06 && insn == LDBRX) { tcg_out32(s, ADDI | TAI(TCG_REG_R0, addrlo, 4)); tcg_out32(s, LWBRX | TAB(datalo, rbase, addrlo)); tcg_out32(s, LWBRX | TAB(TCG_REG_R0, rbase, TCG_REG_R0)); @@ -1869,7 +1868,7 @@ static void tcg_out_qemu_st(TCGContext *s, const TCGArg *args, bool is_64) } } else { uint32_t insn = qemu_stx_opc[opc & (MO_BSWAP | MO_SIZE)]; - if (!HAVE_ISA_2_06 && insn == STDBRX) { + if (!have_isa_2_06 && insn == STDBRX) { tcg_out32(s, STWBRX | SAB(datalo, rbase, addrlo)); tcg_out32(s, ADDI | TAI(TCG_REG_TMP1, addrlo, 4)); tcg_out_shri64(s, TCG_REG_R0, datalo, 32);