diff options
Diffstat (limited to 'chapter10a')
5 files changed, 16 insertions, 7 deletions
diff --git a/chapter10a/README.md b/chapter10a/README.md index 70a09f8d..47fd5ad6 100644 --- a/chapter10a/README.md +++ b/chapter10a/README.md @@ -37,7 +37,11 @@ different fields are independent. Chapter 10b will remove it. | `Store` | Memory, pointer, field name, value | The updated whole-memory state | | `Load` | Memory, pointer, field name | The value of the field | | `Start` | External entry | Control, initial memory, and `arg` | -| `Return` | Control, result, memory | Completion with all preceding effects retained | +| `Return` | Control, memory, result | Completion with all preceding effects retained | + +For nodes consuming or producing both control and memory, control occupies slot +0 and memory slot 1. Start's outputs are `{ctrl, $mem, arg}`; Return's inputs +are `{ctrl, $mem, result}`. The memory edge is a dependency, not a copy of the heap. The graph determines the legal execution order. In hardware, a Store updates physical memory diff --git a/chapter10a/src/main/java/com/seaofnodes/simple/node/ReturnNode.java b/chapter10a/src/main/java/com/seaofnodes/simple/node/ReturnNode.java index f13f3708..96d58599 100644 --- a/chapter10a/src/main/java/com/seaofnodes/simple/node/ReturnNode.java +++ b/chapter10a/src/main/java/com/seaofnodes/simple/node/ReturnNode.java @@ -4,15 +4,16 @@ import com.seaofnodes.simple.type.*; import java.util.BitSet; -/** Keeps the return value and all preceding memory effects alive. */ +/** Keeps all preceding memory effects and the return value alive: {ctrl, $mem, value}. */ public class ReturnNode extends Node { public ReturnNode(Node ctrl, Node data, ScopeNode scope) { - super(ctrl, data, scope.lookup("$mem")); + super(ctrl, scope.lookup("$mem"), data); } public Node ctrl() { return in(0); } - public Node expr() { return in(1); } + public Node mem () { return in(1); } + public Node expr() { return in(2); } @Override public String label() { return "Return"; } @@ -28,7 +29,8 @@ public class ReturnNode extends Node { @Override public Type compute() { - return TypeTuple.make(ctrl()._type,expr()._type); + // Return exposes the complete memory state. + return TypeTuple.make(ctrl()._type,TypeMem.BOT,expr()._type); } @Override diff --git a/chapter10a/src/main/java/com/seaofnodes/simple/print/SimpleGraphAdapter.java b/chapter10a/src/main/java/com/seaofnodes/simple/print/SimpleGraphAdapter.java index 5e21c852..600e9c73 100644 --- a/chapter10a/src/main/java/com/seaofnodes/simple/print/SimpleGraphAdapter.java +++ b/chapter10a/src/main/java/com/seaofnodes/simple/print/SimpleGraphAdapter.java @@ -52,7 +52,7 @@ public class SimpleGraphAdapter extends GraphAdapter<Node> { if( n instanceof ProjNode ) return n.isCFG() ? Role.CTRL : isMem(n) ? Role.MEM : Role.DATA; if( n instanceof RegionNode && i == 0 ) return Role.ASSOC; if( i == 0 || n instanceof RegionNode || n instanceof StopNode ) return Role.CTRL; - if( i == 1 && n instanceof MemOpNode || i == 2 && n instanceof ReturnNode ) return Role.MEM; + if( i == 1 && (n instanceof MemOpNode || n instanceof ReturnNode) ) return Role.MEM; Node def = n.in(i); if( def != null && isMem(def) ) return Role.MEM; return Role.DATA; diff --git a/chapter10a/src/test/java/com/seaofnodes/simple/Chapter04Test.java b/chapter10a/src/test/java/com/seaofnodes/simple/Chapter04Test.java index f1603cc4..edc62f50 100644 --- a/chapter10a/src/test/java/com/seaofnodes/simple/Chapter04Test.java +++ b/chapter10a/src/test/java/com/seaofnodes/simple/Chapter04Test.java @@ -85,6 +85,9 @@ public class Chapter04Test { ReturnNode ret = stop.ret(); assertTrue(ret.in(0) instanceof ProjNode); assertTrue(ret.in(1) instanceof ProjNode); + assertEquals(1, ((ProjNode)ret.in(1))._idx); + assertTrue(ret.in(2) instanceof ProjNode); + assertEquals(2, ((ProjNode)ret.in(2))._idx); } @Test diff --git a/chapter10a/src/test/java/com/seaofnodes/simple/evaluator/Evaluator.java b/chapter10a/src/test/java/com/seaofnodes/simple/evaluator/Evaluator.java index eaeb061b..bddcc596 100644 --- a/chapter10a/src/test/java/com/seaofnodes/simple/evaluator/Evaluator.java +++ b/chapter10a/src/test/java/com/seaofnodes/simple/evaluator/Evaluator.java @@ -162,7 +162,7 @@ public class Evaluator { case null: return Status.FALLTHROUGH; case ReturnNode ret: - return val(ret.in(1)); + return val(ret.expr()); case IfNode ifn: block = block.next()[isTrue(val(ifn.in(1))) ? 0 : 1]; if (block == null) return Status.FALLTHROUGH; |