Skip to content

Commit 53160fd

Browse files
author
Rajkumar Natarajan
committed
eta573 Rename core runtime ready for review
1 parent 01216f1 commit 53160fd

131 files changed

Lines changed: 253 additions & 312 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,9 @@ result
1818
utils/scripts/lib/
1919
release.log
2020
binaries/
21-
.gradle
21+
.gradle
22+
.idea
23+
rts/.classpath
24+
rts/.project
25+
rts/.settings/
26+
rts/rts.iml

rts/src/main/java/eta/runtime/stg/Closure.java renamed to rts/src/main/java/eta/Closure.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
package eta.runtime.stg;
1+
package eta;
22

3+
import eta.runtime.stg.StgContext;
34
import java.io.Serializable;
4-
5-
import eta.runtime.stg.Capability;
6-
import eta.runtime.stg.TSO;
7-
import eta.runtime.thunk.Thunk;
8-
95
import static eta.runtime.RuntimeLogging.barf;
106

117
public abstract class Closure implements Serializable {

rts/src/main/java/eta/runtime/stg/DataCon.java renamed to rts/src/main/java/eta/DataCon.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
package eta.runtime.stg;
1+
package eta;
2+
3+
import eta.runtime.stg.Print;
4+
import eta.runtime.stg.StgContext;
25

36
import static eta.runtime.RuntimeLogging.barf;
47

rts/src/main/java/eta/runtime/apply/Function.java renamed to rts/src/main/java/eta/Function.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
package eta.runtime.apply;
1+
package eta;
22

3+
import eta.runtime.apply.PAPSlow;
4+
import eta.runtime.apply.PAP1_1;
35
import eta.runtime.stg.Print;
4-
import eta.runtime.stg.Value;
5-
import eta.runtime.stg.Closure;
66
import eta.runtime.stg.StgContext;
77
import eta.runtime.stg.ArgumentStack;
8-
98
import static eta.runtime.RuntimeLogging.barf;
109

1110
public abstract class Function extends Value {

rts/src/main/java/eta/runtime/thunk/Thunk.java renamed to rts/src/main/java/eta/Thunk.java

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,21 @@
1-
package eta.runtime.thunk;
1+
package eta;
22

33
import java.lang.reflect.Field;
44
import java.util.Queue;
55
import java.util.concurrent.ConcurrentLinkedQueue;
66
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
7-
87
import eta.runtime.stg.Print;
9-
import eta.runtime.stg.Value;
10-
import eta.runtime.stg.Capability;
11-
import eta.runtime.stg.Closure;
8+
import eta.runtime.Capability;
129
import eta.runtime.stg.StgContext;
1310
import eta.runtime.stg.TSO;
11+
import eta.runtime.thunk.*;
1412
import eta.runtime.util.UnsafeUtil;
15-
import eta.runtime.message.MessageBlackHole;
16-
import eta.runtime.exception.Exception;
17-
import eta.runtime.exception.EtaException;
13+
import eta.exception.Exception;
14+
import eta.exception.EtaException;
1815
import eta.runtime.exception.EtaAsyncException;
1916
import eta.runtime.exception.Raise;
2017
import eta.runtime.exception.StgException;
2118
import static eta.runtime.util.UnsafeUtil.UNSAFE;
22-
import static eta.runtime.RuntimeLogging.barf;
2319
import static eta.runtime.stg.TSO.WhyBlocked.*;
2420

2521
public abstract class Thunk extends Closure {
@@ -279,7 +275,7 @@ protected static boolean handleException(StgContext context, java.lang.Exception
279275
if (raise == null) {
280276
context.raise = raise = new Raise(((EtaException) thrw).exception);
281277
}
282-
ui.updatee.updateCode(context, raise);
278+
ui.getUpdatee().updateCode(context, raise);
283279
} //TODO: Handle EtaAsyncExceptions?
284280
throw thrw;
285281
}

rts/src/main/java/eta/runtime/thunk/UpdatableThunk.java renamed to rts/src/main/java/eta/UpdatableThunk.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package eta.runtime.thunk;
1+
package eta;
22

3-
import eta.runtime.stg.Closure;
43
import eta.runtime.stg.StgContext;
4+
import eta.runtime.thunk.UpdateInfo;
55

66
public abstract class UpdatableThunk extends Thunk {
77

@@ -28,7 +28,7 @@ public final Closure evaluate(StgContext context) {
2828
context.popUpdate();
2929
context.trampoline = trampoline;
3030
}
31-
if (ui.marked) {
31+
if (ui.isMarked()) {
3232
return updateCode(context, result);
3333
} else {
3434
updateWithIndirection(result);

rts/src/main/java/eta/runtime/stg/Value.java renamed to rts/src/main/java/eta/Value.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
package eta.runtime.stg;
1+
package eta;
22

3+
import eta.runtime.stg.StgContext;
34
import static eta.runtime.RuntimeLogging.barf;
45

56
public abstract class Value extends Closure {

rts/src/main/java/eta/runtime/exception/EtaException.java renamed to rts/src/main/java/eta/exception/EtaException.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
package eta.runtime.exception;
1+
package eta.exception;
22

3-
import eta.runtime.stg.Closure;
3+
import eta.Closure;
4+
import eta.runtime.exception.StgException;
45
import eta.runtime.stg.Closures;
56

67
public class EtaException extends StgException {

rts/src/main/java/eta/runtime/exception/Exception.java renamed to rts/src/main/java/eta/exception/Exception.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
package eta.runtime.exception;
1+
package eta.exception;
22

33
import java.util.Arrays;
4-
import java.util.ListIterator;
5-
6-
import eta.runtime.stg.Capability;
4+
import eta.Closure;
5+
import eta.runtime.exception.StgException;
6+
import eta.runtime.exception.EtaAsyncException;
7+
import eta.runtime.Capability;
78
import eta.runtime.stg.TSO;
8-
import eta.runtime.stg.Closure;
99
import eta.runtime.stg.Closures;
1010
import eta.runtime.stg.StgContext;
1111
import eta.runtime.thunk.UpdateInfo;
12-
1312
import eta.runtime.Runtime;
1413
import eta.runtime.message.MessageBlackHole;
1514
import eta.runtime.message.MessageThrowTo;

rts/src/main/java/eta/runtime/stg/Capability.java renamed to rts/src/main/java/eta/runtime/Capability.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package eta.runtime.stg;
1+
package eta.runtime;
22

33
import java.util.List;
44
import java.util.LinkedList;
@@ -12,15 +12,11 @@
1212
import java.util.concurrent.locks.LockSupport;
1313
import java.util.concurrent.atomic.AtomicBoolean;
1414
import java.util.concurrent.atomic.AtomicInteger;
15-
1615
import java.lang.ref.WeakReference;
17-
18-
import eta.runtime.Runtime;
19-
import eta.runtime.io.IO;
2016
import eta.runtime.io.MemoryManager;
2117
import eta.runtime.concurrent.Concurrent;
2218
import eta.runtime.concurrent.WorkerThread;
23-
import eta.runtime.exception.Exception;
19+
import eta.exception.Exception;
2420
import eta.runtime.exception.FiberYieldException;
2521
import eta.runtime.interpreter.Interpreter;
2622
import eta.runtime.message.Message;
@@ -29,12 +25,15 @@
2925
import eta.runtime.message.MessageShutdown;
3026
import eta.runtime.message.MessageWakeup;
3127
import eta.runtime.parallel.Parallel;
28+
import eta.Closure;
29+
import eta.runtime.stg.Closures;
30+
import eta.runtime.stg.StgContext;
31+
import eta.runtime.stg.TSO;
3232
import eta.runtime.storage.Block;
3333
import eta.runtime.storage.LocalHeap;
3434
import eta.runtime.thunk.BlockingQueue;
35-
import eta.runtime.thunk.Thunk;
35+
import eta.Thunk;
3636
import eta.runtime.thunk.UpdateInfo;
37-
import eta.runtime.thunk.WhiteHole;
3837
import eta.runtime.util.MPSCLongQueue;
3938
import static eta.runtime.stg.TSO.*;
4039
import static eta.runtime.stg.TSO.WhatNext;

0 commit comments

Comments
 (0)