diff options
| author |  qadeer <qadeer@microsoft.com> | 2011-08-03 22:57:31 -0700 |
|---|---|---|
| committer | qadeer <qadeer@microsoft.com> | 2011-08-03 22:57:31 -0700 |
| commit | e957d4dd1d2b3f93e55820a754a8f32d11cbc2ef (patch) | |
| tree | 6c5189d1fd434f2e4db5d22c86a84bc93b169ac6 | |
| parent | 0e8cbbea071a5cc924edd3764ab4b0f2d89af36c (diff) | |
ported Houdini to C#, added Houdini project to the Boogie solution
| -rw-r--r-- | Source/AbsInt/AbstractInterpretation.cs | 9 | ||||
| -rw-r--r-- | Source/Boogie.sln | 26 | ||||
| -rw-r--r-- | Source/Houdini/AssemblyInfo.ssc | 4 | ||||
| -rw-r--r-- | Source/Houdini/Checker.cs | 186 | ||||
| -rw-r--r-- | Source/Houdini/Checker.ssc | 460 | ||||
| -rw-r--r-- | Source/Houdini/Houdini.cs (renamed from Source/Houdini/Houdini.ssc) | 519 | ||||
| -rw-r--r-- | Source/Houdini/Houdini.csproj | 99 | ||||
| -rw-r--r-- | Source/Houdini/Houdini.sscproj | 118 |
8 files changed, 553 insertions, 868 deletions
diff --git a/Source/AbsInt/AbstractInterpretation.cs b/Source/AbsInt/AbstractInterpretation.cs index e29a6d4a..698141bb 100644 --- a/Source/AbsInt/AbstractInterpretation.cs +++ b/Source/AbsInt/AbstractInterpretation.cs @@ -153,15 +153,6 @@ namespace Microsoft.Boogie.AbstractInterpretation { return this.lattice.Meet(atReturn, knownAtCallSite);
}
- /*
- private Cci.IGraphNavigator callGraph;
- public Cci.IGraphNavigator CallGraph {
- get {
- return this.callGraph;
- }
- }
- */
-
/// <summary>
/// Compute the invariants for the program using the underlying abstract domain
/// </summary>
diff --git a/Source/Boogie.sln b/Source/Boogie.sln index 6b5723c8..e91b47c8 100644 --- a/Source/Boogie.sln +++ b/Source/Boogie.sln @@ -39,6 +39,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ParserHelper", "ParserHelpe EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TPTP", "Provers\TPTP\TPTP.csproj", "{A598ED5A-93AD-4125-A555-3921A2F936FA}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Houdini", "Houdini\Houdini.csproj", "{CF41E903-78EB-43BA-A355-E5FEB5ECECD4}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Checked|.NET = Checked|.NET
@@ -495,6 +497,30 @@ Global {A598ED5A-93AD-4125-A555-3921A2F936FA}.z3apidebug|Mixed Platforms.ActiveCfg = Release|Any CPU
{A598ED5A-93AD-4125-A555-3921A2F936FA}.z3apidebug|Mixed Platforms.Build.0 = Release|Any CPU
{A598ED5A-93AD-4125-A555-3921A2F936FA}.z3apidebug|x86.ActiveCfg = Release|Any CPU
+ {CF41E903-78EB-43BA-A355-E5FEB5ECECD4}.Checked|.NET.ActiveCfg = Release|Any CPU
+ {CF41E903-78EB-43BA-A355-E5FEB5ECECD4}.Checked|Any CPU.ActiveCfg = Release|Any CPU
+ {CF41E903-78EB-43BA-A355-E5FEB5ECECD4}.Checked|Any CPU.Build.0 = Release|Any CPU
+ {CF41E903-78EB-43BA-A355-E5FEB5ECECD4}.Checked|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {CF41E903-78EB-43BA-A355-E5FEB5ECECD4}.Checked|Mixed Platforms.Build.0 = Release|Any CPU
+ {CF41E903-78EB-43BA-A355-E5FEB5ECECD4}.Checked|x86.ActiveCfg = Release|Any CPU
+ {CF41E903-78EB-43BA-A355-E5FEB5ECECD4}.Debug|.NET.ActiveCfg = Debug|Any CPU
+ {CF41E903-78EB-43BA-A355-E5FEB5ECECD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CF41E903-78EB-43BA-A355-E5FEB5ECECD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CF41E903-78EB-43BA-A355-E5FEB5ECECD4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {CF41E903-78EB-43BA-A355-E5FEB5ECECD4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {CF41E903-78EB-43BA-A355-E5FEB5ECECD4}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {CF41E903-78EB-43BA-A355-E5FEB5ECECD4}.Release|.NET.ActiveCfg = Release|Any CPU
+ {CF41E903-78EB-43BA-A355-E5FEB5ECECD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CF41E903-78EB-43BA-A355-E5FEB5ECECD4}.Release|Any CPU.Build.0 = Release|Any CPU
+ {CF41E903-78EB-43BA-A355-E5FEB5ECECD4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {CF41E903-78EB-43BA-A355-E5FEB5ECECD4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {CF41E903-78EB-43BA-A355-E5FEB5ECECD4}.Release|x86.ActiveCfg = Release|Any CPU
+ {CF41E903-78EB-43BA-A355-E5FEB5ECECD4}.z3apidebug|.NET.ActiveCfg = Release|Any CPU
+ {CF41E903-78EB-43BA-A355-E5FEB5ECECD4}.z3apidebug|Any CPU.ActiveCfg = Release|Any CPU
+ {CF41E903-78EB-43BA-A355-E5FEB5ECECD4}.z3apidebug|Any CPU.Build.0 = Release|Any CPU
+ {CF41E903-78EB-43BA-A355-E5FEB5ECECD4}.z3apidebug|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {CF41E903-78EB-43BA-A355-E5FEB5ECECD4}.z3apidebug|Mixed Platforms.Build.0 = Release|Any CPU
+ {CF41E903-78EB-43BA-A355-E5FEB5ECECD4}.z3apidebug|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Source/Houdini/AssemblyInfo.ssc b/Source/Houdini/AssemblyInfo.ssc deleted file mode 100644 index 6ed99a25..00000000 --- a/Source/Houdini/AssemblyInfo.ssc +++ /dev/null @@ -1,4 +0,0 @@ -using System.Reflection;
-using System.Runtime.CompilerServices;
-
-[assembly: AssemblyKeyFile("..\\InterimKey.snk")]
diff --git a/Source/Houdini/Checker.cs b/Source/Houdini/Checker.cs new file mode 100644 index 00000000..661393ff --- /dev/null +++ b/Source/Houdini/Checker.cs @@ -0,0 +1,186 @@ +//-----------------------------------------------------------------------------
+//
+// Copyright (C) Microsoft Corporation. All Rights Reserved.
+//
+//-----------------------------------------------------------------------------
+using System;
+using System.Diagnostics.Contracts;
+using System.Collections.Generic;
+using Microsoft.Boogie;
+using Microsoft.Boogie.VCExprAST;
+using Microsoft.Boogie.Simplify;
+using VC;
+using Microsoft.Boogie.Z3;
+using System.Collections;
+using System.IO;
+using System.Threading;
+
+namespace Microsoft.Boogie.Houdini {
+ public class HoudiniChecker {
+ private Stack<VCExpr> axioms = new Stack<VCExpr>();
+ private Checker checker;
+ private string descriptiveName;
+ private VCExpr conjecture;
+ private ProverInterface.ErrorHandler handler;
+
+ internal HoudiniChecker(Checker checker)
+ {
+ Contract.Requires(checker.TheoremProver != null);
+ Contract.Requires(checker.TheoremProver is Z3ProcessTheoremProver);
+ this.checker = checker;
+ }
+
+ public void PrepareCheck(string _descriptiveName, VCExpr _vc, ProverInterface.ErrorHandler _handler)
+ {
+ this.descriptiveName = _descriptiveName;
+ this.conjecture = _vc;
+ this.handler = _handler;
+ }
+
+ public void PushAxiom(VCExpr vc) {
+ axioms.Push(vc);
+ }
+
+ public void Pop() {
+ axioms.Pop();
+ }
+
+ private VCExpr BuildVCAxioms(Stack<VCExpr> axioms)
+ {
+ Contract.Requires(axioms.Count > 0);
+ VCExpr vc_axioms = null;
+ foreach (VCExpr axiom in axioms) {
+ if (vc_axioms == null)
+ vc_axioms = axiom;
+ else
+ vc_axioms = checker.VCExprGen.And(vc_axioms,axiom);
+ }
+ return vc_axioms;
+ }
+
+ public void Check()
+ {
+ Contract.Assert (descriptiveName != null);
+ Contract.Assert (conjecture != null);
+ Contract.Assert (handler != null);
+ outcome = ProverInterface.Outcome.Undetermined;
+
+ VCExpr vc;
+ if (axioms.Count > 0) {
+ VCExpr vc_axioms = BuildVCAxioms(axioms);
+ vc = checker.VCExprGen.Implies(vc_axioms, conjecture);
+ }
+ else {
+ vc = conjecture;
+ }
+ checker.BeginCheck(descriptiveName, vc, handler);
+ WaitHandle.WaitAny(new WaitHandle[] {checker.ProverDone});
+ }
+
+ private ProverInterface.Outcome outcome;
+ private UnexpectedProverOutputException outputExn;
+
+ public ProverInterface.Outcome ReadOutcome()
+ {
+ try {
+ outcome = checker.ReadOutcome();
+ } catch (UnexpectedProverOutputException e) {
+ throw e;
+ }
+ return outcome;
+ }
+ }
+
+ public class HoudiniVCGen : VCGen {
+ private HoudiniChecker hdnChecker;
+ private VCExpressionGenerator gen;
+ CounterexampleCollector collector = new CounterexampleCollector();
+
+ public HoudiniVCGen(Program program, string logFilePath, bool appendLogFile)
+ : base(program, logFilePath, appendLogFile)
+ {
+ }
+
+ public void VerifyImplementation(Implementation impl, Program program) {
+ collector.OnProgress("HdnVCGen", 0, 0, 0.0);
+ if (CommandLineOptions.Clo.SoundnessSmokeTest) {
+ throw new Exception("HoudiniVCGen does not support Soundness smoke test.");
+ }
+
+ ConvertCFG2DAG(impl, program);
+ ModelViewInfo mvInfo;
+ Hashtable/*TransferCmd->ReturnCmd*/ gotoCmdOrigins = PassifyImpl(impl, program, out mvInfo);
+ Hashtable/*<int, Absy!>*/ label2absy;
+ Checker checker = new Checker(this, program, this.logFilePath, this.appendLogFile, impl, CommandLineOptions.Clo.ProverKillTime);
+ VCExpr vc = GenerateVC(impl, null, out label2absy, checker);
+
+ ErrorReporter reporter;
+ if (CommandLineOptions.Clo.vcVariety == CommandLineOptions.VCVariety.Local) {
+ reporter = new ErrorReporterLocal(gotoCmdOrigins, label2absy, impl.Blocks, incarnationOriginMap, collector, mvInfo, null, null, program);
+ } else {
+ reporter = new ErrorReporter(gotoCmdOrigins, label2absy, impl.Blocks, incarnationOriginMap, collector, mvInfo, null, null, program);
+ }
+ this.gen = checker.VCExprGen;
+ if (checker.TheoremProver is Z3ProcessTheoremProver)
+ this.hdnChecker = new HoudiniChecker(checker);
+ else
+ throw new Exception("HdnChecker only works with z3");
+ this.hdnChecker.PrepareCheck(impl.Name, vc, reporter);
+ this.hdnChecker.Check();
+ }
+
+ public void PushAxiom(Axiom axiom)
+ {
+ Contract.Assume(hdnChecker != null);
+ Contract.Assume(gen != null);
+ //VCExpr vc = axiom.Expr.VCView(gen);
+ //this.hdnChecker.PushAxiom(vc);
+ }
+
+ public void Pop() {
+ Contract.Assume(hdnChecker!=null);
+ hdnChecker.Pop();
+ }
+
+ public Outcome Verify(out List<Counterexample> errors)
+ {
+ Contract.Assume (hdnChecker != null);
+ collector.examples.Clear();
+ hdnChecker.Check();
+ ProverInterface.Outcome proverOutcome;
+ proverOutcome = hdnChecker.ReadOutcome();
+ Outcome verifyOutcome = ReadOutcome(proverOutcome);
+ if (verifyOutcome == Outcome.Errors) {
+ Contract.Assume (collector.examples != null);
+ if (collector.examples.Count == 0) {
+ string memStr = System.Convert.ToString(System.GC.GetTotalMemory(false));
+ if (memStr != null)
+ memStr = "?";
+ throw new UnexpectedProverOutputException("Outcome.Errors w/ 0 counter examples. " + memStr + " memory used");
+ }
+ errors = collector.examples;
+ } else {
+ errors = null;
+ }
+ return verifyOutcome;
+ }
+
+ private Outcome ReadOutcome(ProverInterface.Outcome proverOutcome) {
+ switch (proverOutcome) {
+ case ProverInterface.Outcome.Valid:
+ return Outcome.Correct;
+ case ProverInterface.Outcome.Invalid:
+ return Outcome.Errors;
+ case ProverInterface.Outcome.TimeOut:
+ return Outcome.TimedOut;
+ case ProverInterface.Outcome.Undetermined:
+ return Outcome.Inconclusive;
+ default:
+ throw new Exception("Unknown Prover Interface outcome while reading outcome.");
+ }
+ }
+
+ }
+
+
+}
\ No newline at end of file diff --git a/Source/Houdini/Checker.ssc b/Source/Houdini/Checker.ssc deleted file mode 100644 index 03c2beda..00000000 --- a/Source/Houdini/Checker.ssc +++ /dev/null @@ -1,460 +0,0 @@ -//-----------------------------------------------------------------------------
-//
-// Copyright (C) Microsoft Corporation. All Rights Reserved.
-//
-//-----------------------------------------------------------------------------
-using System;
-using Microsoft.Contracts;
-using System.Collections.Generic;
-using Microsoft.Boogie;
-using Microsoft.Boogie.Simplify.AST;
-using VC;
-using Microsoft.Boogie.Z3;
-using Microsoft.AbstractInterpretationFramework;
-using Microsoft.Boogie.AbstractInterpretation;
-using System.Collections;
-using System.Compiler;
-using System.IO;
-using System.Threading;
-
-namespace Microsoft.Boogie.Houdini {
-
- public abstract class HdnCheckerFactory {
- public static HdnChecker! BuildHdnChecker(Checker! checker) {
- if (checker.TheoremProver is Z3ThreadTheoremProver)
- return new HoudiniZ3ApiChecker(checker);
- else if (checker.TheoremProver is Z3ProcessTheoremProver) {
- if (CommandLineOptions.Clo.houdiniFlags.incremental) {
- return new HoudiniZ3CheckerIncr(checker);
- } else {
- return new HoudiniZ3Checker(checker);
- }
- } else
- throw new Exception("HdnChecker only works with z3");
- }
- }
-
- public abstract class HdnChecker {
- public abstract void PrepareCheck(string! _descriptiveName,
- VCExpr! _vc, ProverInterface.ErrorHandler! _handler);
- public abstract void PushAxiom(VCExpr! vc);
- public abstract void Pop();
- public abstract void Check();
- public abstract ProverInterface.Outcome ReadOutcome()
- throws UnexpectedProverOutputException;
- }
-
- public class HoudiniZ3ApiChecker:HdnChecker {
-
- private Z3ThreadTheoremProver! z3prover;
-
- private ProverInterface.ErrorHandler handler;
- private ProverInterface.Outcome outcome;
- private UnexpectedProverOutputException outputExn;
-
- internal HoudiniZ3ApiChecker(Checker! checker)
- requires checker.TheoremProver!=null;
- requires checker.TheoremProver is Z3ThreadTheoremProver;
- {
- this.z3prover = (Z3ThreadTheoremProver)checker.TheoremProver;
- }
-
- public override void PrepareCheck(string! _descriptiveName, VCExpr! _vc, ProverInterface.ErrorHandler! _handler) {
- handler = _handler;
- z3prover.LogComment(_descriptiveName);
- z3prover.PrepareCheck(_descriptiveName,_vc);
- }
-
- public override void PushAxiom(VCExpr! vc) {
- z3prover.PushAxiom(vc);
- }
-
- public override void Pop() {
- z3prover.Pop();
- }
-
- public override void Check() {
- z3prover.BeginPreparedCheck();
- try {
- outcome = z3prover.CheckOutcome((!)handler);
- } catch (UnexpectedProverOutputException e) {
- outputExn = e;
- }
- }
-
- public override ProverInterface.Outcome ReadOutcome()
- throws UnexpectedProverOutputException;
- {
- if (outputExn != null) {
- throw outputExn;
- }
- return outcome;
- }
- }
-
- // version of Z3PTP exposing more of the prover process functionality
- public class Z3ProcessTPExposed : Z3ProcessTheoremProver {
-
- [NotDelayed]
- public Z3ProcessTPExposed (TextWriter/*?*/ logFileWriter, VCExpressionGenerator! gen, DeclFreeProverContext! ctx, int timeout, bool typed)
- throws UnexpectedProverOutputException;
- {
- base(logFileWriter, gen, ctx, timeout, typed, "z3.exe");
- }
-
-
- //MOVED Directly Z3 ProverInterface for now...
- //To introduce this cleanly, need to add a new subproject under Provers
- //and must use the commandline option for that, instead of saying /prover:z3
- //That way, the class is constructed in class Checker the same way
- //all the other provers are constructed
-
- }
-
- public class Z3ExposedFactory : Z3.Factory {
-
- }
-
-
- //Old version
- public class HoudiniZ3Checker:HdnChecker {
- private Stack<VCExpr!>! axioms = new Stack<VCExpr!>();
- private Checker! checker;
- private string descriptiveName;
- private VCExpr conjecture;
- private ProverInterface.ErrorHandler handler;
-
- internal HoudiniZ3Checker(Checker! checker)
- requires checker.TheoremProver!=null;
- requires checker.TheoremProver is Z3ProcessTheoremProver;
- {
- this.checker = checker;
- }
-
- public override void PrepareCheck(string! _descriptiveName, VCExpr! _vc, ProverInterface.ErrorHandler! _handler)
- {
- this.descriptiveName = _descriptiveName;
- this.conjecture = _vc;
- this.handler = _handler;
- }
- public override void PushAxiom(VCExpr! vc) {
- axioms.Push(vc);
- }
- public override void Pop() {
- axioms.Pop();
- }
- private VCExpr! BuildVCAxioms(Stack<VCExpr!>! axioms)
- requires axioms.Count>0;
- {
- VCExpr vc_axioms = null;
- foreach (VCExpr! axiom in axioms) {
- if (vc_axioms==null)
- vc_axioms=axiom;
- else
- vc_axioms = checker.VCExprGen.And(vc_axioms,axiom);
- }
- return (!)vc_axioms;
- }
-
- public override void Check()
- {
- assert (descriptiveName!=null);
- assert (conjecture!=null);
- assert (handler!=null);
- outcome = ProverInterface.Outcome.Undetermined;
-
- VCExpr! vc;
- if (axioms.Count>0) {
- VCExpr vc_axioms = BuildVCAxioms(axioms);
- vc = checker.VCExprGen.Implies(vc_axioms,conjecture);
- } else
- vc = conjecture;
-
- checker.BeginCheck(descriptiveName,vc,handler);
- WaitHandle.WaitAny(new WaitHandle[] {checker.ProverDone});
- }
-
- private ProverInterface.Outcome outcome;
- private UnexpectedProverOutputException outputExn;
-
- public override ProverInterface.Outcome ReadOutcome()
- throws UnexpectedProverOutputException;
- {
- try {
- outcome = checker.ReadOutcome();
- } catch (UnexpectedProverOutputException e) {
- throw e;
- }
- return outcome;
- }
- }
-
- //new version
- public class HoudiniZ3CheckerIncr:HdnChecker {
- private Checker! checker;
- private string descriptiveName;
- private VCExpr conjecture;
- private ProverInterface.ErrorHandler handler;
-
- // Hack to delay the exception throwing (from Push/Pop...) for now
- private UnexpectedProverOutputException delayedExc;
- private Z3ProcessTheoremProver! thmProver;
-
- internal HoudiniZ3CheckerIncr(Checker! checker)
- requires checker.TheoremProver!=null;
- requires checker.TheoremProver is Z3ProcessTheoremProver;
- {
- this.checker = checker;
- this.thmProver = (Z3ProcessTheoremProver!)checker.TheoremProver;
- }
-
- private void delayException(UnexpectedProverOutputException exc) {
- if (delayedExc == null) { delayedExc = exc; }
- }
-
- public override void PrepareCheck(string! _descriptiveName, VCExpr! _vc,
- ProverInterface.ErrorHandler! _handler)
- {
- this.descriptiveName = _descriptiveName;
- this.conjecture = _vc;
- this.handler = _handler;
- this.thmProver.LogComment(_descriptiveName);
- try {
- this.thmProver.PrepareCheck(_descriptiveName,_vc);
- } catch (UnexpectedProverOutputException exc) {
- delayException(exc);
- }
- }
- public override void PushAxiom(VCExpr! vc) {
- string! vcStr = vc.ToString();
- try {
- thmProver.PushAxioms(vcStr);
- } catch (UnexpectedProverOutputException exc) {
- delayException(exc);
- }
- }
- public override void Pop() {
- try {
- thmProver.PopAxioms();
- } catch (UnexpectedProverOutputException exc) {
- delayException(exc);
- }
- }
-
- public override void Check()
- {
- assert (descriptiveName!=null);
- assert (conjecture!=null);
- assert (handler!=null);
- outcome = ProverInterface.Outcome.Undetermined;
-
- VCExpr! vc = checker.VCExprGen.False;
- checker.BeginCheck(descriptiveName,vc,handler);
- WaitHandle.WaitAny(new WaitHandle[] {checker.ProverDone});
- }
-
- private ProverInterface.Outcome outcome;
- private UnexpectedProverOutputException outputExn;
-
- public override ProverInterface.Outcome ReadOutcome()
- throws UnexpectedProverOutputException;
- {
- // HACK
- if (delayedExc != null) {
- UnexpectedProverOutputException temp = delayedExc;
- delayedExc = null;
- throw temp;
- }
- // Normal stuff
- try {
- outcome = checker.ReadOutcome();
- } catch (UnexpectedProverOutputException e) {
- throw e;
- }
- return outcome;
- }
- }
-
- public abstract class HdnVCGenFactory {
- public abstract HdnVCGen! BuildVCGen(Program! program, string logFilePath, bool appendLogFile);
- }
- public class Z3APIHdnVCGenFactory:HdnVCGenFactory {
- public override HdnVCGen! BuildVCGen(Program! program, string logFilePath, bool appendLogFile) {
- return new Z3ApiHdnVCGen(program, logFilePath, appendLogFile);
- }
- }
- public class Z3HdnVCGenFactory:HdnVCGenFactory {
- public override HdnVCGen! BuildVCGen(Program! program, string logFilePath, bool appendLogFile) {
- return new Z3HdnVCGen(program, logFilePath, appendLogFile);
- }
- }
-
- public abstract class HdnVCGen {
- public abstract void PrepareVerification(Implementation! impl, Program! program);
- public abstract void PushAxiom(Axiom! axiom);
- public abstract void Pop();
- public abstract VC.VCGen.Outcome Verify(out List<Counterexample!>? errors)
- throws UnexpectedProverOutputException;
-
- }
-
- public class Z3HdnVCGen: HdnVCGen {
- private Program! program;
- private string logFilePath;
- private bool appendLogFile;
- private Implementation implementation;
- private Axiom axiom;
-
- private ExtVCGen vcgen;
-
- public Z3HdnVCGen(Program! program, string logFilePath, bool appendLogFile) {
- this.program = program;
- this.logFilePath = logFilePath;
- this.appendLogFile= appendLogFile;
- }
-
- public override void PrepareVerification(Implementation! impl, Program! program) {
- this.implementation = impl;
- this.program = program;
- this.vcgen = new ExtVCGen(program,logFilePath,appendLogFile);
- this.vcgen.PrepareVerification(this.implementation,this.program);
- //watch out for > 1 call -- don't want CFG conversion to happen too many times!!!
- }
-
- public override void PushAxiom(Axiom! axiom) {
- assert this.vcgen != null;
- this.axiom=axiom;
- this.vcgen.PushAxiom(this.axiom);
- }
-
- public override void Pop() {
- assert this.vcgen != null;
- this.vcgen.Pop();
- this.axiom = null;
- }
-
- public override VC.VCGen.Outcome Verify(out List<Counterexample!>? errors)
- throws UnexpectedProverOutputException; {
- assert(this.vcgen!=null);
-
- return vcgen.Verify(out errors);
- }
-
- }
-
- public class Z3ApiHdnVCGen: HdnVCGen {
- private ExtVCGen! vcgen;
-
- public Z3ApiHdnVCGen(Program! program, string logFilePath, bool appendLogFile) {
- this.vcgen = new ExtVCGen(program,logFilePath,appendLogFile);
- }
-
- public override void PrepareVerification(Implementation! impl, Program! program) {
- vcgen.PrepareVerification(impl,program);
- }
-
- public override void PushAxiom(Axiom! axiom) {
- vcgen.PushAxiom(axiom);
- }
-
- public override void Pop() {
- vcgen.Pop();
- }
-
- public override VC.VCGen.Outcome Verify(out List<Counterexample!>? errors)
- throws UnexpectedProverOutputException; {
- return vcgen.Verify(out errors);
- }
-
- }
-
-
-
- public class ExtVCGen : VCGen {
-
- private HdnChecker hdnChecker;
- private VCExpressionGenerator gen;
- CounterexampleCollector! collector = new CounterexampleCollector();
-
- public ExtVCGen(Program! program, string logFilePath, bool appendLogFile) {
- base(program,logFilePath,appendLogFile);
- }
-
- public void PrepareVerification(Implementation! impl, Program! program) {
- collector.OnProgress("HdnVCGen", 0, 0, 0.0);
- if (CommandLineOptions.Clo.SoundnessSmokeTest) {
- throw new Exception("HoudiniVCGen does not support Soundness smoke test.");
- }
-
- ConvertCFG2DAG(impl, program);
- Hashtable/*TransferCmd->ReturnCmd*/ gotoCmdOrigins = PassifyImpl(impl, program);
- Hashtable/*<int, Absy!>*/! label2absy;
- Checker! checker = new Checker(program, this.logFilePath, this.appendLogFile, impl, CommandLineOptions.Clo.ProverKillTime);
- VCExpr! vc = GenerateVC(impl, out label2absy, checker);
-
- ErrorReporter reporter;
- if (CommandLineOptions.Clo.vcVariety == CommandLineOptions.VCVariety.Local) {
- reporter = new ErrorReporterLocal(gotoCmdOrigins, label2absy, impl.Blocks, incarnationOriginMap, collector);
- } else {
- reporter = new ErrorReporter(gotoCmdOrigins, label2absy, impl.Blocks, incarnationOriginMap, collector);
- }
- this.gen = checker.VCExprGen;
- this.hdnChecker = HdnCheckerFactory.BuildHdnChecker(checker);
- this.hdnChecker.PrepareCheck((!) impl.Name, vc, reporter);
- }
-
-
- public void PushAxiom(Axiom! axiom)
- {
- assume (hdnChecker!=null);
- assume (gen!=null);
- VCExpr vc = axiom.Expr.VCView(gen);
- this.hdnChecker.PushAxiom(vc);
- }
- public void Pop() {
- assume (hdnChecker!=null);
- hdnChecker.Pop();
- }
-
- public Outcome Verify(out List<Counterexample!>? errors)
- throws UnexpectedProverOutputException; {
- assume (hdnChecker!=null);
- collector.examples.Clear();
- hdnChecker.Check();
- ProverInterface.Outcome proverOutcome;
- proverOutcome = hdnChecker.ReadOutcome();
- Outcome verifyOutcome = ReadOutcome(proverOutcome);
- if (verifyOutcome == Outcome.Errors) {
- assume (collector.examples!=null);
- if (collector.examples.Count == 0) {
- string memStr = System.Convert.ToString(System.GC.GetTotalMemory(false));
- if (memStr != null)
- memStr = "?";
- throw new UnexpectedProverOutputException("Outcome.Errors w/ 0 counter examples. " + memStr + " memory used");
- }
- errors = collector.examples;
- } else {
- errors = null;
- }
- return verifyOutcome;
- }
-
- private Outcome ReadOutcome(ProverInterface.Outcome proverOutcome) {
- switch (proverOutcome) {
- case ProverInterface.Outcome.Valid:
- return Outcome.Correct;
- case ProverInterface.Outcome.Invalid:
- return Outcome.Errors;
- case ProverInterface.Outcome.TimeOut:
- return Outcome.TimedOut;
- case ProverInterface.Outcome.Undetermined:
- return Outcome.Inconclusive;
- default:
- throw new Exception("Unknown Prover Interface outcome while reading outcome.");
- }
- }
-
- }
-
-
-}
\ No newline at end of file diff --git a/Source/Houdini/Houdini.ssc b/Source/Houdini/Houdini.cs index bd8348be..6dc58dde 100644 --- a/Source/Houdini/Houdini.ssc +++ b/Source/Houdini/Houdini.cs @@ -4,24 +4,23 @@ //
//-----------------------------------------------------------------------------
using System;
-using Microsoft.Contracts;
+using System.Diagnostics.Contracts;
using System.Collections.Generic;
using Microsoft.Boogie;
-using Microsoft.Boogie.Simplify.AST;
+using Microsoft.Boogie.Simplify;
using VC;
using Microsoft.Boogie.Z3;
-using Microsoft.AbstractInterpretationFramework;
-using Microsoft.Boogie.AbstractInterpretation;
using System.Collections;
-using System.Compiler;
using System.IO;
+using Microsoft.AbstractInterpretationFramework;
+using Graphing;
namespace Microsoft.Boogie.Houdini
{
class ReadOnlyDictionary<K,V> {
- private Dictionary<K,V>! dictionary;
- public ReadOnlyDictionary(Dictionary<K,V>! dictionary) {
+ private Dictionary<K,V> dictionary;
+ public ReadOnlyDictionary(Dictionary<K,V> dictionary) {
this.dictionary = dictionary;
}
@@ -29,7 +28,7 @@ namespace Microsoft.Boogie.Houdini get { return this.dictionary.Keys; }
}
- public bool TryGetValue(K k, out V? v) {
+ public bool TryGetValue(K k, out V v) {
return this.dictionary.TryGetValue(k, out v);
}
@@ -39,42 +38,42 @@ namespace Microsoft.Boogie.Houdini }
public class CallGraph {
-
- private IGraphNavigator! aiCallGraph;
-
- public CallGraph(IGraphNavigator! aiCallGraph) {
- this.aiCallGraph = aiCallGraph;
+ Graph<Implementation> callGraph;
+ public CallGraph() {
+ //this.callGraph = null;
}
- public IEnumerable! PreviousNodes(Implementation! n) {
- return (!)this.aiCallGraph.PreviousNodes(n);
+ public IEnumerable PreviousNodes(Implementation n) {
+ //return this.callGraph.PreviousNodes(n);
+ return null;
}
- public IEnumerable! NextNodes(Implementation! n) {
- return (!)this.aiCallGraph.NextNodes(n);
+ public IEnumerable NextNodes(Implementation n) {
+ //return this.callGraph.NextNodes(n);
+ return null;
}
}
public abstract class HoudiniObserver {
- public virtual void UpdateStart(Program! program, int numConstants) {}
+ public virtual void UpdateStart(Program program, int numConstants) {}
public virtual void UpdateIteration() {}
- public virtual void UpdateImplementation(Implementation! implementation) {}
- public virtual void UpdateAssignment(Dictionary<string!,bool>! assignment) {}
+ public virtual void UpdateImplementation(Implementation implementation) {}
+ public virtual void UpdateAssignment(Dictionary<string,bool> assignment) {}
public virtual void UpdateOutcome(VCGen.Outcome outcome) {}
- public virtual void UpdateEnqueue(Implementation! implementation) {}
+ public virtual void UpdateEnqueue(Implementation implementation) {}
public virtual void UpdateDequeue() {}
- public virtual void UpdateConstant(string! constantName) {}
+ public virtual void UpdateConstant(string constantName) {}
public virtual void UpdateEnd(bool isNormalEnd) {}
public virtual void UpdateFlushStart() {}
public virtual void UpdateFlushFinish() {}
- public virtual void SeeException(string! msg){}
+ public virtual void SeeException(string msg){}
}
public class IterationTimer <K> {
- private Dictionary<K, List<double>!>! times;
+ private Dictionary<K, List<double>> times;
public IterationTimer () {
- times = new Dictionary<K, List<double>!>();
+ times = new Dictionary<K, List<double>>();
}
public void AddTime(K key, double timeMS) {
@@ -89,11 +88,11 @@ namespace Microsoft.Boogie.Houdini times.Add(key, oldList);
}
- public void PrintTimes(TextWriter! wr) {
+ public void PrintTimes(TextWriter wr) {
wr.WriteLine ("Total procedures: {0}", times.Count);
double total = 0;
int totalIters = 0;
- foreach(KeyValuePair<K, List<double>!> kv in times) {
+ foreach(KeyValuePair<K, List<double>> kv in times) {
int curIter = 0;
wr.WriteLine("Times for {0}:", kv.Key);
foreach(double v in kv.Value) {
@@ -112,21 +111,21 @@ namespace Microsoft.Boogie.Houdini public class HoudiniTimer : HoudiniObserver {
private DateTime startT;
private Implementation curImp;
- private IterationTimer<string!>! times;
- private TextWriter! wr;
+ private IterationTimer<string> times;
+ private TextWriter wr;
- public HoudiniTimer(TextWriter! wr) {
+ public HoudiniTimer(TextWriter wr) {
this.wr = wr;
- times = new IterationTimer<string!>();
+ times = new IterationTimer<string>();
}
public override void UpdateIteration() {
startT = DateTime.Now;
}
- public override void UpdateImplementation(Implementation! implementation){
+ public override void UpdateImplementation(Implementation implementation){
curImp = implementation;
}
public override void UpdateOutcome (VCGen.Outcome o) {
- assert curImp != null;
+ Contract.Assert(curImp != null);
DateTime endT = DateTime.Now;
times.AddTime(curImp.Name, (endT - startT).TotalMilliseconds); // assuming names are unique
}
@@ -139,13 +138,13 @@ namespace Microsoft.Boogie.Houdini }
public class HoudiniTextReporter: HoudiniObserver {
- private TextWriter! wr;
+ private TextWriter wr;
private int currentIteration = -1;
- public HoudiniTextReporter(TextWriter! wr) {
+ public HoudiniTextReporter(TextWriter wr) {
this.wr = wr;
}
- public override void UpdateStart(Program! program, int numConstants) {
+ public override void UpdateStart(Program program, int numConstants) {
wr.WriteLine("Houdini started:" + program.ToString() + " #constants: " + numConstants.ToString());
currentIteration = -1;
wr.Flush();
@@ -156,16 +155,16 @@ namespace Microsoft.Boogie.Houdini wr.WriteLine("Houdini iteration #" + currentIteration);
wr.Flush();
}
- public override void UpdateImplementation(Implementation! implementation){
+ public override void UpdateImplementation(Implementation implementation){
wr.WriteLine("implementation under analysis :" + implementation.Name);
wr.Flush();
}
- public override void UpdateAssignment(Dictionary<string!,bool>! assignment) {
+ public override void UpdateAssignment(Dictionary<string,bool> assignment) {
bool firstTime = true;
wr.Write("assignment under analysis : axiom (");
- foreach (KeyValuePair<string!,bool> kv in assignment) {
+ foreach (KeyValuePair<string,bool> kv in assignment) {
if (!firstTime) wr.Write(" && "); else firstTime = false;
- string! valString; // ugliness to get it lower cased
+ string valString; // ugliness to get it lower cased
if (kv.Value) valString = "true"; else valString = "false";
wr.Write(kv.Key + " == " + valString);
}
@@ -176,7 +175,7 @@ namespace Microsoft.Boogie.Houdini wr.WriteLine("analysis outcome :" + outcome);
wr.Flush();
}
- public override void UpdateEnqueue(Implementation! implementation) {
+ public override void UpdateEnqueue(Implementation implementation) {
wr.WriteLine("worklist enqueue :" + implementation.Name);
wr.Flush();
}
@@ -184,7 +183,7 @@ namespace Microsoft.Boogie.Houdini wr.WriteLine("worklist dequeue");
wr.Flush();
}
- public override void UpdateConstant(string! constantName) {
+ public override void UpdateConstant(string constantName) {
wr.WriteLine("constant disabled : " + constantName);
wr.Flush();
}
@@ -203,7 +202,7 @@ namespace Microsoft.Boogie.Houdini wr.WriteLine("Flushing finished");
wr.Flush();
}
- public override void SeeException(string! msg) {
+ public override void SeeException(string msg) {
wr.WriteLine("Caught exception: " + msg);
wr.Flush();
}
@@ -212,152 +211,129 @@ namespace Microsoft.Boogie.Houdini public abstract class ObservableHoudini {
- private List<HoudiniObserver!>! observers= new List<HoudiniObserver!>();
+ private List<HoudiniObserver> observers = new List<HoudiniObserver>();
- public void AddObserver(HoudiniObserver! observer) {
+ public void AddObserver(HoudiniObserver observer) {
if (!observers.Contains(observer))
observers.Add(observer);
}
- private delegate void NotifyDelegate(HoudiniObserver! observer);
+ private delegate void NotifyDelegate(HoudiniObserver observer);
- private void Notify(NotifyDelegate! notifyDelegate) {
- foreach (HoudiniObserver! observer in observers) {
+ private void Notify(NotifyDelegate notifyDelegate) {
+ foreach (HoudiniObserver observer in observers) {
notifyDelegate(observer);
}
}
- protected void NotifyStart(Program! program, int numConstants) {
- NotifyDelegate notifyDelegate = (NotifyDelegate) delegate (HoudiniObserver! r) { r.UpdateStart(program, numConstants); };
+ protected void NotifyStart(Program program, int numConstants) {
+ NotifyDelegate notifyDelegate = (NotifyDelegate) delegate (HoudiniObserver r) { r.UpdateStart(program, numConstants); };
Notify(notifyDelegate);
}
protected void NotifyIteration() {
- Notify((NotifyDelegate) delegate (HoudiniObserver! r) { r.UpdateIteration(); });
+ Notify((NotifyDelegate) delegate (HoudiniObserver r) { r.UpdateIteration(); });
}
- protected void NotifyImplementation(Implementation! implementation) {
- Notify((NotifyDelegate) delegate (HoudiniObserver! r) { r.UpdateImplementation(implementation); });
+ protected void NotifyImplementation(Implementation implementation) {
+ Notify((NotifyDelegate) delegate (HoudiniObserver r) { r.UpdateImplementation(implementation); });
}
- protected void NotifyAssignment(Dictionary<string!,bool>! assignment) {
- Notify((NotifyDelegate) delegate (HoudiniObserver! r) { r.UpdateAssignment(assignment); });
+ protected void NotifyAssignment(Dictionary<string,bool> assignment) {
+ Notify((NotifyDelegate) delegate (HoudiniObserver r) { r.UpdateAssignment(assignment); });
}
protected void NotifyOutcome(VCGen.Outcome outcome) {
- Notify((NotifyDelegate) delegate (HoudiniObserver! r) { r.UpdateOutcome(outcome); });
+ Notify((NotifyDelegate) delegate (HoudiniObserver r) { r.UpdateOutcome(outcome); });
}
- protected void NotifyEnqueue(Implementation! implementation){
- Notify((NotifyDelegate) delegate (HoudiniObserver! r) { r.UpdateEnqueue(implementation); });
+ protected void NotifyEnqueue(Implementation implementation){
+ Notify((NotifyDelegate) delegate (HoudiniObserver r) { r.UpdateEnqueue(implementation); });
}
protected void NotifyDequeue(){
- Notify((NotifyDelegate) delegate (HoudiniObserver! r) { r.UpdateDequeue(); });
+ Notify((NotifyDelegate) delegate (HoudiniObserver r) { r.UpdateDequeue(); });
}
- protected void NotifyConstant(string! constantName){
- Notify((NotifyDelegate) delegate (HoudiniObserver! r) { r.UpdateConstant(constantName); });
+ protected void NotifyConstant(string constantName){
+ Notify((NotifyDelegate) delegate (HoudiniObserver r) { r.UpdateConstant(constantName); });
}
protected void NotifyEnd(bool isNormalEnd) {
- Notify((NotifyDelegate) delegate (HoudiniObserver! r) { r.UpdateEnd(isNormalEnd); });
+ Notify((NotifyDelegate) delegate (HoudiniObserver r) { r.UpdateEnd(isNormalEnd); });
}
protected void NotifyFlushStart() {
- Notify((NotifyDelegate) delegate (HoudiniObserver! r) { r.UpdateFlushStart(); });
+ Notify((NotifyDelegate) delegate (HoudiniObserver r) { r.UpdateFlushStart(); });
}
protected void NotifyFlushFinish() {
- Notify((NotifyDelegate) delegate (HoudiniObserver! r) { r.UpdateFlushFinish(); });
+ Notify((NotifyDelegate) delegate (HoudiniObserver r) { r.UpdateFlushFinish(); });
}
- protected void NotifyException(string! msg) {
- Notify((NotifyDelegate) delegate (HoudiniObserver! r) { r.SeeException(msg); });
+ protected void NotifyException(string msg) {
+ Notify((NotifyDelegate) delegate (HoudiniObserver r) { r.SeeException(msg); });
}
}
- public enum HoudiniProver { Z3, Z3API }
-
public class Houdini : ObservableHoudini {
-
- private Program! program;
-
- private ReadOnlyDictionary<string!,IdentifierExpr!>! houdiniConstants;
- private ReadOnlyDictionary<Implementation!,HdnVCGen!>! vcgenSessions;
- private CallGraph! callGraph;
+ private Program program;
+ private ReadOnlyDictionary<string, IdentifierExpr> houdiniConstants;
+ private ReadOnlyDictionary<Implementation, HoudiniVCGen> vcgenSessions;
+ private CallGraph callGraph;
private bool continueAtError;
- private HoudiniProver houdiniProver;
- private HdnVCGenFactory! vcgenFactory;
- public Houdini(Program! program, CallGraph! callgraph, bool continueAtError, HoudiniProver houdiniProver) {
- this.program=program;
- this.callGraph = callgraph;
+ public Houdini(Program program, bool continueAtError) {
+ this.program = program;
+ this.callGraph = BuildCallGraph(program);
this.continueAtError = continueAtError;
- this.houdiniProver = houdiniProver;
- HdnVCGenFactory factory;
- switch (this.houdiniProver) {
- case HoudiniProver.Z3:
- factory = new Z3HdnVCGenFactory();
- break;
- case HoudiniProver.Z3API:
- default:
- factory = new Z3APIHdnVCGenFactory();
- break;
- }
- this.vcgenFactory = factory;
- HoudiniHelper helper = new HoudiniHelper(factory);
- this.houdiniConstants = helper.CollectExistentialConstants(program);
- this.vcgenSessions = helper.PrepareVCGenSessions(program);
+ this.houdiniConstants = CollectExistentialConstants(program);
+ this.vcgenSessions = PrepareVCGenSessions(program);
}
- private Queue<Implementation!>! BuildWorkList(Program! program) {
- Queue<Implementation!>! queue = new Queue<Implementation!>();
- foreach ( Declaration! decl in program.TopLevelDeclarations ) {
- Implementation impl = decl as Implementation;
- if (impl!=null) {
- queue.Enqueue(impl);
+ private ReadOnlyDictionary<Implementation, HoudiniVCGen> PrepareVCGenSessions(Program program) {
+ Dictionary<Implementation, HoudiniVCGen> vcgenSessions = new Dictionary<Implementation, HoudiniVCGen>();
+
+ foreach (Declaration decl in program.TopLevelDeclarations) {
+ Implementation impl = decl as Implementation;
+ if (impl != null) {
+ // make a different simplify log file for each function
+ String simplifyLog = null;
+ if (CommandLineOptions.Clo.SimplifyLogFilePath != null) {
+ simplifyLog = impl.ToString() + CommandLineOptions.Clo.SimplifyLogFilePath;
}
+ HoudiniVCGen vcgen = new HoudiniVCGen(program, simplifyLog, CommandLineOptions.Clo.SimplifyLogFileAppend);
+ //vcgen.PrepareVerification(impl, program);
+ vcgenSessions.Add(impl, vcgen);
+ }
}
- return queue;
+ return new ReadOnlyDictionary<Implementation, HoudiniVCGen>(vcgenSessions);
}
- private class HoudiniHelper {
- private HdnVCGenFactory! vcgenFactory;
- public HoudiniHelper(HdnVCGenFactory! vcgenFactory) {
- this.vcgenFactory = vcgenFactory;
+ private ReadOnlyDictionary<string, IdentifierExpr> CollectExistentialConstants(Program program) {
+ Dictionary<string, IdentifierExpr> existentialConstants = new Dictionary<string, IdentifierExpr>();
+ foreach (Declaration decl in program.TopLevelDeclarations) {
+ Constant constant = decl as Constant;
+ if (constant != null) {
+ bool result = false;
+ if (constant.CheckBooleanAttribute("existential", ref result)) {
+ if (result == true)
+ existentialConstants.Add(constant.Name, new IdentifierExpr(Token.NoToken, constant));
+ }
+ }
}
-
- public ReadOnlyDictionary<Implementation!,HdnVCGen!>! PrepareVCGenSessions(Program! program) {
- Dictionary<Implementation!,HdnVCGen!>! vcgenSessions = new Dictionary<Implementation!,HdnVCGen!>();
-
- foreach ( Declaration! decl in program.TopLevelDeclarations ) {
+ return new ReadOnlyDictionary<string, IdentifierExpr>(existentialConstants);
+ }
+
+ private CallGraph BuildCallGraph(Program program) {
+ return null;
+ }
+ private Queue<Implementation> BuildWorkList(Program program) {
+ Queue<Implementation> queue = new Queue<Implementation>();
+ foreach ( Declaration decl in program.TopLevelDeclarations ) {
Implementation impl = decl as Implementation;
if (impl!=null) {
- // make a different simplify log file for each function
- String simplifyLog = null;
- if (CommandLineOptions.Clo.SimplifyLogFilePath != null) {
- simplifyLog = impl.ToString() + CommandLineOptions.Clo.SimplifyLogFilePath;
- }
- HdnVCGen! vcgen = vcgenFactory.BuildVCGen(program, simplifyLog, CommandLineOptions.Clo.SimplifyLogFileAppend);
- vcgen.PrepareVerification(impl,program);
- vcgenSessions.Add(impl,vcgen);
+ queue.Enqueue(impl);
}
- }
- return new ReadOnlyDictionary<Implementation!,HdnVCGen!>(vcgenSessions);
}
-
- public ReadOnlyDictionary<string!,IdentifierExpr!>! CollectExistentialConstants(Program! program) {
- Dictionary<string!,IdentifierExpr!>! existentialConstants = new Dictionary<string!,IdentifierExpr!>();
- foreach ( Declaration! decl in program.TopLevelDeclarations ) {
- Constant constant = decl as Constant;
- if (constant!=null) {
- bool result=false;
- if (constant.CheckBooleanAttribute("existential",ref result)) {
- if (result==true)
- existentialConstants.Add(constant.Name, new IdentifierExpr(Token.NoToken,constant));
- }
- }
- }
- return new ReadOnlyDictionary<string!,IdentifierExpr!>(existentialConstants);
- }
+ return queue;
}
-
+
private bool MatchCandidate(Expr boogieExpr, out string candidateConstant) {
candidateConstant = null;
IExpr antecedent;
IExpr expr = boogieExpr as IExpr;
- if (expr!=null && ExprUtil.Match(expr, Prop.Implies, out antecedent)) {
+ if (expr != null && ExprUtil.Match(expr, Prop.Implies, out antecedent)) {
IdentifierExpr.ConstantFunApp constantFunApp = antecedent as IdentifierExpr.ConstantFunApp;
- if ((constantFunApp !=null) && (houdiniConstants.ContainsKey(constantFunApp.IdentifierExpr.Name))) {
+ if (constantFunApp != null && houdiniConstants.ContainsKey(constantFunApp.IdentifierExpr.Name)) {
candidateConstant = constantFunApp.IdentifierExpr.Name;
return true;
}
@@ -366,12 +342,12 @@ namespace Microsoft.Boogie.Houdini }
- private Axiom! BuildAxiom(Dictionary<string!,bool>! currentAssignment) {
+ private Axiom BuildAxiom(Dictionary<string,bool> currentAssignment) {
Expr axiom = null;
- foreach (KeyValuePair<string!,bool> kv in currentAssignment) {
+ foreach (KeyValuePair<string,bool> kv in currentAssignment) {
IdentifierExpr constantExpr;
houdiniConstants.TryGetValue(kv.Key,out constantExpr);
- assume (constantExpr!=null);
+ Contract.Assume (constantExpr!=null);
Expr valueExpr = new LiteralExpr(Token.NoToken, kv.Value);
Expr constantAssignment = Expr.Binary(Token.NoToken,BinaryOperator.Opcode.Eq,constantExpr,valueExpr);
if (axiom==null)
@@ -384,15 +360,15 @@ namespace Microsoft.Boogie.Houdini return new Axiom(Token.NoToken,axiom);
}
- private Dictionary<string!,bool>! BuildAssignment(Dictionary<string!,IdentifierExpr!>.KeyCollection! constants) {
- Dictionary<string!,bool>! initial = new Dictionary<string!,bool>();
- foreach (string! constant in constants)
+ private Dictionary<string,bool> BuildAssignment(Dictionary<string,IdentifierExpr>.KeyCollection constants) {
+ Dictionary<string,bool> initial = new Dictionary<string,bool>();
+ foreach (string constant in constants)
initial.Add(constant,true);
return initial;
}
- private VCGen.Outcome VerifyUsingAxiom(Implementation! implementation, Axiom! axiom, out List<Counterexample!>? errors) {
- HdnVCGen vcgen;
+ private VCGen.Outcome VerifyUsingAxiom(Implementation implementation, Axiom axiom, out List<Counterexample> errors) {
+ HoudiniVCGen vcgen;
vcgenSessions.TryGetValue(implementation,out vcgen);
if(vcgen==null)
throw new Exception("HdnVCGen not found for implementation: " + implementation.Name);
@@ -404,15 +380,15 @@ namespace Microsoft.Boogie.Houdini // the main procedure that checks a procedure and updates the
// assignment and the worklist
- private VCGen.Outcome HoudiniVerifyCurrent(HoudiniState! current,
- Program! program,
- out List<Counterexample!>? errors,
+ private VCGen.Outcome HoudiniVerifyCurrent(HoudiniState current,
+ Program program,
+ out List<Counterexample> errors,
out bool exc) {
- HdnVCGen vcgen;
+ HoudiniVCGen vcgen;
if (current.Implementation == null)
throw new Exception("HoudiniVerifyCurrent has null implementation");
- Implementation! implementation = current.Implementation;
+ Implementation implementation = current.Implementation;
vcgenSessions.TryGetValue(implementation,out vcgen);
if(vcgen==null)
throw new Exception("HdnVCGen not found for implementation: " + implementation.Name);
@@ -421,15 +397,15 @@ namespace Microsoft.Boogie.Houdini return outcome;
}
- private VCGen.Outcome VerifyCurrent(HoudiniState! current,
- Program! program,
- out List<Counterexample!>? errors,
+ private VCGen.Outcome VerifyCurrent(HoudiniState current,
+ Program program,
+ out List<Counterexample> errors,
out bool exc) {
- HdnVCGen vcgen;
+ HoudiniVCGen vcgen;
if (current.Implementation != null) {
- Implementation! implementation = current.Implementation;
- vcgenSessions.TryGetValue(implementation,out vcgen);
- if(vcgen==null)
+ Implementation implementation = current.Implementation;
+ vcgenSessions.TryGetValue(implementation, out vcgen);
+ if(vcgen == null)
throw new Exception("HdnVCGen not found for implementation: " + implementation.Name);
VCGen.Outcome outcome = TrySpinSameFunc(current, program, vcgen, out errors, out exc);
@@ -439,13 +415,13 @@ namespace Microsoft.Boogie.Houdini }
}
- private bool IsOutcomeNotHoudini(VCGen.Outcome outcome, List<Counterexample!>? errors) {
+ private bool IsOutcomeNotHoudini(VCGen.Outcome outcome, List<Counterexample> errors) {
switch (outcome) {
case VCGen.Outcome.Correct:
return false;
break;
case VCGen.Outcome.Errors:
- assume (errors!=null);
+ Contract.Assume (errors!=null);
foreach (Counterexample error in errors) {
if (ExtractRefutedAnnotation(error)==null)
return true;
@@ -462,10 +438,10 @@ namespace Microsoft.Boogie.Houdini // returns true if at least one of the violations is non-candidate
- private bool AnyNonCandidateViolation(VCGen.Outcome outcome, List<Counterexample!>? errors) {
+ private bool AnyNonCandidateViolation(VCGen.Outcome outcome, List<Counterexample> errors) {
switch (outcome) {
case VCGen.Outcome.Errors:
- assert (errors!=null);
+ Contract.Assert (errors!=null);
foreach (Counterexample error in errors) {
if (ExtractRefutedAnnotation(error)==null)
return true;
@@ -482,21 +458,21 @@ namespace Microsoft.Boogie.Houdini }
- private List<Counterexample!> emptyList = new List<Counterexample!>();
+ private List<Counterexample> emptyList = new List<Counterexample>();
// Record most current Non-Candidate errors found by Boogie, etc.
- private void UpdateHoudiniOutcome(HoudiniOutcome! houdiniOutcome,
- Implementation! implementation,
+ private void UpdateHoudiniOutcome(HoudiniOutcome houdiniOutcome,
+ Implementation implementation,
VCGen.Outcome verificationOutcome,
- List<Counterexample!>? errors) {
- string! implName = implementation.ToString();
+ List<Counterexample> errors) {
+ string implName = implementation.ToString();
houdiniOutcome.implementationOutcomes.Remove(implName);
- List<Counterexample!> nonCandidateErrors = new List<Counterexample!>();
+ List<Counterexample> nonCandidateErrors = new List<Counterexample>();
switch (verificationOutcome) {
case VCGen.Outcome.Errors:
- assume (errors!=null);
- foreach (Counterexample! error in errors) {
+ Contract.Assume (errors!=null);
+ foreach (Counterexample error in errors) {
if (ExtractRefutedAnnotation(error)==null)
nonCandidateErrors.Add(error);
}
@@ -512,7 +488,7 @@ namespace Microsoft.Boogie.Houdini }
- private void FlushWorkList(HoudiniState! current) {
+ private void FlushWorkList(HoudiniState current) {
this.NotifyFlushStart();
Axiom axiom = BuildAxiom(current.Assignment);
while (current.WorkList.Count>0) {
@@ -521,7 +497,7 @@ namespace Microsoft.Boogie.Houdini current.Implementation= current.WorkList.Peek();
this.NotifyImplementation(current.Implementation);
- List<Counterexample!>? errors;
+ List<Counterexample> errors;
VCGen.Outcome outcome = VerifyUsingAxiom(current.Implementation,axiom,out errors);
UpdateHoudiniOutcome(current.Outcome,current.Implementation,outcome,errors);
this.NotifyOutcome(outcome);
@@ -533,23 +509,23 @@ namespace Microsoft.Boogie.Houdini this.NotifyFlushFinish();
}
- private void UpdateAssignment(HoudiniState! current, RefutedAnnotation! refAnnot){
+ private void UpdateAssignment(HoudiniState current, RefutedAnnotation refAnnot){
current.Assignment.Remove(refAnnot.Constant);
current.Assignment.Add(refAnnot.Constant,false);
this.NotifyConstant(refAnnot.Constant);
}
- private void AddToWorkList(HoudiniState! current, Implementation! imp) {
+ private void AddToWorkList(HoudiniState current, Implementation imp) {
if (!current.WorkList.Contains(imp) && !current.isBlackListed(imp.Name)) {
current.WorkList.Enqueue(imp);
this.NotifyEnqueue(imp);
}
}
- private void UpdateWorkList(HoudiniState! current,
+ private void UpdateWorkList(HoudiniState current,
VCGen.Outcome outcome,
- List<Counterexample!>? errors) {
- assume (current.Implementation!=null);
+ List<Counterexample> errors) {
+ Contract.Assume (current.Implementation!=null);
switch (outcome) {
case VCGen.Outcome.Correct:
@@ -557,12 +533,12 @@ namespace Microsoft.Boogie.Houdini this.NotifyDequeue();
break;
case VCGen.Outcome.Errors:
- assume (errors!=null);
+ Contract.Assume (errors!=null);
bool dequeue = false;
- foreach (Counterexample! error in errors) {
+ foreach (Counterexample error in errors) {
RefutedAnnotation refutedAnnotation = ExtractRefutedAnnotation(error);
if (refutedAnnotation!=null) {
- foreach (Implementation! implementation in FindImplementationsToEnqueue(refutedAnnotation,current.Implementation))
+ foreach (Implementation implementation in FindImplementationsToEnqueue(refutedAnnotation,current.Implementation))
{ AddToWorkList(current, implementation); }
UpdateAssignment(current, refutedAnnotation);
}
@@ -592,9 +568,9 @@ namespace Microsoft.Boogie.Houdini }
- private void AddRelatedToWorkList(HoudiniState! current, RefutedAnnotation! refutedAnnotation) {
- assume (current.Implementation != null);
- foreach (Implementation! implementation in FindImplementationsToEnqueue(refutedAnnotation,current.Implementation)) {
+ private void AddRelatedToWorkList(HoudiniState current, RefutedAnnotation refutedAnnotation) {
+ Contract.Assume (current.Implementation != null);
+ foreach (Implementation implementation in FindImplementationsToEnqueue(refutedAnnotation,current.Implementation)) {
AddToWorkList(current, implementation);
}
}
@@ -602,10 +578,10 @@ namespace Microsoft.Boogie.Houdini // Updates the worklist and current assignment
// @return true if the current function is kept on the queue
- private bool UpdateAssignmentWorkList(HoudiniState! current,
+ private bool UpdateAssignmentWorkList(HoudiniState current,
VCGen.Outcome outcome,
- List<Counterexample!>? errors) {
- assume (current.Implementation!=null);
+ List<Counterexample> errors) {
+ Contract.Assume (current.Implementation!=null);
bool dequeue = true;
switch (outcome) {
@@ -613,8 +589,8 @@ namespace Microsoft.Boogie.Houdini //yeah, dequeue
break;
case VCGen.Outcome.Errors:
- assume (errors!=null);
- foreach (Counterexample! error in errors) {
+ Contract.Assume (errors!=null);
+ foreach (Counterexample error in errors) {
RefutedAnnotation refutedAnnotation = ExtractRefutedAnnotation(error);
if (refutedAnnotation!=null) { // some candidate annotation removed
AddRelatedToWorkList(current, refutedAnnotation);
@@ -644,78 +620,67 @@ namespace Microsoft.Boogie.Houdini private class HoudiniState {
- private Queue<Implementation!>! _workList;
- private Set<string!>! blackList;
- private Dictionary<string!,bool>! _assignment;
+ private Queue<Implementation> _workList;
+ private HashSet<string> blackList;
+ private Dictionary<string,bool> _assignment;
private Implementation _implementation;
- private HoudiniOutcome! _outcome;
+ private HoudiniOutcome _outcome;
- public HoudiniState(Queue<Implementation!>! workList, Dictionary<string!,bool>! currentAssignment) {
+ public HoudiniState(Queue<Implementation> workList, Dictionary<string,bool> currentAssignment) {
this._workList = workList;
this._assignment = currentAssignment;
this._implementation = null;
this._outcome = new HoudiniOutcome();
- this.blackList = new Set<string!>();
+ this.blackList = new HashSet<string>();
}
- public Queue<Implementation!>! WorkList {
+ public Queue<Implementation> WorkList {
get { return this._workList; }
}
- public Dictionary<string!,bool>! Assignment {
+ public Dictionary<string,bool> Assignment {
get { return this._assignment; }
}
public Implementation Implementation {
get { return this._implementation; }
set { this._implementation = value; }
}
- public HoudiniOutcome! Outcome {
+ public HoudiniOutcome Outcome {
get { return this._outcome; }
}
- public bool isBlackListed(string! funcName) {
+ public bool isBlackListed(string funcName) {
return blackList.Contains(funcName);
}
- public void addToBlackList(string! funcName) {
+ public void addToBlackList(string funcName) {
blackList.Add(funcName);
}
}
- private void PrintBadList(string kind, List<string!>! list) {
+ private void PrintBadList(string kind, List<string> list) {
if(list.Count != 0) {
Console.WriteLine("----------------------------------------");
Console.WriteLine("Functions: {0}", kind);
- foreach(string! fname in list) {
+ foreach(string fname in list) {
Console.WriteLine("\t{0}", fname);
}
Console.WriteLine("----------------------------------------");
}
}
- private void PrintBadOutcomes(List<string!>! timeouts, List<string!>! inconc, List<string!>! errors) {
+ private void PrintBadOutcomes(List<string> timeouts, List<string> inconc, List<string> errors) {
PrintBadList("TimedOut", timeouts);
PrintBadList("Inconclusive", inconc);
PrintBadList("Errors", errors);
}
- public HoudiniOutcome! VerifyProgram (Program! program) {
- HoudiniOutcome outcome;
- switch (this.houdiniProver) {
- case HoudiniProver.Z3:
- outcome = VerifyProgramSameFuncFirst(program);
- //outcome = PerformHoudiniInference(program);
- break;
- case HoudiniProver.Z3API: // not that stable
- outcome = VerifyProgramUnorderedWork(program);
- break;
- default:
- throw new Exception("Unknown HoudiniProver: " + this.houdiniProver.ToString());
- }
+ public HoudiniOutcome VerifyProgram (Program program) {
+ HoudiniOutcome outcome = VerifyProgramSameFuncFirst(program);
PrintBadOutcomes(outcome.ListOfTimeouts, outcome.ListOfInconclusives, outcome.ListOfErrors);
return outcome;
}
// Old main loop
- public HoudiniOutcome! VerifyProgramUnorderedWork (Program! program) {
- HoudiniState current = new HoudiniState(BuildWorkList(program),BuildAssignment((!)houdiniConstants.Keys));
+ public HoudiniOutcome VerifyProgramUnorderedWork (Program program) {
+ HoudiniState current = new HoudiniState(BuildWorkList(program),BuildAssignment(houdiniConstants.Keys));
this.NotifyStart(program, houdiniConstants.Keys.Count);
while (current.WorkList.Count>0) {
@@ -728,7 +693,7 @@ namespace Microsoft.Boogie.Houdini current.Implementation= current.WorkList.Peek();
this.NotifyImplementation(current.Implementation);
- List<Counterexample!>? errors;
+ List<Counterexample> errors;
VCGen.Outcome outcome = VerifyUsingAxiom(current.Implementation, axiom, out errors);
this.NotifyOutcome(outcome);
@@ -746,8 +711,8 @@ namespace Microsoft.Boogie.Houdini }
// New main loop
- public HoudiniOutcome! VerifyProgramSameFuncFirst (Program! program) {
- HoudiniState current = new HoudiniState(BuildWorkList(program),BuildAssignment((!)houdiniConstants.Keys));
+ public HoudiniOutcome VerifyProgramSameFuncFirst (Program program) {
+ HoudiniState current = new HoudiniState(BuildWorkList(program),BuildAssignment(houdiniConstants.Keys));
this.NotifyStart(program, houdiniConstants.Keys.Count);
while (current.WorkList.Count>0) {
@@ -758,7 +723,7 @@ namespace Microsoft.Boogie.Houdini current.Implementation = current.WorkList.Peek();
this.NotifyImplementation(current.Implementation);
- List<Counterexample!>? errors;
+ List<Counterexample> errors;
VCGen.Outcome outcome = VerifyCurrent(current, program, out errors, out exceptional);
// updates to worklist already done in VerifyCurrent, unless there was an exception
@@ -784,8 +749,8 @@ namespace Microsoft.Boogie.Houdini //Aborts when there is a violation of non-candidate assertion
//This can be used in eager mode (continueAfterError) by simply making
//all non-candidate annotations as unchecked (free requires/ensures, assumes)
- public HoudiniOutcome! PerformHoudiniInference(Program! program) {
- HoudiniState current = new HoudiniState(BuildWorkList(program),BuildAssignment((!)houdiniConstants.Keys));
+ public HoudiniOutcome PerformHoudiniInference(Program program) {
+ HoudiniState current = new HoudiniState(BuildWorkList(program),BuildAssignment(houdiniConstants.Keys));
this.NotifyStart(program, houdiniConstants.Keys.Count);
Console.WriteLine("Using the new houdini algorithm\n");
@@ -798,7 +763,7 @@ namespace Microsoft.Boogie.Houdini current.Implementation = current.WorkList.Peek();
this.NotifyImplementation(current.Implementation);
- List<Counterexample!>? errors;
+ List<Counterexample> errors;
VCGen.Outcome outcome = HoudiniVerifyCurrent(current, program, out errors, out exceptional);
// updates to worklist already done in VerifyCurrent, unless there was an exception
@@ -820,18 +785,18 @@ namespace Microsoft.Boogie.Houdini }
- private List<Implementation!>! FindImplementationsToEnqueue(RefutedAnnotation! refutedAnnotation, Implementation! currentImplementation) {
- List<Implementation!>! implementations = new List<Implementation!>();
+ private List<Implementation> FindImplementationsToEnqueue(RefutedAnnotation refutedAnnotation, Implementation currentImplementation) {
+ List<Implementation> implementations = new List<Implementation>();
switch (refutedAnnotation.Kind) {
case RefutedAnnotationKind.REQUIRES:
- foreach (Implementation! callee in callGraph.NextNodes(currentImplementation)) {
- assume (callee.Proc!=null);
+ foreach (Implementation callee in callGraph.NextNodes(currentImplementation)) {
+ Contract.Assume (callee.Proc!=null);
if (callee.Proc.Equals(refutedAnnotation.CalleeProc))
implementations.Add(callee);
}
break;
case RefutedAnnotationKind.ENSURES:
- foreach (Implementation! caller in callGraph.PreviousNodes(currentImplementation))
+ foreach (Implementation caller in callGraph.PreviousNodes(currentImplementation))
implementations.Add(caller);
break;
case RefutedAnnotationKind.ASSERT: //the implementation is already in queue
@@ -846,11 +811,11 @@ namespace Microsoft.Boogie.Houdini private enum RefutedAnnotationKind { REQUIRES, ENSURES, ASSERT};
private class RefutedAnnotation {
- private string! _constant;
+ private string _constant;
private RefutedAnnotationKind _kind;
private Procedure _callee;
- private RefutedAnnotation(string! constant, RefutedAnnotationKind kind, Procedure callee) {
+ private RefutedAnnotation(string constant, RefutedAnnotationKind kind, Procedure callee) {
this._constant = constant;
this._kind = kind;
this._callee = callee;
@@ -858,41 +823,41 @@ namespace Microsoft.Boogie.Houdini public RefutedAnnotationKind Kind {
get { return this._kind; }
}
- public string! Constant {
+ public string Constant {
get { return this._constant; }
}
public Procedure CalleeProc {
get { return this._callee; }
}
- public static RefutedAnnotation BuildRefutedRequires(string! constant, Procedure! callee) {
+ public static RefutedAnnotation BuildRefutedRequires(string constant, Procedure callee) {
return new RefutedAnnotation(constant,RefutedAnnotationKind.REQUIRES,callee);
}
- public static RefutedAnnotation BuildRefutedEnsures(string! constant) {
+ public static RefutedAnnotation BuildRefutedEnsures(string constant) {
return new RefutedAnnotation(constant,RefutedAnnotationKind.ENSURES, null);
}
- public static RefutedAnnotation BuildRefutedAssert(string! constant) {
+ public static RefutedAnnotation BuildRefutedAssert(string constant) {
return new RefutedAnnotation(constant,RefutedAnnotationKind.ASSERT, null);
}
}
- private void PrintRefutedCall(CallCounterexample! err, XmlSink! xmlOut) {
- Expr! cond = err.FailingRequires.Condition;
+ private void PrintRefutedCall(CallCounterexample err, XmlSink xmlOut) {
+ Expr cond = err.FailingRequires.Condition;
string houdiniConst;
if (MatchCandidate(cond, out houdiniConst)) {
xmlOut.WriteError("precondition violation", err.FailingCall.tok, err.FailingRequires.tok, err.Trace);
}
}
- private void PrintRefutedReturn(ReturnCounterexample! err, XmlSink! xmlOut) {
- Expr! cond = err.FailingEnsures.Condition;
+ private void PrintRefutedReturn(ReturnCounterexample err, XmlSink xmlOut) {
+ Expr cond = err.FailingEnsures.Condition;
string houdiniConst;
if (MatchCandidate(cond, out houdiniConst)) {
xmlOut.WriteError("postcondition violation", err.FailingReturn.tok, err.FailingEnsures.tok, err.Trace);
}
}
- private void PrintRefutedAssert(AssertCounterexample! err, XmlSink! xmlOut) {
+ private void PrintRefutedAssert(AssertCounterexample err, XmlSink xmlOut) {
Expr cond = err.FailingAssert.OrigExpr;
string houdiniConst;
if (MatchCandidate(cond, out houdiniConst)) {
@@ -901,13 +866,13 @@ namespace Microsoft.Boogie.Houdini }
- private void DebugRefutedCandidates(Implementation! curFunc, List<Counterexample!> errors) {
+ private void DebugRefutedCandidates(Implementation curFunc, List<Counterexample> errors) {
XmlSink xmlRefuted = CommandLineOptions.Clo.XmlRefuted;
if (xmlRefuted != null && errors != null) {
DateTime start = DateTime.Now;
xmlRefuted.WriteStartMethod(curFunc.ToString(), start);
- foreach (Counterexample! error in errors) {
+ foreach (Counterexample error in errors) {
CallCounterexample ce = error as CallCounterexample;
if (ce != null) PrintRefutedCall(ce, xmlRefuted);
ReturnCounterexample re = error as ReturnCounterexample;
@@ -925,10 +890,10 @@ namespace Microsoft.Boogie.Houdini string houdiniConstant;
CallCounterexample callCounterexample = error as CallCounterexample;
if (callCounterexample!=null) {
- Procedure! failingProcedure = (!)callCounterexample.FailingCall.Proc;
- Requires! failingRequires = (!)callCounterexample.FailingRequires;
+ Procedure failingProcedure = callCounterexample.FailingCall.Proc;
+ Requires failingRequires = callCounterexample.FailingRequires;
if (MatchCandidate(failingRequires.Condition,out houdiniConstant)) {
- assert (houdiniConstant!=null);
+ Contract.Assert (houdiniConstant!=null);
return RefutedAnnotation.BuildRefutedRequires(houdiniConstant, failingProcedure);
}
}
@@ -936,7 +901,7 @@ namespace Microsoft.Boogie.Houdini if (returnCounterexample!=null) {
Ensures failingEnsures =returnCounterexample.FailingEnsures;
if (MatchCandidate(failingEnsures.Condition,out houdiniConstant)) {
- assert (houdiniConstant!=null);
+ Contract.Assert (houdiniConstant!=null);
return RefutedAnnotation.BuildRefutedEnsures(houdiniConstant);
}
}
@@ -944,7 +909,7 @@ namespace Microsoft.Boogie.Houdini if (assertCounterexample!=null) {
AssertCmd failingAssert = assertCounterexample.FailingAssert;
if (MatchCandidate(failingAssert.OrigExpr,out houdiniConstant)) {
- assert (houdiniConstant!=null);
+ Contract.Assert (houdiniConstant!=null);
return RefutedAnnotation.BuildRefutedAssert(houdiniConstant);
}
}
@@ -952,16 +917,16 @@ namespace Microsoft.Boogie.Houdini return null;
}
- private VCGen.Outcome TryCatchVerify(HdnVCGen! vcgen, out List<Counterexample!>? errors) {
+ private VCGen.Outcome TryCatchVerify(HoudiniVCGen vcgen, out List<Counterexample> errors) {
VCGen.Outcome outcome;
try {
outcome = vcgen.Verify(out errors);
} catch (VCGenException e) {
- assume(e!=null);
+ Contract.Assume(e!=null);
errors = null;
outcome = VCGen.Outcome.Inconclusive;
} catch (UnexpectedProverOutputException upo) {
- assume(upo!=null);
+ Contract.Assume(upo!=null);
errors = null;
outcome = VCGen.Outcome.Inconclusive;
}
@@ -970,12 +935,12 @@ namespace Microsoft.Boogie.Houdini //version of TryCatchVerify that spins on the same function
//as long as the current assignment is changing
- private VCGen.Outcome TrySpinSameFunc(HoudiniState! current,
- Program! program,
- HdnVCGen! vcgen,
- out List<Counterexample!>? errors,
+ private VCGen.Outcome TrySpinSameFunc(HoudiniState current,
+ Program program,
+ HoudiniVCGen vcgen,
+ out List<Counterexample> errors,
out bool exceptional) {
- assert (current.Implementation != null);
+ Contract.Assert (current.Implementation != null);
VCGen.Outcome outcome;
bool pushed = false;
errors = null;
@@ -989,7 +954,7 @@ namespace Microsoft.Boogie.Houdini System.GC.Collect();
this.NotifyIteration();
}
- Axiom! currentAx = BuildAxiom(current.Assignment);
+ Axiom currentAx = BuildAxiom(current.Assignment);
this.NotifyAssignment(current.Assignment);
vcgen.PushAxiom(currentAx);
@@ -1016,7 +981,7 @@ namespace Microsoft.Boogie.Houdini } while (trySameFunc && current.WorkList.Count > 0);
} catch (VCGenException e) {
- assume(e!=null);
+ Contract.Assume(e!=null);
if (pushed){
vcgen.Pop(); // what if session is dead?
}
@@ -1024,7 +989,7 @@ namespace Microsoft.Boogie.Houdini exceptional = true;
return outcome;
} catch (UnexpectedProverOutputException upo) {
- assume(upo!=null);
+ Contract.Assume(upo!=null);
if (pushed){
vcgen.Pop();
}
@@ -1039,12 +1004,12 @@ namespace Microsoft.Boogie.Houdini //Similar to TrySpinSameFunc except no Candidate logic
- private VCGen.Outcome HoudiniVerifyCurrentAux(HoudiniState! current,
- Program! program,
- HdnVCGen! vcgen,
- out List<Counterexample!>? errors,
+ private VCGen.Outcome HoudiniVerifyCurrentAux(HoudiniState current,
+ Program program,
+ HoudiniVCGen vcgen,
+ out List<Counterexample> errors,
out bool exceptional) {
- assert (current.Implementation != null);
+ Contract.Assert (current.Implementation != null);
VCGen.Outcome outcome;
bool pushed = false;
errors = null;
@@ -1059,7 +1024,7 @@ namespace Microsoft.Boogie.Houdini this.NotifyIteration();
}
- Axiom! currentAx = BuildAxiom(current.Assignment);
+ Axiom currentAx = BuildAxiom(current.Assignment);
this.NotifyAssignment(current.Assignment);
//check the VC with the current assignment
@@ -1088,7 +1053,7 @@ namespace Microsoft.Boogie.Houdini } while (trySameFunc && current.WorkList.Count > 0);
} catch (VCGenException e) {
- assume(e!=null);
+ Contract.Assume(e!=null);
if (pushed){
vcgen.Pop(); // what if session is dead?
}
@@ -1096,7 +1061,7 @@ namespace Microsoft.Boogie.Houdini exceptional = true;
return outcome;
} catch (UnexpectedProverOutputException upo) {
- assume(upo!=null);
+ Contract.Assume(upo!=null);
if (pushed){
vcgen.Pop();
}
@@ -1113,8 +1078,8 @@ namespace Microsoft.Boogie.Houdini public class VCGenOutcome {
public VCGen.Outcome outcome;
- public List<Counterexample!> errors;
- public VCGenOutcome(VCGen.Outcome outcome, List<Counterexample!> errors) {
+ public List<Counterexample> errors;
+ public VCGenOutcome(VCGen.Outcome outcome, List<Counterexample> errors) {
this.outcome = outcome;
this.errors = errors;
}
@@ -1122,9 +1087,9 @@ namespace Microsoft.Boogie.Houdini public class HoudiniOutcome {
// final assignment
- public Dictionary<string!,bool>! assignment = new Dictionary<string!,bool>();
+ public Dictionary<string,bool> assignment = new Dictionary<string,bool>();
// boogie errors
- public Dictionary<string!,VCGenOutcome!>! implementationOutcomes = new Dictionary<string!,VCGenOutcome!>();
+ public Dictionary<string,VCGenOutcome> implementationOutcomes = new Dictionary<string,VCGenOutcome>();
// outcome kind
public HoudiniOutcomeKind kind;
@@ -1132,16 +1097,16 @@ namespace Microsoft.Boogie.Houdini private int CountResults(VCGen.Outcome outcome) {
int outcomeCount=0;
- foreach (VCGenOutcome! verifyOutcome in implementationOutcomes.Values) {
+ foreach (VCGenOutcome verifyOutcome in implementationOutcomes.Values) {
if (verifyOutcome.outcome==outcome)
outcomeCount++;
}
return outcomeCount;
}
- private List<string!>! ListOutcomeMatches(VCGen.Outcome outcome) {
- List<string!>! result = new List<string!>();
- foreach (KeyValuePair<string!, VCGenOutcome!> kvpair in implementationOutcomes) {
+ private List<string> ListOutcomeMatches(VCGen.Outcome outcome) {
+ List<string> result = new List<string>();
+ foreach (KeyValuePair<string, VCGenOutcome> kvpair in implementationOutcomes) {
if (kvpair.Value.outcome==outcome)
result.Add(kvpair.Key);
}
@@ -1168,17 +1133,17 @@ namespace Microsoft.Boogie.Houdini return CountResults(VCGen.Outcome.TimedOut);
}
}
- public List<string!>! ListOfTimeouts {
+ public List<string> ListOfTimeouts {
get {
return ListOutcomeMatches(VCGen.Outcome.TimedOut);
}
}
- public List<string!>! ListOfInconclusives {
+ public List<string> ListOfInconclusives {
get {
return ListOutcomeMatches(VCGen.Outcome.Inconclusive);
}
}
- public List<string!>! ListOfErrors {
+ public List<string> ListOfErrors {
get {
return ListOutcomeMatches(VCGen.Outcome.Errors);
}
diff --git a/Source/Houdini/Houdini.csproj b/Source/Houdini/Houdini.csproj new file mode 100644 index 00000000..5e910e03 --- /dev/null +++ b/Source/Houdini/Houdini.csproj @@ -0,0 +1,99 @@ +<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>8.0.30703</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{CF41E903-78EB-43BA-A355-E5FEB5ECECD4}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>Microsoft.Boogie.Houdini</RootNamespace>
+ <AssemblyName>Houdini</AssemblyName>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Core" />
+ <Reference Include="System.Xml.Linq" />
+ <Reference Include="System.Data.DataSetExtensions" />
+ <Reference Include="Microsoft.CSharp" />
+ <Reference Include="System.Data" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="Checker.cs" />
+ <Compile Include="Houdini.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\AIFramework\AIFramework.csproj">
+ <Project>{39B0658D-C955-41C5-9A43-48C97A1EF5FD}</Project>
+ <Name>AIFramework</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\Basetypes\Basetypes.csproj">
+ <Project>{43DFAD18-3E35-4558-9BE2-CAFF6B5BA8A0}</Project>
+ <Name>Basetypes</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\CodeContractsExtender\CodeContractsExtender.csproj">
+ <Project>{ACCC0156-0921-43ED-8F67-AD8BDC8CDE31}</Project>
+ <Name>CodeContractsExtender</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\Core\Core.csproj">
+ <Project>{B230A69C-C466-4065-B9C1-84D80E76D802}</Project>
+ <Name>Core</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\Graph\Graph.csproj">
+ <Project>{69A2B0B8-BCAC-4101-AE7A-556FCC58C06E}</Project>
+ <Name>Graph</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\ParserHelper\ParserHelper.csproj">
+ <Project>{FCD3AC7F-9DFD-46C8-AB1E-09F0B0F16DC5}</Project>
+ <Name>ParserHelper</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\Provers\Simplify\Simplify.csproj">
+ <Project>{FEE9F01B-9722-4A76-A24B-72A4016DFA8E}</Project>
+ <Name>Simplify</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\Provers\Z3\Z3.csproj">
+ <Project>{BB49B90B-BE21-4BE8-85BA-359FDB55F4DF}</Project>
+ <Name>Z3</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\VCExpr\VCExpr.csproj">
+ <Project>{56FFDBCA-7D14-43B8-A6CA-22A20E417EE1}</Project>
+ <Name>VCExpr</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\VCGeneration\VCGeneration.csproj">
+ <Project>{E1F10180-C7B9-4147-B51F-FA1B701966DC}</Project>
+ <Name>VCGeneration</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <Folder Include="Properties\" />
+ </ItemGroup>
+ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+ -->
+</Project>
\ No newline at end of file diff --git a/Source/Houdini/Houdini.sscproj b/Source/Houdini/Houdini.sscproj deleted file mode 100644 index 3f68bb91..00000000 --- a/Source/Houdini/Houdini.sscproj +++ /dev/null @@ -1,118 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<VisualStudioProject>
- <XEN ProjectType="Local"
- SchemaVersion="1.0"
- Name="Houdini"
- ProjectGuid="40454b39-4f61-48b2-bde3-e9271b24f469"
- >
- <Build>
- <Settings ApplicationIcon=""
- AssemblyName="Houdini"
- OutputType="Library"
- RootNamespace="Houdini"
- StartupObject=""
- StandardLibraryLocation=""
- TargetPlatform="v2"
- TargetPlatformLocation=""
- >
- <Config Name="Debug"
- AllowUnsafeBlocks="False"
- BaseAddress="285212672"
- CheckForOverflowUnderflow="False"
- ConfigurationOverrideFile=""
- DefineConstants="DEBUG;TRACE"
- DocumentationFile=""
- DebugSymbols="True"
- FileAlignment="4096"
- IncrementalBuild="True"
- Optimize="False"
- OutputPath="bin\debug"
- RegisterForComInterop="False"
- RemoveIntegerChecks="false"
- TreatWarningsAsErrors="False"
- WarningLevel="4"
- CheckContractAdmissibility="True"
- CheckPurity="False"
- />
- <Config Name="Release"
- AllowUnsafeBlocks="false"
- BaseAddress="285212672"
- CheckForOverflowUnderflow="false"
- ConfigurationOverrideFile=""
- DefineConstants="TRACE"
- DocumentationFile=""
- DebugSymbols="false"
- FileAlignment="4096"
- IncrementalBuild="false"
- Optimize="true"
- OutputPath="bin\release"
- RegisterForComInterop="false"
- RemoveIntegerChecks="false"
- TreatWarningsAsErrors="false"
- WarningLevel="4"
- CheckContractAdmissibility="True"
- CheckPurity="False"
- />
- </Settings>
- <References>
- <Reference Name="System"
- AssemblyName="System"
- Private="false"
- />
- <Reference Name="System.Data"
- AssemblyName="System.Data"
- Private="false"
- />
- <Reference Name="System.Xml"
- AssemblyName="System.Xml"
- Private="false"
- />
- <Reference Name="Core"
- Project="{47BC34F1-A173-40BE-84C2-9332B4418387}"
- Private="true"
- />
- <Reference Name="VCGeneration"
- Project="{F65666DE-FB56-457C-8782-09BE243450FC}"
- Private="true"
- />
- <Reference Name="Simplify"
- Project="{F75666DE-FB56-457C-8782-09BE243450FC}"
- Private="true"
- />
- <Reference Name="AIFramework"
- Project="{24B55172-AD8B-47D1-8952-5A95CFDB9B31}"
- Private="true"
- />
- <Reference Name="AbsInt"
- Project="{11D06232-2039-4BCA-853B-C596E2A4EDB0}"
- Private="true"
- />
- <Reference Name="System.Compiler.Framework"
- AssemblyName="System.Compiler.Framework"
- Private="false"
- HintPath="../../Binaries/System.Compiler.Framework.dll"
- />
- <Reference Name="Z3"
- Project="{F75666DE-CD56-457C-8782-09BE243450FC}"
- Private="true"
- />
- </References>
- </Build>
- <Files>
- <Include>
- <File RelPath="Houdini.ssc"
- SubType="Code"
- BuildAction="Compile"
- />
- <File BuildAction="Compile"
- SubType="Code"
- RelPath="Checker.ssc"
- />
- <File BuildAction="Compile"
- SubType="Code"
- RelPath="..\version.ssc"
- />
- </Include>
- </Files>
- </XEN>
-</VisualStudioProject>
\ No newline at end of file |