From patchwork Fri Aug 11 13:50:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Wiederhake X-Patchwork-Id: 1820288 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=hj9sG7/w; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RMlbw0CYBz1yf6 for ; Fri, 11 Aug 2023 23:52:44 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qUSYf-0000jC-QY; Fri, 11 Aug 2023 09:52:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qUSYd-0000iY-Uj for qemu-devel@nongnu.org; Fri, 11 Aug 2023 09:52:03 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qUSYc-000394-76 for qemu-devel@nongnu.org; Fri, 11 Aug 2023 09:52:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691761921; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KtR7/mOWyjlooXnBTec0ACvT+LAQo+yC+T4Mj0Zre8k=; b=hj9sG7/wgr0f6plhdO+QWojNtrqV6CvNL4H7oSm7YXgj9Eoihs+kmMl3DK4Owu8DDROuHI l4zHARTVoiSR3Z+dU+5e7RmUmeGrmMT7ur8h6EDYNTqMmOUL0Dpkid1ZV23Mn1Tw0M5nDm pFMw9OCu2JWvHEAu+QidrIZwqPfyxLA= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-459-2khNARG-NU-vwcByxnO3TQ-1; Fri, 11 Aug 2023 09:50:16 -0400 X-MC-Unique: 2khNARG-NU-vwcByxnO3TQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5F3553C0FCA4 for ; Fri, 11 Aug 2023 13:50:16 +0000 (UTC) Received: from work.redhat.com (unknown [10.39.193.214]) by smtp.corp.redhat.com (Postfix) with ESMTP id E7516140E96D; Fri, 11 Aug 2023 13:50:15 +0000 (UTC) From: Tim Wiederhake To: qemu-devel@nongnu.org Cc: Tim Wiederhake Subject: [PATCH 4/4] target/i386: Autogenerate feature_word_info.c.inc Date: Fri, 11 Aug 2023 15:50:11 +0200 Message-Id: <20230811135011.23343-5-twiederh@redhat.com> In-Reply-To: <20230811135011.23343-1-twiederh@redhat.com> References: <20230811135011.23343-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 Received-SPF: pass client-ip=170.10.129.124; envelope-from=twiederh@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This introduces no semantic changes to the file. Signed-off-by: Tim Wiederhake --- target/i386/feature_word_info.c.inc | 2 + target/i386/feature_word_info.py | 110 ++++++++++++++++++++++++++++ target/i386/feature_word_info.xml | 3 + 3 files changed, 115 insertions(+) create mode 100755 target/i386/feature_word_info.py diff --git a/target/i386/feature_word_info.c.inc b/target/i386/feature_word_info.c.inc index 040c3c4e56..b8e77ab7e5 100644 --- a/target/i386/feature_word_info.c.inc +++ b/target/i386/feature_word_info.c.inc @@ -1,3 +1,5 @@ +/* This file is autogenerated by feature_word_info.py. */ + FeatureWordInfo feature_word_info[FEATURE_WORDS] = { [FEAT_1_EDX] = { .type = CPUID_FEATURE_WORD, diff --git a/target/i386/feature_word_info.py b/target/i386/feature_word_info.py new file mode 100755 index 0000000000..95f3931aa0 --- /dev/null +++ b/target/i386/feature_word_info.py @@ -0,0 +1,110 @@ +#!/bin/env python3 + +import lxml.etree +import os + + +class FeatureWord: + def __init__(self, xml): + self.index = xml.values()[0] + for node in xml: + if node.tag == "cpuid": + self.cpuid = dict() + for child in node: + self.cpuid[child.tag] = child.text + elif node.tag == "feat_names": + self.feat_names = [child.text for child in node] + else: + setattr(self, node.tag, node.text) + + +def write_feat_names(f, data): + f.write(" .feat_names = {\n") + for index, name in enumerate(data): + if name is None: + name = "NULL" + if index % 4 == 0: + f.write(" " * 11) + f.write(" " + str(name) + ",") + if index % 4 == 3: + f.write("\n") + f.write(" },\n") + + +def write_cpuid(f, data): + f.write(" .cpuid = {\n") + f.write(" .eax = {},\n".format(data["eax"])) + if "ecx" in data: + f.write(" .needs_ecx = true,\n") + f.write(" .ecx = {},\n".format(data["ecx"])) + f.write(" .reg = {},\n".format(data["reg"])) + f.write(" },\n") + + +def write_msr(f, data): + f.write(" .msr = {\n") + f.write(" .index = {},\n".format(data)) + f.write(" },\n") + + +def write_tcg_features(f, data): + f.write(" .tcg_features = {},\n".format(data)) + + +def write_unmigratable_flags(f, data): + f.write(" .unmigratable_flags = {},\n".format(data)) + + +def write_migratable_flags(f, data): + f.write(" .migratable_flags = {},\n".format(data)) + + +def write_no_autoenable_flags(f, data): + f.write(" .no_autoenable_flags = {},\n".format(data)) + + +def write_feature_word(f, data): + f.write(" [{}] = {{\n".format(data.index)) + f.write(" .type = {},\n".format(data.type)) + if hasattr(data, "feat_names"): + write_feat_names(f, data.feat_names) + if hasattr(data, "cpuid"): + write_cpuid(f, data.cpuid) + if hasattr(data, "msr"): + write_msr(f, data.msr) + if hasattr(data, "tcg_features"): + write_tcg_features(f, data.tcg_features) + if hasattr(data, "unmigratable_flags"): + write_unmigratable_flags(f, data.unmigratable_flags) + if hasattr(data, "migratable_flags"): + write_migratable_flags(f, data.migratable_flags) + if hasattr(data, "no_autoenable_flags"): + write_no_autoenable_flags(f, data.no_autoenable_flags) + f.write(" },\n") + + +def write_feature_words(f, data): + f.write("/* This file is autogenerated by feature_word_info.py. */\n\n") + f.write("FeatureWordInfo feature_word_info[FEATURE_WORDS] = {\n") + for feature_word in data: + write_feature_word(f, feature_word) + f.write("};\n") + + +def main(): + dirname = os.path.dirname(__file__) + ifile = os.path.join(dirname, "feature_word_info.xml") + ofile = os.path.join(dirname, "feature_word_info.c.inc") + + parser = lxml.etree.XMLParser(remove_comments=True, remove_blank_text=True) + with open(ifile, "tr") as f: + doc = lxml.etree.parse(f, parser=parser) + + feature_words = [FeatureWord(node) for node in doc.getroot()] + + with open(ofile, "tw") as f: + write_feature_words(f, feature_words) + + +if __name__ == "__main__": + main() diff --git a/target/i386/feature_word_info.xml b/target/i386/feature_word_info.xml index ff741b9f5a..662b8b1dfc 100644 --- a/target/i386/feature_word_info.xml +++ b/target/i386/feature_word_info.xml @@ -1,3 +1,6 @@ + CPUID_FEATURE_WORD