From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id WDwHMlwR9F7WLAAA0tVLHw (envelope-from ) for ; Thu, 25 Jun 2020 02:52:12 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 4ODyLVwR9F6jDAAAB5/wlQ (envelope-from ) for ; Thu, 25 Jun 2020 02:52:12 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id AE67A940539 for ; Thu, 25 Jun 2020 02:52:11 +0000 (UTC) Received: from localhost ([::1]:42162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1joHzk-00060m-LK for larch@yhetil.org; Wed, 24 Jun 2020 22:52:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60784) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1joHze-0005zo-MR for guix-patches@gnu.org; Wed, 24 Jun 2020 22:52:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56242) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1joHze-0005lI-DR for guix-patches@gnu.org; Wed, 24 Jun 2020 22:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1joHze-0007zI-9t for guix-patches@gnu.org; Wed, 24 Jun 2020 22:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41574] gnu: Add intel-xev. Resent-From: elaexuotee@wilsonb.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 25 Jun 2020 02:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41574 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Marius Bakke Cc: 41574@debbugs.gnu.org Received: via spool by 41574-submit@debbugs.gnu.org id=B41574.159305350330676 (code B ref 41574); Thu, 25 Jun 2020 02:52:02 +0000 Received: (at 41574) by debbugs.gnu.org; 25 Jun 2020 02:51:43 +0000 Received: from localhost ([127.0.0.1]:39555 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1joHz9-0007yX-Mb for submit@debbugs.gnu.org; Wed, 24 Jun 2020 22:51:43 -0400 Received: from m42-5.mailgun.net ([69.72.42.5]:31636) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1joHz0-0007yD-Qs for 41574@debbugs.gnu.org; Wed, 24 Jun 2020 22:51:30 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.wilsonb.com; q=dns/txt; s=krs; t=1593053486; h=Content-Type: MIME-Version: Message-Id: In-Reply-To: References: Subject: From: Cc: To: Date: Sender; bh=iAU81oQEzQmVYbtg4yAyo8ckXvbxbHUfRTdIWQaoLfY=; b=YMOzRIPLK9jUBOQfdJo5/stPiH+j1Ulce7VHn5+eLc9SOPEmDOie/pfCgeyOgoGDMTE7bIfD iXSzcYeIAHeO7f7Cw6Pl8cBQ13C091QdyALUoPunnCthXz8pGeh1+LaCI6O/jT6+P7pUrjqx aSYU43IFOQ46ruY124NfVETmk5FVjhHbTn/XDvCbZgEKzPzde5IioqTdapHY1KX4JYNnuYdX LN/oMnfeHQqp/SKkWPuMAzxLvOQKPxoDj5TlO27B+U71dtUfl360w5CBmEB5nsGzAB5bOyQa hIhXhgWiZei2APx+KbbTbCSxbQyNg9eNFr2i1y7Vs4aaWwL+k3lZhg== X-Mailgun-Sending-Ip: 69.72.42.5 X-Mailgun-Sid: WyIwYzVjZiIsICI0MTU3NEBkZWJidWdzLmdudS5vcmciLCAiMDg1NDdhIl0= Received: from wilsonb.com (wilsonb.com [104.199.203.42]) by smtp-out-n14.prod.us-east-1.postgun.com with SMTP id 5ef41113a3d8a44743c7546f (version=TLS1.3, cipher=TLS_AES_128_GCM_SHA256); Thu, 25 Jun 2020 02:50:59 GMT Received: from localhost (KD111239203083.au-net.ne.jp [111.239.203.83]) by wilsonb.com (Postfix) with ESMTPSA id 2BECAA2C2D; Thu, 25 Jun 2020 02:50:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wilsonb.com; s=201703; t=1593053456; bh=iAU81oQEzQmVYbtg4yAyo8ckXvbxbHUfRTdIWQaoLfY=; h=Date:To:Cc:From:Subject:References:In-Reply-To:From; b=xduObHoSdQHJyxxGvbv2HeirYgCy6HUo3S84dGAjnAtprsRfPAxZSIGHu1BU1mWxY 8+g9vO4z48hWCMoyLGRRgnOet2nGXsWB12Ca9Las/VHZD4eZVzBCoVvwDfxkygD275 AkDniwG72yME7ok31GfBR7voNDKTSiaHWhuq+JA9d1Wu5Ho8+8XvJXeNrgrmsBgCZe kimJF0MNtfjKE4Pfy5dfNrGImqj9WoJJ+ss0jjwru0eiFHCS/mvYOqjJl2KG1UwJOc wA+k1ilHhdYODpXa1DI8qqRtxRRHy3F0MMByiOmdU3hGlcNdJkcp84wx1LXowX8P+H O5baKr3YcoERKCSVoaTx/7hjQ9Sxk4RD06/WctWFnT2pukBTqPVB/OmtO0FVwHZ7we 0tkiHWAm6TmHnvA22+k/JTLa8ZglCUxSvmgvz7Mr/znj6wlZcMDlZtejXpkTH0qM5o xeVqGuJq58RgW31GJEDGP27PRZNxFm67mPmF/F8VDGYPoFb/YMAwdellPBwvoiqcp4 3nYBnEd1xEj6aqMRpczo3pMX/np2+ZcgBLwexlAfa6MDv3aRQULxkq2wSSNP+6t48d Jb6NWaWufRAYYdmBOOevRH6WTLe9fJhal0UqQ7dJInxHJBFNVvf2iQLe5C/14HfSW0 3QRDexcfGrVqEIi4JkCYkaqk= Date: Thu, 25 Jun 2020 11:50:48 +0900 References: <30SSS7KMH7STU.2VZS2NNFF6QOP@wilsonb.com> <338KSVUXDSMM8.2HI3H62CJZAVU@wilsonb.com> <878sgebzbx.fsf@gnu.org> <337PSS1AAVGN7.2MVZ1RZ09WTJA@wilsonb.com> <87o8p86xyg.fsf@gnu.org> In-Reply-To: <87o8p86xyg.fsf@gnu.org> Message-Id: <3ILYVAJYYCJDV.3HZ7KJLE03IG5@wilsonb.com> User-Agent: mblaze/0.7 MIME-Version: 1.0 Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="----_=_66f35ef05a51c47e06aab864_=_" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: elaexuotee@wilsonb.com, elaexuotee--- via Guix-patches From: elaexuotee--- via Guix-patches via X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=mg.wilsonb.com header.s=krs header.b=YMOzRIPL; dkim=fail (rsa verify failed) header.d=wilsonb.com header.s=201703 header.b=xduObHoS; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -2.11 X-TUID: q43/tmos4YIx This is a multipart message in MIME format. ------_=_66f35ef05a51c47e06aab864_=_ MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----_=_6befa4603ceaeffc6457b167_=_" This is a multipart message in MIME format. ------_=_6befa4603ceaeffc6457b167_=_ Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable > Please also mention the new patch and change to local.mk in the commit > message. Looks like I also forgot to mention the patch itself. Thanks. > Use the "11.2.0" tag here instead of the commit hash. Done. As you mentioned in a follow-up email, I replaced the commit string w= ith the `version' token which happily happens to match the name of the version = tag we want. > Can you add a comment about where you got that version number from? > Also, would it make sense to package this separately? Can be done later > though. I went ahead and added a comment explaining both of these decisions. The re= ason for including mbuild in this way instead of packaging it separately is simp= ly that it seems to be a home-grown build system just for XED (I have no idea why). There are other projects called "mbuild" and I didn't want to pollute= the package namespace unnecessarily. > > + (outputs '("out" "lib" "src")) >=20 > As mentioned before, the 'src' output can go. Argh. Completely missed that. Nice catch. > Apart from these minor issues, I think it's good to go. \o/ >=20 > Can you send an updated patch? TIA! :-) Here you go! ------_=_6befa4603ceaeffc6457b167_=_ Content-Disposition: attachment; filename=0001-gnu-Add-intel-xed.patch Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable =46rom aeaae07bbec8e2405ec3be40098b9a6b3fcc0a3b Mon Sep 17 00:00:00 2001 =46rom: "B. Wilson" =44ate: Thu, 28 May 2020 07:32:28 +0900 =53ubject: [PATCH] gnu: Add intel-xed. =54o: guix-patches@gnu.org =0A* gnu/packages/assembly.scm (intel-xed): New variable. =2A gnu/packages/patches/intel-xed-fix-nondeterminism.patch: New file. =2A gnu/local.mk (dist_patch_DATA): Add reference to new patch. =2D-- =20gnu/local.mk | 1 + =20gnu/packages/assembly.scm | 94 +++++++++++++++ =20.../intel-xed-fix-nondeterminism.patch | 113 ++++++++++++++++++ =203 files changed, 208 insertions(+) =20create mode 100644 gnu/packages/patches/intel-xed-fix-nondeterminism.pat= =63h =0Adiff --git a/gnu/local.mk b/gnu/local.mk =69ndex a321575799..c70ee59b8f 100644 =2D-- a/gnu/local.mk =2B++ b/gnu/local.mk =40@ -1107,6 +1107,7 @@ dist_patch_DATA =3D \ =20 %D%/packages/patches/ilmbase-fix-test-arm.patch \ =20 %D%/packages/patches/inetutils-hurd.patch \ =20 %D%/packages/patches/inkscape-poppler-0.76.patch \ =2B %D%/packages/patches/intel-xed-fix-nondeterminism.patch \ =20 %D%/packages/patches/intltool-perl-compatibility.patch \ =20 %D%/packages/patches/iputils-libcap-compat.patch \ =20 %D%/packages/patches/irrlicht-use-system-libs.patch \ =64iff --git a/gnu/packages/assembly.scm b/gnu/packages/assembly.scm =69ndex c9582bc596..39e14d452c 100644 =2D-- a/gnu/packages/assembly.scm =2B++ b/gnu/packages/assembly.scm =40@ -8,6 +8,7 @@ =20;;; Copyright =C2=A9 2019 Andy Tai =20;;; Copyright =C2=A9 2020 Jakub K=C4=85dzio=C5=82ka = =0A ;;; Copyright =C2=A9 2020 Christopher Lemmer Webber =2B;;; Copyright =C2=A9 2020 B. Wilson =20;;; =20;;; This file is part of GNU Guix. =20;;; =40@ -47,6 +48,7 @@ =20 #:use-module (gnu packages texinfo) =20 #:use-module (gnu packages python) =20 #:use-module (gnu packages sphinx) =2B #:use-module (gnu packages shells) =20 #:use-module (gnu packages xml) =20 #:use-module ((guix utils) =20 #:select (%current-system))) =40@ -371,3 +373,95 @@ It understands mnemonics and generates code for NMOS= =206502s (such =20as 6502A, 6504, 6507, 6510, 7501, 8500, 8501, 8502 ...), =20 CMOS 6502s (65C02 and Rockwell R65C02) and the 65816.") =20 (license license:gpl2))) =2B =2B(define-public intel-xed =2B (package =2B (name "intel-xed") =2B (version "11.2.0") =2B (source =2B (origin =2B (method git-fetch) =2B (uri (git-reference =2B (url "https://github.com/intelxed/xed.git") =2B (commit version))) =2B (sha256 (base32 "1jffayski2gpd54vaska7fmiwnnia8v3cka4nfyzjgl8xsky= =39v2s")) =2B (file-name (git-file-name name version)) =2B (patches (search-patches "intel-xed-fix-nondeterminism.patch"))))= =0A+ (build-system gnu-build-system) =2B (native-inputs =2B `(("python-wrapper" ,python-wrapper) =2B ("tcsh" ,tcsh) =2B ;; As of the time of writing this comment, mbuild does not exist = =69n the =2B ;; Python Package Index and seems to only be used by intel-xed, s= =6F we =2B ;; opt to include it here instead of packaging separately. Note = =61lso =2B ;; that the git repository contains no version tags, so we direct= =6Cy =2B ;; reference the "version" variable from setup.py instead. =2B ("mbuild" =2B ,(let ((name "mbuild") =2B (version "0.2496")) =2B (origin =2B (method git-fetch) =2B (uri (git-reference =2B (url "https://github.com/intelxed/mbuild.git") =2B (commit "5304b94361fccd830c0e2417535a866b79c1c297")))= =0A+ (sha256 =2B (base32 =2B "0r3avc3035aklqxcnc14rlmmwpj3jp09vbcbwynhvvmcp8srl7dl")) =2B (file-name (git-file-name name version))))))) =2B (outputs '("out" "lib")) =2B (arguments =2B `(#:phases =2B ;; Upstream uses the custom Python build tool `mbuild', so we mun= =67e =2B ;; gnu-build-system to fit. The build process for this package i= =73 =2B ;; documented at https://intelxed.github.io/build-manual/. =2B (let* ((build-dir "build") =2B (kit-dir "kit")) =2B (modify-phases %standard-phases =2B (delete 'configure) =2B (replace 'build =2B (lambda* (#:key inputs #:allow-other-keys) =2B (let ((mbuild (assoc-ref inputs "mbuild"))) =2B (setenv "PYTHONPATH" (string-append =2B (getenv "PYTHONPATH") ":" mbuild)= =29 =2B (invoke "./mfile.py" =2B (string-append "--build-dir=3D" build-dir) =2B (string-append "--install-dir=3D" kit-dir) =2B "examples" =2B "doc" =2B "install")))) =2B (replace 'check =2B (lambda _ =2B ;; Skip broken test group `tests/tests-avx512pf'. =2B (invoke "tests/run-cmd.py" =2B (string-append "--build-dir=3D" kit-dir "/bin") =2B "--tests" "tests/tests-base" =2B "--tests" "tests/tests-avx512" =2B "--tests" "tests/tests-cet" =2B "--tests" "tests/tests-via" =2B "--tests" "tests/tests-syntax" =2B "--tests" "tests/tests-xop"))) =2B (replace 'install =2B (lambda* (#:key outputs #:allow-other-keys) =2B (let* ((out (assoc-ref outputs "out")) =2B (lib (assoc-ref outputs "lib"))) =2B (copy-recursively (string-append kit-dir "/bin") =2B (string-append out "/bin")) =2B (copy-recursively (string-append kit-dir "/include") =2B (string-append lib "/include")) =2B (copy-recursively (string-append kit-dir "/lib") =2B (string-append lib "/lib")) =2B #t))))))) =2B (home-page "https://intelxed.github.io/") =2B (synopsis "Encoder and decoder for x86 (IA32 and Intel64) instructio= =6Es") =2B (description "The Intel X86 Encoder Decoder (XED) is a software libr= =61ry and =2Bfor encoding and decoding X86 (IA32 and Intel64) instructions. The deco= =64er =2Btakes sequences of 1-15 bytes along with machine mode information and pr= =6Fduces =2Ba data structure describing the opcode, operands, and flags. The encode= =72 takes =2Ba similar data structure and produces a sequence of 1 to 15 bytes. Disa= =73sembly =2Bis essentially a printing pass on the data structure. =2B =2BThe library and development files are under the @code{lib} output, with = =61 =2Bfamily of command line utility wrappers in the default output. Each of = =74he cli =2Btools is named like @code{xed*}. Documentation for the cli tools is spa= =72se, so =2Bthis is a case where ``the code is the documentation.''") =2B (license license:asl2.0))) =64iff --git a/gnu/packages/patches/intel-xed-fix-nondeterminism.patch b/gn= =75/packages/patches/intel-xed-fix-nondeterminism.patch =6Eew file mode 100644 =69ndex 0000000000..c81bd0edde =2D-- /dev/null =2B++ b/gnu/packages/patches/intel-xed-fix-nondeterminism.patch =40@ -0,0 +1,113 @@ =2BThis patch removes sources of build non-determinism in the upstream sour= =63es. =2B =2BIn particular, many of the compiled sources are generated with Python co= =64e, =2Bwhich in turn uses dictionaries to index the output C functions. Howeve= =72, =2Biterators over Python dictionaries have no guaranteed order, thus result= =69ng in =2Bthe C functions being output in a random order between builds. =2B =2BThe patch below fixes this by forcing an order during output in several = =6Bey =2Bplaces. Note, however, that future updates may uncover new such places = =74hat =2Bjust happen to be non-problematic at the time of this patch. If you are= =0A+reading this due to finding such issues, feel free to contact me at =2Belaexuotee@wilsonb.com for help. =2B =2Bdiff --git a/pysrc/ild_codegen.py b/pysrc/ild_codegen.py =2Bindex 628ec45..a9bff79 100755 =2B--- a/pysrc/ild_codegen.py =2B+++ b/pysrc/ild_codegen.py =2B@@ -188,14 +188,14 @@ def gen_l2_func_list(agi, target_nt_dict, arg_nt_d= =69ct, =2B ild_t_member): =2B """generate L2 functions""" =2B l2_func_list =3D [] =2B- for (nt_name,array) in target_nt_dict.items(): =2B+ for (nt_name,array) in sorted(target_nt_dict.items()): =2B target_opname =3D array.get_target_opname() =2B if array.is_const_lookup_fun(): =2B fo =3D gen_const_l2_function(agi, nt_name, =2B target_opname, ild_t_member) =2B l2_func_list.append(fo) =2B else: =2B- for arg_nt_seq,arg_arr in arg_nt_dict.items(): =2B+ for arg_nt_seq,arg_arr in sorted(arg_nt_dict.items()): =2B fo =3D gen_scalable_l2_function(agi, nt_name, =2B target_opname, ild_t_member, arg_arr, list(arg_nt_= =73eq)) =2B l2_func_list.append(fo) =2Bdiff --git a/pysrc/ild_disp.py b/pysrc/ild_disp.py =2Bindex 942c036..cf80e29 100755 =2B--- a/pysrc/ild_disp.py =2B+++ b/pysrc/ild_disp.py =2B@@ -350,7 +350,8 @@ def work(agi, united_lookup, disp_nts, brdisp_nts, = =69ld_gendir, =2B disp_dict =3D _gen_l3_array_dict(agi, disp_nts, _disp_token) =2B=20 =2B =20 =2B- nt_arr_list =3D list(brdisp_dict.values()) + list(disp_dict.values(= =29) =2B+ nt_arr_list =3D ([v for (k,v) in sorted(brdisp_dict.items())] + =2B+ [v for (k,v) in sorted(disp_dict.items())]) =2B #create function that calls all initialization functions =2B init_f =3D ild_nt.gen_init_function(nt_arr_list, 'xed_ild_disp_l3_i= =6Eit') =2B =20 =2B@@ -367,7 +368,7 @@ def work(agi, united_lookup, disp_nts, brdisp_nts, = =69ld_gendir, =2B l2_functions =3D [] =2B eosz_op =3D ild_eosz.get_target_opname() =2B easz_op =3D ild_easz.get_target_opname() =2B- for nt_name,array in list(disp_dict.items()) + list(brdisp_dict.ite= =6Ds()): =2B+ for nt_name,array in sorted(disp_dict.items()) + sorted(brdisp_dict= =2Eitems()): =2B #Some DISP NTs depend on EOSZ, others on EASZ, we need to know =2B #that when we generate L2 functions =2B if eosz_op in array.get_arg_names(): =2Bdiff --git a/pysrc/ild_easz.py b/pysrc/ild_easz.py =2Bindex 02cd691..c53b9f2 100755 =2B--- a/pysrc/ild_easz.py =2B+++ b/pysrc/ild_easz.py =2B@@ -165,9 +165,10 @@ def work(agi, united_lookup, easz_nts, ild_gendir, = =64ebug): =2B return =2B nt_seq_arrays[tuple(nt_seq)] =3D array =2B #init function calls all single init functions for the created tabl= =65s =2B- init_f =3D ild_nt.gen_init_function(list(nt_seq_arrays.values()), =2B+ nt_seq_values =3D [v for (k,v) in sorted(nt_seq_arrays.items())] =2B+ init_f =3D ild_nt.gen_init_function(nt_seq_values, =2B 'xed_ild_easz_init') =2B- ild_nt.dump_lu_arrays(agi, list(nt_seq_arrays.values()), _easz_c_fn= =2C=20 =2B+ ild_nt.dump_lu_arrays(agi, nt_seq_values, _easz_c_fn,=20 =2B mbuild.join('include-private', _easz_header_f= =6E), =2B init_f) =2B getter_fos =3D [] =2Bdiff --git a/pysrc/ild_eosz.py b/pysrc/ild_eosz.py =2Bindex 6643bc3..89d2d89 100755 =2B--- a/pysrc/ild_eosz.py =2B+++ b/pysrc/ild_eosz.py =2B@@ -200,10 +200,11 @@ def work(agi, united_lookup, eosz_nts, ild_gendir,= =20debug): =2B return None =2B nt_seq_arrays[tuple(nt_seq)] =3D array =2B #init function calls all single init functions for the created tabl= =65s =2B- init_f =3D ild_nt.gen_init_function(list(nt_seq_arrays.values()),=20= =0A++ nt_seq_values =3D [v for (k,v) in sorted(nt_seq_arrays.items())] =2B+ init_f =3D ild_nt.gen_init_function(nt_seq_values,=20 =2B 'xed_ild_eosz_init') =2B #dump init and lookup functions for EOSZ sequences =2B- ild_nt.dump_lu_arrays(agi, list(nt_seq_arrays.values()), _eosz_c_fn= =2C =2B+ ild_nt.dump_lu_arrays(agi, nt_seq_values, _eosz_c_fn, =2B mbuild.join('include-private', _eosz_header_f= =6E), =2B init_f) =2B #generate EOSZ getter functions - they get xed_decoded_inst_t* =2Bdiff --git a/pysrc/ild_imm.py b/pysrc/ild_imm.py =2Bindex 51c413c..0530bae 100755 =2B--- a/pysrc/ild_imm.py =2B+++ b/pysrc/ild_imm.py =2B@@ -322,12 +322,14 @@ def work(agi, united_lookup, imm_nts, ild_gendir, = =65osz_dict, =2B level=3D'l3') =2B nt_dict[nt_name] =3D array =2B=20 =2B+ nt_dict_values =3D [v for (k,v) in sorted(nt_dict.items())] =2B+ =2B #create function that calls all initialization functions for L3 =2B- init_f =3D ild_nt.gen_init_function(list(nt_dict.values()), =2B+ init_f =3D ild_nt.gen_init_function(nt_dict_values, =2B 'xed_ild_imm_l3_init') =2B =20 =2B #dump L3 functions =2B- ild_nt.dump_lu_arrays(agi, list(nt_dict.values()), _l3_c_fn, =2B+ ild_nt.dump_lu_arrays(agi, nt_dict_values, _l3_c_fn, =2B mbuild.join('include-private',_l3_header_fn),= =0A+ init_f) =2B =20 =2D-=20 =32.27.0 =0A= ------_=_6befa4603ceaeffc6457b167_=_-- ------_=_66f35ef05a51c47e06aab864_=_ Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYIADUWIQQ7FdZn/PDWvxE6cmR2pStZ7i7CgQUCXvQRBhccZWxhZXh1b3Rl ZUB3aWxzb25iLmNvbQAKCRB2pStZ7i7Cge+CAQCMOR1F28F44nVqpSCsWUs4eV4B sM0MAnFDTalj4b03OwEA559AvPMG0U+9PkTpvByWGZEJU73XxT+ccvWGcsfcwwU= =uicZ -----END PGP SIGNATURE----- ------_=_66f35ef05a51c47e06aab864_=_--