From: bdemsky Date: Thu, 1 Oct 2009 05:21:23 +0000 (+0000) Subject: changes for sandboxing X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8930502ab387ab9234429e70180c68b7263c5444;p=IRC.git changes for sandboxing --- diff --git a/Robust/src/IR/Flat/BuildCode.java b/Robust/src/IR/Flat/BuildCode.java index 8360a637..3341552b 100644 --- a/Robust/src/IR/Flat/BuildCode.java +++ b/Robust/src/IR/Flat/BuildCode.java @@ -2870,7 +2870,7 @@ public class BuildCode { output.println("transstart"+faen.getIdentifier()+":"); output.println("transStart();"); - if (state.ABORTREADERS) { + if (state.ABORTREADERS||state.SANDBOX) { output.println("if (_setjmp(aborttrans)) {"); output.println(" goto transretry"+faen.getIdentifier()+"; }"); } diff --git a/Robust/src/IR/State.java b/Robust/src/IR/State.java index edcb828c..dfb49813 100644 --- a/Robust/src/IR/State.java +++ b/Robust/src/IR/State.java @@ -89,6 +89,7 @@ public class State { public static boolean ABORTREADERS=false; public static boolean SINGLETM=false; public static boolean READSET=false; + public boolean SANDBOX=false; public int CORENUM = 1; public String structfile; public String main; diff --git a/Robust/src/Main/Main.java b/Robust/src/Main/Main.java index ce1a5de9..4e90919f 100644 --- a/Robust/src/Main/Main.java +++ b/Robust/src/Main/Main.java @@ -111,6 +111,8 @@ public class Main { state.TASK=true; else if (option.equals("-abortreaders")) state.ABORTREADERS=true; + else if (option.equals("-sandbox")) + state.SANDBOX=true; else if (option.equals("-taskstate")) state.TASKSTATE=true; else if (option.equals("-tagstate"))