mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-06 13:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

codegen: Set c_char signedness based on the target

Browse source
This commit is contained in:
Evan Haas 2023-06-20 00:20:32 -07:00
parent 657fe55711
commit fb9d6b8bd9
No known key found for this signature in database
5 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/codegen/c.zig
View file

@ -1880,7 +1880,7 @@ pub const DeclGen = struct {
if (cty.isBool()) if (cty.isBool())
signAbbrev(.unsigned) signAbbrev(.unsigned)
else if (cty.isInteger()) else if (cty.isInteger())
signAbbrev(cty.signedness() orelse .unsigned) signAbbrev(cty.signedness(dg.module.getTarget()))
else if (cty.isFloat()) else if (cty.isFloat())
@as(u8, 'f') @as(u8, 'f')
else if (cty.isPointer()) else if (cty.isPointer())

4
src/codegen/c/type.zig
View file

@ -537,9 +537,9 @@ pub const CType = extern union {
}; };
} }
pub fn signedness(self: CType) ?std.builtin.Signedness { pub fn signedness(self: CType, target: std.Target) std.builtin.Signedness {
return switch (self.tag()) { return switch (self.tag()) {
.char => null, // unknown signedness .char => target.charSignedness(),
.@"signed char", .@"signed char",
.short, .short,
.int, .int,

6
src/type.zig
View file

@ -2216,7 +2216,8 @@ pub const Type = struct {
/// Returns true if and only if the type is a fixed-width, signed integer. /// Returns true if and only if the type is a fixed-width, signed integer.
pub fn isSignedInt(ty: Type, mod: *const Module) bool { pub fn isSignedInt(ty: Type, mod: *const Module) bool {
return switch (ty.toIntern()) { return switch (ty.toIntern()) {
.c_char_type, .isize_type, .c_short_type, .c_int_type, .c_long_type, .c_longlong_type => true, .c_char_type => mod.getTarget().charSignedness() == .signed,
.isize_type, .c_short_type, .c_int_type, .c_long_type, .c_longlong_type => true,
else => switch (mod.intern_pool.indexToKey(ty.toIntern())) { else => switch (mod.intern_pool.indexToKey(ty.toIntern())) {
.int_type => |int_type| int_type.signedness == .signed, .int_type => |int_type| int_type.signedness == .signed,
else => false, else => false,
@ -2227,6 +2228,7 @@ pub const Type = struct {
/// Returns true if and only if the type is a fixed-width, unsigned integer. /// Returns true if and only if the type is a fixed-width, unsigned integer.
pub fn isUnsignedInt(ty: Type, mod: *const Module) bool { pub fn isUnsignedInt(ty: Type, mod: *const Module) bool {
return switch (ty.toIntern()) { return switch (ty.toIntern()) {
.c_char_type => mod.getTarget().charSignedness() == .unsigned,
.usize_type, .c_ushort_type, .c_uint_type, .c_ulong_type, .c_ulonglong_type => true, .usize_type, .c_ushort_type, .c_uint_type, .c_ulong_type, .c_ulonglong_type => true,
else => switch (mod.intern_pool.indexToKey(ty.toIntern())) { else => switch (mod.intern_pool.indexToKey(ty.toIntern())) {
.int_type => |int_type| int_type.signedness == .unsigned, .int_type => |int_type| int_type.signedness == .unsigned,
@ -2257,7 +2259,7 @@ pub const Type = struct {
}, },
.usize_type => return .{ .signedness = .unsigned, .bits = target.ptrBitWidth() }, .usize_type => return .{ .signedness = .unsigned, .bits = target.ptrBitWidth() },
.isize_type => return .{ .signedness = .signed, .bits = target.ptrBitWidth() }, .isize_type => return .{ .signedness = .signed, .bits = target.ptrBitWidth() },
.c_char_type => return .{ .signedness = .signed, .bits = target.c_type_bit_size(.char) }, .c_char_type => return .{ .signedness = mod.getTarget().charSignedness(), .bits = target.c_type_bit_size(.char) },
.c_short_type => return .{ .signedness = .signed, .bits = target.c_type_bit_size(.short) }, .c_short_type => return .{ .signedness = .signed, .bits = target.c_type_bit_size(.short) },
.c_ushort_type => return .{ .signedness = .unsigned, .bits = target.c_type_bit_size(.ushort) }, .c_ushort_type => return .{ .signedness = .unsigned, .bits = target.c_type_bit_size(.ushort) },
.c_int_type => return .{ .signedness = .signed, .bits = target.c_type_bit_size(.int) }, .c_int_type => return .{ .signedness = .signed, .bits = target.c_type_bit_size(.int) },

1
test/behavior.zig
View file

@ -145,6 +145,7 @@ test {
_ = @import("behavior/bugs/15778.zig"); _ = @import("behavior/bugs/15778.zig");
_ = @import("behavior/byteswap.zig"); _ = @import("behavior/byteswap.zig");
_ = @import("behavior/byval_arg_var.zig"); _ = @import("behavior/byval_arg_var.zig");
_ = @import("behavior/c_char_signedness.zig");
_ = @import("behavior/call.zig"); _ = @import("behavior/call.zig");
_ = @import("behavior/cast.zig"); _ = @import("behavior/cast.zig");
_ = @import("behavior/cast_int.zig"); _ = @import("behavior/cast_int.zig");

10
test/behavior/c_char_signedness.zig Normal file
View file

@ -0,0 +1,10 @@
const std = @import("std");
const expectEqual = std.testing.expectEqual;
const c = @cImport({
@cInclude("limits.h");
});
test "c_char signedness" {
try expectEqual(@as(c_char, c.CHAR_MIN), std.math.minInt(c_char));
try expectEqual(@as(c_char, c.CHAR_MAX), std.math.maxInt(c_char));
}