authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-08-06 14:55:15-07:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2024-08-06 14:55:15-07:00
logc8a226a42960297deb0b7bf270cc3ef3253f0c6d
tree835da0e073e0c76c0ec0e49a0ad5f3d7e59e0cc8
parentde1fb199091ef1b3ae53d4de0fc30fa958131c96
parentef502daafe2b4e216c68fe07ff05aa91d539b831
signaturebadge-check Signed by PGP key B5690EEEBB952194

Merge pull request #20960 from alexrp/size-align-fixes

`std.Target`: A bunch of C type size/alignment fixes

1 files changed, 21 insertions(+), 29 deletions(-)

lib/std/Target.zig+21-29
......@@ -1852,14 +1852,15 @@ pub fn ptrBitWidth_cpu_abi(cpu: Cpu, abi: Abi) u16 {
18521852 .kalimba,
18531853 .lanai,
18541854 .wasm32,
1855 .sparc,
18551856 .spirv32,
18561857 .loongarch32,
1857 .dxil,
18581858 .xtensa,
18591859 => 32,
18601860
18611861 .aarch64,
18621862 .aarch64_be,
1863 .dxil,
18631864 .mips64,
18641865 .mips64el,
18651866 .powerpc64,
......@@ -1874,13 +1875,10 @@ pub fn ptrBitWidth_cpu_abi(cpu: Cpu, abi: Abi) u16 {
18741875 .sparc64,
18751876 .s390x,
18761877 .ve,
1878 .spirv,
18771879 .spirv64,
18781880 .loongarch64,
18791881 => 64,
1880
1881 .sparc => if (std.Target.sparc.featureSetHas(cpu.features, .v9)) 64 else 32,
1882
1883 .spirv => @panic("TODO what should this value be?"),
18841882 };
18851883}
18861884
......@@ -2061,12 +2059,12 @@ pub fn c_type_bit_size(target: Target, c_type: CType) u16 {
20612059 .aarch64,
20622060 .aarch64_be,
20632061 .s390x,
2064 .sparc,
20652062 .sparc64,
20662063 .wasm32,
20672064 .wasm64,
20682065 .loongarch32,
20692066 .loongarch64,
2067 .ve,
20702068 => return 128,
20712069
20722070 else => return 64,
......@@ -2167,12 +2165,12 @@ pub fn c_type_bit_size(target: Target, c_type: CType) u16 {
21672165 .s390x,
21682166 .mips64,
21692167 .mips64el,
2170 .sparc,
21712168 .sparc64,
21722169 .wasm32,
21732170 .wasm64,
21742171 .loongarch32,
21752172 .loongarch64,
2173 .ve,
21762174 => return 128,
21772175
21782176 else => return 64,
......@@ -2252,23 +2250,20 @@ pub fn c_type_bit_size(target: Target, c_type: CType) u16 {
22522250 .longdouble => return 64,
22532251 },
22542252
2255 .amdhsa, .amdpal => switch (c_type) {
2253 .amdhsa, .amdpal, .mesa3d => switch (c_type) {
22562254 .char => return 8,
22572255 .short, .ushort => return 16,
22582256 .int, .uint, .float => return 32,
22592257 .long, .ulong, .longlong, .ulonglong, .double => return 64,
2260 .longdouble => return 128,
2258 .longdouble => return 64,
22612259 },
22622260
22632261 .opencl, .vulkan => switch (c_type) {
22642262 .char => return 8,
22652263 .short, .ushort => return 16,
22662264 .int, .uint, .float => return 32,
2267 .long, .ulong, .double => return 64,
2268 .longlong, .ulonglong => return 128,
2269 // Note: The OpenCL specification does not guarantee a particular size for long double,
2270 // but clang uses 128 bits.
2271 .longdouble => return 128,
2265 .long, .ulong, .longlong, .ulonglong, .double => return 64,
2266 .longdouble => return 64,
22722267 },
22732268
22742269 .ps4, .ps5 => switch (c_type) {
......@@ -2285,7 +2280,6 @@ pub fn c_type_bit_size(target: Target, c_type: CType) u16 {
22852280 .rtems,
22862281 .aix,
22872282 .elfiamcu,
2288 .mesa3d,
22892283 .contiki,
22902284 .hermit,
22912285 .hurd,
......@@ -2344,11 +2338,8 @@ pub fn c_type_alignment(target: Target, c_type: CType) u16 {
23442338 .csky,
23452339 .x86,
23462340 .xcore,
2347 .dxil,
23482341 .loongarch32,
2349 .spirv32,
23502342 .kalimba,
2351 .ve,
23522343 .spu_2,
23532344 .xtensa,
23542345 => 4,
......@@ -2356,22 +2347,24 @@ pub fn c_type_alignment(target: Target, c_type: CType) u16 {
23562347 .amdgcn,
23572348 .bpfel,
23582349 .bpfeb,
2350 .dxil,
23592351 .hexagon,
2360 .loongarch64,
23612352 .m68k,
23622353 .mips,
23632354 .mipsel,
23642355 .sparc,
2365 .sparc64,
23662356 .lanai,
23672357 .nvptx,
23682358 .nvptx64,
23692359 .s390x,
2360 .spirv,
2361 .spirv32,
23702362 .spirv64,
23712363 => 8,
23722364
23732365 .aarch64,
23742366 .aarch64_be,
2367 .loongarch64,
23752368 .mips64,
23762369 .mips64el,
23772370 .powerpc,
......@@ -2380,12 +2373,12 @@ pub fn c_type_alignment(target: Target, c_type: CType) u16 {
23802373 .powerpc64le,
23812374 .riscv32,
23822375 .riscv64,
2376 .sparc64,
23832377 .x86_64,
2378 .ve,
23842379 .wasm32,
23852380 .wasm64,
23862381 => 16,
2387
2388 .spirv => @panic("TODO what should this value be?"),
23892382 }),
23902383 );
23912384}
......@@ -2449,11 +2442,8 @@ pub fn c_type_preferred_alignment(target: Target, c_type: CType) u16 {
24492442
24502443 .csky,
24512444 .xcore,
2452 .dxil,
24532445 .loongarch32,
2454 .spirv32,
24552446 .kalimba,
2456 .ve,
24572447 .spu_2,
24582448 .xtensa,
24592449 => 4,
......@@ -2467,23 +2457,25 @@ pub fn c_type_preferred_alignment(target: Target, c_type: CType) u16 {
24672457 .amdgcn,
24682458 .bpfel,
24692459 .bpfeb,
2460 .dxil,
24702461 .hexagon,
24712462 .x86,
2472 .loongarch64,
24732463 .m68k,
24742464 .mips,
24752465 .mipsel,
24762466 .sparc,
2477 .sparc64,
24782467 .lanai,
24792468 .nvptx,
24802469 .nvptx64,
24812470 .s390x,
2471 .spirv,
2472 .spirv32,
24822473 .spirv64,
24832474 => 8,
24842475
24852476 .aarch64,
24862477 .aarch64_be,
2478 .loongarch64,
24872479 .mips64,
24882480 .mips64el,
24892481 .powerpc,
......@@ -2492,12 +2484,12 @@ pub fn c_type_preferred_alignment(target: Target, c_type: CType) u16 {
24922484 .powerpc64le,
24932485 .riscv32,
24942486 .riscv64,
2487 .sparc64,
24952488 .x86_64,
2489 .ve,
24962490 .wasm32,
24972491 .wasm64,
24982492 => 16,
2499
2500 .spirv => @panic("TODO what should this value be?"),
25012493 }),
25022494 );
25032495}