diff options
| -rw-r--r-- | builtin.c | 21 | ||||
| -rw-r--r-- | linearize.c | 30 | ||||
| -rw-r--r-- | validation/expand/builtin_isdigit.c | 10 | ||||
| -rw-r--r-- | validation/linear/builtin-fma.c | 2 | ||||
| -rw-r--r-- | validation/linear/builtin_isdigit.c | 12 |
5 files changed, 70 insertions, 5 deletions
@@ -305,6 +305,26 @@ static struct symbol_op fp_unop_op = { }; +static int expand_isdigit(struct expression *expr, int cost) +{ + struct expression *arg = first_expression(expr->args); + long long val = get_expression_value_silent(arg); + + if (cost) + return cost; + + expr->value = (val >= '0') && (val <= '9'); + expr->type = EXPR_VALUE; + expr->taint = 0; + return 0; +} + +static struct symbol_op isdigit_op = { + .evaluate = evaluate_pure_unop, + .expand = expand_isdigit, +}; + + static int evaluate_overflow_gen(struct expression *expr, int ptr) { struct expression *arg; @@ -552,6 +572,7 @@ static const struct builtin_fn builtins_common[] = { { "__builtin_inf", &double_ctype, 0 }, { "__builtin_inff", &float_ctype, 0 }, { "__builtin_infl", &ldouble_ctype, 0 }, + { "__builtin_isdigit", &int_ctype, 0, { &int_ctype }, .op = &isdigit_op }, { "__builtin_isfinite", &int_ctype, 1, .op = &fp_unop_op }, { "__builtin_isgreater", &int_ctype, 0, { &float_ctype, &float_ctype }}, { "__builtin_isgreaterequal", &int_ctype, 0, { &float_ctype, &float_ctype }}, diff --git a/linearize.c b/linearize.c index 301a5d9e..c1e3455a 100644 --- a/linearize.c +++ b/linearize.c @@ -2590,17 +2590,38 @@ static pseudo_t linearize_fma(struct entrypoint *ep, struct expression *expr) struct expression *arg; PREPARE_PTR_LIST(expr->args, arg); - insn->src1 = linearize_expression(ep, arg); + use_pseudo(insn, linearize_expression(ep, arg), &insn->src1); NEXT_PTR_LIST(arg) - insn->src2 = linearize_expression(ep, arg); + use_pseudo(insn, linearize_expression(ep, arg), &insn->src2); NEXT_PTR_LIST(arg) - insn->src3 = linearize_expression(ep, arg); + use_pseudo(insn, linearize_expression(ep, arg), &insn->src3); FINISH_PTR_LIST(arg); add_one_insn(ep, insn); return insn->target = alloc_pseudo(insn); } +static pseudo_t linearize_isdigit(struct entrypoint *ep, struct expression *expr) +{ + struct instruction *insn; + pseudo_t src; + + insn = alloc_typed_instruction(OP_SUB, &int_ctype); + src = linearize_expression(ep, first_expression(expr->args)); + use_pseudo(insn, src, &insn->src1); + insn->src2 = value_pseudo('0'); + src = insn->target = alloc_pseudo(insn); + add_one_insn(ep, insn); + + insn = alloc_typed_instruction(OP_SET_BE, &int_ctype); + use_pseudo(insn, src, &insn->src1); + insn->src2 = value_pseudo(9); + insn->target = alloc_pseudo(insn); + add_one_insn(ep, insn); + + return insn->target; +} + static pseudo_t linearize_unreachable(struct entrypoint *ep, struct expression *exp) { add_unreachable(ep); @@ -2616,6 +2637,7 @@ static struct sym_init { { "__builtin_fma", linearize_fma }, { "__builtin_fmaf", linearize_fma }, { "__builtin_fmal", linearize_fma }, + { "__builtin_isdigit", linearize_isdigit }, { "__builtin_unreachable", linearize_unreachable }, { } }; @@ -2630,6 +2652,6 @@ void init_linearized_builtins(int stream) if (!sym->op) sym->op = &ptr->op; sym->op->type |= KW_BUILTIN; - ptr->op.linearize = ptr->linearize; + sym->op->linearize = ptr->linearize; } } diff --git a/validation/expand/builtin_isdigit.c b/validation/expand/builtin_isdigit.c new file mode 100644 index 00000000..56550b38 --- /dev/null +++ b/validation/expand/builtin_isdigit.c @@ -0,0 +1,10 @@ +_Static_assert(__builtin_isdigit('0')); +_Static_assert(__builtin_isdigit('9')); + +_Static_assert(!__builtin_isdigit(0)); +_Static_assert(!__builtin_isdigit(' ')); +_Static_assert(!__builtin_isdigit('z')); + +/* + * check-name: builtin_isdigit + */ diff --git a/validation/linear/builtin-fma.c b/validation/linear/builtin-fma.c index b1024f39..9ca50f0f 100644 --- a/validation/linear/builtin-fma.c +++ b/validation/linear/builtin-fma.c @@ -11,7 +11,7 @@ double fma(double a, double x, double y) fma: .L0: <entry-point> - fmadd.64 %r4 <- %r1, %r2, %r3 + fmadd.64 %r4 <- %arg1, %arg2, %arg3 ret.64 %r4 diff --git a/validation/linear/builtin_isdigit.c b/validation/linear/builtin_isdigit.c new file mode 100644 index 00000000..c1d3ea15 --- /dev/null +++ b/validation/linear/builtin_isdigit.c @@ -0,0 +1,12 @@ +_Bool isdigit(int c) +{ + return __builtin_isdigit(c) == (((unsigned) (c - '0')) <= 9); +} + +/* + * check-name: builtin_isdigit + * check-command: test-linearize -Wno-decl $file + * + * check-output-ignore + * check-output-returns: 1 + */ |