implemented builtin_nan, nand

[r18564]

diff --git a/ast2firm.c b/ast2firm.c
index b75ddc1..ec2bbc9 100644 (file)
--- a/ast2firm.c
+++ b/ast2firm.c
@@ -28,9 +28,6 @@ static type_t *type_const_char;
 static type_t *type_void;
 static type_t *type_int;
 
-static symbol_t *symbol_builtin_alloca;
-static symbol_t *symbol_builtin_nanf;
-
 static int       next_value_number_function;
 static ir_node  *continue_label;
 static ir_node  *break_label;
@@ -99,9 +96,6 @@ void init_ast2firm(void)
                                                       type in firm */
 
        type_void->base.firm_type = ir_type_void;
-
-       symbol_builtin_alloca = symbol_table_insert("__builtin_alloca");
-       symbol_builtin_nanf   = symbol_table_insert("__builtin_nanf");
 }
 
 void exit_ast2firm(void)
@@ -803,11 +797,13 @@ static ir_node *process_builtin_call(const call_expression_t *call)
        dbg_info *dbgi = get_dbg_info(&call->expression.source_position);
 
        assert(call->function->type == EXPR_BUILTIN_SYMBOL);
-       builtin_symbol_expression_t *builtin
-               = (builtin_symbol_expression_t*) call->function;
-       symbol_t *symbol = builtin->symbol;
+       builtin_symbol_expression_t *builtin = &call->function->builtin_symbol;
+       symbol_t                    *symbol  = builtin->symbol;
+       type_t                      *type    = builtin->expression.datatype;
+       type                                 = skip_typeref(type);
 
-       if(symbol == symbol_builtin_alloca) {
+       switch(symbol->ID) {
+       case T___builtin_alloca: {
                if(call->arguments == NULL || call->arguments->next != NULL) {
                        panic("invalid number of parameters on __builtin_alloca");
                }
@@ -822,13 +818,18 @@ static ir_node *process_builtin_call(const call_expression_t *call)
                ir_node *res    = new_Proj(alloca, mode_P_data, pn_Alloc_res);
 
                return res;
-       } else if(symbol == symbol_builtin_nanf) {
+       }
+       case T___builtin_nan:
+       case T___builtin_nanf:
+       case T___builtin_nand: {
                /* Ignore string for now... */
-               ir_mode *mode = mode_D;
+               assert(type->type == TYPE_FUNCTION);
+               ir_mode *mode = get_ir_mode(type->function.result_type);
                tarval  *tv   = get_mode_NAN(mode);
                ir_node *res  = new_d_Const(dbgi, mode, tv);
                return res;
-       } else {
+       }
+       default:
                panic("Unsupported builtin found\n");
        }
 }

diff --git a/parser.c b/parser.c
index b486ad2..879e803 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -2651,8 +2651,12 @@ static type_t *get_builtin_symbol_type(symbol_t *symbol)
        switch(symbol->ID) {
        case T___builtin_alloca:
                return make_function_1_type(type_void_ptr, type_size_t);
-       case T___builtin_nanf:
+       case T___builtin_nan:
                return make_function_1_type(type_double, type_string);
+       case T___builtin_nanf:
+               return make_function_1_type(type_float, type_string);
+       case T___builtin_nand:
+               return make_function_1_type(type_long_double, type_string);
        default:
                panic("not implemented builtin symbol found");
        }

diff --git a/tokens.inc b/tokens.inc
index 977d3b5..6af3859 100644 (file)
--- a/tokens.inc
+++ b/tokens.inc
@@ -53,6 +53,8 @@ S(__builtin_va_arg)
 S(__builtin_va_end)
 S(__builtin_alloca)
 S(__builtin_nanf)
+S(__builtin_nan)
+S(__builtin_nand)
 S(__PRETTY_FUNCTION__)
 S(__FUNCTION__)
 S(__func__)