diff options
Diffstat (limited to 'src')
45 files changed, 78 insertions, 78 deletions
diff --git a/src/command.h b/src/command.h index 0666464..5441249 100644 --- a/src/command.h +++ b/src/command.h @@ -26,7 +26,8 @@ enum Command : int Dump, SmallDump, DumpUnsupported, - MemoryUsage + MemoryUsage, + FindArgs }; extern Command command; diff --git a/src/localconsts.h b/src/localconsts.h index 64db50f..044d2f9 100644 --- a/src/localconsts.h +++ b/src/localconsts.h @@ -42,6 +42,6 @@ #define setPrintField(node, macro, method) \ node->method = macro(node->gccNode); \ - Log::logInt(node, \ + Log::dumpInt(node, \ "- "#method": %d", \ node->method) diff --git a/src/logger.cpp b/src/logger.cpp index fa7b510..13df3ed 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -28,9 +28,9 @@ namespace Log { -void log(const Node *const node, - const char *const text, - ...) +void dump(const Node *const node, + const char *const text, + ...) { if (command != Command::Dump) return; @@ -48,9 +48,9 @@ void log(const Node *const node, va_end(ap); } -void logRaw(const Node *const node, - const char *const text, - ...) +void dumpRaw(const Node *const node, + const char *const text, + ...) { if (command != Command::Dump) return; @@ -78,9 +78,9 @@ void error(const char *const text, va_end(ap); } -void logInt(const Node *const node, - const char *const text, - const int val) +void dumpInt(const Node *const node, + const char *const text, + const int val) { if (command != Command::Dump || !val || !node) return; @@ -90,11 +90,10 @@ void logInt(const Node *const node, fprintf(stderr, "\n"); } -void log(const Node *const node, - const int indent, - const char *const text, - ... - ) +void dump(const Node *const node, + const int indent, + const char *const text, + ...) { if (command != Command::Dump) return; @@ -118,7 +117,7 @@ void log(const Node *const node, va_end(ap); } -void log(const Node *const node) +void dump(const Node *const node) { if (command == Command::SmallDump) { diff --git a/src/logger.h b/src/logger.h index cc72512..76ebddf 100644 --- a/src/logger.h +++ b/src/logger.h @@ -26,27 +26,27 @@ struct Node; namespace Log { - void log(const Node *const node, - const char *const text, - ...); + void dump(const Node *const node, + const char *const text, + ...); - void logRaw(const Node *const node, - const char *const text, - ...); + void dumpRaw(const Node *const node, + const char *const text, + ...); void error(const char *const text, ...); - void logInt(const Node *const node, - const char *const text, - const int val); + void dumpInt(const Node *const node, + const char *const text, + const int val); - void log(const Node *const node, - const int indent, - const char *const text, - ...); + void dump(const Node *const node, + const int indent, + const char *const text, + ...); - void log(const Node *const node); + void dump(const Node *const node); } #endif // LOGGER_H diff --git a/src/parsers/base/decl.cpp b/src/parsers/base/decl.cpp index 0f862e2..f868fdc 100644 --- a/src/parsers/base/decl.cpp +++ b/src/parsers/base/decl.cpp @@ -62,7 +62,7 @@ void fillDeclAutoGenerated(DeclNode *node) } node->isAutoGenerated = DECL_ARTIFICIAL(node->gccNode); - Log::logInt(node, + Log::dumpInt(node, "- isAutogenerated: %d", node->isAutoGenerated); } diff --git a/src/parsers/blocknode.cpp b/src/parsers/blocknode.cpp index 7a27e2e..0b8e93a 100644 --- a/src/parsers/blocknode.cpp +++ b/src/parsers/blocknode.cpp @@ -36,7 +36,7 @@ void parseBlockNode(BlockNode *node) node->line = LOCATION_LINE(loc); node->column = LOCATION_COLUMN(loc); } - Log::log(node); + Log::dump(node); FOR_CHAIN(node->gccNode, it, BLOCK_VARS, DECL_CHAIN) { diff --git a/src/parsers/cst/integer_cst.cpp b/src/parsers/cst/integer_cst.cpp index ebdfe7a..6be0463 100644 --- a/src/parsers/cst/integer_cst.cpp +++ b/src/parsers/cst/integer_cst.cpp @@ -49,7 +49,7 @@ void parseIntegerCstNode(IntegerCstNode *node) { node->label.append(toString(tree_to_shwi(node->gccNode))); } - Log::log(node); + Log::dump(node); } } diff --git a/src/parsers/decl/function_decl.cpp b/src/parsers/decl/function_decl.cpp index 29047f5..fd3a931 100644 --- a/src/parsers/decl/function_decl.cpp +++ b/src/parsers/decl/function_decl.cpp @@ -36,7 +36,7 @@ void parseFunctionDeclNode(FunctionDeclNode *node) fillDeclLabel(node); fillDeclAutoGenerated(node); - Log::log(node); + Log::dump(node); setPrintField(node, DECL_FUNCTION_VERSIONED, hasTargets); setPrintField(node, DECL_VIRTUAL_P, isVirtual); diff --git a/src/parsers/decl/parm_decl.cpp b/src/parsers/decl/parm_decl.cpp index fd314db..5f52d05 100644 --- a/src/parsers/decl/parm_decl.cpp +++ b/src/parsers/decl/parm_decl.cpp @@ -36,7 +36,7 @@ void parseParmDeclNode(ParmDeclNode *node) setPrintField(node, DECL_REGISTER, isRegister); setPrintField(node, TREE_USED, isUsed); - Log::log(node); + Log::dump(node); fillDeclAutoGenerated(node); fillDeclAttributes(node); diff --git a/src/parsers/decl/result_decl.cpp b/src/parsers/decl/result_decl.cpp index 8a85c47..d4decb3 100644 --- a/src/parsers/decl/result_decl.cpp +++ b/src/parsers/decl/result_decl.cpp @@ -35,7 +35,7 @@ void parseResultDeclNode(ResultDeclNode *node) fillType(node); fillLocation(node); fillDeclLabel(node); - Log::log(node); + Log::dump(node); fillDeclAutoGenerated(node); diff --git a/src/parsers/decl/type_decl.cpp b/src/parsers/decl/type_decl.cpp index f220e97..a87f4a0 100644 --- a/src/parsers/decl/type_decl.cpp +++ b/src/parsers/decl/type_decl.cpp @@ -33,7 +33,7 @@ void parseTypeDeclNode(TypeDeclNode *node) fillType(node); fillLocation(node); fillDeclLabel(node); - Log::log(node); + Log::dump(node); fillDeclAutoGenerated(node); fillDeclAttributes(node); diff --git a/src/parsers/decl/var_decl.cpp b/src/parsers/decl/var_decl.cpp index ca1318a..661f421 100644 --- a/src/parsers/decl/var_decl.cpp +++ b/src/parsers/decl/var_decl.cpp @@ -34,7 +34,7 @@ void parseVarDeclNode(VarDeclNode *node) fillLocation(node); fillDeclLabel(node); - Log::log(node); + Log::dump(node); setPrintField(node, DECL_THIS_STATIC, isStatic); setPrintField(node, DECL_REGISTER, isRegister); diff --git a/src/parsers/expr/addr_expr.cpp b/src/parsers/expr/addr_expr.cpp index c2028b0..e1c2583 100644 --- a/src/parsers/expr/addr_expr.cpp +++ b/src/parsers/expr/addr_expr.cpp @@ -31,7 +31,7 @@ namespace Generic void parseAddrExprNode(AddrExprNode *node) { fillType(node); - Log::log(node); + Log::dump(node); fillExprOperands(node); } diff --git a/src/parsers/expr/bind_expr.cpp b/src/parsers/expr/bind_expr.cpp index b88c5f2..0c0e0ea 100644 --- a/src/parsers/expr/bind_expr.cpp +++ b/src/parsers/expr/bind_expr.cpp @@ -31,7 +31,7 @@ namespace Generic void parseBindExprNode(BindExprNode *node) { fillType(node); - Log::log(node); + Log::dump(node); fillExprOperands(node); diff --git a/src/parsers/expr/call_expr.cpp b/src/parsers/expr/call_expr.cpp index 18eaea5..265da1a 100644 --- a/src/parsers/expr/call_expr.cpp +++ b/src/parsers/expr/call_expr.cpp @@ -33,13 +33,13 @@ namespace Generic void parseCallExprNode(CallExprNode *node) { fillType(node); - Log::log(node); + Log::dump(node); // not recommended // fillExprOperands(node); node->functionName = internal_fn_name(CALL_EXPR_IFN (node->gccNode)); - Log::log(node, "- function: %s", node->functionName.c_str()); + Log::dump(node, "- function: %s", node->functionName.c_str()); const int argsCount = call_expr_nargs(node->gccNode); for (int f = 0; f < argsCount; f ++) { diff --git a/src/parsers/expr/cleanuppoint_expr.cpp b/src/parsers/expr/cleanuppoint_expr.cpp index 5889ab2..19d3686 100644 --- a/src/parsers/expr/cleanuppoint_expr.cpp +++ b/src/parsers/expr/cleanuppoint_expr.cpp @@ -31,7 +31,7 @@ namespace Generic void parseCleanupPointExprNode(CleanupPointExprNode *node) { fillType(node); - Log::log(node); + Log::dump(node); fillExprOperands(node); } diff --git a/src/parsers/expr/cond_expr.cpp b/src/parsers/expr/cond_expr.cpp index 36c8fa4..a334a84 100644 --- a/src/parsers/expr/cond_expr.cpp +++ b/src/parsers/expr/cond_expr.cpp @@ -31,7 +31,7 @@ namespace Generic void parseCondExprNode(CondExprNode *node) { fillType(node); - Log::log(node); + Log::dump(node); fillExprOperands(node); } diff --git a/src/parsers/expr/convert_expr.cpp b/src/parsers/expr/convert_expr.cpp index 841fdca..7680da0 100644 --- a/src/parsers/expr/convert_expr.cpp +++ b/src/parsers/expr/convert_expr.cpp @@ -31,7 +31,7 @@ namespace Generic void parseConvertExprNode(ConvertExprNode *node) { fillType(node); - Log::log(node); + Log::dump(node); fillExprOperands(node); } diff --git a/src/parsers/expr/decl_expr.cpp b/src/parsers/expr/decl_expr.cpp index 78b4bbf..b65226d 100644 --- a/src/parsers/expr/decl_expr.cpp +++ b/src/parsers/expr/decl_expr.cpp @@ -31,7 +31,7 @@ namespace Generic void parseDeclExprNode(DeclExprNode *node) { fillType(node); - Log::log(node); + Log::dump(node); fillExprOperands(node); diff --git a/src/parsers/expr/eq_expr.cpp b/src/parsers/expr/eq_expr.cpp index 068754a..66668f1 100644 --- a/src/parsers/expr/eq_expr.cpp +++ b/src/parsers/expr/eq_expr.cpp @@ -31,7 +31,7 @@ namespace Generic void parseEqExprNode(EqExprNode *node) { fillType(node); - Log::log(node); + Log::dump(node); fillExprOperands(node); } diff --git a/src/parsers/expr/ge_expr.cpp b/src/parsers/expr/ge_expr.cpp index d0b82d7..39589af 100644 --- a/src/parsers/expr/ge_expr.cpp +++ b/src/parsers/expr/ge_expr.cpp @@ -31,7 +31,7 @@ namespace Generic void parseGeExprNode(GeExprNode *node) { fillType(node); - Log::log(node); + Log::dump(node); fillExprOperands(node); } diff --git a/src/parsers/expr/gt_expr.cpp b/src/parsers/expr/gt_expr.cpp index 1c1860a..511f184 100644 --- a/src/parsers/expr/gt_expr.cpp +++ b/src/parsers/expr/gt_expr.cpp @@ -31,7 +31,7 @@ namespace Generic void parseGtExprNode(GtExprNode *node) { fillType(node); - Log::log(node); + Log::dump(node); fillExprOperands(node); } diff --git a/src/parsers/expr/indirect_ref.cpp b/src/parsers/expr/indirect_ref.cpp index d712a08..2f935b5 100644 --- a/src/parsers/expr/indirect_ref.cpp +++ b/src/parsers/expr/indirect_ref.cpp @@ -31,7 +31,7 @@ namespace Generic void parseIndirectRefNode(IndirectRefNode *node) { fillType(node); - Log::log(node); + Log::dump(node); fillExprOperands(node); } diff --git a/src/parsers/expr/init_expr.cpp b/src/parsers/expr/init_expr.cpp index 9e4f303..a35b7bc 100644 --- a/src/parsers/expr/init_expr.cpp +++ b/src/parsers/expr/init_expr.cpp @@ -31,7 +31,7 @@ namespace Generic void parseInitExprNode(InitExprNode *node) { fillType(node); - Log::log(node); + Log::dump(node); fillExprOperands(node); diff --git a/src/parsers/expr/le_expr.cpp b/src/parsers/expr/le_expr.cpp index 0114125..f3619f5 100644 --- a/src/parsers/expr/le_expr.cpp +++ b/src/parsers/expr/le_expr.cpp @@ -31,7 +31,7 @@ namespace Generic void parseLeExprNode(LeExprNode *node) { fillType(node); - Log::log(node); + Log::dump(node); fillExprOperands(node); } diff --git a/src/parsers/expr/loop_expr.cpp b/src/parsers/expr/loop_expr.cpp index 6f291f0..e8558a5 100644 --- a/src/parsers/expr/loop_expr.cpp +++ b/src/parsers/expr/loop_expr.cpp @@ -31,7 +31,7 @@ namespace Generic void parseLoopExprNode(LoopExprNode *node) { fillType(node); - Log::log(node); + Log::dump(node); // fillExprOperands(node); diff --git a/src/parsers/expr/lt_expr.cpp b/src/parsers/expr/lt_expr.cpp index 96b0a43..b0c833e 100644 --- a/src/parsers/expr/lt_expr.cpp +++ b/src/parsers/expr/lt_expr.cpp @@ -31,7 +31,7 @@ namespace Generic void parseLtExprNode(LtExprNode *node) { fillType(node); - Log::log(node); + Log::dump(node); fillExprOperands(node); } diff --git a/src/parsers/expr/minus_expr.cpp b/src/parsers/expr/minus_expr.cpp index a7c74bf..19a18c7 100644 --- a/src/parsers/expr/minus_expr.cpp +++ b/src/parsers/expr/minus_expr.cpp @@ -31,7 +31,7 @@ namespace Generic void parseMinusExprNode(MinusExprNode *node) { fillType(node); - Log::log(node); + Log::dump(node); fillExprOperands(node); } diff --git a/src/parsers/expr/modify_expr.cpp b/src/parsers/expr/modify_expr.cpp index b2270e8..07552fa 100644 --- a/src/parsers/expr/modify_expr.cpp +++ b/src/parsers/expr/modify_expr.cpp @@ -31,7 +31,7 @@ namespace Generic void parseModifyExprNode(ModifyExprNode *node) { fillType(node); - Log::log(node); + Log::dump(node); fillExprOperands(node); } diff --git a/src/parsers/expr/mult_expr.cpp b/src/parsers/expr/mult_expr.cpp index 0805bfb..4950737 100644 --- a/src/parsers/expr/mult_expr.cpp +++ b/src/parsers/expr/mult_expr.cpp @@ -31,7 +31,7 @@ namespace Generic void parseMultExprNode(MultExprNode *node) { fillType(node); - Log::log(node); + Log::dump(node); fillExprOperands(node); } diff --git a/src/parsers/expr/ne_expr.cpp b/src/parsers/expr/ne_expr.cpp index a0ba9ba..22e9cc5 100644 --- a/src/parsers/expr/ne_expr.cpp +++ b/src/parsers/expr/ne_expr.cpp @@ -31,7 +31,7 @@ namespace Generic void parseNeExprNode(NeExprNode *node) { fillType(node); - Log::log(node); + Log::dump(node); fillExprOperands(node); } diff --git a/src/parsers/expr/nop_expr.cpp b/src/parsers/expr/nop_expr.cpp index 33d2dbb..8eba0c2 100644 --- a/src/parsers/expr/nop_expr.cpp +++ b/src/parsers/expr/nop_expr.cpp @@ -31,7 +31,7 @@ namespace Generic void parseNopExprNode(NopExprNode *node) { fillType(node); - Log::log(node); + Log::dump(node); fillExprOperands(node); } diff --git a/src/parsers/expr/plus_expr.cpp b/src/parsers/expr/plus_expr.cpp index 2450979..211a516 100644 --- a/src/parsers/expr/plus_expr.cpp +++ b/src/parsers/expr/plus_expr.cpp @@ -31,7 +31,7 @@ namespace Generic void parsePlusExprNode(PlusExprNode *node) { fillType(node); - Log::log(node); + Log::dump(node); fillExprOperands(node); } diff --git a/src/parsers/expr/return_expr.cpp b/src/parsers/expr/return_expr.cpp index d1102c7..76e36d0 100644 --- a/src/parsers/expr/return_expr.cpp +++ b/src/parsers/expr/return_expr.cpp @@ -31,7 +31,7 @@ namespace Generic void parseReturnExprNode(ReturnExprNode *node) { fillType(node); - Log::log(node); + Log::dump(node); fillExprOperands(node); } diff --git a/src/parsers/generic.cpp b/src/parsers/generic.cpp index 0e3f1ac..a7195a4 100644 --- a/src/parsers/generic.cpp +++ b/src/parsers/generic.cpp @@ -68,7 +68,7 @@ Node *createParseNode(Node *parent, } else { - Log::log(parent, + Log::dump(parent, 1, "Unsupported node type: %s - %s", get_tree_code_name(TREE_CODE(gccNode)), @@ -99,14 +99,14 @@ Node *createParseNode(Node *parent, { if (tag.empty()) { - Log::log(node, + Log::dump(node, "Wrong node type. Want %s but get %s", get_tree_code_name(wantType), node->nodeType.c_str()); } else { - Log::log(node, + Log::dump(node, "Wrong node type. Want %s but get %s - %s", get_tree_code_name(wantType), node->nodeType.c_str(), @@ -164,7 +164,7 @@ void fillType(Node *node) node->treeNumber = static_cast<int>(TREE_CODE(node->gccNode)); node->nodeType = get_tree_code_name(TREE_CODE(node->gccNode)); -// Log::log(node); +// Log::dump(node); } void fillLocation(Node *node) diff --git a/src/parsers/identifier_node.cpp b/src/parsers/identifier_node.cpp index 05d25b5..786eb4a 100644 --- a/src/parsers/identifier_node.cpp +++ b/src/parsers/identifier_node.cpp @@ -30,7 +30,7 @@ void parseIdentifierNode(IdentifierNode *node) { fillType(node); node->label = IDENTIFIER_POINTER(node->gccNode); - Log::log(node); + Log::dump(node); } } diff --git a/src/parsers/list/statement_list.cpp b/src/parsers/list/statement_list.cpp index 9d9da5a..4b4ca9e 100644 --- a/src/parsers/list/statement_list.cpp +++ b/src/parsers/list/statement_list.cpp @@ -31,7 +31,7 @@ namespace Generic void parseStatementListNode(StatementListNode *node) { fillType(node); - Log::log(node); + Log::dump(node); for (tree_stmt_iterator it = tsi_start (node->gccNode); !tsi_end_p (it); diff --git a/src/parsers/list/tree_list.cpp b/src/parsers/list/tree_list.cpp index ef2c37a..2b48899 100644 --- a/src/parsers/list/tree_list.cpp +++ b/src/parsers/list/tree_list.cpp @@ -29,7 +29,7 @@ namespace Generic void parseTreeListNode(TreeListNode *node) { fillType(node); - Log::log(node); + Log::dump(node); node->purpose = createParseNode( node, diff --git a/src/parsers/stmt/expr_stmt.cpp b/src/parsers/stmt/expr_stmt.cpp index a3104c8..46afdf5 100644 --- a/src/parsers/stmt/expr_stmt.cpp +++ b/src/parsers/stmt/expr_stmt.cpp @@ -33,7 +33,7 @@ namespace Generic void parseExprStmtNode(ExprStmtNode *node) { fillType(node); - Log::log(node); + Log::dump(node); node->expression = static_cast<ExprNode*>(createParseNode( node, diff --git a/src/parsers/stmt/if_stmt.cpp b/src/parsers/stmt/if_stmt.cpp index b342f1b..6a5c8b5 100644 --- a/src/parsers/stmt/if_stmt.cpp +++ b/src/parsers/stmt/if_stmt.cpp @@ -31,7 +31,7 @@ namespace Generic void parseIfStmtNode(IfStmtNode *node) { fillType(node); - Log::log(node); + Log::dump(node); node->condition = createParseNode( node, diff --git a/src/parsers/stmt/while_stmt.cpp b/src/parsers/stmt/while_stmt.cpp index 782b2c4..5814462 100644 --- a/src/parsers/stmt/while_stmt.cpp +++ b/src/parsers/stmt/while_stmt.cpp @@ -31,7 +31,7 @@ namespace Generic void parseWhileStmtNode(WhileStmtNode *node) { fillType(node); - Log::log(node); + Log::dump(node); node->condition = createParseNode( node, diff --git a/src/parsers/type/function_type.cpp b/src/parsers/type/function_type.cpp index e2f306e..ae55bf6 100644 --- a/src/parsers/type/function_type.cpp +++ b/src/parsers/type/function_type.cpp @@ -31,7 +31,7 @@ namespace Generic void parseFunctionTypeNode(FunctionTypeNode *node) { fillType(node); - Log::log(node); + Log::dump(node); fillTypeName(node); node->returnType = static_cast<TypeNode*>(createParseNode( diff --git a/src/parsers/type/integer_type.cpp b/src/parsers/type/integer_type.cpp index 3b048eb..4633a4e 100644 --- a/src/parsers/type/integer_type.cpp +++ b/src/parsers/type/integer_type.cpp @@ -31,15 +31,15 @@ namespace Generic void parseIntegerTypeNode(IntegerTypeNode *node) { fillType(node); - Log::log(node); + Log::dump(node); setPrintField(node, TYPE_PRECISION, precisionBits); setPrintField(node, TYPE_STRING_FLAG, isChar); node->isUnsigned = TYPE_UNSIGNED(node->gccNode); if (node->isUnsigned) - Log::logRaw(node, "- unsigned"); + Log::dumpRaw(node, "- unsigned"); else - Log::logRaw(node, "- signed"); + Log::dumpRaw(node, "- signed"); fillTypeName(node); fillTypeAttributes(node); diff --git a/src/parsers/type/pointer_type.cpp b/src/parsers/type/pointer_type.cpp index 7137e3e..df64497 100644 --- a/src/parsers/type/pointer_type.cpp +++ b/src/parsers/type/pointer_type.cpp @@ -31,7 +31,7 @@ namespace Generic void parsePointerTypeNode(PointerTypeNode *node) { fillType(node); - Log::log(node); + Log::dump(node); fillTypeName(node); fillTypeAttributes(node); diff --git a/src/parsers/type/void_type.cpp b/src/parsers/type/void_type.cpp index addb686..cea3e6f 100644 --- a/src/parsers/type/void_type.cpp +++ b/src/parsers/type/void_type.cpp @@ -31,7 +31,7 @@ namespace Generic void parseVoidTypeNode(VoidTypeNode *node) { fillType(node); - Log::log(node); + Log::dump(node); fillTypeName(node); fillTypeAttributes(node); |