Skip to content

Commit

Permalink
lib.systems: add as32bit and as64bit
Browse files Browse the repository at this point in the history
  • Loading branch information
@RossComputerGuy
RossComputerGuy committed Oct 12, 2024
1 parent 9f6509c commit bec5d71
Show file tree
Hide file tree
Showing 2 changed files with 89 additions and 33 deletions.
56 changes: 56 additions & 0 deletions lib/systems/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,57 @@ let
(final.parsed.abi.assertions or []);
final;

# Breaks down an elaborated system into its arguments.
delaborate = platform:
lib.removeAttrs platform (lib.attrNames inspect.predicates
++ lib.attrNames architectures.predicates
++ [
"canExecute"
"darwinArch"
"darwinPlatform"
"emulator"
"emulatorAvailable"
"extensions"
"efiArch"
"hasSharedLibraries"
"isCompatible"
"libDir"
"linuxArch"
"parsed"
"qemuArch"
"ubootArch"
"uname"
]);

updateTriple = parsed: { cpu ? null, abi ? null, kernel ? null, vendor ? null }@args:
parse.tripleFromSystem
(parse.mkSystemFromSkeleton ((lib.mapAttrs
(n: v: v.name)
(lib.filterAttrs (n: v: lib.isAttrs v) parsed)) // lib.filterAttrs (n: v: v != null) args));

# Elaborates a new system and inherit the previous one but override the parsed.
# CPU, ABI, Kernel, and Vendor all can be changed but by default inherit from the previous platform.
composeNew = platform: { cpu ? null, abi ? null, kernel ? null, vendor ? null }@args:
elaborate ({
system = updateTriple platform.parsed args;
} // lib.removeAttrs (delaborate platform) [ "system" "config" ]);

as32bit = platform: if !platform.is32bit && platform.parsed.cpu ? as32bit then
composeNew platform {
cpu = platform.parsed.cpu.as32bit;
abi = if platform.isAarch64 && platform.parsed.abi.name == "gnu" then
"gnueabi"
else platform.parsed.abi.name;
} else null;

as64bit = platform: if !platform.is64bit && !platform.isWasm && platform.parsed.cpu ? as64bit then
composeNew platform {
cpu = platform.parsed.cpu.as64bit;
abi = if platform.isAarch32 && platform.parsed.abi.name == "gnueabi" then
"gnu"
else platform.parsed.abi.name;
} else null;

in

# Everything in this attrset is the public interface of the file.
Expand All @@ -435,5 +486,10 @@ in
inspect
parse
platforms
delaborate
updateTriple
composeNew
as32bit
as64bit
;
}
66 changes: 33 additions & 33 deletions lib/systems/parse.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,54 +108,54 @@ rec {
types.cpuType = enum (attrValues cpuTypes);

cpuTypes = let inherit (significantBytes) bigEndian littleEndian; in setTypes types.openCpuType {
arm = { bits = 32; significantByte = littleEndian; family = "arm"; };
armv5tel = { bits = 32; significantByte = littleEndian; family = "arm"; version = "5"; arch = "armv5t"; };
armv6m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "6"; arch = "armv6-m"; };
armv6l = { bits = 32; significantByte = littleEndian; family = "arm"; version = "6"; arch = "armv6"; };
armv7a = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; arch = "armv7-a"; };
armv7r = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; arch = "armv7-r"; };
armv7m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; arch = "armv7-m"; };
armv7l = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; arch = "armv7"; };
armv8a = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; arch = "armv8-a"; };
armv8r = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; arch = "armv8-a"; };
armv8m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; arch = "armv8-m"; };
aarch64 = { bits = 64; significantByte = littleEndian; family = "arm"; version = "8"; arch = "armv8-a"; };
arm = { bits = 32; significantByte = littleEndian; family = "arm"; as64bit = "aarch64"; };
armv5tel = { bits = 32; significantByte = littleEndian; family = "arm"; version = "5"; arch = "armv5t"; as64bit = "aarch64"; };
armv6m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "6"; arch = "armv6-m"; as64bit = "aarch64"; };
armv6l = { bits = 32; significantByte = littleEndian; family = "arm"; version = "6"; arch = "armv6"; as64bit = "aarch64"; };
armv7a = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; arch = "armv7-a"; as64bit = "aarch64"; };
armv7r = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; arch = "armv7-r"; as64bit = "aarch64"; };
armv7m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; arch = "armv7-m"; as64bit = "aarch64"; };
armv7l = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; arch = "armv7"; as64bit = "aarch64"; };
armv8a = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; arch = "armv8-a"; as64bit = "aarch64"; };
armv8r = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; arch = "armv8-a"; as64bit = "aarch64"; };
armv8m = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; arch = "armv8-m"; as64bit = "aarch64"; };
aarch64 = { bits = 64; significantByte = littleEndian; family = "arm"; version = "8"; arch = "armv8-a"; as32bit = "arm"; };
aarch64_be = { bits = 64; significantByte = bigEndian; family = "arm"; version = "8"; arch = "armv8-a"; };

