From: bdemsky Date: Tue, 16 May 2006 00:32:37 +0000 (+0000) Subject: more changes X-Git-Tag: preEdgeChange~883 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=125d1d40b9d358f8bf40333f07b09b516a168a16;p=IRC.git more changes --- diff --git a/Robust/src/IR/Flat/BuildFlat.java b/Robust/src/IR/Flat/BuildFlat.java index 211dddc6..471b5fe0 100644 --- a/Robust/src/IR/Flat/BuildFlat.java +++ b/Robust/src/IR/Flat/BuildFlat.java @@ -531,7 +531,11 @@ public class BuildFlat { return new NodePair(cond.getBegin(),rnflat); } else return new NodePair(rnflat,rnflat); - + } + + private NodePair flattenTaskExitNode(TaskExitNode ten) { + FlatTaskExitNode tenflat=new FlatTaskExitNode(); + return new NodePair(tenflat,tenflat); } private NodePair flattenSubBlockNode(SubBlockNode sbn) { @@ -554,6 +558,9 @@ public class BuildFlat { case Kind.ReturnNode: return flattenReturnNode((IR.Tree.ReturnNode)bsn); + + case Kind.TaskExitNode: + return flattenTaskExitNode((IR.Tree.TaskExitNode)bsn); case Kind.SubBlockNode: return flattenSubBlockNode((SubBlockNode)bsn); diff --git a/Robust/src/IR/Flat/FKind.java b/Robust/src/IR/Flat/FKind.java index 4c700d43..292ed678 100644 --- a/Robust/src/IR/Flat/FKind.java +++ b/Robust/src/IR/Flat/FKind.java @@ -13,4 +13,5 @@ public class FKind { public static final int FlatNop=10; public static final int FlatSetElementNode=11; public static final int FlatElementNode=12; + public static final int FlatTaskExitNode=13; } diff --git a/Robust/src/IR/Flat/FlatTaskExitNode.java b/Robust/src/IR/Flat/FlatTaskExitNode.java new file mode 100644 index 00000000..c13d9ebd --- /dev/null +++ b/Robust/src/IR/Flat/FlatTaskExitNode.java @@ -0,0 +1,14 @@ +package IR.Flat; + +public class FlatTaskExitNode extends FlatNode { + public FlatTaskExitNode() { + } + + public int kind() { + return FKind.FlatTaskExitNode; + } + + public TempDescriptor [] readsTemps() { + return new TempDescriptor [0]; + } +} diff --git a/Robust/src/Makefile b/Robust/src/Makefile index 8bb5f886..bd748eb0 100644 --- a/Robust/src/Makefile +++ b/Robust/src/Makefile @@ -7,11 +7,12 @@ IR/Flat/FlatElementNode.class IR/Flat/FlatFieldNode.class \ IR/Flat/FlatLiteralNode.class IR/Flat/FlatMethod.class \ IR/Flat/FlatNew.class IR/Flat/FlatNode.class IR/Flat/FlatNop.class \ IR/Flat/FlatOpNode.class IR/Flat/FlatReturnNode.class \ -IR/Flat/FlatSetElementNode.class IR/Flat/FlatSetFieldNode.class \ -IR/Flat/NodePair.class IR/Flat/ParamsObject.class \ -IR/Flat/TempDescriptor.class IR/Flat/TempObject.class \ -IR/MethodDescriptor.class IR/NameDescriptor.class IR/Operation.class \ -IR/State.class IR/SymbolTable.class IR/TaskDescriptor.class \ +IR/Flat/FlatTaskExitNode.class IR/Flat/FlatSetElementNode.class \ +IR/Flat/FlatSetFieldNode.class IR/Flat/NodePair.class \ +IR/Flat/ParamsObject.class IR/Flat/TempDescriptor.class \ +IR/Flat/TempObject.class IR/MethodDescriptor.class \ +IR/NameDescriptor.class IR/Operation.class IR/State.class \ +IR/SymbolTable.class IR/TaskDescriptor.class \ IR/Tree/ArrayAccessNode.class IR/Tree/AssignmentNode.class \ IR/Tree/BlockExpressionNode.class IR/Tree/BlockNode.class \ IR/Tree/BlockStatementNode.class IR/Tree/BuildIR.class \