X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/blobdiff_plain/7ebcc5bb1729918edf2ba5b4b9d5a67cdea4afb5..517a2db3da924ba77ae313404da5e12fda798947:/src/context.c diff --git a/src/context.c b/src/context.c index b9475b8..b7fcc97 100644 --- a/src/context.c +++ b/src/context.c @@ -1,6 +1,6 @@ /* -** LCLint - annotation-assisted static program checker -** Copyright (C) 1994-2001 University of Virginia, +** Splint - annotation-assisted static program checker +** Copyright (C) 1994-2003 University of Virginia, ** Massachusetts Institute of Technology ** ** This program is free software; you can redistribute it and/or modify it @@ -17,9 +17,9 @@ ** the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, ** MA 02111-1307, USA. ** -** For information on lclint: lclint-request@cs.virginia.edu -** To report a bug: lclint-bug@cs.virginia.edu -** For more information: http://lclint.cs.virginia.edu +** For information on splint: info@splint.org +** To report a bug: splint-bug@splint.org +** For more information: http://www.splint.org */ /* ** context.c @@ -33,20 +33,15 @@ * or, if not set "." will be used. */ -# include "lclintMacros.nf" -# include "llbasic.h" +# include "splintMacros.nf" +# include "basic.h" -# ifndef NOLCL # include "usymtab_interface.h" -# endif - # include "exprChecks.h" # include "filelocStack.h" -# include "fileIdList.h" # include "llmain.h" # include "intSet.h" # include "osd.h" -# include "portab.h" extern /*@external@*/ int yydebug; extern /*@external@*/ int mtdebug; @@ -54,7 +49,7 @@ extern /*@external@*/ int mtdebug; typedef struct { cstring file; - typeIdSet daccess ; + typeIdSet daccess; } maccesst; typedef enum { @@ -135,7 +130,6 @@ static struct /*@reldef@*/ maccesst *moduleaccess; /* Not defined is nmods == 0. */ kcontext kind; - kcontext savekind; ctype boolType; @@ -148,16 +142,19 @@ static struct int counters[NUMVALUEFLAGS]; o_cstring strings[NUMSTRINGFLAGS]; - sRefSetList modrecs; /*@i32 ???? what is this for? */ + sRefSetList modrecs; /* Keep track of file static symbols modified. */ metaStateTable stateTable; /* User-defined state information. */ annotationTable annotTable; /* User-defined annotations table. */ - union + union u_cont { bool glob; int cdepth; /*@dependent@*/ /*@exposed@*/ uentry fcn; } cont; + + kcontext savekind; + union u_cont savecont; } gc; static /*@exposed@*/ cstring context_exposeString (flagcode p_flag) ; @@ -169,14 +166,16 @@ static void context_exitClauseSimp (void) /*@modifies gc@*/ ; static void context_exitClausePlain (void) /*@modifies gc@*/ ; static void context_setJustPopped (void) /*@modifies gc.justpopped@*/ ; static void context_setValue (flagcode p_flag, int p_val) /*@modifies gc.flags@*/ ; -static void context_setFlag (flagcode p_f, bool p_b) +static void context_setFlag (flagcode p_f, bool p_b, fileloc p_loc) /*@modifies gc.flags@*/ ; static void - context_setFlagAux (flagcode p_f, bool p_b, bool p_inFile, bool p_isRestore) + context_setFlagAux (flagcode p_f, bool p_b, bool p_inFile, + bool p_isRestore, fileloc p_loc) /*@modifies gc.flags@*/ ; -static void context_restoreFlag (flagcode p_f) /*@modifies gc.flags@*/ ; +static void context_restoreFlag (flagcode p_f, fileloc p_loc) + /*@modifies gc.flags@*/ ; /*@+enumindex@*/ @@ -268,10 +267,9 @@ context_addMacroCache (/*@only@*/ cstring def) } void -context_addComment (/*@only@*/ cstring def) +context_addComment (/*@only@*/ cstring def, fileloc loc) { - DPRINTF (("macro comment: %s", def)); - macrocache_addComment (gc.mc, fileloc_copy (g_currentloc), def); + macrocache_addComment (gc.mc, fileloc_copy (loc), def); } /* @@ -341,7 +339,7 @@ context_suppressFlagMsg (flagcode flag, fileloc fl) return (!context_getFlag (flag) || context_inSuppressRegion () || context_inSuppressZone (fl) - || (/*@!@@#@ gc.inDerivedFile && */ context_inSuppressFlagZone (fl, flag))); + || (context_inSuppressFlagZone (fl, flag))); /* removed gc.inDerivedFile from this */ } else { @@ -389,39 +387,47 @@ context_inSuppressRegion (void) } void -context_enterSuppressRegion (void) +context_enterSuppressRegion (fileloc loc) { if (gc.insuppressregion) { gc.insuppressregion = FALSE; /* get this msg! */ llmsg (message ("%q: New ignore errors region entered while in ignore errors region", - fileloc_unparse (g_currentloc))); + fileloc_unparse (loc))); } gc.insuppressregion = TRUE; - flagMarkerList_add (gc.markers, flagMarker_createIgnoreOn (g_currentloc)); + (void) flagMarkerList_add (gc.markers, flagMarker_createIgnoreOn (loc)); } static void -context_addFlagMarker (flagcode code, ynm set) +context_addFlagMarker (flagcode code, ynm set, fileloc loc) { - flagMarkerList_add (gc.markers, - flagMarker_createLocalSet (code, set, g_currentloc)); + (void) flagMarkerList_add (gc.markers, + flagMarker_createLocalSet (code, set, loc)); } void -context_enterSuppressLine (int count) +context_enterSuppressLine (int count, fileloc loc) { - fileloc nextline = fileloc_copy (g_currentloc); + if (context_processingMacros ()) + { + return; + } - flagMarkerList_add (gc.markers, - flagMarker_createIgnoreCount (count, g_currentloc)); + if (flagMarkerList_add + (gc.markers, + flagMarker_createIgnoreCount (count, loc))) + { + fileloc nextline = fileloc_copy (loc); + fileloc_nextLine (nextline); + fileloc_setColumn (nextline, 0); - fileloc_nextLine (nextline); - flagMarkerList_add (gc.markers, - flagMarker_createIgnoreOff (nextline)); - fileloc_free (nextline); + check (flagMarkerList_add (gc.markers, + flagMarker_createIgnoreOff (nextline))); + fileloc_free (nextline); + } } void context_checkSuppressCounts (void) @@ -439,16 +445,18 @@ void context_incLineno (void) } void -context_exitSuppressRegion (void) +context_exitSuppressRegion (fileloc loc) { if (!gc.insuppressregion) { - llerrorlit (FLG_SYNTAX, - "End ignore errors in region while not ignoring errors"); + voptgenerror + (FLG_SYNTAX, + message ("End ignore errors in region while not ignoring errors"), + loc); } - - gc.insuppressregion = FALSE; - flagMarkerList_add (gc.markers, flagMarker_createIgnoreOff (g_currentloc)); + + gc.insuppressregion = FALSE; + (void) flagMarkerList_add (gc.markers, flagMarker_createIgnoreOff (loc)); } void @@ -464,14 +472,12 @@ context_exitMTfile (void) gc.kind = CX_GLOBAL; } -# ifndef NOLCL void context_enterLCLfile (void) { gc.kind = CX_LCL; gc.facct = typeIdSet_emptySet (); } -# endif static void addModuleAccess (/*@only@*/ cstring fname, typeIdSet mods) @@ -528,14 +534,13 @@ insertModuleAccess (cstring fname, typeId t) addModuleAccess (cstring_copy (fname), typeIdSet_single (t)); } -# ifndef NOLCL void context_exitLCLfile (void) { if (gc.kind != CX_LCLLIB) { cstring lclname = - fileLib_withoutExtension (fileName (currentFile ()), LCL_EXTENSION); + fileLib_withoutExtension (fileTable_fileName (currentFile ()), LCL_EXTENSION); addModuleAccess (fileLib_removePath (lclname), gc.facct); cstring_free (lclname); @@ -545,7 +550,6 @@ context_exitLCLfile (void) gc.kind = CX_GLOBAL; gc.facct = typeIdSet_emptySet (); } -# endif void context_dumpModuleAccess (FILE *fout) @@ -666,17 +670,15 @@ typeIdSet context_fileAccessTypes (void) void context_resetModeFlags (void) -{ - +{ allFlagCodes (code) { if (flagcode_isModeFlag (code)) { - context_setFlag (code, FALSE); + context_setFlag (code, FALSE, g_currentloc); } - } end_allFlagCodes; - - } + } end_allFlagCodes; +} /* ** resetAllFlags @@ -702,11 +704,13 @@ conext_resetAllCounters (void) void context_resetAllFlags (void) { + DPRINTF (("******** Reset all flags")); + allFlagCodes (code) { gc.flags[code] = FALSE; - if (flagcode_hasValue (code)) + if (flagcode_hasNumber (code)) { int val = 0; @@ -721,22 +725,24 @@ context_resetAllFlags (void) val = DEFAULT_LINELEN; break; case FLG_INDENTSPACES: val = DEFAULT_INDENTSPACES; break; + case FLG_LOCINDENTSPACES: + val = DEFAULT_LOCINDENTSPACES; break; case FLG_EXTERNALNAMELEN: - val = DEFAULT_EXTERNALNAMELEN; break; + val = ISO99_EXTERNALNAMELEN; break; case FLG_INTERNALNAMELEN: - val = DEFAULT_INTERNALNAMELEN; break; + val = ISO99_INTERNALNAMELEN; break; case FLG_COMMENTCHAR: val = (int) DEFAULT_COMMENTCHAR; break; case FLG_CONTROLNESTDEPTH: - val = (int) DEFAULT_CONTROLNESTDEPTH; break; + val = (int) ISO99_CONTROLNESTDEPTH; break; case FLG_STRINGLITERALLEN: - val = (int) DEFAULT_STRINGLITERALLEN; break; + val = (int) ISO99_STRINGLITERALLEN; break; case FLG_INCLUDENEST: - val = (int) DEFAULT_INCLUDENEST; break; + val = (int) ISO99_INCLUDENEST; break; case FLG_NUMSTRUCTFIELDS: - val = (int) DEFAULT_NUMSTRUCTFIELDS; break; + val = (int) ISO99_NUMSTRUCTFIELDS; break; case FLG_NUMENUMMEMBERS: - val = (int) DEFAULT_NUMENUMMEMBERS; break; + val = (int) ISO99_NUMENUMMEMBERS; break; case FLG_EXPECT: case FLG_LCLEXPECT: break; @@ -745,7 +751,15 @@ context_resetAllFlags (void) } /*@=loopswitchbreak@*/ + DPRINTF (("Set value: [%s] / %d", flagcode_unparse (code), val)); context_setValue (code, val); + DPRINTF (("Set value: [%s] / %d", flagcode_unparse (code), context_getValue (code))); + llassert (context_getValue (code) == val); + } + else if (flagcode_hasChar (code)) + { + llassert (code == FLG_COMMENTCHAR); + context_setCommentMarkerChar (DEFAULT_COMMENTCHAR); } else if (flagcode_hasString (code)) { @@ -793,9 +807,9 @@ context_resetAllFlags (void) case FLG_BOOLTYPE: val = cstring_makeLiteral (DEFAULT_BOOLTYPE); break; case FLG_BOOLFALSE: - val = cstring_makeLiteral ("FALSE"); break; + val = cstring_makeLiteral ("false"); break; case FLG_BOOLTRUE: - val = cstring_makeLiteral ("TRUE"); break; + val = cstring_makeLiteral ("true"); break; case FLG_MACROVARPREFIX: val = cstring_makeLiteral ("m_"); break; case FLG_SYSTEMDIRS: @@ -803,7 +817,7 @@ context_resetAllFlags (void) default: break; } /*@=loopswitchbreak@*/ - + context_setString (code, val); } else @@ -816,17 +830,25 @@ context_resetAllFlags (void) ** These flags are true by default. */ - /*@i34 move this into flags.def */ + /* eventually, move this into flags.def */ + gc.flags[FLG_STREAMOVERWRITE] = TRUE; + gc.flags[FLG_OBVIOUSLOOPEXEC] = TRUE; gc.flags[FLG_MODIFIES] = TRUE; gc.flags[FLG_NESTCOMMENT] = TRUE; gc.flags[FLG_GLOBALS] = TRUE; gc.flags[FLG_FULLINITBLOCK] = TRUE; + gc.flags[FLG_INITSIZE] = TRUE; + gc.flags[FLG_INITALLELEMENTS] = TRUE; + gc.flags[FLG_NULLINIT] = TRUE; + + gc.flags[FLG_STRINGLITTOOLONG] = TRUE; + gc.flags[FLG_LIKELYBOOL] = TRUE; gc.flags[FLG_ZEROPTR] = TRUE; gc.flags[FLG_NUMLITERAL] = TRUE; gc.flags[FLG_DUPLICATEQUALS] = TRUE; - gc.flags[FLG_SKIPANSIHEADERS] = TRUE; + gc.flags[FLG_SKIPISOHEADERS] = TRUE; gc.flags[FLG_SKIPPOSIXHEADERS] = TRUE; gc.flags[FLG_SYSTEMDIREXPAND] = TRUE; gc.flags[FLG_UNRECOGCOMMENTS] = TRUE; @@ -842,6 +864,7 @@ context_resetAllFlags (void) gc.flags[FLG_SIZEOFFORMALARRAY] = TRUE; gc.flags[FLG_FIXEDFORMALARRAY] = TRUE; + gc.flags[FLG_UNRECOGDIRECTIVE] = TRUE; gc.flags[FLG_WARNUSE] = TRUE; gc.flags[FLG_PREDASSIGN] = TRUE; gc.flags[FLG_MODOBSERVER] = TRUE; @@ -858,10 +881,12 @@ context_resetAllFlags (void) gc.flags[FLG_FORMATTYPE] = TRUE; gc.flags[FLG_BADFLAG] = TRUE; gc.flags[FLG_WARNFLAGS] = TRUE; + gc.flags[FLG_WARNRC] = TRUE; gc.flags[FLG_FILEEXTENSIONS] = TRUE; - gc.flags[FLG_WARNUNIXLIB] = TRUE; + gc.flags[FLG_WARNUNIXLIB] = FALSE; gc.flags[FLG_WARNPOSIX] = TRUE; gc.flags[FLG_SHOWCOL] = TRUE; + gc.flags[FLG_SHOWDEEPHISTORY] = FALSE; /* TRUE; */ gc.flags[FLG_SHOWFUNC] = TRUE; gc.flags[FLG_SUPCOUNTS] = TRUE; gc.flags[FLG_HINTS] = TRUE; @@ -869,8 +894,13 @@ context_resetAllFlags (void) gc.flags[FLG_TYPE] = TRUE; gc.flags[FLG_INCOMPLETETYPE] = TRUE; gc.flags[FLG_ABSTRACT] = TRUE; - gc.flags[FLG_ITER] = TRUE; - gc.flags[FLG_CONTROL] = TRUE; + gc.flags[FLG_NUMABSTRACT] = TRUE; + gc.flags[FLG_ITERBALANCE] = TRUE; + gc.flags[FLG_ITERYIELD] = TRUE; + gc.flags[FLG_DUPLICATECASES] = TRUE; + gc.flags[FLG_ALWAYSEXITS] = TRUE; + gc.flags[FLG_EMPTYRETURN] = TRUE; + gc.flags[FLG_MACRORETURN] = TRUE; gc.flags[FLG_UNRECOG] = TRUE; gc.flags[FLG_SYSTEMUNRECOG] = TRUE; gc.flags[FLG_LINTCOMMENTS] = TRUE; @@ -889,11 +919,24 @@ context_resetAllFlags (void) gc.flags[FLG_GNUEXTENSIONS] = TRUE; /* - ** On by default for Win32, but not Unix (to support MS/VC++ error message format). + Changed for 3.0.0.19 + */ + + /* commenting ou until some output issues are fixed */ + gc.flags[FLG_ORCONSTRAINT] = TRUE; + + gc.flags[FLG_CONSTRAINTLOCATION] = TRUE; + + /*drl 1/18/2002*/ + gc.flags[FLG_WARNSYSFILES] = TRUE; + + /* + ** On by default for Win32, but not Unix */ # ifdef WIN32 gc.flags[FLG_PARENFILEFORMAT] = TRUE; + gc.flags[FLG_CASEINSENSITIVEFILENAMES] = TRUE; # endif } @@ -908,10 +951,24 @@ context_resetAllFlags (void) if (!flagcode_isModeFlag (modeflags[i])) \ { llbug (message ("not a mode flag: %s", \ flagcode_unparse (modeflags[i]))); } \ - else { context_setFlag (modeflags[i], TRUE); } i++; }} + else { context_setFlag (modeflags[i], TRUE, g_currentloc); } i++; }} + +static void context_setModeAux (cstring p_s, bool p_warn) ; void context_setMode (cstring s) +{ + context_setModeAux (s, TRUE); +} + +void +context_setModeNoWarn (cstring s) +{ + context_setModeAux (s, FALSE); +} + +void +context_setModeAux (cstring s, bool warn) { intSet setflags = intSet_new (); @@ -952,11 +1009,14 @@ context_setMode (cstring s) } } end_intSet_elements ; - voptgenerror (FLG_WARNFLAGS, - message ("Setting mode %s after setting mode flags will " - "override set values of flags: %s", - s, rflags), - g_currentloc); + if (warn) + { + voptgenerror (FLG_WARNFLAGS, + message ("Setting mode %s after setting mode flags will " + "override set values of flags: %s", + s, rflags), + g_currentloc); + } cstring_free (rflags); } @@ -970,17 +1030,21 @@ context_setMode (cstring s) flagcode modeflags[] = { FLG_ENUMINT, FLG_MACROMATCHNAME, + FLG_STRINGLITNOROOM, + FLG_STRINGLITNOROOMFINALNULL, FLG_MACROUNDEF, FLG_RELAXQUALS, FLG_USEALLGLOBS, FLG_CHECKSTRICTGLOBALS, FLG_CHECKSTRICTGLOBALIAS, FLG_CHECKEDGLOBALIAS, FLG_CHECKMODGLOBALIAS, FLG_PREDBOOLOTHERS, FLG_PREDBOOLINT, + FLG_UNSIGNEDCOMPARE, FLG_PARAMUNUSED, FLG_VARUNUSED, FLG_FUNCUNUSED, FLG_TYPEUNUSED, + FLG_ABSTRACTCOMPARE, FLG_CONSTUNUSED, FLG_ENUMMEMUNUSED, FLG_FIELDUNUSED, - FLG_PTRNUMCOMPARE, FLG_BOOLCOMPARE, FLG_MUTREP, - FLG_NOEFFECT, FLG_IMPTYPE, + FLG_PTRNUMCOMPARE, FLG_BOOLCOMPARE, FLG_UNSIGNEDCOMPARE, + FLG_MUTREP, FLG_NOEFFECT, FLG_IMPTYPE, FLG_RETVALOTHER, FLG_RETVALBOOL, FLG_RETVALINT, FLG_SPECUNDEF, FLG_INCONDEFS, FLG_INCONDEFSLIB, FLG_MISPLACEDSHAREQUAL, FLG_MATCHFIELDS, @@ -1019,11 +1083,13 @@ context_setMode (cstring s) FLG_UNKNOWNTRANS, FLG_KEEPTRANS, FLG_IMMEDIATETRANS, - + FLG_NUMABSTRACTCAST, FLG_EXPORTLOCAL, FLG_USERELEASED, FLG_ALIASUNIQUE, FLG_MAYALIASUNIQUE, - FLG_MUSTFREE, FLG_MUSTDEFINE, FLG_GLOBSTATE, + FLG_MUSTFREEONLY, + FLG_MUSTFREEFRESH, + FLG_MUSTDEFINE, FLG_GLOBSTATE, FLG_COMPDESTROY, FLG_MUSTNOTALIAS, FLG_MEMIMPLICIT, FLG_BRANCHSTATE, @@ -1034,7 +1100,8 @@ context_setMode (cstring s) FLG_MODGLOBS, FLG_WARNLINTCOMMENTS, FLG_IFEMPTY, FLG_REALCOMPARE, FLG_BOOLOPS, FLG_PTRNEGATE, - FLG_SHIFTSIGNED, + FLG_SHIFTNEGATIVE, + FLG_SHIFTIMPLEMENTATION, FLG_BUFFEROVERFLOWHIGH, FLG_BUFFEROVERFLOW, INVALID_FLAG @@ -1046,16 +1113,18 @@ context_setMode (cstring s) { flagcode modeflags[] = { - FLG_BOOLINT, FLG_CHARINT, FLG_FLOATDOUBLE, + FLG_BOOLINT, FLG_CHARINT, FLG_FLOATDOUBLE, FLG_LONGINT, FLG_SHORTINT, FLG_ENUMINT, FLG_RELAXQUALS, FLG_FORWARDDECL, - FLG_CHARINDEX, FLG_ABSTVOIDP, FLG_USEALLGLOBS, + FLG_CHARINDEX, FLG_NUMABSTRACTINDEX, FLG_ABSTVOIDP, FLG_USEALLGLOBS, FLG_CHARUNSIGNEDCHAR, FLG_PREDBOOLOTHERS, + FLG_NUMABSTRACTLIT, FLG_VARUNUSED, FLG_FUNCUNUSED, FLG_TYPEUNUSED, FLG_CHECKSTRICTGLOBALS, FLG_MACROMATCHNAME, FLG_RETVALOTHER, FLG_IFEMPTY, + FLG_BUFFEROVERFLOWHIGH, FLG_RETSTACK, FLG_PTRNEGATE, FLG_STATETRANSFER, FLG_STATEMERGE, FLG_LONGUNSIGNEDINTEGRAL, @@ -1064,6 +1133,8 @@ context_setMode (cstring s) FLG_CHARINTLITERAL, FLG_ZEROBOOL, FLG_BUFFEROVERFLOWHIGH, + FLG_STRINGLITNOROOM, + FLG_STRINGLITNOROOMFINALNULL, INVALID_FLAG } ; @@ -1073,16 +1144,21 @@ context_setMode (cstring s) { flagcode modeflags[] = { - FLG_EXPORTLOCAL, FLG_IMPTYPE, + FLG_EXPORTLOCAL, FLG_IMPTYPE, + FLG_NUMABSTRACTCAST, + FLG_ABSTRACTCOMPARE, FLG_STATETRANSFER, FLG_STATEMERGE, FLG_CHECKSTRICTGLOBALIAS, FLG_CHECKEDGLOBALIAS, FLG_CHECKMODGLOBALIAS, FLG_UNCHECKEDGLOBALIAS, FLG_FORMATCONST, + FLG_STRINGLITNOROOM, + FLG_STRINGLITNOROOMFINALNULL, + FLG_STRINGLITSMALLER, FLG_EXITARG, FLG_PTRNUMCOMPARE, - FLG_BOOLCOMPARE, FLG_MACROUNDEF, - FLG_MUSTMOD, FLG_ALLGLOBALS, + FLG_BOOLCOMPARE, FLG_UNSIGNEDCOMPARE, + FLG_MACROUNDEF, FLG_MUSTMOD, FLG_ALLGLOBALS, FLG_PREDBOOLOTHERS, FLG_PREDBOOLPTR, FLG_PREDBOOLINT, FLG_USEALLGLOBS, FLG_MUTREP, FLG_RETALIAS, FLG_RETEXPOSE, FLG_ASSIGNEXPOSE, FLG_CASTEXPOSE, @@ -1094,6 +1170,7 @@ context_setMode (cstring s) FLG_SPECUNDEF, FLG_IMPCHECKMODINTERNALS, FLG_DECLUNDEF, FLG_INCONDEFS, FLG_INCONDEFSLIB, FLG_MISPLACEDSHAREQUAL, FLG_REDUNDANTSHAREQUAL, + FLG_NUMABSTRACTPRINT, FLG_MATCHFIELDS, FLG_MACROPARAMS, FLG_MACROASSIGN, @@ -1108,9 +1185,12 @@ context_setMode (cstring s) FLG_UNREACHABLE, FLG_NORETURN, FLG_CASEBREAK, FLG_MISSCASE, FLG_EVALORDER, FLG_USEDEF, - FLG_NESTEDEXTERN, + /* warn use flags */ + FLG_MULTITHREADED, FLG_PORTABILITY, FLG_SUPERUSER, FLG_IMPLEMENTATIONOPTIONAL, + FLG_BUFFEROVERFLOWHIGH, + /* memchecks flags */ FLG_NULLSTATE, FLG_NULLDEREF, FLG_NULLASSIGN, @@ -1138,7 +1218,9 @@ context_setMode (cstring s) FLG_IMMEDIATETRANS, FLG_ONLYUNQGLOBALTRANS, FLG_USERELEASED, FLG_ALIASUNIQUE, FLG_MAYALIASUNIQUE, - FLG_MUSTFREE, FLG_MUSTDEFINE, FLG_GLOBSTATE, + FLG_MUSTFREEONLY, + FLG_MUSTFREEFRESH, + FLG_MUSTDEFINE, FLG_GLOBSTATE, FLG_COMPDESTROY, FLG_MUSTNOTALIAS, FLG_MEMIMPLICIT, FLG_BRANCHSTATE, @@ -1148,9 +1230,10 @@ context_setMode (cstring s) FLG_LOOPLOOPBREAK, FLG_SWITCHLOOPBREAK, FLG_MODGLOBS, FLG_CHECKSTRICTGLOBALS, FLG_IMPCHECKEDSPECGLOBALS, FLG_MACROMATCHNAME, FLG_WARNLINTCOMMENTS, - FLG_INCLUDENEST, FLG_ANSIRESERVED, FLG_CPPNAMES, + FLG_INCLUDENEST, FLG_ISORESERVED, FLG_CPPNAMES, FLG_NOPARAMS, FLG_IFEMPTY, FLG_WHILEEMPTY, FLG_REALCOMPARE, - FLG_BOOLOPS, FLG_SHIFTSIGNED, + FLG_BOOLOPS, FLG_SHIFTNEGATIVE, + FLG_SHIFTIMPLEMENTATION, FLG_BUFFEROVERFLOWHIGH, FLG_BUFFEROVERFLOW, INVALID_FLAG } ; @@ -1160,13 +1243,19 @@ context_setMode (cstring s) { flagcode modeflags[] = { - FLG_CHECKSTRICTGLOBALIAS, + FLG_ABSTRACTCOMPARE, + FLG_CHECKSTRICTGLOBALIAS, + FLG_NUMABSTRACTCAST, FLG_CHECKEDGLOBALIAS, FLG_CHECKMODGLOBALIAS, FLG_UNCHECKEDGLOBALIAS, FLG_MODFILESYSTEM, FLG_MACROMATCHNAME, FLG_FORMATCONST, + FLG_NUMABSTRACTPRINT, + FLG_STRINGLITNOROOM, + FLG_STRINGLITNOROOMFINALNULL, + FLG_STRINGLITSMALLER, FLG_STATETRANSFER, FLG_STATEMERGE, FLG_MACROUNDEF, FLG_MUTREP, FLG_MUSTMOD, FLG_ALLGLOBALS, FLG_IMPTYPE, @@ -1191,9 +1280,9 @@ context_setMode (cstring s) FLG_VARUNUSED, FLG_NULLPOINTERARITH, FLG_POINTERARITH, FLG_PTRNUMCOMPARE, - FLG_BOOLCOMPARE, FLG_NOEFFECT, - FLG_RETVALINT, FLG_RETVALBOOL, FLG_RETVALOTHER, - FLG_ANSIRESERVED, FLG_ANSIRESERVEDLOCAL, FLG_CPPNAMES, + FLG_BOOLCOMPARE, FLG_UNSIGNEDCOMPARE, + FLG_NOEFFECT, FLG_RETVALINT, FLG_RETVALBOOL, FLG_RETVALOTHER, + FLG_ISORESERVED, FLG_ISORESERVEDLOCAL, FLG_CPPNAMES, FLG_RETVALBOOL, FLG_RETVALINT, FLG_SPECUNDEF, FLG_DECLUNDEF, FLG_STRICTOPS, FLG_INCONDEFS, FLG_MISPLACEDSHAREQUAL, FLG_REDUNDANTSHAREQUAL, @@ -1214,6 +1303,11 @@ context_setMode (cstring s) FLG_NESTEDEXTERN, FLG_FIRSTCASE, + /* warn use flags */ + FLG_MULTITHREADED, FLG_PORTABILITY, FLG_SUPERUSER, FLG_IMPLEMENTATIONOPTIONAL, + FLG_BUFFEROVERFLOWHIGH, + FLG_BUFFEROVERFLOW, FLG_TOCTOU, + /* memchecks flags */ FLG_NULLSTATE, FLG_NULLDEREF, FLG_NULLASSIGN, FLG_NULLPASS, FLG_NULLRET, @@ -1240,7 +1334,9 @@ context_setMode (cstring s) FLG_UNKNOWNINITTRANS, FLG_USERELEASED, FLG_ALIASUNIQUE, FLG_MAYALIASUNIQUE, - FLG_MUSTFREE, FLG_MUSTDEFINE, FLG_GLOBSTATE, + FLG_MUSTFREEONLY, + FLG_MUSTFREEFRESH, + FLG_MUSTDEFINE, FLG_GLOBSTATE, FLG_COMPDESTROY, FLG_MUSTNOTALIAS, FLG_MEMIMPLICIT, FLG_BRANCHSTATE, @@ -1258,7 +1354,7 @@ context_setMode (cstring s) FLG_IMPCHECKEDSTRICTSPECGLOBALS, FLG_IMPCHECKMODINTERNALS, FLG_WARNMISSINGGLOBALS, FLG_WARNMISSINGGLOBALSNOGLOBS, - FLG_WARNLINTCOMMENTS, FLG_ANSIRESERVEDLOCAL, + FLG_WARNLINTCOMMENTS, FLG_ISORESERVEDLOCAL, FLG_INCLUDENEST, FLG_STRINGLITERALLEN, FLG_NUMSTRUCTFIELDS, FLG_NUMENUMMEMBERS, FLG_CONTROLNESTDEPTH, @@ -1269,7 +1365,9 @@ context_setMode (cstring s) FLG_REALCOMPARE, FLG_BOOLOPS, FLG_SYSTEMDIRERRORS, FLG_UNUSEDSPECIAL, - FLG_SHIFTSIGNED, FLG_BITWISEOPS, + FLG_SHIFTNEGATIVE, + FLG_SHIFTIMPLEMENTATION, + FLG_BITWISEOPS, FLG_BUFFEROVERFLOWHIGH, FLG_BUFFEROVERFLOW, INVALID_FLAG } ; @@ -1295,44 +1393,44 @@ context_isSpecialFile (cstring fname) bool context_isSystemDir (cstring dir) { - cstring sysDirs = context_exposeString (FLG_SYSTEMDIRS); - char *thisdir = cstring_toCharsSafe (sysDirs); - char *nextdir = strchr (thisdir, PATH_SEPARATOR); - - if (nextdir != NULL) + cstring thisdir = cstring_copy (context_getString (FLG_SYSTEMDIRS)); + cstring savedir = thisdir; + cstring nextdir = cstring_afterChar (thisdir, PATH_SEPARATOR); + + if (cstring_isDefined (nextdir)) { - *nextdir = '\0'; + /*@access cstring@*/ + *nextdir = '\0'; /* closes thisdir */ nextdir += 1; + /*@noaccess cstring@*/ } - while (thisdir != NULL) + /* 2001-09-09: added thisdir[0] != '\0' + ** herbert: don't compare with an empty name! + ** should return false for empty directory path + */ + + while (!cstring_isEmpty (thisdir)) { DPRINTF (("Test: %s / %s", dir, thisdir)); - if (cstring_equalCanonicalPrefix (dir, thisdir)) + if (osd_equalCanonicalPrefix (dir, thisdir)) { - if (nextdir != NULL) - { - *(nextdir - 1) = PATH_SEPARATOR; - } - + cstring_free (savedir); return TRUE; } - if (nextdir != NULL) - { - *(nextdir - 1) = PATH_SEPARATOR; - } - - if (nextdir != NULL) + if (cstring_isDefined (nextdir)) { thisdir = nextdir; - nextdir = strchr (thisdir, PATH_SEPARATOR); + nextdir = cstring_afterChar (thisdir, PATH_SEPARATOR); - if (nextdir != NULL) + if (cstring_isDefined (nextdir)) { + /*@access cstring@*/ *nextdir = '\0'; nextdir += 1; + /*@noaccess cstring@*/ } } else @@ -1342,6 +1440,7 @@ context_isSystemDir (cstring dir) } DPRINTF (("Returns FALSE")); + cstring_free (savedir); return FALSE; } @@ -1378,6 +1477,11 @@ context_removeFileAccessType (typeId t) void context_enterFunctionHeader (void) { + if (context_getFlag (FLG_GRAMMAR)) + { + lldiagmsg (message ("Enter function header: %q", context_unparse ())); + } + if (gc.kind != CX_GLOBAL) { llparseerror (cstring_makeLiteral @@ -1393,6 +1497,11 @@ void context_enterFunctionHeader (void) void context_exitFunctionHeader (void) { + if (context_getFlag (FLG_GRAMMAR)) + { + lldiagmsg (message ("Exit function header: %q", context_unparse ())); + } + DPRINTF (("Exit function header!")); gc.inFunctionHeader = FALSE; } @@ -1404,21 +1513,38 @@ bool context_inFunctionHeader (void) void context_enterFunctionDeclaration (uentry e) { + if (context_getFlag (FLG_GRAMMAR)) + { + lldiagmsg (message ("Enter function declaration: %q", context_unparse ())); + } + DPRINTF (("Enter function decl")); llassert (gc.savekind == CX_ERROR); gc.savekind = gc.kind; + gc.savecont = gc.cont; gc.kind = CX_FCNDECLARATION; gc.cont.fcn = e; } void context_exitFunctionDeclaration (void) { + if (context_getFlag (FLG_GRAMMAR)) + { + lldiagmsg (message ("Exit function declaration: %q", context_unparse ())); + } + DPRINTF (("Exit function decl")); llassert (gc.savekind != CX_ERROR); llassert (gc.kind == CX_FCNDECLARATION); gc.kind = gc.savekind; - gc.cont.fcn = uentry_undefined; + gc.cont = gc.savecont; + gc.savekind = CX_ERROR; + + if (context_getFlag (FLG_GRAMMAR)) + { + lldiagmsg (message ("After exit function declaration: %q", context_unparse ())); + } } bool context_inFunctionDeclaration (void) @@ -1638,14 +1764,14 @@ void context_enterTrueClause (exprNode e) void context_enterSwitch (exprNode e) { - + DPRINTF (("Enter switch: %s", exprNode_unparse (e))); usymtab_switchBranch (e); context_enterCondClauseAux (SWITCHCLAUSE); } void context_exitSwitch (exprNode e, bool allpaths) { - usymtab_exitSwitch (e, allpaths); + usymtab_exitSwitch (e, allpaths); while (clause_isCase (clauseStack_top (gc.clauses))) { @@ -1760,6 +1886,11 @@ context_enterFunction (/*@exposed@*/ uentry e) sRef_enterFunctionScope (); } +bool context_inOldStyleScope(void) +{ + return (gc.kind == CX_OLDSTYLESCOPE); +} + void context_enterOldStyleScope (void) { @@ -2168,8 +2299,7 @@ static void context_exitClauseAux (exprNode pred, exprNode tbranch) { context_setJustPopped (); - /*@i32 was makeAlt */ - usymtab_popTrueBranch (pred, tbranch, gc.inclause); + usymtab_popTrueBranch (pred, tbranch, gc.inclause); /* evans 2003-02-02?: was makeAlt */ clauseStack_pop (gc.clauses); gc.inclause = topClause (gc.clauses); } @@ -2197,7 +2327,7 @@ void context_exitIterClause (exprNode body) context_setJustPopped (); - if (context_getFlag (FLG_LOOPEXEC)) + if (context_getFlag (FLG_ITERLOOPEXEC)) { usymtab_popTrueExecBranch (exprNode_undefined, body, ITERCLAUSE); } @@ -2254,7 +2384,7 @@ void context_exitWhileClause (exprNode pred, exprNode body) ** predicate must be false after while loop (unless there are breaks) */ - if (context_getFlag (FLG_LOOPEXEC)) + if (context_getFlag (FLG_WHILELOOPEXEC)) { usymtab_popTrueExecBranch (pred, body, WHILECLAUSE); } @@ -2300,17 +2430,30 @@ void context_exitForClause (exprNode forPred, exprNode body) llassert (gc.inclause == FORCLAUSE); context_setJustPopped (); + DPRINTF (("Exit for: %s / %s", exprNode_unparse (forPred), exprNode_unparse (body))); + /* - ** predicate must be false after while loop (unless there are breaks) + ** Predicate must be false after for loop (unless there are breaks) */ - if (context_getFlag (FLG_LOOPEXEC)) + if (context_getFlag (FLG_FORLOOPEXEC)) { + DPRINTF (("Here: for loop exec")); usymtab_popTrueExecBranch (forPred, body, FORCLAUSE); } else { - usymtab_popTrueBranch (forPred, body, FORCLAUSE); + if (context_getFlag (FLG_OBVIOUSLOOPEXEC) + && exprNode_loopMustExec (forPred)) + { + DPRINTF (("Here: loop must exec")); + usymtab_popTrueExecBranch (forPred, body, FORCLAUSE); + } + else + { + DPRINTF (("Pop true branch:")); + usymtab_popTrueBranch (forPred, body, FORCLAUSE); + } } usymtab_addGuards (invGuards); @@ -2361,13 +2504,17 @@ context_returnFunction (void) void context_exitFunction (void) { + DPRINTF (("Exit function: %s", context_unparse ())); + if (!context_inFunction () && !context_inMacroConstant () - && !context_inMacroUnknown () + && !context_inUnknownMacro () && !context_inIterDef () && !context_inIterEnd ()) { /* ** not a bug because of parse errors */ + + BADBRANCH; } else { @@ -2412,6 +2559,7 @@ context_exitFunction (void) llassert (clauseStack_isEmpty (gc.clauses)); llassert (gc.inclause == NOCLAUSE); + DPRINTF (("After exit function: %s", context_unparse ())); } void @@ -2422,7 +2570,7 @@ context_quietExitFunction (void) context_exitInnerPlain (); } - if (!context_inFunction () && !context_inMacroConstant () && !context_inMacroUnknown () + if (!context_inFunction () && !context_inMacroConstant () && !context_inUnknownMacro () && !context_inIterDef () && !context_inIterEnd ()) { } @@ -2652,15 +2800,15 @@ context_setValue (flagcode flag, int val) { llerror_flagWarning (message ("Value for %s must be a positive " - "number (given %d)", - flagcode_unparse (flag), val)); + "number (given %d)", + flagcode_unparse (flag), val)); return; } if (flag == FLG_LINELEN && val < MINLINELEN) { llerror_flagWarning (message ("Value for %s must be at least %d (given %d)", - flagcode_unparse (flag), - MINLINELEN, val)); + flagcode_unparse (flag), + MINLINELEN, val)); val = MINLINELEN; } break; @@ -2673,10 +2821,9 @@ context_setValue (flagcode flag, int val) case FLG_INDENTSPACES: if (val < 0) { - llerror_flagWarning (message ("Value for %s must be a non-negative " - "number (given %d)", - flagcode_unparse (flag), val)); + "number (given %d)", + flagcode_unparse (flag), val)); return; } @@ -2684,7 +2831,8 @@ context_setValue (flagcode flag, int val) default: break; } - + + DPRINTF (("Set value [%s] %d = %d", flagcode_unparse (flag), index, val)); gc.values[index] = val; } @@ -2701,6 +2849,7 @@ context_getValue (flagcode flag) int index = flagcode_valueIndex (flag); llassert (index >= 0 && index <= NUMVALUEFLAGS); + DPRINTF (("Get value [%s] %d = %d", flagcode_unparse (flag), index, gc.values[index])); return (gc.values[index]); } @@ -2744,76 +2893,135 @@ context_setString (flagcode flag, cstring val) llassert (index >= 0 && index <= NUMSTRINGFLAGS); - if (flag == FLG_SYSTEMDIRS) + DPRINTF (("set string: %s", flagcode_unparse (flag))); + + switch (flag) { - llassert (cstring_isDefined (val)); + case FLG_MESSAGESTREAM: + case FLG_WARNINGSTREAM: + case FLG_ERRORSTREAM: + { + if (cstring_isDefined (val)) + { + FILE *fstream; - if (cstring_firstChar (val) == '\"') - { - cstring oval = val; - cstring tval = cstring_copy (cstring_suffix (val, 1)); - - if (cstring_lastChar (tval) != '\"') - { - int n = cstring_length (tval) - 1; + if (osd_fileExists (val)) + { + if (context_getFlag (FLG_STREAMOVERWRITE)) + { + llfatalerror (message + ("Output stream file %s would overwrite existing file. " + "Use -streamoverwrite if you want to allow this.", + val)); + } + } + + fstream = fopen (cstring_toCharsSafe (val), "w"); - while (isspace ((int) cstring_getChar (tval, n))) - { - n--; - } + if (fstream == NULL) + { + llfatalerror (message ("Unable to open output stream file %s for writing", + val)); + } - if (cstring_getChar (tval, n) != '\"') - { - llerror_flagWarning (message ("Setting -systemdirs to string with unmatching quotes: %s", val)); - } - else - { - cstring otval = tval; - tval = cstring_prefix (tval, n); - cstring_free (otval); - } - } - - val = cstring_copy (cstring_clip (tval, cstring_length (tval) - 1)); - DPRINTF (("val = %s", val)); - cstring_free (tval); - cstring_free (oval); - } - } + /* + ** This ensures fstream will be closed on exit. + */ - if (flag == FLG_TMPDIR) - { - llassert (cstring_isDefined (val)); - - if (cstring_length (val) == 0) - { - cstring_free (val); - val = message (".%s", cstring_makeLiteralTemp (CONNECTSTR)); - } - else if (cstring_lastChar (val) != CONNECTCHAR) - { - val = cstring_appendChar (val, CONNECTCHAR); - } - else - { - ; - } - } + fileTable_addStreamFile (gc.ftab, fstream, cstring_copy (val)); + + switch (flag) + { + case FLG_MESSAGESTREAM: + g_messagestream = fstream; + /*@innerbreak@*/ break; + case FLG_WARNINGSTREAM: + g_warningstream = fstream; + /*@innerbreak@*/ break; + case FLG_ERRORSTREAM: + g_errorstream = fstream; + /*@innerbreak@*/ break; + BADDEFAULT; + } + /*@-statetransfer@*/ + } /*@=statetransfer@*/ /* fstream not closed, but will be on exit */ + break; + } + case FLG_SYSTEMDIRS: + { + llassert (cstring_isDefined (val)); + + if (cstring_firstChar (val) == '\"') + { + cstring oval = val; + cstring tval = cstring_copy (cstring_suffix (val, 1)); + + if (cstring_lastChar (tval) != '\"') + { + int n = size_toInt (cstring_length (tval) - 1); + + while (isspace ((int) cstring_getChar (tval, size_fromInt (n)))) + { + n--; + } + + if (cstring_getChar (tval, size_fromInt (n)) != '\"') + { + llerror_flagWarning + (message ("Setting -systemdirs to string with unmatching quotes: %s", val)); + } + else + { + cstring otval = tval; + tval = cstring_prefix (tval, size_fromInt (n)); + cstring_free (otval); + } + } + + val = cstring_copy (cstring_clip (tval, cstring_length (tval) - 1)); + DPRINTF (("val = %s", val)); + cstring_free (tval); + cstring_free (oval); + } + + break; + } + case FLG_TMPDIR: + { + llassert (cstring_isDefined (val)); + + if (cstring_length (val) == 0) + { + cstring_free (val); + val = message (".%s", cstring_makeLiteralTemp (CONNECTSTR)); + } + else if (cstring_lastChar (val) != CONNECTCHAR) + { + val = cstring_appendChar (val, CONNECTCHAR); + } + else + { + ; + } + break; + } + default: + { + ; /* Okay not handle everything in this switch */ + } + /*@-branchstate@*/ + } /* evans 2002-03-24: splintme reports a spurious (I think) warning here...need to look into it */ + /*@=branchstate@*/ if (cstring_length (val) >= 1 - && cstring_firstChar (val) == '"') + && cstring_firstChar (val) == '\"') { llerror_flagWarning (message - ("setting %s to string beginning with \". You probably " - "don't meant to have the \"'s.", - flagcode_unparse (flag))); + ("Setting %s to string beginning with \". You probably " + "don't meant to have the \"'s.", + flagcode_unparse (flag))); } - - if (flag == FLG_BOOLTYPE) - { - - } - + gc.strings[index] = val; } @@ -2842,7 +3050,10 @@ void context_initMod (void) /*@globals undef gc; @*/ { gc.kind = CX_GLOBAL; + gc.savekind = CX_ERROR; + gc.savecont.glob = FALSE; + gc.instandardlib = FALSE; gc.numerrors = 0; gc.neednl = FALSE; @@ -2897,16 +3108,17 @@ void context_initMod (void) { gc.setGlobally[code] = FALSE; gc.setLocally[code] = FALSE; - } end_allFlagCodes ; - + } + end_allFlagCodes ; + usymtab_initMod (); - context_resetAllFlags (); + assertSet (gc.flags); /* Can't use global in defines */ assertSet (gc.saveflags); assertSet (gc.values); assertSet (gc.strings); - + conext_resetAllCounters (); assertSet (gc.counters); @@ -2973,7 +3185,9 @@ context_unparse (void) s = message ("Global Context:%q", fileloc_unparse (g_currentloc)); break; case CX_INNER: - s = message ("Inner Context:%q", fileloc_unparse (g_currentloc)); + s = message ("Inner Context [%d] : %q", + gc.cont.cdepth, + fileloc_unparse (g_currentloc)); break; case CX_FUNCTION: s = message ("Function %q :%q \n\taccess %q\n\tmodifies %q", @@ -2997,6 +3211,9 @@ context_unparse (void) case CX_ITEREND: s = message ("Iter end %q", uentry_unparse (gc.cont.fcn)); break; + case CX_FCNDECLARATION: + s = message ("Function declaration %q", uentry_unparse (gc.cont.fcn)); + break; default: s = message ("Un-unparseable context: %d", (int) gc.kind); break; @@ -3029,6 +3246,11 @@ context_currentFunctionType (void) void context_enterInnerContext (void) { + if (context_getFlag (FLG_GRAMMAR)) + { + lldiagmsg (message ("Enter inner context: %q", context_unparse ())); + } + if (gc.kind == CX_GLOBAL) { gc.kind = CX_INNER; @@ -3056,7 +3278,11 @@ context_exitInnerPlain (void) /*@modifies gc;@*/ void context_exitInner (exprNode exp) { - + if (context_getFlag (FLG_GRAMMAR)) + { + lldiagmsg (message ("Enter inner context: %q", context_unparse ())); + } + llassertprint (gc.inclause == NOCLAUSE || gc.inclause == CASECLAUSE, ("inclause = %s", clause_nameTaken (gc.inclause))); @@ -3087,6 +3313,11 @@ context_exitInner (exprNode exp) void context_enterStructInnerContext (void) { + if (context_getFlag (FLG_GRAMMAR)) + { + lldiagmsg (message ("Enter struct inner context: %q", context_unparse ())); + } + if (gc.kind == CX_GLOBAL) { gc.kind = CX_INNER; @@ -3102,18 +3333,39 @@ context_enterStructInnerContext (void) } usymtab_enterScope (); + + if (context_getFlag (FLG_GRAMMAR)) + { + lldiagmsg (message ("Enter struct inner context: %q", context_unparse ())); + } } void context_exitStructInnerContext (void) { + if (context_getFlag (FLG_GRAMMAR)) + { + lldiagmsg (message ("Exit struct inner context: %q [%d]", context_unparse (), gc.cont.cdepth)); + } + if (gc.kind == CX_INNER) { - if (--gc.cont.cdepth == 0) + if (gc.cont.cdepth <= 0) { + llcontbuglit ("Attempt to exit inner context with no depth"); gc.kind = CX_GLOBAL; gc.cont.glob = TRUE; + gc.cont.cdepth = 0; } + else { + gc.cont.cdepth--; + + if (gc.cont.cdepth == 0) + { + gc.kind = CX_GLOBAL; + gc.cont.glob = TRUE; + } + } } else { @@ -3125,17 +3377,26 @@ context_exitStructInnerContext (void) } usymtab_exitScope (exprNode_undefined); + + if (context_getFlag (FLG_GRAMMAR)) + { + lldiagmsg (message ("After exit struct inner context: %q [%d]", context_unparse (), gc.cont.cdepth)); + } } void context_exitInnerSafe (void) { - + if (context_getFlag (FLG_GRAMMAR)) + { + lldiagmsg (message ("Exit inner safe: %q", context_unparse ())); + } + if (gc.kind == CX_INNER) { - if (--gc.cont.cdepth == 0) + if (--gc.cont.cdepth <= 0) { - gc.cont.cdepth++; + gc.cont.cdepth = 0; } } else if (gc.kind == CX_GLOBAL) @@ -3277,7 +3538,7 @@ context_processMacros (void) if (fileId_isValid (currentFile ())) { fileloc lastfl; - cstring cbase = fileLib_removePathFree (fileLib_removeAnyExtension (fileName (currentFile ()))); + cstring cbase = fileLib_removePathFree (fileLib_removeAnyExtension (fileTable_fileName (currentFile ()))); gc.inmacrocache = TRUE; @@ -3431,16 +3692,19 @@ context_inFunctionName (void) void context_userSetFlag (flagcode f, bool b) { - DPRINTF (("set flag: %s", flagcode_unparse (f))); + DPRINTF (("set flag: %s / %s", + flagcode_unparse (f), + bool_unparse (context_getFlag (f)))); if (f == FLG_NEVERINCLUDE && b) { if (gc.flags[FLG_EXPORTHEADER]) { - llerror_flagWarning (cstring_makeLiteral - ("setting +neverinclude after +exportheader. " - "Turning off exportheader, since headers are not checked " - "when +neverinclude is used.")); + llerror_flagWarning + (cstring_makeLiteral + ("Setting +neverinclude after +exportheader. " + "Turning off exportheader, since headers are not checked " + "when +neverinclude is used.")); gc.flags[FLG_EXPORTHEADER] = FALSE; } @@ -3451,10 +3715,11 @@ context_userSetFlag (flagcode f, bool b) { if (gc.flags[FLG_NEVERINCLUDE]) { - llerror_flagWarning (cstring_makeLiteral - ("setting +exportheader after +neverinclude. " - "Not setting exportheader, since headers are not checked " - "when +neverinclude is used.")); + llerror_flagWarning + (cstring_makeLiteral + ("Setting +exportheader after +neverinclude. " + "Not setting exportheader, since headers are not checked " + "when +neverinclude is used.")); gc.flags[FLG_EXPORTHEADER] = FALSE; return; } @@ -3470,9 +3735,10 @@ context_userSetFlag (flagcode f, bool b) && !flagcode_isIdemFlag (f) && !flagcode_hasArgument (f)) { - llerror_flagWarning (message ("setting %s%s redundant with current value", - cstring_makeLiteralTemp (b ? "+" : "-"), - flagcode_unparse (f))); + llerror_flagWarning + (message ("Setting %s%s redundant with current value", + cstring_makeLiteralTemp (b ? "+" : "-"), + flagcode_unparse (f))); } } @@ -3480,9 +3746,9 @@ context_userSetFlag (flagcode f, bool b) { if (!context_getFlag (FLG_WARNUSE)) { - llerror_flagWarning (message ("flag +%s is canceled by -warnuse", - flagcode_unparse (f))); - + llerror_flagWarning + (message ("Flag +%s is canceled by -warnuse", + flagcode_unparse (f))); } } @@ -3492,40 +3758,44 @@ context_userSetFlag (flagcode f, bool b) if (gc.library != FLG_ANSILIB && gc.library != f) { - llerror_flagWarning (message ("selecting library %s after library %s was " - "selected (only one library may be used)", - flagcode_unparse (f), - flagcode_unparse (gc.library))); + llerror_flagWarning + (message ("Selecting library %s after library %s was " + "selected (only one library may be used)", + flagcode_unparse (f), + flagcode_unparse (gc.library))); } - + if (f == FLG_UNIXLIB) { if (context_getFlag (FLG_WARNUNIXLIB)) { - llerror_flagWarning (cstring_makeLiteral - ("selecting unix library. Unix library is " - "ad hoc addition to POSIX library. Recommend " - "use +posixlib to select POSIX library instead. " - "Use -warnunixlib to suppress this message.")); + llerror_flagWarning + (cstring_makeLiteral + ("Selecting unix library. Unix library is " + "based on the Single Unix Specification, Version 2. Not all " + "Unix implementations are consistend with this specification. " + "Use -warnunixlib to suppress this message.")); } } gc.library = f; } - + if (flagcode_isNameChecksFlag (f) && b && !context_maybeSet (FLG_NAMECHECKS)) { - llerror_flagWarning (message - ("setting +%s will not produce warnings with -namechecks. Must set +namechecks also.", - flagcode_unparse (f))); + llerror_flagWarning + (message + ("Setting +%s will not produce warnings with -namechecks. " + "Must set +namechecks also.", + flagcode_unparse (f))); } - + gc.setGlobally[f] = TRUE; - context_setFlag (f, b); + context_setFlag (f, b, g_currentloc); } void -context_fileSetFlag (flagcode f, ynm set) +context_fileSetFlag (flagcode f, ynm set, fileloc loc) { if (!gc.savedFlags) { @@ -3534,23 +3804,22 @@ context_fileSetFlag (flagcode f, ynm set) if (ynm_isOff (set)) { - context_setFlagAux (f, FALSE, TRUE, FALSE); + context_setFlagAux (f, FALSE, TRUE, FALSE, loc); } else if (ynm_isOn (set)) { - context_setFlagAux (f, TRUE, TRUE, FALSE); + context_setFlagAux (f, TRUE, TRUE, FALSE, loc); gc.setLocally[f] = TRUE; } else { - context_restoreFlag (f); + context_restoreFlag (f, loc); } } static void -context_restoreFlag (flagcode f) +context_restoreFlag (flagcode f, fileloc loc) { - if (!gc.savedFlags) { voptgenerror @@ -3558,20 +3827,20 @@ context_restoreFlag (flagcode f) message ("Attempt to restore flag %s when no file scope flags " "have been set.", flagcode_unparse (f)), - g_currentloc); + loc); } else { - context_addFlagMarker (f, MAYBE); - context_setFlagAux (f, gc.saveflags[f], FALSE, TRUE); + context_addFlagMarker (f, MAYBE, loc); + context_setFlagAux (f, gc.saveflags[f], FALSE, TRUE, loc); } } static void -context_setFlag (flagcode f, bool b) +context_setFlag (flagcode f, bool b, fileloc loc) { - context_setFlagAux (f, b, FALSE, FALSE); + context_setFlagAux (f, b, FALSE, FALSE, loc); } void @@ -3584,24 +3853,15 @@ context_setFlagTemp (flagcode f, bool b) /*@notfunction@*/ # define DOSET(ff,b) \ do { if (inFile) { gc.setLocally[ff] = TRUE; \ - context_addFlagMarker (ff, ynm_fromBool (b)); } \ + context_addFlagMarker (ff, ynm_fromBool (b), loc); } \ DPRINTF (("set flag: %s / %s", flagcode_unparse (ff), bool_unparse (b))); \ gc.flags[ff] = b; } while (FALSE) static void - context_setFlagAux (flagcode f, bool b, bool - inFile, /*@unused@*/ bool isRestore) +context_setFlagAux (flagcode f, bool b, bool inFile, + /*@unused@*/ bool isRestore, fileloc loc) { - DPRINTF (("set flag: %s / %s", flagcode_unparse (f), bool_unparse (b))); - - if (f == FLG_USESTDERR) - { - if (b) { - g_msgstream = stderr; - } else { - g_msgstream = stdout; - } - } + DPRINTF (("Set flag: %s / %s", flagcode_unparse (f), bool_unparse (b))); /* ** Removed test for special flags. @@ -3664,6 +3924,24 @@ static void switch (f) { + case FLG_MESSAGESTREAMSTDOUT: + g_messagestream = stdout; + break; + case FLG_MESSAGESTREAMSTDERR: + g_messagestream = stderr; + break; + case FLG_WARNINGSTREAMSTDOUT: + g_warningstream = stdout; + break; + case FLG_WARNINGSTREAMSTDERR: + g_warningstream = stderr; + break; + case FLG_ERRORSTREAMSTDOUT: + g_errorstream = stdout; + break; + case FLG_ERRORSTREAMSTDERR: + g_errorstream = stderr; + break; case FLG_ALLEMPTY: DOSET (FLG_ALLEMPTY, b); DOSET (FLG_IFEMPTY, b); @@ -3723,8 +4001,27 @@ static void DOSET (FLG_SPECRETIMPONLY, b); DOSET (FLG_SPECSTRUCTIMPONLY, b); break; - case FLG_ANSILIMITS: - DOSET (FLG_ANSILIMITS, b); + case FLG_ANSI89LIMITS: + DOSET (FLG_ANSI89LIMITS, b); + DOSET (FLG_CONTROLNESTDEPTH, b); + DOSET (FLG_STRINGLITERALLEN, b); + DOSET (FLG_INCLUDENEST, b); + DOSET (FLG_NUMSTRUCTFIELDS, b); + DOSET (FLG_NUMENUMMEMBERS, b); + + if (b) + { + context_setValue (FLG_CONTROLNESTDEPTH, ANSI89_CONTROLNESTDEPTH); + context_setValue (FLG_STRINGLITERALLEN, ANSI89_STRINGLITERALLEN); + context_setValue (FLG_INCLUDENEST, ANSI89_INCLUDENEST); + context_setValue (FLG_NUMSTRUCTFIELDS, ANSI89_NUMSTRUCTFIELDS); + context_setValue (FLG_NUMENUMMEMBERS, ANSI89_NUMENUMMEMBERS); + context_setValue (FLG_EXTERNALNAMELEN, ANSI89_EXTERNALNAMELEN); + context_setValue (FLG_INTERNALNAMELEN, ANSI89_INTERNALNAMELEN); + } + break; + case FLG_ISO99LIMITS: + DOSET (FLG_ISO99LIMITS, b); DOSET (FLG_CONTROLNESTDEPTH, b); DOSET (FLG_STRINGLITERALLEN, b); DOSET (FLG_INCLUDENEST, b); @@ -3733,11 +4030,13 @@ static void if (b) { - context_setValue (FLG_CONTROLNESTDEPTH, DEFAULT_CONTROLNESTDEPTH); - context_setValue (FLG_STRINGLITERALLEN, DEFAULT_STRINGLITERALLEN); - context_setValue (FLG_INCLUDENEST, DEFAULT_INCLUDENEST); - context_setValue (FLG_NUMSTRUCTFIELDS, DEFAULT_NUMSTRUCTFIELDS); - context_setValue (FLG_NUMENUMMEMBERS, DEFAULT_NUMENUMMEMBERS); + context_setValue (FLG_CONTROLNESTDEPTH, ISO99_CONTROLNESTDEPTH); + context_setValue (FLG_STRINGLITERALLEN, ISO99_STRINGLITERALLEN); + context_setValue (FLG_INCLUDENEST, ISO99_INCLUDENEST); + context_setValue (FLG_NUMSTRUCTFIELDS, ISO99_NUMSTRUCTFIELDS); + context_setValue (FLG_NUMENUMMEMBERS, ISO99_NUMENUMMEMBERS); + context_setValue (FLG_EXTERNALNAMELEN, ISO99_EXTERNALNAMELEN); + context_setValue (FLG_INTERNALNAMELEN, ISO99_INTERNALNAMELEN); } break; case FLG_EXTERNALNAMELEN: @@ -3815,6 +4114,11 @@ static void DOSET (FLG_LOOPLOOPCONTINUE, b); DOSET (FLG_DEEPBREAK, b); break; + case FLG_LOOPEXEC: + DOSET (FLG_FORLOOPEXEC, b); + DOSET (FLG_WHILELOOPEXEC, b); + DOSET (FLG_ITERLOOPEXEC, b); + break; case FLG_ACCESSALL: DOSET (FLG_ACCESSMODULE, b); DOSET (FLG_ACCESSFILE, b); @@ -3824,7 +4128,24 @@ static void DOSET (FLG_ALLMACROS, b); DOSET (FLG_FCNMACROS, b); DOSET (FLG_CONSTMACROS, b); + break; + case FLG_BOUNDS: + DOSET (FLG_BOUNDSREAD, b); + DOSET (FLG_BOUNDSWRITE, b); + DOSET (FLG_LIKELYBOUNDSREAD, b); + DOSET (FLG_LIKELYBOUNDSWRITE, b); + break; + case FLG_BOUNDSREAD: + DOSET (FLG_LIKELYBOUNDSREAD, b); + break; + case FLG_BOUNDSWRITE: + DOSET (FLG_LIKELYBOUNDSWRITE, b); + break; + case FLG_LIKELYBOUNDS: + DOSET (FLG_LIKELYBOUNDSREAD, b); + DOSET (FLG_LIKELYBOUNDSWRITE, b); break; + case FLG_CZECH: if (b) { DOSET (FLG_ACCESSCZECH, b); } DOSET (FLG_CZECHFUNCTIONS, b); @@ -3853,6 +4174,10 @@ static void DOSET (FLG_NULLPASS, b); DOSET (FLG_NULLRET, b); break; + case FLG_MUSTFREE: + DOSET (FLG_MUSTFREEONLY, b); + DOSET (FLG_MUSTFREEFRESH, b); + break; case FLG_MEMCHECKS: DOSET (FLG_NULLSTATE, b); DOSET (FLG_NULLDEREF, b); @@ -3866,7 +4191,8 @@ static void DOSET (FLG_USERELEASED, b); DOSET (FLG_ALIASUNIQUE, b); DOSET (FLG_MAYALIASUNIQUE, b); - DOSET (FLG_MUSTFREE, b); + DOSET (FLG_MUSTFREEONLY, b); + DOSET (FLG_MUSTFREEFRESH, b); DOSET (FLG_MUSTDEFINE, b); DOSET (FLG_GLOBSTATE, b); DOSET (FLG_COMPDESTROY, b); @@ -3990,14 +4316,14 @@ void context_setFilename (fileId fid, int lineno) void context_enterIterDef (/*@observer@*/ uentry le) { - context_enterMacro (le); + context_enterMacro (le); gc.acct = typeIdSet_subtract (gc.facct, gc.nacct); gc.kind = CX_ITERDEF; } void context_enterIterEnd (/*@observer@*/ uentry le) { - context_enterMacro (le); + context_enterMacro (le); gc.kind = CX_ITEREND; } @@ -4005,17 +4331,29 @@ void context_destroyMod (void) /*@globals killed gc@*/ { + int i; setCodePoint (); ctype_destroyMod (); + /* setCodePoint (); usymtab_free (); setCodePoint (); + */ + fileTable_free (gc.ftab); + gc.ftab = fileTable_undefined; + filelocStack_free (gc.locstack); setCodePoint (); - gc.ftab = fileTable_undefined; macrocache_free (gc.mc); + + /* evans 2002-07-12: not reported because of reldef */ + for (i = 0; i < gc.nmods; i++) + { + cstring_free (gc.moduleaccess[i].file); + } + sfree (gc.moduleaccess); setCodePoint (); @@ -4039,40 +4377,48 @@ context_destroyMod (void) } /* -** Flag shortcuts. +** Flag shortcuts */ bool context_msgBoolInt (void) { - return gc.flags [FLG_BOOLINT]; + return context_flagOn (FLG_BOOLINT, g_currentloc); } bool context_msgCharInt (void) { - return gc.flags [FLG_CHARINT]; + return context_flagOn (FLG_CHARINT, g_currentloc); } bool context_msgEnumInt (void) { - return gc.flags [FLG_ENUMINT]; + return context_flagOn (FLG_ENUMINT, g_currentloc); +} + +bool context_msgLongInt (void) +{ + return context_flagOn (FLG_LONGINT, g_currentloc); +} + +bool context_msgShortInt (void) +{ + return context_flagOn (FLG_SHORTINT, g_currentloc); } bool context_msgPointerArith (void) { - return gc.flags [FLG_POINTERARITH]; + return context_flagOn (FLG_POINTERARITH, g_currentloc); } bool context_msgStrictOps (void) { - return gc.flags [FLG_STRICTOPS]; + return context_flagOn (FLG_STRICTOPS, g_currentloc); } -# ifndef NOLCL bool context_msgLh (void) { return gc.flags [FLG_DOLH]; } -# endif void context_pushLoc (void) { @@ -4132,12 +4478,10 @@ int context_getExpect (void) return (context_getValue (FLG_EXPECT)); } -# ifndef NOLCL int context_getLCLExpect (void) { return (context_getValue (FLG_LCLEXPECT)); } -# endif int context_getLimit (void) { @@ -4209,7 +4553,7 @@ bool context_inMacroConstant (void) return (gc.kind == CX_MACROCONST); } -bool context_inMacroUnknown (void) +bool context_inUnknownMacro (void) { return (gc.kind == CX_UNKNOWNMACRO); } @@ -4239,12 +4583,34 @@ cstring context_getMerge (void) return context_getString (FLG_MERGE); } -# ifndef NOLCL bool context_inLCLLib (void) { return (gc.kind == CX_LCLLIB); } + +/*drl add these 3/5/2003*/ +static bool inSizeof = FALSE; + +bool context_inSizeof (void) +{ + return (inSizeof); +} + +void context_enterSizeof (void) +{ + DPRINTF((message("context_enterSizeof ") ) ); + inSizeof = TRUE; +} + +void context_leaveSizeof (void) +{ + DPRINTF((message("context_leaveSizeof ") )); + inSizeof = FALSE; +} +/*end function added 3/5/2003*/ + + bool context_inImport (void) { return (gc.inimport); @@ -4259,7 +4625,6 @@ void context_leaveImport (void) { gc.inimport = FALSE; } -# endif bool context_inMacro (void) { @@ -4288,7 +4653,6 @@ int context_getSpecLinesProcessed (void) return (gc.speclinesprocessed); } -# ifndef NOLCL void context_processedSpecLine (void) { gc.speclinesprocessed++; @@ -4297,14 +4661,45 @@ void context_processedSpecLine (void) void context_resetSpecLines (void) { gc.speclinesprocessed = 0; + } -# endif bool context_inGlobalContext (void) { return (gc.kind == CX_GLOBAL); } +static void context_quietExitScopes (void) +{ + /* + ** Try to restore the global scope (after an error). + */ + + while (!usymtab_inFileScope ()) + { + usymtab_quietExitScope (g_currentloc); + } + + gc.cont.glob = TRUE; + gc.kind = CX_GLOBAL; +} + +void context_checkGlobalScope (void) +{ + if (gc.kind != CX_GLOBAL) + { + if (context_inMacro ()) + { + ; /* evans 2001-10-14: Okay to be in a macro here! */ + } + else + { + llcontbug (message ("Not in global scope as expected: %q", context_unparse ())); + context_quietExitScopes (); + } + } +} + void context_setFileId (fileId s) { g_currentloc = fileloc_updateFileId (g_currentloc, s); @@ -4447,7 +4842,7 @@ valueTable context_createValueTable (sRef s, stateInfo sinfo) if (metaStateTable_size (gc.stateTable) > 0) { valueTable res = valueTable_create (metaStateTable_size (gc.stateTable)); - /*@i32 should use smaller value... */ + /* should use smaller value... */ DPRINTF (("Value table for: %s", sRef_unparse (s))); metaStateTable_elements (gc.stateTable, msname, msi) @@ -4488,11 +4883,11 @@ valueTable context_createGlobalMarkerValueTable (stateInfo sinfo) if (metaStateTable_size (gc.stateTable) > 0) { valueTable res = valueTable_create (metaStateTable_size (gc.stateTable)); - /*@i32 should use smaller value... */ + /* should use smaller value... */ metaStateTable_elements (gc.stateTable, msname, msi) { - /*@i23 only add global...*/ + /* only add global...*/ DPRINTF (("Create: %s", metaStateInfo_unparse (msi))); llassert (cstring_equal (msname, metaStateInfo_getName (msi))); @@ -4515,4 +4910,110 @@ valueTable context_createGlobalMarkerValueTable (stateInfo sinfo) } +/*drl 12/30/01 these are some ugly functions that were added to facilitate struct annotations */ + + +/*drl added */ +static ctype lastStruct; + +ctype context_setLastStruct (/*@returned@*/ ctype s) /*@globals lastStruct@*/ +{ + lastStruct = s; + return s; +} + +ctype context_getLastStruct (/*@returned@*/ /*ctype s*/) /*@globals lastStruct@*/ +{ + return lastStruct; +} + +/* +** Why is this stuff in context.c? +*/ + +/*@unused@*/ static int sInfoNum = 0; + + +struct getUe { + /*@unused@*/ uentry ue; + /*@unused@*/ sRef s; +}; + +struct sInfo { + /*@unused@*/ ctype ct; + /*@unused@*/ constraintList inv; + /*@unused@*/ int ngetUe; + /*@unused@*/ struct getUe * t ; +}; + +/* unused: static struct sInfo globalStructInfo; */ + +/*drl 1/6/2001: I didn't think these functions were solid enough to include in the + stable release of splint. I coomented them out so that they won't break anything + but didn't delete them because they will be fixed and included later + + +*/ + +/*@-paramuse@*/ + +void context_setGlobalStructInfo (ctype ct, constraintList list) +{ +# if 0 + /* int i; + uentryList f; + + f = ctype_getFields (ct); + + if (constraintList_isDefined(list) ) + { + globalStructInfo.ct = ct; + globalStructInfo.inv = list; + + globalStructInfo.ngetUe = 0; + + /* abstraction violation fix it * / + globalStructInfo.t = dmalloc(f->nelements * sizeof(struct getUe) ); + + globalStructInfo.ngetUe = f->nelements; + + i = 0; + + uentryList_elements(f, ue) + { + globalStructInfo.t[i].ue = ue; + globalStructInfo.t[i].s = uentry_getSref(ue); + TPRINTF(( message(" setGlobalStructInfo:: adding ue=%s and sRef=%s", + uentry_unparse(ue), sRef_unparse( uentry_getSref(ue) ) + ) + )); + i++; + } + end_uentryList_elements; + } + */ +# endif +} + +# if 0 +/* + +bool hasInvariants (ctype ct) /*@* / +{ + if ( ctype_sameName(globalStructInfo.ct, ct) ) + + return TRUE; + + else + + return FALSE; + +} +*/ +# endif + +/*@=paramuse@*/ + + +