git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #102766 from siraben/mmix

Initial implementation of cross-compilation to Knuth's MMIX

commit86fedc3a921e0e8a6d425613f28a5f37e2e6417f authorJohn Ericson <git@JohnEricson.me> dateSat 14 Nov 2020, 12:46 (6 years ago) parent07202f8445dde6
8 files changed+79−16
lib/systems/doubles.nix+3 lib/systems/examples.nix+5 lib/systems/inspect.nix+1 lib/systems/parse.nix+19−14 lib/tests/systems.nix+4−2 pkgs/build-support/bintools-wrapper/default.nix+1 pkgs/development/tools/mmixware/default.nix+44 pkgs/top-level/all-packages.nix+2
lib/systems/doubles.nix+3
@@ -36,6 +36,8 @@ let
3636 "riscv64-none" "riscv32-none"
3737 "vc4-none"
3838
39+ "mmix-mmixware"
40+
3941 "js-ghcjs"
4042
4143 "aarch64-genode" "i686-genode" "x86_64-genode"
@@ -56,6 +58,7 @@ in {
5658 i686 = filterDoubles predicates.isi686;
5759 x86_64 = filterDoubles predicates.isx86_64;
5860 mips = filterDoubles predicates.isMips;
61+ mmix = filterDoubles predicates.isMmix;
5962 riscv = filterDoubles predicates.isRiscV;
6063 vc4 = filterDoubles predicates.isVc4;
6164 js = filterDoubles predicates.isJavaScript;
lib/systems/examples.nix+5
@@ -109,6 +109,11 @@ rec {
109109 platform = platforms.riscv-multiplatform "32";
110110 };
111111
112+ mmix = {
113+ config = "mmix-unknown-mmixware";
114+ libc = "newlib";
115+ };
116+
112117 msp430 = {
113118 config = "msp430-elf";
114119 libc = "newlib";
lib/systems/inspect.nix+1
@@ -17,6 +17,7 @@ rec {
1717 isAarch32 = { cpu = { family = "arm"; bits = 32; }; };
1818 isAarch64 = { cpu = { family = "arm"; bits = 64; }; };
1919 isMips = { cpu = { family = "mips"; }; };
20+ isMmix = { cpu = { family = "mmix"; }; };
2021 isRiscV = { cpu = { family = "riscv"; }; };
2122 isSparc = { cpu = { family = "sparc"; }; };
2223 isWasm = { cpu = { family = "wasm"; }; };
lib/systems/parse.nix+19−14
@@ -93,6 +93,8 @@ rec {
9393 mips64 = { bits = 64; significantByte = bigEndian; family = "mips"; };
9494 mips64el = { bits = 64; significantByte = littleEndian; family = "mips"; };
9595
96+ mmix = { bits = 64; significantByte = bigEndian; family = "mmix"; };
97+
9698 powerpc = { bits = 32; significantByte = bigEndian; family = "power"; };
9799 powerpc64 = { bits = 64; significantByte = bigEndian; family = "power"; };
98100 powerpc64le = { bits = 64; significantByte = littleEndian; family = "power"; };
@@ -268,19 +270,20 @@ rec {
268270 kernels = with execFormats; with kernelFamilies; setTypes types.openKernel {
269271 # TODO(@Ericson2314): Don't want to mass-rebuild yet to keeping 'darwin' as
270272 # the nnormalized name for macOS.
271− macos = { execFormat = macho; families = { inherit darwin; }; name = "darwin"; };
272− ios = { execFormat = macho; families = { inherit darwin; }; };
273− freebsd = { execFormat = elf; families = { inherit bsd; }; };
274− linux = { execFormat = elf; families = { }; };
275− netbsd = { execFormat = elf; families = { inherit bsd; }; };
276− none = { execFormat = unknown; families = { }; };
277− openbsd = { execFormat = elf; families = { inherit bsd; }; };
278− solaris = { execFormat = elf; families = { }; };
279− wasi = { execFormat = wasm; families = { }; };
280− redox = { execFormat = elf; families = { }; };
281− windows = { execFormat = pe; families = { }; };
282− ghcjs = { execFormat = unknown; families = { }; };
283− genode = { execFormat = elf; families = { }; };
273+ macos = { execFormat = macho; families = { inherit darwin; }; name = "darwin"; };
274+ ios = { execFormat = macho; families = { inherit darwin; }; };
275+ freebsd = { execFormat = elf; families = { inherit bsd; }; };
276+ linux = { execFormat = elf; families = { }; };
277+ netbsd = { execFormat = elf; families = { inherit bsd; }; };
278+ none = { execFormat = unknown; families = { }; };
279+ openbsd = { execFormat = elf; families = { inherit bsd; }; };
280+ solaris = { execFormat = elf; families = { }; };
281+ wasi = { execFormat = wasm; families = { }; };
282+ redox = { execFormat = elf; families = { }; };
283+ windows = { execFormat = pe; families = { }; };
284+ ghcjs = { execFormat = unknown; families = { }; };
285+ genode = { execFormat = elf; families = { }; };
286+ mmixware = { execFormat = unknown; families = { }; };
284287 } // { # aliases
285288 # 'darwin' is the kernel for all of them. We choose macOS by default.
286289 darwin = kernels.macos;
@@ -382,7 +385,7 @@ rec {
382385 else if (elemAt l 1) == "elf"
383386 then { cpu = elemAt l 0; vendor = "unknown"; kernel = "none"; abi = elemAt l 1; }
384387 else { cpu = elemAt l 0; kernel = elemAt l 1; };
385− "3" = # Awkwards hacks, beware!
388+ "3" = # Awkward hacks, beware!
386389 if elemAt l 1 == "apple"
387390 then { cpu = elemAt l 0; vendor = "apple"; kernel = elemAt l 2; }
388391 else if (elemAt l 1 == "linux") || (elemAt l 2 == "gnu")
@@ -393,6 +396,8 @@ rec {
393396 then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "wasi"; }
394397 else if (elemAt l 2 == "redox")
395398 then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "redox"; }
399+ else if (elemAt l 2 == "mmixware")
400+ then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "mmixware"; }
396401 else if hasPrefix "netbsd" (elemAt l 2)
397402 then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = elemAt l 2; }
398403 else if (elem (elemAt l 2) ["eabi" "eabihf" "elf"])
lib/tests/systems.nix+4−2
@@ -11,12 +11,14 @@ let
1111 expr = lib.sort lib.lessThan x;
1212 expected = lib.sort lib.lessThan y;
1313 };
14−in with lib.systems.doubles; lib.runTests {
15− testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded ++ js ++ genode ++ redox);
14+in
15+with lib.systems.doubles; lib.runTests {
16+ testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded ++ mmix ++ js ++ genode ++ redox);
1617
1718 testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv6l-none" "armv7a-linux" "armv7l-linux" "arm-none" "armv7a-darwin" ];
1819 testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-genode" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ];
1920 testmips = mseteq mips [ "mipsel-linux" ];
21+ testmmix = mseteq mmix [ "mmix-mmixware" ];
2022 testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-genode" "x86_64-redox" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ];
2123
2224 testcygwin = mseteq cygwin [ "i686-cygwin" "x86_64-cygwin" ];
pkgs/build-support/bintools-wrapper/default.nix+1
@@ -179,6 +179,7 @@ stdenv.mkDerivation {
179179 mips64 = "btsmip";
180180 mips64el = "ltsmip";
181181 }.${targetPlatform.parsed.cpu.name}
182+ else if targetPlatform.isMmix then "mmix"
182183 else if targetPlatform.isPower then if targetPlatform.isBigEndian then "ppc" else "lppc"
183184 else if targetPlatform.isSparc then "sparc"
184185 else if targetPlatform.isMsp430 then "msp430"
pkgs/development/tools/mmixware/default.nixnew file+44
@@ -0,0 +1,44 @@
1+{ stdenv, fetchFromGitLab, tetex }:
2+
3+stdenv.mkDerivation {
4+ pname = "mmixware";
5+ version = "unstable-2019-02-19";
6+
7+ src = fetchFromGitLab {
8+ domain = "gitlab.lrz.de";
9+ owner = "mmix";
10+ repo = "mmixware";
11+ rev = "a330d68aafcfe739ecaaece888a669b8e7d9bcb8";
12+ sha256 = "0bq0d19vqhfbpk4mcqzmd0hygbkhapl1mzlfkcr6afx0fhlhi087";
13+ };
14+
15+ hardeningDisable = [ "format" ];
16+
17+ postPatch = ''
18+ substituteInPlace Makefile --replace 'rm abstime.h' ""
19+ '';
20+
21+ nativeBuildInputs = [ tetex ];
22+ enableParallelBuilding = true;
23+
24+ makeFlags = [ "all" "doc" "CFLAGS=-O2" ];
25+
26+ installPhase = ''
27+ runHook preInstall
28+ mkdir -p $out/share/doc
29+ cp *.ps $out/share/doc
30+ install -Dm755 mmixal -t $out/bin
31+ install -Dm755 mmix -t $out/bin
32+ install -Dm755 mmotype -t $out/bin
33+ install -Dm755 mmmix -t $out/bin
34+ runHook postInstall
35+ '';
36+
37+ meta = with stdenv.lib; {
38+ description = "MMIX simulator and assembler";
39+ homepage = "https://www-cs-faculty.stanford.edu/~knuth/mmix-news.html";
40+ maintainers = with maintainers; [ siraben ];
41+ platforms = platforms.unix;
42+ license = licenses.publicDomain;
43+ };
44+}
pkgs/top-level/all-packages.nix+2
@@ -5691,6 +5691,8 @@ in
56915691
56925692 mmake = callPackage ../tools/misc/mmake { };
56935693
5694+ mmixware = callPackage ../development/tools/mmixware { };
5695+
56945696 modemmanager = callPackage ../tools/networking/modem-manager {};
56955697
56965698 modem-manager-gui = callPackage ../applications/networking/modem-manager-gui {};