From 98eea963deb85d2174262d5f45ddd614a7906231 Mon Sep 17 00:00:00 2001 From: Evan Haas Date: Mon, 26 Jul 2021 12:08:29 -0700 Subject: translate-c: fix import path in translation failure comment --- src/translate_c.zig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/translate_c.zig b/src/translate_c.zig index 395a314f7c..df8e285b59 100644 --- a/src/translate_c.zig +++ b/src/translate_c.zig @@ -1969,7 +1969,7 @@ fn transBuiltinFnExpr(c: *Context, scope: *Scope, expr: *const clang.Expr, used: const node = try transExpr(c, scope, expr, used); if (node.castTag(.identifier)) |ident| { const name = ident.data; - if (!isBuiltinDefined(name)) return fail(c, error.UnsupportedTranslation, expr.getBeginLoc(), "TODO implement function '{s}' in std.c.builtins", .{name}); + if (!isBuiltinDefined(name)) return fail(c, error.UnsupportedTranslation, expr.getBeginLoc(), "TODO implement function '{s}' in std.zig.c_builtins", .{name}); } return node; } @@ -5574,7 +5574,7 @@ fn parseCPrimaryExprInner(c: *Context, m: *MacroCtx, scope: *Scope) ParseError!N .Identifier => { const mangled_name = scope.getAlias(slice); if (mem.startsWith(u8, mangled_name, "__builtin_") and !isBuiltinDefined(mangled_name)) { - try m.fail(c, "TODO implement function '{s}' in std.c.builtins", .{mangled_name}); + try m.fail(c, "TODO implement function '{s}' in std.zig.c_builtins", .{mangled_name}); return error.ParseError; } const identifier = try Tag.identifier.create(c.arena, builtin_typedef_map.get(mangled_name) orelse mangled_name); -- cgit v1.2.3 From c090e38340f3b0df30e1affb838a6e171f943280 Mon Sep 17 00:00:00 2001 From: Evan Haas Date: Tue, 27 Jul 2021 16:06:38 -0700 Subject: translate-c: add support for ChooseExpr --- src/clang.zig | 5 +++++ src/translate_c.zig | 4 ++++ src/zig_clang.cpp | 5 +++++ src/zig_clang.h | 3 +++ test/run_translated_c.zig | 50 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 67 insertions(+) (limited to 'src') diff --git a/src/clang.zig b/src/clang.zig index 023d1aba4b..0632c5ab67 100644 --- a/src/clang.zig +++ b/src/clang.zig @@ -269,6 +269,11 @@ pub const CharacterLiteral = opaque { extern fn ZigClangCharacterLiteral_getValue(*const CharacterLiteral) c_uint; }; +pub const ChooseExpr = opaque { + pub const getChosenSubExpr = ZigClangChooseExpr_getChosenSubExpr; + extern fn ZigClangChooseExpr_getChosenSubExpr(*const ChooseExpr) *const Expr; +}; + pub const CompoundAssignOperator = opaque { pub const getType = ZigClangCompoundAssignOperator_getType; extern fn ZigClangCompoundAssignOperator_getType(*const CompoundAssignOperator) QualType; diff --git a/src/translate_c.zig b/src/translate_c.zig index df8e285b59..fb40344b34 100644 --- a/src/translate_c.zig +++ b/src/translate_c.zig @@ -1308,6 +1308,10 @@ fn transStmt( const shuffle_vec_node = try transShuffleVectorExpr(c, scope, shuffle_vec_expr); return maybeSuppressResult(c, scope, result_used, shuffle_vec_node); }, + .ChooseExprClass => { + const choose_expr = @ptrCast(*const clang.ChooseExpr, stmt); + return transExpr(c, scope, choose_expr.getChosenSubExpr(), result_used); + }, // When adding new cases here, see comment for maybeBlockify() .GCCAsmStmtClass, .GotoStmtClass, diff --git a/src/zig_clang.cpp b/src/zig_clang.cpp index 7c923021d8..4fe1dfc286 100644 --- a/src/zig_clang.cpp +++ b/src/zig_clang.cpp @@ -2832,6 +2832,11 @@ unsigned ZigClangCharacterLiteral_getValue(const struct ZigClangCharacterLiteral return casted->getValue(); } +const struct ZigClangExpr *ZigClangChooseExpr_getChosenSubExpr(const struct ZigClangChooseExpr *self) { + auto casted = reinterpret_cast(self); + return reinterpret_cast(casted->getChosenSubExpr()); +} + const struct ZigClangExpr *ZigClangAbstractConditionalOperator_getCond(const struct ZigClangAbstractConditionalOperator *self) { auto casted = reinterpret_cast(self); return reinterpret_cast(casted->getCond()); diff --git a/src/zig_clang.h b/src/zig_clang.h index 634534dfb4..dc35df3772 100644 --- a/src/zig_clang.h +++ b/src/zig_clang.h @@ -104,6 +104,7 @@ struct ZigClangCStyleCastExpr; struct ZigClangCallExpr; struct ZigClangCaseStmt; struct ZigClangCharacterLiteral; +struct ZigClangChooseExpr; struct ZigClangCompoundAssignOperator; struct ZigClangCompoundStmt; struct ZigClangConditionalOperator; @@ -1242,6 +1243,8 @@ ZIG_EXTERN_C struct ZigClangSourceLocation ZigClangCharacterLiteral_getBeginLoc( ZIG_EXTERN_C enum ZigClangCharacterLiteral_CharacterKind ZigClangCharacterLiteral_getKind(const struct ZigClangCharacterLiteral *); ZIG_EXTERN_C unsigned ZigClangCharacterLiteral_getValue(const struct ZigClangCharacterLiteral *); +ZIG_EXTERN_C const struct ZigClangExpr *ZigClangChooseExpr_getChosenSubExpr(const struct ZigClangChooseExpr *); + ZIG_EXTERN_C const struct ZigClangExpr *ZigClangAbstractConditionalOperator_getCond(const struct ZigClangAbstractConditionalOperator *); ZIG_EXTERN_C const struct ZigClangExpr *ZigClangAbstractConditionalOperator_getTrueExpr(const struct ZigClangAbstractConditionalOperator *); ZIG_EXTERN_C const struct ZigClangExpr *ZigClangAbstractConditionalOperator_getFalseExpr(const struct ZigClangAbstractConditionalOperator *); diff --git a/test/run_translated_c.zig b/test/run_translated_c.zig index ef2fd187df..dab200af0d 100644 --- a/test/run_translated_c.zig +++ b/test/run_translated_c.zig @@ -1659,4 +1659,54 @@ pub fn addCases(cases: *tests.RunTranslatedCContext) void { \\ return 0; \\} , ""); + + cases.add("__builtin_choose_expr (unchosen expression is not evaluated)", + \\#include + \\int main(void) { + \\ int x = 0.0; + \\ int y = 0.0; + \\ int res; + \\ res = __builtin_choose_expr(1, 1, x / y); + \\ if (res != 1) abort(); + \\ res = __builtin_choose_expr(0, x / y, 2); + \\ if (res != 2) abort(); + \\ return 0; + \\} + , ""); + + // TODO: add isnan check for long double once bitfield support is added + // (needed for x86_64-windows-gnu) + // TODO: add isinf check for long double once std.math.isInf supports c_longdouble + cases.add("NAN and INFINITY", + \\#include + \\#include + \\#include + \\union uf { uint32_t u; float f; }; + \\#define CHECK_NAN(STR, VAL) { \ + \\ union uf unpack = {.f = __builtin_nanf(STR)}; \ + \\ if (!isnan(unpack.f)) abort(); \ + \\ if (unpack.u != VAL) abort(); \ + \\} + \\int main(void) { + \\ float f_nan = NAN; + \\ if (!isnan(f_nan)) abort(); + \\ double d_nan = NAN; + \\ if (!isnan(d_nan)) abort(); + \\ CHECK_NAN("0", 0x7FC00000); + \\ CHECK_NAN("", 0x7FC00000); + \\ CHECK_NAN("1", 0x7FC00001); + \\ CHECK_NAN("0x7FC00000", 0x7FC00000); + \\ CHECK_NAN("0x7FC0000F", 0x7FC0000F); + \\ CHECK_NAN("0x7FC000F0", 0x7FC000F0); + \\ CHECK_NAN("0x7FC00F00", 0x7FC00F00); + \\ CHECK_NAN("0x7FC0F000", 0x7FC0F000); + \\ CHECK_NAN("0x7FCF0000", 0x7FCF0000); + \\ CHECK_NAN("0xFFFFFFFF", 0x7FFFFFFF); + \\ float f_inf = INFINITY; + \\ if (!isinf(f_inf)) abort(); + \\ double d_inf = INFINITY; + \\ if (!isinf(d_inf)) abort(); + \\ return 0; + \\} + , ""); } -- cgit v1.2.3