From patchwork Tue Jun 20 00:03:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 778032 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ws7Q70MCLz9s4q for ; Tue, 20 Jun 2017 10:05:01 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="p6swkFAb"; dkim-atps=neutral Received: from localhost ([::1]:44863 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dN6fD-0003OK-FO for incoming@patchwork.ozlabs.org; Mon, 19 Jun 2017 20:04:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33545) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dN6eR-0003MP-Th for qemu-devel@nongnu.org; Mon, 19 Jun 2017 20:04:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dN6eP-0001nN-G8 for qemu-devel@nongnu.org; Mon, 19 Jun 2017 20:04:11 -0400 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]:32993) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dN6eP-0001n9-AS for qemu-devel@nongnu.org; Mon, 19 Jun 2017 20:04:09 -0400 Received: by mail-pf0-x241.google.com with SMTP id w12so19893430pfk.0 for ; Mon, 19 Jun 2017 17:04:09 -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=fUbk68YXNgg2rcM4XSKxZpYFJHHYn3XBKuenHUbdE7c=; b=p6swkFAbGbR/3TVYq9lUu1PAZl+9Mr+FgzaEepZN6Qh10a9gt2N6Ba1XW9evuwsL8C GjQp3KU7WbSlV2UUwhd2Okxk/891z36YJk9tYgiEdpmhKVUXhh12CthVLOqJRgaqYgqE dYYEsibh2oRlbshXBpNsKYkYOFyMsBzu6EfSfYbkJ1AQki8gdrWkdEtak/adjjoOtb8s W7lSUbGyH+6/yMWcCV8dRpKlxgrN7i4Aga+7ej/TVk9cQCp/OXyFrdyPopGcqXK8HLlI NNS74jb/4MLSy0p3J967OHnue/hoAyuTWm85ByNsVaeAIMSejk7NcIFt70Hp/XuAQWil RYGg== 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=fUbk68YXNgg2rcM4XSKxZpYFJHHYn3XBKuenHUbdE7c=; b=jY1gh8IKXdylor6xBONzdsRnYxUegoOm7VNZlCkdfMN1k/Dj4Uw8q8Z2ryy7a9ZLZl xaJnMoCQ+tCSJAZOYFybHd53Cm3fOFZu/VcEEyvTW17oGzfj0MWnwICN7i77y3jipZsc Fk62qfer496DJ9715lms1pEIPgyWOG3l7J/tavBwb/wEeaEC2ePVu0P6TsWZc/CIXSCX 6e+78JO4nObSVV4uiXDYBvjaqG2tAKqS6Hywx3e30jU/dJPxt2L0z0HtO5DYnUgkAMSp X4ch17IV4byN3CgQv0JfDLm1dm/vN5uO+w1nKCg3fmZEiDH9cyB/Sf7QM1OMGyVl4ZvT 2jmA== X-Gm-Message-State: AKS2vOzxkV28QnD1ePtJmEPPP9fUMDDqQQ81mGw697ZIpWtHhQwZyQm6 5qK2QjDmzYPBwybezi4= X-Received: by 10.99.153.26 with SMTP id d26mr28855179pge.241.1497917048117; Mon, 19 Jun 2017 17:04:08 -0700 (PDT) Received: from bigtime.twiddle.net (97-113-165-157.tukw.qwest.net. [97.113.165.157]) by smtp.gmail.com with ESMTPSA id o8sm23064937pgn.52.2017.06.19.17.04.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Jun 2017 17:04:07 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 19 Jun 2017 17:03:48 -0700 Message-Id: <20170620000405.3391-2-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170620000405.3391-1-rth@twiddle.net> References: <20170620000405.3391-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::241 Subject: [Qemu-devel] [PATCH v3 01/18] 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: thuth@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The FAC_ names were placeholders prior to the introduction of the current facility modeling. Signed-off-by: Richard Henderson Reviewed-by: Aurelien Jarno --- 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 8c055b7..af18ffb 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -1178,39 +1178,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; @@ -5413,6 +5384,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" };