implement __builtin_expect, fix _Bool in ast2firm, improve declaration counting ...
[cparser] / ast.c
diff --git a/ast.c b/ast.c
index b89b92f..f8a1c18 100644 (file)
--- a/ast.c
+++ b/ast.c
@@ -140,42 +140,51 @@ static void print_call_expression(const call_expression_t *call)
 
 static void print_binary_expression(const binary_expression_t *binexpr)
 {
+       if(binexpr->expression.type == EXPR_BINARY_BUILTIN_EXPECT) {
+               fputs("__builtin_expect(", out);
+               print_expression(binexpr->left);
+               fputs(", ", out);
+               print_expression(binexpr->right);
+               fputs(")", out);
+               return;
+       }
+
        fprintf(out, "(");
        print_expression(binexpr->left);
        fprintf(out, " ");
-       switch(binexpr->type) {
-       case BINEXPR_INVALID:            fputs("INVOP", out); break;
-       case BINEXPR_COMMA:              fputs(",", out);     break;
-       case BINEXPR_ASSIGN:             fputs("=", out);     break;
-       case BINEXPR_ADD:                fputs("+", out);     break;
-       case BINEXPR_SUB:                fputs("-", out);     break;
-       case BINEXPR_MUL:                fputs("*", out);     break;
-       case BINEXPR_MOD:                fputs("%", out);     break;
-       case BINEXPR_DIV:                fputs("/", out);     break;
-       case BINEXPR_BITWISE_OR:         fputs("|", out);     break;
-       case BINEXPR_BITWISE_AND:        fputs("&", out);     break;
-       case BINEXPR_BITWISE_XOR:        fputs("^", out);     break;
-       case BINEXPR_LOGICAL_OR:         fputs("||", out);    break;
-       case BINEXPR_LOGICAL_AND:        fputs("&&", out);    break;
-       case BINEXPR_NOTEQUAL:           fputs("!=", out);    break;
-       case BINEXPR_EQUAL:              fputs("==", out);    break;
-       case BINEXPR_LESS:               fputs("<", out);     break;
-       case BINEXPR_LESSEQUAL:          fputs("<=", out);    break;
-       case BINEXPR_GREATER:            fputs(">", out);     break;
-       case BINEXPR_GREATEREQUAL:       fputs(">=", out);    break;
-       case BINEXPR_SHIFTLEFT:          fputs("<<", out);    break;
-       case BINEXPR_SHIFTRIGHT:         fputs(">>", out);    break;
-
-       case BINEXPR_ADD_ASSIGN:         fputs("+=", out);    break;
-       case BINEXPR_SUB_ASSIGN:         fputs("-=", out);    break;
-       case BINEXPR_MUL_ASSIGN:         fputs("*=", out);    break;
-       case BINEXPR_MOD_ASSIGN:         fputs("%=", out);    break;
-       case BINEXPR_DIV_ASSIGN:         fputs("/=", out);    break;
-       case BINEXPR_BITWISE_OR_ASSIGN:  fputs("|=", out);    break;
-       case BINEXPR_BITWISE_AND_ASSIGN: fputs("&=", out);    break;
-       case BINEXPR_BITWISE_XOR_ASSIGN: fputs("^=", out);    break;
-       case BINEXPR_SHIFTLEFT_ASSIGN:   fputs("<<=", out);   break;
-       case BINEXPR_SHIFTRIGHT_ASSIGN:  fputs(">>=", out);   break;
+       switch(binexpr->expression.type) {
+       case EXPR_BINARY_COMMA:              fputs(",", out);     break;
+       case EXPR_BINARY_ASSIGN:             fputs("=", out);     break;
+       case EXPR_BINARY_ADD:                fputs("+", out);     break;
+       case EXPR_BINARY_SUB:                fputs("-", out);     break;
+       case EXPR_BINARY_MUL:                fputs("*", out);     break;
+       case EXPR_BINARY_MOD:                fputs("%", out);     break;
+       case EXPR_BINARY_DIV:                fputs("/", out);     break;
+       case EXPR_BINARY_BITWISE_OR:         fputs("|", out);     break;
+       case EXPR_BINARY_BITWISE_AND:        fputs("&", out);     break;
+       case EXPR_BINARY_BITWISE_XOR:        fputs("^", out);     break;
+       case EXPR_BINARY_LOGICAL_OR:         fputs("||", out);    break;
+       case EXPR_BINARY_LOGICAL_AND:        fputs("&&", out);    break;
+       case EXPR_BINARY_NOTEQUAL:           fputs("!=", out);    break;
+       case EXPR_BINARY_EQUAL:              fputs("==", out);    break;
+       case EXPR_BINARY_LESS:               fputs("<", out);     break;
+       case EXPR_BINARY_LESSEQUAL:          fputs("<=", out);    break;
+       case EXPR_BINARY_GREATER:            fputs(">", out);     break;
+       case EXPR_BINARY_GREATEREQUAL:       fputs(">=", out);    break;
+       case EXPR_BINARY_SHIFTLEFT:          fputs("<<", out);    break;
+       case EXPR_BINARY_SHIFTRIGHT:         fputs(">>", out);    break;
+
+       case EXPR_BINARY_ADD_ASSIGN:         fputs("+=", out);    break;
+       case EXPR_BINARY_SUB_ASSIGN:         fputs("-=", out);    break;
+       case EXPR_BINARY_MUL_ASSIGN:         fputs("*=", out);    break;
+       case EXPR_BINARY_MOD_ASSIGN:         fputs("%=", out);    break;
+       case EXPR_BINARY_DIV_ASSIGN:         fputs("/=", out);    break;
+       case EXPR_BINARY_BITWISE_OR_ASSIGN:  fputs("|=", out);    break;
+       case EXPR_BINARY_BITWISE_AND_ASSIGN: fputs("&=", out);    break;
+       case EXPR_BINARY_BITWISE_XOR_ASSIGN: fputs("^=", out);    break;
+       case EXPR_BINARY_SHIFTLEFT_ASSIGN:   fputs("<<=", out);   break;
+       case EXPR_BINARY_SHIFTRIGHT_ASSIGN:  fputs(">>=", out);   break;
+       default: panic("invalid binexpression found");
        }
        fprintf(out, " ");
        print_expression(binexpr->right);
@@ -184,39 +193,38 @@ static void print_binary_expression(const binary_expression_t *binexpr)
 
 static void print_unary_expression(const unary_expression_t *unexpr)
 {
-       switch(unexpr->type) {
-       case UNEXPR_NEGATE:           fputs("-", out);  break;
-       case UNEXPR_PLUS:             fputs("+", out);  break;
-       case UNEXPR_NOT:              fputs("!", out);  break;
-       case UNEXPR_BITWISE_NEGATE:   fputs("~", out);  break;
-       case UNEXPR_PREFIX_INCREMENT: fputs("++", out); break;
-       case UNEXPR_PREFIX_DECREMENT: fputs("--", out); break;
-       case UNEXPR_DEREFERENCE:      fputs("*", out);  break;
-       case UNEXPR_TAKE_ADDRESS:     fputs("&", out);  break;
-
-       case UNEXPR_POSTFIX_INCREMENT:
+       switch(unexpr->expression.type) {
+       case EXPR_UNARY_NEGATE:           fputs("-", out);  break;
+       case EXPR_UNARY_PLUS:             fputs("+", out);  break;
+       case EXPR_UNARY_NOT:              fputs("!", out);  break;
+       case EXPR_UNARY_BITWISE_NEGATE:   fputs("~", out);  break;
+       case EXPR_UNARY_PREFIX_INCREMENT: fputs("++", out); break;
+       case EXPR_UNARY_PREFIX_DECREMENT: fputs("--", out); break;
+       case EXPR_UNARY_DEREFERENCE:      fputs("*", out);  break;
+       case EXPR_UNARY_TAKE_ADDRESS:     fputs("&", out);  break;
+
+       case EXPR_UNARY_POSTFIX_INCREMENT:
                fputs("(", out);
                print_expression(unexpr->value);
                fputs(")", out);
                fputs("++", out);
                return;
-       case UNEXPR_POSTFIX_DECREMENT:
+       case EXPR_UNARY_POSTFIX_DECREMENT:
                fputs("(", out);
                print_expression(unexpr->value);
                fputs(")", out);
                fputs("--", out);
                return;
-       case UNEXPR_CAST:
+       case EXPR_UNARY_CAST:
                fputs("(", out);
                print_type(unexpr->expression.datatype);
                fputs(")", out);
                break;
-       case UNEXPR_CAST_IMPLICIT:
+       case EXPR_UNARY_CAST_IMPLICIT:
                print_expression(unexpr->value);
                return;
-       case UNEXPR_INVALID:
-               fprintf(out, "unop%d", (int) unexpr->type);
-               break;
+       default:
+               panic("invalid unary expression found");
        }
        fputs("(", out);
        print_expression(unexpr->value);
@@ -334,7 +342,7 @@ void print_expression(const expression_t *expression)
        case EXPR_CALL:
                print_call_expression(&expression->call);
                break;
-       case EXPR_BINARY:
+       EXPR_BINARY_CASES
                print_binary_expression(&expression->binary);
                break;
        case EXPR_REFERENCE:
@@ -343,7 +351,7 @@ void print_expression(const expression_t *expression)
        case EXPR_ARRAY_ACCESS:
                print_array_expression(&expression->array_access);
                break;
-       case EXPR_UNARY:
+       EXPR_UNARY_CASES
                print_unary_expression(&expression->unary);
                break;
        case EXPR_SIZEOF:
@@ -674,7 +682,10 @@ static void print_normal_declaration(const declaration_t *declaration)
 {
        print_storage_class(declaration->storage_class);
        if(declaration->is_inline) {
-               fputs("inline ", out);
+               if (declaration->decl_modifiers & DM_FORCEINLINE)
+                       fputs("__forceinline ", out);
+               else
+                       fputs("inline ", out);
        }
        print_type_ext(declaration->type, declaration->symbol,
                       &declaration->context);
@@ -744,6 +755,110 @@ void print_ast(const translation_unit_t *unit)
        }
 }
 
+bool is_constant_expression(const expression_t *expression)
+{
+       switch(expression->type) {
+
+       case EXPR_CONST:
+       case EXPR_STRING_LITERAL:
+       case EXPR_WIDE_STRING_LITERAL:
+       case EXPR_SIZEOF:
+       case EXPR_CLASSIFY_TYPE:
+       case EXPR_FUNCTION:
+       case EXPR_PRETTY_FUNCTION:
+       case EXPR_OFFSETOF:
+               return true;
+
+       case EXPR_BUILTIN_SYMBOL:
+       case EXPR_CALL:
+       case EXPR_SELECT:
+       case EXPR_VA_START:
+       case EXPR_VA_ARG:
+       case EXPR_STATEMENT:
+       case EXPR_UNARY_POSTFIX_INCREMENT:
+       case EXPR_UNARY_POSTFIX_DECREMENT:
+       case EXPR_UNARY_PREFIX_INCREMENT:
+       case EXPR_UNARY_PREFIX_DECREMENT:
+       case EXPR_BINARY_ASSIGN:
+       case EXPR_BINARY_MUL_ASSIGN:
+       case EXPR_BINARY_DIV_ASSIGN:
+       case EXPR_BINARY_MOD_ASSIGN:
+       case EXPR_BINARY_ADD_ASSIGN:
+       case EXPR_BINARY_SUB_ASSIGN:
+       case EXPR_BINARY_SHIFTLEFT_ASSIGN:
+       case EXPR_BINARY_SHIFTRIGHT_ASSIGN:
+       case EXPR_BINARY_BITWISE_AND_ASSIGN:
+       case EXPR_BINARY_BITWISE_XOR_ASSIGN:
+       case EXPR_BINARY_BITWISE_OR_ASSIGN:
+       case EXPR_BINARY_COMMA:
+               return false;
+
+       case EXPR_UNARY_NEGATE:
+       case EXPR_UNARY_PLUS:
+       case EXPR_UNARY_BITWISE_NEGATE:
+       case EXPR_UNARY_NOT:
+       case EXPR_UNARY_DEREFERENCE:
+       case EXPR_UNARY_TAKE_ADDRESS:
+       case EXPR_UNARY_CAST:
+       case EXPR_UNARY_CAST_IMPLICIT:
+               return is_constant_expression(expression->unary.value);
+
+       case EXPR_BINARY_ADD:
+       case EXPR_BINARY_SUB:
+       case EXPR_BINARY_MUL:
+       case EXPR_BINARY_DIV:
+       case EXPR_BINARY_MOD:
+       case EXPR_BINARY_EQUAL:
+       case EXPR_BINARY_NOTEQUAL:
+       case EXPR_BINARY_LESS:
+       case EXPR_BINARY_LESSEQUAL:
+       case EXPR_BINARY_GREATER:
+       case EXPR_BINARY_GREATEREQUAL:
+       case EXPR_BINARY_BITWISE_AND:
+       case EXPR_BINARY_BITWISE_OR:
+       case EXPR_BINARY_BITWISE_XOR:
+       case EXPR_BINARY_LOGICAL_AND:
+       case EXPR_BINARY_LOGICAL_OR:
+       case EXPR_BINARY_SHIFTLEFT:
+       case EXPR_BINARY_SHIFTRIGHT:
+       case EXPR_BINARY_BUILTIN_EXPECT:
+       case EXPR_BINARY_ISGREATER:
+       case EXPR_BINARY_ISGREATEREQUAL:
+       case EXPR_BINARY_ISLESS:
+       case EXPR_BINARY_ISLESSEQUAL:
+       case EXPR_BINARY_ISLESSGREATER:
+       case EXPR_BINARY_ISUNORDERED:
+               return is_constant_expression(expression->binary.left)
+                       && is_constant_expression(expression->binary.right);
+
+       case EXPR_CONDITIONAL:
+               /* TODO: not correct, we only have to test expressions which are
+                * evaluated, which means either the true or false part might be not
+                * constant */
+               return is_constant_expression(expression->conditional.condition)
+                       && is_constant_expression(expression->conditional.true_expression)
+                       && is_constant_expression(expression->conditional.false_expression);
+
+       case EXPR_ARRAY_ACCESS:
+               return is_constant_expression(expression->array_access.array_ref)
+                       && is_constant_expression(expression->array_access.index);
+
+       case EXPR_REFERENCE: {
+               declaration_t *declaration = expression->reference.declaration;
+               if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY)
+                       return true;
+
+               return false;
+       }
+
+       case EXPR_UNKNOWN:
+       case EXPR_INVALID:
+               break;
+       }
+       panic("invalid expression found (is constant expression)");
+}
+
+
 void init_ast(void)
 {
        obstack_init(&ast_obstack);