From patchwork Mon Sep 30 20:21:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 174780 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp7612058ill; Mon, 30 Sep 2019 13:26:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqxscvFMvmudRJuO0oiDzb8HKzLimBaSXXXSUXC2Wdc/aAoebnFPLB5Sbx027HSfrBpCgzgZ X-Received: by 2002:a05:6402:1a4f:: with SMTP id bf15mr22226609edb.292.1569875178860; Mon, 30 Sep 2019 13:26:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569875178; cv=none; d=google.com; s=arc-20160816; b=NJyOEcEdXv9f4Lb6hz0Sg6IHaIyj/hL7bVKijdC0wyRF9xj7CK6w5/9j+7KQrhMAZg MdjGwusVCpgdqyN1goG54V7NaCUmav0VxXo2d4aGKUayVdytVrls/6ex1FmCkHorz9uv onFfRD/MfREu06fAVXezQWZNVUeSJ6BygW6OYxoJVaIewZ5E1u0vYCI3grWkUW++nhsd Em0zlTkkzGKlpekUg+q5oJHzShEJi7VEIsUD/qP/6mn/BW8FlK7bDNXGt61e6N5QhtRt qUW716LjMAzoyahJGJCAXkPJJbqx8sJeVVPMHJ+YWNXQnYJIuk46Dd01FASXk9/EKLM5 2nHQ== 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=SzVKSOWxR21GxNNFEkqthMF5+mItMVvGCPcgyomd1W8=; b=wyiCG1P0Qk62rKVKyQr8k3QEtrhhW1E5dPT3kxX+k8TI9XJcNucSM4OwftwygBkQmX IiH7BAbW4vHxU89rQhFVFjzikUx4YtDJ1SGwilULmP8PwKMV7qsOZfZXoW7Zsxcf/Ty8 8giS1YARu0HWJg2ip6xccbw3ZG8drVWOqtUh8Psg21/jP5aFd3kvB9TUwT7iqeO9MBLV cFk7y0wP2Qc8wtdyc2Nsqf2VyCAkqXz+7X5fgGTMChs3D7UJdAgOF1WeZyupv4eyhNkQ XJqI3fzTxtd57P2HQNLO2/CEoJvh2rdtAKhwmr2D3KS4gkoNWXvNc2KG0tUz7Nd0Fps1 xXtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=n66VoN6c; 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=fail (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 k39si7600806edb.52.2019.09.30.13.26.18 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 Sep 2019 13:26:18 -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=fail header.i=@linaro.org header.s=google header.b=n66VoN6c; 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=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:56860 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iF2FN-000171-7C for patch@linaro.org; Mon, 30 Sep 2019 16:26:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44799) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iF2Ao-0004Tl-FP for qemu-devel@nongnu.org; Mon, 30 Sep 2019 16:21:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iF2An-0005Xl-Cw for qemu-devel@nongnu.org; Mon, 30 Sep 2019 16:21:34 -0400 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]:45822) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iF2An-0005XQ-7y for qemu-devel@nongnu.org; Mon, 30 Sep 2019 16:21:33 -0400 Received: by mail-pf1-x443.google.com with SMTP id y72so6213688pfb.12 for ; Mon, 30 Sep 2019 13:21:33 -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=SzVKSOWxR21GxNNFEkqthMF5+mItMVvGCPcgyomd1W8=; b=n66VoN6cw0yROmNJ5enKQ27M2KM/lOpS6VNk+kp0zTmsO+0HsSmpYTqdJreYWJouaY 062M5CIwN+wO484xLl7kFoqSqlBy4FvwepbAPQEkluxmTtWiSPz03jliNTmtEoRx9dSL VfeiqdahDCUscFjediuiisD2dPH/iOx6Ep8fc6tMUfArvQw46T+WObFKabg4ektSftBf pKv2pg13HrpJeI/Pq9lzlVaYklx0wyq2WufKRFLkZMOlmwPnz0skpzAWG0Fm+hZKfDGC zh5r/KwKqbWO8zved0EDwwPhiDnhCvJAXafvzZw5EHgNlO/TEhN3aXW8AZ5ePOQgadxf ArWQ== 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=SzVKSOWxR21GxNNFEkqthMF5+mItMVvGCPcgyomd1W8=; b=fmXFhJ0LIwEcf4Cx4T8m4DrbINETEA1iNLVkr292EhLxAOHUtbyUOovaf19Cgc76ex jg2TVECYbiHJT704vbqHI9Iod9mRlx2rX39f4fIQU5mf19iqYQeawnffjpb+oF8nM7Wz VnWPE5sH1P8NpsRvm9gHY4RkRYHJfqer+n8G2z6PHcLth7on/ERmyvXIaYTbk/Xw1pEQ iEuLf4TCTkDFrqYMtIA5tYAu/MasqrdV5d8S0GziU0NPU5VFfZd+kiRtoSjf7lsH0reN MPpKFiRxBwyqpvouTcrQxk/VQO1K20FdjLBL6dU2hexHxSbsjCiAV16nugB/oNbDM6tt ncVQ== X-Gm-Message-State: APjAAAXEJxaf+mWL2DgBBMjV54gOJg1AeqsKvhN/O3pfr6TRsxNWY4bC 0rVJ+lI4kS2IUie2xUldWZy0K/N/hwM= X-Received: by 2002:a63:f74c:: with SMTP id f12mr23969606pgk.316.1569874891912; Mon, 30 Sep 2019 13:21:31 -0700 (PDT) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id r28sm15336802pfg.62.2019.09.30.13.21.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Sep 2019 13:21:30 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v7 04/22] tcg/ppc: Create TCGPowerISA and have_isa Date: Mon, 30 Sep 2019 13:21:07 -0700 Message-Id: <20190930202125.21064-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190930202125.21064-1-richard.henderson@linaro.org> References: <20190930202125.21064-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::443 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: mark.cave-ayland@ilande.co.uk, amarkovic@wavecomp.com, hsp.cat7@gmail.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Introduce an enum to hold base < 2.06 < 3.00. Use macros to preserve the existing have_isa_2_06 and have_isa_3_00 predicates. Signed-off-by: Richard Henderson --- tcg/ppc/tcg-target.h | 12 ++++++++++-- tcg/ppc/tcg-target.inc.c | 8 ++++---- 2 files changed, 14 insertions(+), 6 deletions(-) -- 2.17.1 diff --git a/tcg/ppc/tcg-target.h b/tcg/ppc/tcg-target.h index 690fa744e1..35ba8693fa 100644 --- a/tcg/ppc/tcg-target.h +++ b/tcg/ppc/tcg-target.h @@ -58,8 +58,16 @@ typedef enum { TCG_AREG0 = TCG_REG_R27 } TCGReg; -extern bool have_isa_2_06; -extern bool have_isa_3_00; +typedef enum { + tcg_isa_base, + tcg_isa_2_06, + tcg_isa_3_00, +} TCGPowerISA; + +extern TCGPowerISA have_isa; + +#define have_isa_2_06 (have_isa >= tcg_isa_2_06) +#define have_isa_3_00 (have_isa >= tcg_isa_3_00) /* optional instructions automatically implemented */ #define TCG_TARGET_HAS_ext8u_i32 0 /* andi */ diff --git a/tcg/ppc/tcg-target.inc.c b/tcg/ppc/tcg-target.inc.c index 4aad5d2b36..0bfaef9418 100644 --- a/tcg/ppc/tcg-target.inc.c +++ b/tcg/ppc/tcg-target.inc.c @@ -64,8 +64,7 @@ static tcg_insn_unit *tb_ret_addr; -bool have_isa_2_06; -bool have_isa_3_00; +TCGPowerISA have_isa; #define HAVE_ISA_2_06 have_isa_2_06 #define HAVE_ISEL have_isa_2_06 @@ -2787,12 +2786,13 @@ static void tcg_target_init(TCGContext *s) unsigned long hwcap = qemu_getauxval(AT_HWCAP); unsigned long hwcap2 = qemu_getauxval(AT_HWCAP2); + have_isa = tcg_isa_base; if (hwcap & PPC_FEATURE_ARCH_2_06) { - have_isa_2_06 = true; + have_isa = tcg_isa_2_06; } #ifdef PPC_FEATURE2_ARCH_3_00 if (hwcap2 & PPC_FEATURE2_ARCH_3_00) { - have_isa_3_00 = true; + have_isa = tcg_isa_3_00; } #endif