X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=support%2FUtil%2FSDCCerr.c;h=43391455abb6e17d5df1f643ff179842f8948c43;hb=3270f325cf2270f7656186324330c4ee3b9c9515;hp=7e46d97ba0631197323b1cf95f6e4e77f614c9d7;hpb=dbf86023c34946a0a48fd7b70d1e80f3eaa43bbd;p=fw%2Fsdcc diff --git a/support/Util/SDCCerr.c b/support/Util/SDCCerr.c index 7e46d97b..43391455 100644 --- a/support/Util/SDCCerr.c +++ b/support/Util/SDCCerr.c @@ -32,7 +32,8 @@ static struct { ERROR_LOG_LEVEL logLevel; FILE *out; - int style; /* 1=MSVC */ + int style; /* 1=MSVC */ + char disabled[MAX_ERROR_WARNING]; /* 1=warning disabled*/ } _SDCCERRG; extern char *filename ; @@ -85,7 +86,7 @@ struct { W_INIT_IGNORED, ERROR_LEVEL_WARNING, "Variable in the storage class cannot be initialized.'%s'" }, { E_AUTO_ASSUMED, ERROR_LEVEL_ERROR, - "storage class not allowed for automatic variable '%s' in reentrant function unless static" }, + "variable '%s' must be static to have storage class in reentrant function" }, { E_AUTO_ABSA, ERROR_LEVEL_ERROR, "absolute address not allowed for automatic var '%s' in reentrant function " }, { W_INIT_WRONG, ERROR_LEVEL_WARNING, @@ -100,8 +101,8 @@ struct "Array or pointer required for '%s' operation " }, { E_IDX_NOT_INT, ERROR_LEVEL_ERROR, "Array index not an integer" }, -{ E_ARRAY_BOUND, ERROR_LEVEL_ERROR, - "Array bound Exceeded, assuming zero" }, +{ W_IDX_OUT_OF_BOUNDS, ERROR_LEVEL_WARNING, + "index %i is outside of the array bounds (array size is %i)" }, { E_STRUCT_UNION, ERROR_LEVEL_ERROR, "Structure/Union expected left of '.%s'" }, { E_NOT_MEMBER, ERROR_LEVEL_ERROR, @@ -115,7 +116,7 @@ struct { E_INT_REQD, ERROR_LEVEL_ERROR, "type must be INT for bit field definition" }, { E_BITFLD_SIZE, ERROR_LEVEL_ERROR, - "bit field size greater than 16. assuming 16" }, + "bit field size cannot be greater than int (%d bits)" }, { W_TRUNCATION, ERROR_LEVEL_WARNING, "high order truncation might occur" }, { E_CODE_WRITE, ERROR_LEVEL_ERROR, @@ -133,7 +134,7 @@ struct { E_ARG_COUNT, ERROR_LEVEL_ERROR, "Function was expecting more arguments" }, { E_FUNC_EXPECTED, ERROR_LEVEL_ERROR, - "Function name expected '%s'.ANSI style declaration REQUIRED" }, + "Function name expected '%s'. ANSI style declaration REQUIRED" }, { E_PLUS_INVALID, ERROR_LEVEL_ERROR, "invalid operand '%s'" }, { E_PTR_PLUS_PTR, ERROR_LEVEL_ERROR, @@ -155,7 +156,7 @@ struct { E_BIT_ARRAY, ERROR_LEVEL_ERROR, "Array or Pointer to bit|sbit|sfr not allowed.'%s'" }, { E_DUPLICATE_TYPEDEF, ERROR_LEVEL_ERROR, - "typedef/enum '%s' duplicate.Previous definiton Ignored" }, + "typedef/enum '%s' duplicate. Previous definiton Ignored" }, { E_ARG_TYPE, ERROR_LEVEL_ERROR, "Actual Argument type different from declaration %d" }, { E_RET_VALUE, ERROR_LEVEL_ERROR, @@ -165,7 +166,7 @@ struct { E_FUNC_DEF, ERROR_LEVEL_ERROR, "ANSI Style declaration needed" }, { E_DUPLICATE_LABEL, ERROR_LEVEL_ERROR, - "Label name redefined '%s'" }, + "Duplicate label '%s'" }, { E_LABEL_UNDEF, ERROR_LEVEL_ERROR, "Label undefined '%s'" }, { E_FUNC_VOID, ERROR_LEVEL_ERROR, @@ -175,9 +176,9 @@ struct { W_RETURN_MISMATCH, ERROR_LEVEL_WARNING, "function return value mismatch" }, { E_CASE_CONTEXT, ERROR_LEVEL_ERROR, - "'case/default' found without 'switch'.statement ignored" }, + "'case/default' found without 'switch'. Statement ignored" }, { E_CASE_CONSTANT, ERROR_LEVEL_ERROR, - "'case' expression not constant. statement ignored" }, + "'case' expression not constant. Statement ignored" }, { E_BREAK_CONTEXT, ERROR_LEVEL_ERROR, "'break/continue' statement out of context" }, { E_SWITCH_AGGR, ERROR_LEVEL_ERROR, @@ -211,9 +212,9 @@ struct { E_INCOMPAT_TYPES, ERROR_LEVEL_ERROR, "incompatible types" }, { W_LOOP_ELIMINATE, ERROR_LEVEL_WARNING, - "'while' loop with 'zero' constant.loop eliminated" }, + "'while' loop with 'zero' constant. Loop eliminated" }, { W_NO_SIDE_EFFECTS, ERROR_LEVEL_WARNING, - "%s expression has NO side effects.expr eliminated" }, + "%s expression has NO side effects. Expr eliminated" }, { W_CONST_TOO_LARGE, ERROR_LEVEL_PEDANTIC, "constant value '%s', out of range." }, { W_BAD_COMPARE, ERROR_LEVEL_WARNING, @@ -221,7 +222,7 @@ struct { E_TERMINATING, ERROR_LEVEL_ERROR, "Compiler Terminating , contact author with source" }, { W_LOCAL_NOINIT, ERROR_LEVEL_WARNING, - "'auto' variable '%s' may be used before initialization at %s(%d)" }, + "'auto' variable '%s' may be used before initialization" }, { W_NO_REFERENCE, ERROR_LEVEL_WARNING, "in function %s unreferenced %s : '%s'" }, { E_OP_UNKNOWN_SIZE, ERROR_LEVEL_ERROR, @@ -274,9 +275,9 @@ struct { W_FUNC_TOO_LARGE, ERROR_LEVEL_WARNING, "function '%s' too large for global optimization" }, { W_CONTROL_FLOW, ERROR_LEVEL_PEDANTIC, - "conditional flow changed by optimizer '%s(%d)':so said EVELYN the modified DOG" }, + "conditional flow changed by optimizer: so said EVELYN the modified DOG" }, { W_PTR_TYPE_INVALID, ERROR_LEVEL_WARNING, - "invalid type specifier for pointer type specifier ignored" }, + "invalid type specifier for pointer type; specifier ignored" }, { W_IMPLICIT_FUNC, ERROR_LEVEL_WARNING, "function '%s' implicit declaration" }, { W_CONTINUE, ERROR_LEVEL_WARNING, @@ -306,7 +307,7 @@ struct { W_CONST_RANGE, ERROR_LEVEL_WARNING, "constant is out of range %s" }, { W_CODE_UNREACH, ERROR_LEVEL_PEDANTIC, - "unreachable code %s(%d)" }, + "unreachable code" }, { E_NONPTR2_GENPTR, ERROR_LEVEL_ERROR, "non-pointer type cast to generic pointer" }, { W_POSSBUG, ERROR_LEVEL_WARNING, @@ -350,7 +351,7 @@ struct { E_TWO_OR_MORE_STORAGE_CLASSES, ERROR_LEVEL_ERROR, "two or more storage classes in declaration for '%s'" }, { W_EXCESS_INITIALIZERS, ERROR_LEVEL_WARNING, - "excess elements in %s initializer after `%s' at line %d" }, + "excess elements in %s initializer after '%s'" }, { E_ARGUMENT_MISSING, ERROR_LEVEL_ERROR, "Option %s requires an argument." }, { W_STRAY_BACKSLASH, ERROR_LEVEL_WARNING, @@ -385,8 +386,32 @@ struct "duplicate %s member '%s'" }, { E_STACK_VIOLATION, ERROR_LEVEL_ERROR, "'%s' internal stack %s" }, -{ W_INT_OVL, ERROR_LEVEL_WARNING, +{ W_INT_OVL, ERROR_LEVEL_PEDANTIC, "integer overflow in expression" }, +{ W_USELESS_DECL, ERROR_LEVEL_WARNING, + "useless declaration (possible use of keyword as variable name)" }, +{ E_INT_BAD_INTNO, ERROR_LEVEL_ERROR, + "interrupt number '%u' is not valid" }, +{ W_BITFLD_NAMED, ERROR_LEVEL_WARNING, + "ignoring declarator of 0 length bitfield" }, +{ E_FUNC_ATTR, ERROR_LEVEL_ERROR, + "function attribute following non-function declaration"}, +{ W_SAVE_RESTORE, ERROR_LEVEL_PEDANTIC, + "unmatched #pragma save and #pragma restore" }, +{ E_INVALID_CRITICAL, ERROR_LEVEL_ERROR, + "not allowed in a critical section" }, +{ E_NOT_ALLOWED, ERROR_LEVEL_ERROR, + "%s not allowed here" }, +{ E_BAD_TAG, ERROR_LEVEL_ERROR, + "'%s' is not a %s tag" }, +{ E_ENUM_NON_INTEGER, ERROR_LEVEL_ERROR, + "enumeration constant not an integer" }, +{ W_DEPRECATED_PRAGMA, ERROR_LEVEL_WARNING, + "pragma %s is deprecated, please see documentation for details" }, +{ E_SIZEOF_INCOMPLETE_TYPE, ERROR_LEVEL_ERROR, + "sizeof applied to an incomplete type" }, +{ E_PREVIOUS_DEF, ERROR_LEVEL_ERROR, + "previously defined here" }, }; /* @@ -397,15 +422,13 @@ SetErrorOut - Set the error output file */ FILE *SetErrorOut(FILE *NewErrorOut) - { _SDCCERRG.out = NewErrorOut ; -return NewErrorOut ; + return NewErrorOut ; } -void -setErrorLogLevel (ERROR_LOG_LEVEL level) +void setErrorLogLevel (ERROR_LOG_LEVEL level) { _SDCCERRG.logLevel = level; } @@ -423,39 +446,37 @@ void vwerror (int errNum, va_list marker) _SDCCERRG.out = DEFAULT_ERROR_OUT; } - if (ErrTab[errNum].errIndex != errNum) - { + if (ErrTab[errNum].errIndex != errNum) { fprintf(_SDCCERRG.out, - "Internal error: error table entry for %d inconsistent.", errNum); + "Internal error: error table entry for %d inconsistent.", errNum); } - - if (ErrTab[errNum].errType >= _SDCCERRG.logLevel) { + if ((ErrTab[errNum].errType >= _SDCCERRG.logLevel) && (!_SDCCERRG.disabled[errNum])) { if ( ErrTab[errNum].errType == ERROR_LEVEL_ERROR ) fatalError++ ; if ( filename && lineno ) { - if(_SDCCERRG.style) - fprintf(_SDCCERRG.out, "%s(%d) : ",filename,lineno); - else - fprintf(_SDCCERRG.out, "%s:%d: ",filename,lineno); - } else if (lineno) { + if(_SDCCERRG.style) + fprintf(_SDCCERRG.out, "%s(%d) : ",filename,lineno); + else + fprintf(_SDCCERRG.out, "%s:%d: ",filename,lineno); + } else if (lineno) { fprintf(_SDCCERRG.out, "at %d: ", lineno); } else { fprintf(_SDCCERRG.out, "-:0: "); } - + switch(ErrTab[errNum].errType) { case ERROR_LEVEL_ERROR: - fprintf(_SDCCERRG.out, "error: "); + fprintf(_SDCCERRG.out, "error %d: ", errNum); break; case ERROR_LEVEL_WARNING: case ERROR_LEVEL_PEDANTIC: - fprintf(_SDCCERRG.out, "warning: "); + fprintf(_SDCCERRG.out, "warning %d: ", errNum); break; case ERROR_LEVEL_INFO: - fprintf(_SDCCERRG.out, "info: "); + fprintf(_SDCCERRG.out, "info %d: ", errNum); break; default: break; @@ -463,8 +484,7 @@ void vwerror (int errNum, va_list marker) vfprintf(_SDCCERRG.out, ErrTab[errNum].errText,marker); fprintf(_SDCCERRG.out, "\n"); - } - else { + } else { /* Below the logging level, drop. */ } } @@ -483,6 +503,31 @@ void werror (int errNum, ...) va_end(marker); } +/* +------------------------------------------------------------------------------- +werrorfl - Output a standard eror message with variable number of arguements. + Use a specified filename and line number instead of the default. + +------------------------------------------------------------------------------- +*/ + +void werrorfl (char *newFilename, int newLineno, int errNum, ...) +{ + char *oldFilename = filename; + int oldLineno = lineno; + va_list marker; + + filename = newFilename; + lineno = newLineno; + + va_start(marker,errNum); + vwerror(errNum, marker); + va_end(marker); + + filename = oldFilename; + lineno = oldLineno; +} + /* ------------------------------------------------------------------------------- @@ -506,7 +551,19 @@ style - Change the output error style to MSVC ------------------------------------------------------------------------------- */ -void MSVC_style (int style) +void MSVC_style (int style) { _SDCCERRG.style = style; } + +/* +------------------------------------------------------------------------------- +disabled - Disable output of specified warning +------------------------------------------------------------------------------- +*/ + +void setWarningDisabled (int errNum) +{ + if ((errNum < MAX_ERROR_WARNING) && (ErrTab[errNum].errType <= ERROR_LEVEL_WARNING)) + _SDCCERRG.disabled[errNum] = 1; +}