i386 = { bits = 32; significantByte = littleEndian; family = "x86"; arch = "i386"; };
i486 = { bits = 32; significantByte = littleEndian; family = "x86"; arch = "i486"; };
i586 = { bits = 32; significantByte = littleEndian; family = "x86"; arch = "i586"; };
i686 = { bits = 32; significantByte = littleEndian; family = "x86"; arch = "i686"; };
x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; arch = "x86-64"; };
i386 = { bits = 32; significantByte = littleEndian; family = "x86"; arch = "i386"; as64bit = "x86_64"; };
i486 = { bits = 32; significantByte = littleEndian; family = "x86"; arch = "i486"; as64bit = "x86_64"; };
i586 = { bits = 32; significantByte = littleEndian; family = "x86"; arch = "i586"; as64bit = "x86_64"; };
i686 = { bits = 32; significantByte = littleEndian; family = "x86"; arch = "i686"; as64bit = "x86_64"; };
x86_64 = { bits = 64; significantByte = littleEndian; family = "x86"; arch = "x86-64"; as32bit = "i686"; };

microblaze = { bits = 32; significantByte = bigEndian; family = "microblaze"; };
microblazeel = { bits = 32; significantByte = littleEndian; family = "microblaze"; };

mips = { bits = 32; significantByte = bigEndian; family = "mips"; };
mipsel = { bits = 32; significantByte = littleEndian; family = "mips"; };
mips64 = { bits = 64; significantByte = bigEndian; family = "mips"; };
mips64el = { bits = 64; significantByte = littleEndian; family = "mips"; };
mips = { bits = 32; significantByte = bigEndian; family = "mips"; as64bit = "mips64"; };
mipsel = { bits = 32; significantByte = littleEndian; family = "mips"; as64bit = "mips64el"; };
mips64 = { bits = 64; significantByte = bigEndian; family = "mips"; as32bit = "mips"; };
mips64el = { bits = 64; significantByte = littleEndian; family = "mips"; as32bit = "mipsel"; };

mmix = { bits = 64; significantByte = bigEndian; family = "mmix"; };

m68k = { bits = 32; significantByte = bigEndian; family = "m68k"; };

powerpc = { bits = 32; significantByte = bigEndian; family = "power"; };
powerpc64 = { bits = 64; significantByte = bigEndian; family = "power"; };
powerpc64le = { bits = 64; significantByte = littleEndian; family = "power"; };
powerpcle = { bits = 32; significantByte = littleEndian; family = "power"; };
powerpc = { bits = 32; significantByte = bigEndian; family = "power"; as64bit = "powerpc64"; };
powerpc64 = { bits = 64; significantByte = bigEndian; family = "power"; as32bit = "powerpc"; };
powerpc64le = { bits = 64; significantByte = littleEndian; family = "power"; as32bit = "powerpcle"; };
powerpcle = { bits = 32; significantByte = littleEndian; family = "power"; as64bit = "powerpc64le"; };

riscv32 = { bits = 32; significantByte = littleEndian; family = "riscv"; };
riscv64 = { bits = 64; significantByte = littleEndian; family = "riscv"; };
riscv32 = { bits = 32; significantByte = littleEndian; family = "riscv"; as64bit = "riscv64"; };
riscv64 = { bits = 64; significantByte = littleEndian; family = "riscv"; as32bit = "riscv32"; };

s390 = { bits = 32; significantByte = bigEndian; family = "s390"; };
s390x = { bits = 64; significantByte = bigEndian; family = "s390"; };
s390 = { bits = 32; significantByte = bigEndian; family = "s390"; as64bit = "s390x"; };
s390x = { bits = 64; significantByte = bigEndian; family = "s390"; as32bit = "s390"; };

sparc = { bits = 32; significantByte = bigEndian; family = "sparc"; };
sparc64 = { bits = 64; significantByte = bigEndian; family = "sparc"; };
sparc = { bits = 32; significantByte = bigEndian; family = "sparc"; as64bit = "sparc64"; };
sparc64 = { bits = 64; significantByte = bigEndian; family = "sparc"; as32bit = "sparc"; };

wasm32 = { bits = 32; significantByte = littleEndian; family = "wasm"; };
wasm64 = { bits = 64; significantByte = littleEndian; family = "wasm"; };
wasm32 = { bits = 32; significantByte = littleEndian; family = "wasm"; as64bit = "wasm64"; };
wasm64 = { bits = 64; significantByte = littleEndian; family = "wasm"; as32bit = "wasm32"; };

alpha = { bits = 64; significantByte = littleEndian; family = "alpha"; };

Expand Down

0 comments on commit bec5d71

Please sign in to comment.