From patchwork Fri Jun 23 16:22:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9806953 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DA02D60349 for ; Fri, 23 Jun 2017 16:40:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9D3D28740 for ; Fri, 23 Jun 2017 16:40:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BDB6B28792; Fri, 23 Jun 2017 16:40:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1BAE928740 for ; Fri, 23 Jun 2017 16:40:59 +0000 (UTC) Received: from localhost ([::1]:36318 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dORdi-0001Ek-9g for patchwork-qemu-devel@patchwork.kernel.org; Fri, 23 Jun 2017 12:40:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59915) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dORMC-0001SY-Ji for qemu-devel@nongnu.org; Fri, 23 Jun 2017 12:22:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dORM9-0007mI-SD for qemu-devel@nongnu.org; Fri, 23 Jun 2017 12:22:52 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:35811) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dORM9-0007l3-Nn for qemu-devel@nongnu.org; Fri, 23 Jun 2017 12:22:49 -0400 Received: by mail-qk0-x241.google.com with SMTP id 16so6823290qkg.2 for ; Fri, 23 Jun 2017 09:22:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=+Ei+oxBWsb0NVy1D1ZBt1pe2d/pXjVZWokxWZZEsKzM=; b=p0/LcHfv7IWfYOzx7OQe/twdTWFM6fbyTTRq/BTBRc9XN4m+jJvD71EtPSK6Y6JQzv 3jXHJhYuBjWMhLl962nM2FftS92oroCXNmehHmjwnJjWGthm/7O/Gx/gNT/hYHweuMK5 MqQnNbgwXJShFt+n/Icg1f7FD9Ez6ifAw5HrmQBELsqHx0C1FTT8RxKa07SIkK8Xorzz vULDCx1u5DlA18wTcDfpDF4bVjKmmiHdFjMN+NWa3UDnZI/bCYyKm85FOG8WpBwAXumY orvJ0a/L8CknIbukQe5c8SxsZgdEwVo3QfKBdFvOD9Hxi5Eh5xv2K6zGdefQKCEVMVXQ P5Ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=+Ei+oxBWsb0NVy1D1ZBt1pe2d/pXjVZWokxWZZEsKzM=; b=Wo9cRQiExoDmEPWE/ShqMDcTk/qW8bQw8RsZqv3mBA6YqBg1Y26wepFwLsh2t1B4me gng4VaABmmL/YhxDafhgp/sIGXelU097HN37L3DAmHNJCLsbrAQsninvBGzV76vt1U8L u+HWGDGtjUne7+UgcOYWmS0TURC+K/bSWFGdj5xuEMk4UpvpSGLiDgwUBh3E6KlyojaM UM865/UZrj8MUh2Y4T3BiEa99E1CnpYMGiV8tysiUiQylpWRID3PR4EuVbRQxS21JIs9 T34fXuV3J4gHu7JjZZdwnBnw+8RASLGA9mI4ytxbl25XuktDrLKhVDIH4gRy2sW9PNDD eKJg== X-Gm-Message-State: AKS2vOysPY6zGjqvPcV1eXgcYvTzLVYWufadbYxkR6dooq4/7SuVUE5E AlHoiifivNA5l5OdrCE= X-Received: by 10.55.67.82 with SMTP id q79mr10867545qka.18.1498234967524; Fri, 23 Jun 2017 09:22:47 -0700 (PDT) Received: from bigtime.twiddle.net.com (97-113-165-157.tukw.qwest.net. [97.113.165.157]) by smtp.gmail.com with ESMTPSA id p52sm3743567qtb.69.2017.06.23.09.22.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Jun 2017 09:22:46 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 23 Jun 2017 09:22:27 -0700 Message-Id: <20170623162241.8964-2-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170623162241.8964-1-rth@twiddle.net> References: <20170623162241.8964-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::241 Subject: [Qemu-devel] [PULL 01/15] target/s390x: Map existing FAC_* names to S390_FEAT_* names 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The FAC_ names were placeholders prior to the introduction of the current facility modeling. Reviewed-by: Aurelien Jarno Signed-off-by: Richard Henderson --- target/s390x/translate.c | 59 ++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 6403542..5a00279 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -1180,39 +1180,10 @@ typedef enum { EXIT_NORETURN, } ExitStatus; -typedef enum DisasFacility { - FAC_Z, /* zarch (default) */ - FAC_CASS, /* compare and swap and store */ - FAC_CASS2, /* compare and swap and store 2*/ - FAC_DFP, /* decimal floating point */ - FAC_DFPR, /* decimal floating point rounding */ - FAC_DO, /* distinct operands */ - FAC_EE, /* execute extensions */ - FAC_EI, /* extended immediate */ - FAC_FPE, /* floating point extension */ - FAC_FPSSH, /* floating point support sign handling */ - FAC_FPRGR, /* FPR-GR transfer */ - FAC_GIE, /* general instructions extension */ - FAC_HFP_MA, /* HFP multiply-and-add/subtract */ - FAC_HW, /* high-word */ - FAC_IEEEE_SIM, /* IEEE exception sumilation */ - FAC_MIE, /* miscellaneous-instruction-extensions */ - FAC_LAT, /* load-and-trap */ - FAC_LOC, /* load/store on condition */ - FAC_LD, /* long displacement */ - FAC_PC, /* population count */ - FAC_SCF, /* store clock fast */ - FAC_SFLE, /* store facility list extended */ - FAC_ILA, /* interlocked access facility 1 */ - FAC_LPP, /* load-program-parameter */ - FAC_DAT_ENH, /* DAT-enhancement */ - FAC_E2, /* extended-translation facility 2 */ -} DisasFacility; - struct DisasInsn { unsigned opc:16; DisasFormat fmt:8; - DisasFacility fac:8; + unsigned fac:8; unsigned spec:8; const char *name; @@ -5418,6 +5389,34 @@ enum DisasInsnEnum { #define SPEC_prep_0 0 #define SPEC_wout_0 0 +/* Give smaller names to the various facilities. */ +#define FAC_Z S390_FEAT_ZARCH +#define FAC_CASS S390_FEAT_COMPARE_AND_SWAP_AND_STORE +#define FAC_CASS2 S390_FEAT_COMPARE_AND_SWAP_AND_STORE_2 +#define FAC_DFP S390_FEAT_DFP +#define FAC_DFPR S390_FEAT_FLOATING_POINT_SUPPPORT_ENH /* DFP-rounding */ +#define FAC_DO S390_FEAT_STFLE_45 /* distinct-operands */ +#define FAC_EE S390_FEAT_EXECUTE_EXT +#define FAC_EI S390_FEAT_EXTENDED_IMMEDIATE +#define FAC_FPE S390_FEAT_FLOATING_POINT_EXT +#define FAC_FPSSH S390_FEAT_FLOATING_POINT_SUPPPORT_ENH /* FPS-sign-handling */ +#define FAC_FPRGR S390_FEAT_FLOATING_POINT_SUPPPORT_ENH /* FPR-GR-transfer */ +#define FAC_GIE S390_FEAT_GENERAL_INSTRUCTIONS_EXT +#define FAC_HFP_MA S390_FEAT_HFP_MADDSUB +#define FAC_HW S390_FEAT_STFLE_45 /* high-word */ +#define FAC_IEEEE_SIM S390_FEAT_FLOATING_POINT_SUPPPORT_ENH /* IEEE-exception-simulation */ +#define FAC_MIE S390_FEAT_STFLE_49 /* misc-instruction-extensions */ +#define FAC_LAT S390_FEAT_STFLE_49 /* load-and-trap */ +#define FAC_LOC S390_FEAT_STFLE_45 /* load/store on condition 1 */ +#define FAC_LD S390_FEAT_LONG_DISPLACEMENT +#define FAC_PC S390_FEAT_STFLE_45 /* population count */ +#define FAC_SCF S390_FEAT_STORE_CLOCK_FAST +#define FAC_SFLE S390_FEAT_STFLE +#define FAC_ILA S390_FEAT_STFLE_45 /* interlocked-access-facility 1 */ +#define FAC_LPP S390_FEAT_SET_PROGRAM_PARAMETERS /* load-program-parameter */ +#define FAC_DAT_ENH S390_FEAT_DAT_ENH +#define FAC_E2 S390_FEAT_EXTENDED_TRANSLATION_2 + static const DisasInsn insn_info[] = { #include "insn-data.def" };