X-Git-Url: http://andersk.mit.edu/gitweb/splint.git/blobdiff_plain/2e127cb83d8e599677e0b6b04635bc34ba874fa0..210066f9dd04de7d7d2f04d320b39a52f28b290b:/src/context.c diff --git a/src/context.c b/src/context.c index 7c1e480..092eecf 100644 --- a/src/context.c +++ b/src/context.c @@ -1,6 +1,6 @@ /* ** Splint - annotation-assisted static program checker -** Copyright (C) 1994-2002 University of Virginia, +** 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,8 +17,8 @@ ** 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 information on splint: info@splint.org +** To report a bug: splint-bug@splint.org ** For more information: http://www.splint.org */ /* @@ -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 { @@ -107,6 +102,7 @@ static struct clause inclause; int numerrors; + int numbugs; filelocStack locstack; fileTable ftab; @@ -147,7 +143,7 @@ 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. */ @@ -171,14 +167,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@*/ @@ -270,10 +268,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); } /* @@ -343,7 +340,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 { @@ -391,39 +388,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) @@ -441,16 +446,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 @@ -466,14 +473,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) @@ -530,14 +535,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); @@ -547,7 +551,6 @@ context_exitLCLfile (void) gc.kind = CX_GLOBAL; gc.facct = typeIdSet_emptySet (); } -# endif void context_dumpModuleAccess (FILE *fout) @@ -668,17 +671,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 @@ -704,11 +705,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; @@ -723,22 +726,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; @@ -747,7 +752,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)) { @@ -795,9 +808,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: @@ -805,7 +818,7 @@ context_resetAllFlags (void) default: break; } /*@=loopswitchbreak@*/ - + context_setString (code, val); } else @@ -818,8 +831,9 @@ 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; @@ -827,15 +841,16 @@ context_resetAllFlags (void) 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_MACROCONSTDIST] = 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_SKIPPOSIXHEADERS] = TRUE; + gc.flags[FLG_SKIPISOHEADERS] = TRUE; + gc.flags[FLG_SKIPPOSIXHEADERS] = FALSE; gc.flags[FLG_SYSTEMDIREXPAND] = TRUE; gc.flags[FLG_UNRECOGCOMMENTS] = TRUE; gc.flags[FLG_UNRECOGFLAGCOMMENTS] = TRUE; @@ -869,9 +884,10 @@ context_resetAllFlags (void) 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; @@ -879,8 +895,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; @@ -899,11 +920,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 +# if defined (WIN32) || defined (OS2) gc.flags[FLG_PARENFILEFORMAT] = TRUE; + gc.flags[FLG_CASEINSENSITIVEFILENAMES] = TRUE; # endif } @@ -918,10 +952,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 (); @@ -962,11 +1010,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); } @@ -980,7 +1031,8 @@ context_setMode (cstring s) flagcode modeflags[] = { FLG_ENUMINT, FLG_MACROMATCHNAME, - FLG_STRINGLITNOROOM, + FLG_STRINGLITNOROOM, + FLG_STRINGLITNOROOMFINALNULL, FLG_MACROUNDEF, FLG_RELAXQUALS, FLG_USEALLGLOBS, FLG_CHECKSTRICTGLOBALS, FLG_CHECKSTRICTGLOBALIAS, @@ -990,9 +1042,10 @@ context_setMode (cstring s) FLG_UNSIGNEDCOMPARE, FLG_PARAMUNUSED, FLG_VARUNUSED, FLG_FUNCUNUSED, FLG_TYPEUNUSED, + FLG_ABSTRACTCOMPARE, FLG_CONSTUNUSED, FLG_ENUMMEMUNUSED, FLG_FIELDUNUSED, FLG_PTRNUMCOMPARE, FLG_BOOLCOMPARE, FLG_UNSIGNEDCOMPARE, - FLG_MUTREP, FLG_NOEFFECT, FLG_IMPTYPE, + FLG_MUTREP, FLG_NOEFFECT, FLG_IMPTYPE, FLG_RETVALOTHER, FLG_RETVALBOOL, FLG_RETVALINT, FLG_SPECUNDEF, FLG_INCONDEFS, FLG_INCONDEFSLIB, FLG_MISPLACEDSHAREQUAL, FLG_MATCHFIELDS, @@ -1007,10 +1060,12 @@ context_setMode (cstring s) FLG_NESTEDEXTERN, FLG_NUMLITERAL, FLG_ZEROBOOL, + /* memchecks flags */ FLG_NULLDEREF, FLG_NULLSTATE, FLG_NULLASSIGN, FLG_NULLPASS, FLG_NULLRET, + FLG_ALLOCMISMATCH, FLG_COMPDEF, FLG_COMPMEMPASS, FLG_UNIONDEF, FLG_RETSTACK, @@ -1031,7 +1086,7 @@ context_setMode (cstring s) FLG_UNKNOWNTRANS, FLG_KEEPTRANS, FLG_IMMEDIATETRANS, - + FLG_NUMABSTRACTCAST, FLG_EXPORTLOCAL, FLG_USERELEASED, FLG_ALIASUNIQUE, FLG_MAYALIASUNIQUE, @@ -1061,11 +1116,12 @@ 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, @@ -1080,6 +1136,8 @@ context_setMode (cstring s) FLG_CHARINTLITERAL, FLG_ZEROBOOL, FLG_BUFFEROVERFLOWHIGH, + FLG_STRINGLITNOROOM, + FLG_STRINGLITNOROOMFINALNULL, INVALID_FLAG } ; @@ -1089,7 +1147,9 @@ 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, @@ -1097,6 +1157,7 @@ context_setMode (cstring s) FLG_UNCHECKEDGLOBALIAS, FLG_FORMATCONST, FLG_STRINGLITNOROOM, + FLG_STRINGLITNOROOMFINALNULL, FLG_STRINGLITSMALLER, FLG_EXITARG, FLG_PTRNUMCOMPARE, FLG_BOOLCOMPARE, FLG_UNSIGNEDCOMPARE, @@ -1112,6 +1173,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, @@ -1136,6 +1198,7 @@ context_setMode (cstring s) FLG_NULLSTATE, FLG_NULLDEREF, FLG_NULLASSIGN, FLG_NULLPASS, FLG_NULLRET, + FLG_ALLOCMISMATCH, FLG_COMPDEF, FLG_COMPMEMPASS, FLG_UNIONDEF, FLG_RETSTACK, @@ -1171,8 +1234,8 @@ 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_NOPARAMS, FLG_IFEMPTY, FLG_WHILEEMPTY, FLG_REALCOMPARE, + FLG_INCLUDENEST, FLG_ISORESERVED, FLG_CPPNAMES, + FLG_NOPARAMS, FLG_IFEMPTY, FLG_WHILEEMPTY, FLG_REALCOMPARE, FLG_REALRELATECOMPARE, FLG_BOOLOPS, FLG_SHIFTNEGATIVE, FLG_SHIFTIMPLEMENTATION, FLG_BUFFEROVERFLOWHIGH, FLG_BUFFEROVERFLOW, @@ -1184,14 +1247,18 @@ 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, @@ -1219,7 +1286,7 @@ context_setMode (cstring s) FLG_PTRNUMCOMPARE, FLG_BOOLCOMPARE, FLG_UNSIGNEDCOMPARE, FLG_NOEFFECT, FLG_RETVALINT, FLG_RETVALBOOL, FLG_RETVALOTHER, - FLG_ANSIRESERVED, FLG_ANSIRESERVEDLOCAL, FLG_CPPNAMES, + FLG_ISORESERVED, FLG_ISORESERVEDLOCAL, FLG_CPPNAMES, FLG_RETVALBOOL, FLG_RETVALINT, FLG_SPECUNDEF, FLG_DECLUNDEF, FLG_STRICTOPS, FLG_INCONDEFS, FLG_MISPLACEDSHAREQUAL, FLG_REDUNDANTSHAREQUAL, @@ -1248,9 +1315,14 @@ context_setMode (cstring s) /* memchecks flags */ FLG_NULLSTATE, FLG_NULLDEREF, FLG_NULLASSIGN, FLG_NULLPASS, FLG_NULLRET, - + FLG_ALLOCMISMATCH, FLG_COMPDEF, FLG_COMPMEMPASS, FLG_UNIONDEF, + /* memory checking flags */ + FLG_BOUNDSREAD, FLG_BOUNDSWRITE, + FLG_LIKELYBOUNDSREAD, FLG_LIKELYBOUNDSWRITE, + FLG_CHECKPOST, + /* memtrans flags */ FLG_EXPOSETRANS, FLG_OBSERVERTRANS, @@ -1291,7 +1363,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, @@ -1299,7 +1371,7 @@ context_setMode (cstring s) FLG_FOREMPTY, FLG_WHILEEMPTY, FLG_IFEMPTY, FLG_IFBLOCK, FLG_ELSEIFCOMPLETE, - FLG_REALCOMPARE, FLG_BOOLOPS, + FLG_REALCOMPARE, FLG_BOOLOPS, FLG_REALRELATECOMPARE, FLG_SYSTEMDIRERRORS, FLG_UNUSEDSPECIAL, FLG_SHIFTNEGATIVE, @@ -1507,7 +1579,7 @@ context_enterUnknownMacro (/*@dependent@*/ uentry e) void context_enterAndClause (exprNode e) { - + DPRINTF (("enter and clause: %s", exprNode_unparse (e))); usymtab_trueBranch (guardSet_copy (exprNode_getGuards (e))); pushClause (ANDCLAUSE); } @@ -1701,14 +1773,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))) { @@ -1823,6 +1895,11 @@ context_enterFunction (/*@exposed@*/ uentry e) sRef_enterFunctionScope (); } +bool context_inOldStyleScope(void) +{ + return (gc.kind == CX_OLDSTYLESCOPE); +} + void context_enterOldStyleScope (void) { @@ -2231,8 +2308,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); } @@ -2733,15 +2809,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; @@ -2764,7 +2840,8 @@ context_setValue (flagcode flag, int val) default: break; } - + + DPRINTF (("Set value [%s] %d = %d", flagcode_unparse (flag), index, val)); gc.values[index] = val; } @@ -2781,6 +2858,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]); } @@ -2824,76 +2902,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) == '\"') { llerror_flagWarning (message - ("setting %s to string beginning with \". You probably " - "don't meant to have the \"'s.", - flagcode_unparse (flag))); - } - - if (flag == FLG_BOOLTYPE) - { - + ("Setting %s to string beginning with \". You probably " + "don't meant to have the \"'s.", + flagcode_unparse (flag))); } - + gc.strings[index] = val; } @@ -2918,6 +3055,18 @@ context_resetErrors (void) gc.numerrors = 0; } +void +context_recordBug (void) +{ + gc.numbugs++; +} + +int +context_numBugs (void) +{ + return gc.numbugs; +} + void context_initMod (void) /*@globals undef gc; @*/ { @@ -2928,6 +3077,7 @@ void context_initMod (void) gc.instandardlib = FALSE; gc.numerrors = 0; + gc.numbugs = 0; gc.neednl = FALSE; gc.linesprocessed = 0; gc.speclinesprocessed = 0; @@ -2980,16 +3130,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); @@ -3409,7 +3560,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; @@ -3563,16 +3714,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; } @@ -3583,10 +3737,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; } @@ -3602,9 +3757,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))); } } @@ -3612,9 +3768,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))); } } @@ -3624,40 +3780,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) { @@ -3666,23 +3826,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 @@ -3690,20 +3849,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 @@ -3716,25 +3875,16 @@ 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) + /*@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; - } - } - /* ** Removed test for special flags. */ @@ -3796,6 +3946,24 @@ context_setFlagAux (flagcode f, bool b, bool inFile, 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); @@ -3855,8 +4023,8 @@ context_setFlagAux (flagcode f, bool b, bool inFile, 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); @@ -3865,11 +4033,32 @@ context_setFlagAux (flagcode f, bool b, bool inFile, 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, 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); + DOSET (FLG_NUMSTRUCTFIELDS, b); + DOSET (FLG_NUMENUMMEMBERS, b); + + if (b) + { + 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: @@ -3961,7 +4150,24 @@ context_setFlagAux (flagcode f, bool b, bool inFile, 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); @@ -4147,17 +4353,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 (); @@ -4181,40 +4399,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) { @@ -4274,12 +4500,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) { @@ -4381,12 +4605,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); @@ -4401,7 +4647,6 @@ void context_leaveImport (void) { gc.inimport = FALSE; } -# endif bool context_inMacro (void) { @@ -4430,7 +4675,6 @@ int context_getSpecLinesProcessed (void) return (gc.speclinesprocessed); } -# ifndef NOLCL void context_processedSpecLine (void) { gc.speclinesprocessed++; @@ -4439,8 +4683,8 @@ void context_processedSpecLine (void) void context_resetSpecLines (void) { gc.speclinesprocessed = 0; + } -# endif bool context_inGlobalContext (void) { @@ -4573,27 +4817,23 @@ metaStateInfo context_lookupMetaStateInfo (cstring key) /*@null@*/ annotationInfo context_lookupAnnotation (cstring annot) { - annotationInfo ainfo; - - ainfo = annotationTable_lookup (gc.annotTable, annot); - - return ainfo; + return annotationTable_lookup (gc.annotTable, annot); } -void context_addAnnotation (annotationInfo ainfo) +void context_addAnnotation (annotationInfo info) { - if (annotationTable_contains (gc.annotTable, annotationInfo_getName (ainfo))) + if (annotationTable_contains (gc.annotTable, annotationInfo_getName (info))) { voptgenerror (FLG_SYNTAX, - message ("Duplicate annotation declaration: %s", annotationInfo_getName (ainfo)), - annotationInfo_getLoc (ainfo)); + message ("Duplicate annotation declaration: %s", annotationInfo_getName (info)), + annotationInfo_getLoc (info)); - annotationInfo_free (ainfo); + annotationInfo_free (info); } else { - annotationTable_insert (gc.annotTable, ainfo); + annotationTable_insert (gc.annotTable, info); } } @@ -4615,12 +4855,12 @@ void context_addMetaState (cstring mname, metaStateInfo msinfo) } } -valueTable context_createValueTable (sRef s, stateInfo sinfo) +valueTable context_createValueTable (sRef s, stateInfo info) { 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) @@ -4636,7 +4876,7 @@ valueTable context_createValueTable (sRef s, stateInfo sinfo) (res, cstring_copy (metaStateInfo_getName (msi)), stateValue_createImplicit (metaStateInfo_getDefaultValue (msi, s), - stateInfo_copy (sinfo))); + stateInfo_copy (info))); } else { @@ -4645,47 +4885,88 @@ valueTable context_createValueTable (sRef s, stateInfo sinfo) } end_metaStateTable_elements ; - stateInfo_free (sinfo); + stateInfo_free (info); DPRINTF (("Value table: %s", valueTable_unparse (res))); return res; } else { - stateInfo_free (sinfo); + stateInfo_free (info); return valueTable_undefined; } } -valueTable context_createGlobalMarkerValueTable (stateInfo sinfo) +valueTable context_createGlobalMarkerValueTable (stateInfo info) { 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))); valueTable_insert (res, cstring_copy (metaStateInfo_getName (msi)), stateValue_create (metaStateInfo_getDefaultGlobalValue (msi), - stateInfo_copy (sinfo))); + stateInfo_copy (info))); } end_metaStateTable_elements ; - stateInfo_free (sinfo); + stateInfo_free (info); DPRINTF (("Value table: %s", valueTable_unparse (res))); return res; } else { - stateInfo_free (sinfo); + stateInfo_free (info); return valueTable_undefined; } } +constraintList context_getImplicitFcnConstraints (uentry ue) +{ + constraintList ret = constraintList_makeNew (); + uentryList params = uentry_getParams (ue); + uentryList_elements (params, el) + { + DPRINTF (("setImplicitfcnConstraints doing: %s", uentry_unparse(el))); + + if (uentry_isElipsisMarker (el)) + { + ; + } + else + { + sRef s = uentry_getSref (el); + + DPRINTF (("Trying: %s", sRef_unparse (s))); + + if (ctype_isPointer (sRef_getType (s))) + { + constraint c = constraint_makeSRefWriteSafeInt (s, 0); + ret = constraintList_add (ret, c); + + /*drl 10/23/2002 added support for out*/ + + if (!uentry_isOut(el)) + { + c = constraint_makeSRefReadSafeInt (s, 0); + ret = constraintList_add (ret , c); + } + } + else + { + DPRINTF (("%s is NOT a pointer", sRef_unparseFull (s))); + } + } + } end_uentryList_elements; + + DPRINTF (("Returns ==> %s", constraintList_unparse (ret))); + return ret; +}