Eta573

.gitignore

@@ -18,4 +18,9 @@ result
 utils/scripts/lib/
 release.log
 binaries/
-.gradle
+.gradle
+.idea
+rts/.classpath
+rts/.project
+rts/.settings/
+rts/rts.iml

compiler/ETA/CodeGen/Closure.hs

@@ -61,20 +61,21 @@ lfStandardForm args fvs
 
 lfClass :: Bool -> Int -> Int -> LambdaFormInfo -> Text
 lfClass hasStdLayout _arity fvs (LFThunk {..}) =
-  "eta/runtime/thunk/" <> thunkBase <> thunkExt
+  "eta/" <> thunkBase <> thunkExt
   where thunkBase
-          | isTopLevel lfTopLevelFlag = "CAF"
+          | isTopLevel lfTopLevelFlag = "runtime/thunk/CAF"
           | lfUpdatable               = "UpdatableThunk"
-          | otherwise                 = "SingleEntryThunk"
+          | otherwise                 = "runtime/thunk/SingleEntryThunk"
         thunkExt
           | isTopLevel lfTopLevelFlag = mempty
-          | hasStdLayout = T.pack (show fvs)
+          | hasStdLayout = T.pack ((++) (show fvs) "runtime/thunk/")
           | otherwise = mempty
+
 lfClass hasStdLayout args fvs (LFReEntrant {..})
-  = stgFun <> funExt
+  = "eta/runtime/apply/Function" <> funExt
   where funExt
           | hasStdLayout = T.pack (show args) <> fvsText
-          | args <= 6    = T.pack (show args)
+          | args <= 6    = T.pack ((show args))
           | otherwise    = mempty
         fvsText
           | fvs > 0   = "_" <> T.pack (show fvs)

compiler/ETA/CodeGen/Layout.hs

@@ -230,7 +230,7 @@ slowCall dflags loadContext fun argFtCodes
   where n            = length argFtCodes
         ft           = locFt fun
         code         = loadLoc fun
-        realCls      = fromMaybe stgClosure $ locClass fun
+        realCls      = fromMaybe etaClosure $ locClass fun
         (arity, fts) = slowCallPattern $ map (\(a,_,_) -> a) argFtCodes
         slowCode     = directCall' loadContext True True realCls
                          (mkApFast arity realCls fts)
@@ -239,7 +239,7 @@ slowCall dflags loadContext fun argFtCodes
 directCall :: Code -> Type -> CgLoc -> RepArity -> [(ArgRep, Maybe FieldType, Maybe Code)] -> (Code, Maybe Code)
 directCall loadContext funType fun arity argFtCodes
   | Just staticCode <- loadStaticMethod fun argFts
-  = directCall' loadContext True True stgClosure
+  = directCall' loadContext True True etaClosure
       staticCode arity ((P, Nothing, Nothing):argFtCodes)
   | arity' == arity =
     directCall' loadContext True True realCls (mkApFast arity' realCls fts) arity'
@@ -249,7 +249,7 @@ directCall loadContext funType fun arity argFtCodes
         code         = loadLoc fun
         ft           = locFt fun
         entryCode    = enterMethod loadContext fun
-        realCls      = fromMaybe stgClosure $ locClass fun
+        realCls      = fromMaybe etaClosure $ locClass fun
         argFts'      = catMaybes . take arity $ map (\(_,ft,_) -> ft) argFtCodes
         -- All this logic is to get around some weird issues with
         -- the java monad type inlining. Ideally, argFts = staticFts
@@ -308,7 +308,7 @@ genApplyCall :: Code -> Int -> [FieldType] -> [(ArgRep, Maybe FieldType, Maybe C
 genApplyCall loadContext arity fts args =
      loadContext
   <> fold loadCodes
-  <> mkApFast arity stgClosure fts
+  <> mkApFast arity etaClosure fts
   where loadCodes = mapMaybe (\(_, _, a) -> a) args
 
 getRepFtCodes :: [StgArg] -> CodeGen [(ArgRep, Maybe FieldType, Maybe Code)]

compiler/ETA/CodeGen/Main.hs

@@ -246,7 +246,7 @@ externaliseId _dflags id = do
 cgTyCon :: TyCon -> CodeGen ()
 cgTyCon tyCon = unless (null dataCons) $ do
     dflags <- getDynFlags
-    (_, CgState {..}) <- newTypeClosure (tyConClass dflags tyCon) stgConstr
+    (_, CgState {..}) <- newTypeClosure (tyConClass dflags tyCon) etaDataCon
     mapM_ (cgDataCon cgClassName) dataCons
     when (isEnumerationTyCon tyCon) $
       cgEnumerationTyCon cgClassName tyCon

compiler/ETA/CodeGen/Rts.hs

@@ -15,8 +15,10 @@ import qualified Data.Text as T
 merge :: Text -> Text -> Text
 merge x y = T.append x . T.cons '/' $ y
 
-rts, apply, thunk, stg, exception, io, util, stm, par, interp, conc :: Text -> Text
+rts, eta, etaex, apply, thunk, stg, exception, io, util, stm, par, interp, conc :: Text -> Text
 rts       = merge "eta/runtime"
+eta       = merge "eta"
+etaex     = merge "eta/exception"
 apply     = merge (rts "apply")
 thunk     = merge (rts "thunk")
 stg       = merge (rts "stg")
@@ -32,16 +34,16 @@ closureType, indStaticType, contextType, capabilityType, taskType, funType, tsoT
   frameType, conType, thunkType, rtsConfigType, exitCodeType,
   rtsOptsEnbledType, stgArrayType, stgByteArrayType, stgMutVarType, stgMVarType,
   hsResultType, stgTVarType, stgBCOType, stgWeakType :: FieldType
-closureType       = obj stgClosure
+closureType       = obj etaClosure
 indStaticType     = obj stgIndStatic
 contextType       = obj stgContext
 capabilityType    = obj capability
 taskType          = obj task
-funType           = obj stgFun
+funType           = obj etaFun
 tsoType           = obj stgTSO
 frameType         = obj stackFrame
-conType           = obj stgConstr
-thunkType         = obj stgThunk
+conType           = obj etaDataCon
+thunkType         = obj etaThunk
 rtsConfigType     = obj rtsConfig
 rtsOptsEnbledType = obj rtsOptsEnbled
 exitCodeType      = obj exitCode
@@ -54,19 +56,19 @@ hsResultType      = obj hsResult
 stgBCOType        = obj stgBCO
 stgWeakType       = obj stgWeak
 
-stgConstr, stgClosure, stgContext, capability, task, stgInd, stgIndStatic, stgThunk,
-  stgFun, stgTSO, stackFrame, rtsConfig, rtsOptsEnbled, exitCode, stgArray,
+etaDataCon, etaClosure, stgContext, capability, task, stgInd, stgIndStatic, etaThunk,
+  etaFun, stgTSO, stackFrame, rtsConfig, rtsOptsEnbled, exitCode, stgArray,
   stgByteArray, rtsUnsigned, stgMutVar, stgMVar, stgTVar, rtsGroup, hsResult,
   stgBCO, stgWeak :: Text
-stgConstr     = stg "DataCon"
-stgClosure    = stg "Closure"
+etaDataCon    = eta "DataCon"
+etaClosure    = eta "Closure"
 stgContext    = stg "StgContext"
-capability    = stg "Capability"
+capability    = rts "Capability"
 task          = stg "Task"
-stgInd        = thunk "UpdatableThunk"
+stgInd        = eta "UpdatableThunk"
 stgIndStatic  = thunk "CAF"
-stgThunk      = thunk "Thunk"
-stgFun        = apply "Function"
+etaThunk      = eta  "Thunk"
+etaFun        = eta "Function"
 stgTSO        = stg "TSO"
 stackFrame    = stg "StackFrame"
 rtsConfig     = rts "RtsConfig"
@@ -206,14 +208,15 @@ resumeInterruptsMethod :: Code
 resumeInterruptsMethod =
   invokevirtual $ mkMethodRef stgTSO "resumeInterrupts" [jbool] void
 
-stgExceptionGroup, ioGroup, stmGroup, concGroup, parGroup, interpGroup, stgGroup :: Text
+stgExceptionGroup, ioGroup, stmGroup, concGroup, parGroup, interpGroup, stgGroup, applyGroup :: Text
 stgExceptionGroup = exception "Exception"
 ioGroup = io "IO"
 stmGroup = stm "STM"
 concGroup = conc "Concurrent"
 stgGroup = stg "Stg"
 parGroup = par "Parallel"
 interpGroup = interp "Interpreter"
+applyGroup = apply "Apply"
 
 -- Types
 byteArrayBuf :: Code
@@ -275,7 +278,7 @@ getTagMethod :: Code -> Code
 getTagMethod code
   = code
  <> gconv closureType conType
- <> invokevirtual (mkMethodRef stgConstr "getTag" [] (ret jint))
+ <> invokevirtual (mkMethodRef etaDataCon "getTag" [] (ret jint))
 
 printStream :: Text
 printStream = "java/io/PrintStream"

compiler/ETA/CodeGen/Types.hs

@@ -328,15 +328,15 @@ enterMethod loadContext cgLoc
  <> gconv closureType (obj closureCls)
  <> loadContext
  <> invokevirtual (mkMethodRef closureCls "enter" [contextType] (ret closureType))
- where closureCls = fromMaybe stgClosure (locClass cgLoc)
+ where closureCls = fromMaybe etaClosure (locClass cgLoc)
 
 evaluateMethod :: Code -> CgLoc -> Code
 evaluateMethod loadContext cgLoc
   = loadLoc cgLoc
  <> gconv closureType (obj closureCls)
  <> loadContext
  <> invokevirtual (mkMethodRef closureCls "evaluate" [contextType] (ret closureType))
- where closureCls = fromMaybe stgClosure (locClass cgLoc)
+ where closureCls = fromMaybe etaClosure (locClass cgLoc)
 
 type RecIndexes = [(Int, Id)]
 type RecInfo = (Text, Text, Text, FieldRef, Code, RecIndexes)

libraries/base/java-utils/Utils.java

@@ -6,13 +6,11 @@
 import java.util.Set;
 import java.util.List;
 import java.util.HashSet;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
-
 import java.nio.ByteOrder;
 import java.nio.ByteBuffer;
 import java.nio.file.Files;
@@ -35,20 +33,17 @@
 import java.nio.channels.WritableByteChannel;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-
 import eta.runtime.Runtime;
 import eta.runtime.RuntimeLogging;
 import eta.runtime.stg.TSO;
 import eta.runtime.stg.StgContext;
-import eta.runtime.stg.Closure;
-import eta.runtime.stg.Capability;
+import eta.Closure;
+import eta.runtime.Capability;
 import eta.runtime.io.MemoryManager;
-
 import ghc_prim.ghc.types.datacons.Czh;
 import ghc_prim.ghc.types.datacons.ZC;
 import ghc_prim.ghc.types.tycons.ZMZN;
 import ghc_prim.ghc.Types;
-
 import java.lang.management.ManagementFactory;
 import com.sun.management.OperatingSystemMXBean;
 

libraries/ghc-prim/java/Utils.java

@@ -1,7 +1,6 @@
 package eta.ghc_prim;
 
 import java.nio.ByteBuffer;
-
 import eta.runtime.io.MemoryManager;
 
 public class Utils {

libraries/integer/java/Utils.java

@@ -2,7 +2,7 @@
 
 import java.math.BigInteger;
 import eta.runtime.stg.StgContext;
-import eta.runtime.stg.Closure;
+import eta.Closure;
 
 public class Utils {
     /**

rts/src/main/java/eta/runtime/stg/Closure.java → rts/src/main/java/eta/Closure.java

@@ -1,11 +1,7 @@
-package eta.runtime.stg;
+package eta;
 
+import eta.runtime.stg.StgContext;
 import java.io.Serializable;
-
-import eta.runtime.stg.Capability;
-import eta.runtime.stg.TSO;
-import eta.runtime.thunk.Thunk;
-
 import static eta.runtime.RuntimeLogging.barf;
 
 public abstract class Closure implements Serializable {

rts/src/main/java/eta/runtime/stg/DataCon.java → rts/src/main/java/eta/DataCon.java

@@ -1,4 +1,7 @@
-package eta.runtime.stg;
+package eta;
+
+import eta.runtime.stg.Print;
+import eta.runtime.stg.StgContext;
 
 import static eta.runtime.RuntimeLogging.barf;
 

rts/src/main/java/eta/runtime/apply/Function.java → rts/src/main/java/eta/Function.java

@@ -1,11 +1,10 @@
-package eta.runtime.apply;
+package eta;
 
+import eta.runtime.apply.PAPSlow;
+import eta.runtime.apply.PAP1_1;
 import eta.runtime.stg.Print;
-import eta.runtime.stg.Value;
-import eta.runtime.stg.Closure;
 import eta.runtime.stg.StgContext;
 import eta.runtime.stg.ArgumentStack;
-
 import static eta.runtime.RuntimeLogging.barf;
 
 public abstract class Function extends Value {

rts/src/main/java/eta/runtime/thunk/Thunk.java → rts/src/main/java/eta/Thunk.java

@@ -1,25 +1,21 @@
-package eta.runtime.thunk;
+package eta;
 
 import java.lang.reflect.Field;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
-
 import eta.runtime.stg.Print;
-import eta.runtime.stg.Value;
-import eta.runtime.stg.Capability;
-import eta.runtime.stg.Closure;
+import eta.runtime.Capability;
 import eta.runtime.stg.StgContext;
 import eta.runtime.stg.TSO;
+import eta.runtime.thunk.*;
 import eta.runtime.util.UnsafeUtil;
-import eta.runtime.message.MessageBlackHole;
-import eta.runtime.exception.Exception;
-import eta.runtime.exception.EtaException;
+import eta.exception.Exception;
+import eta.exception.EtaException;
 import eta.runtime.exception.EtaAsyncException;
 import eta.runtime.exception.Raise;
 import eta.runtime.exception.StgException;
 import static eta.runtime.util.UnsafeUtil.UNSAFE;
-import static eta.runtime.RuntimeLogging.barf;
 import static eta.runtime.stg.TSO.WhyBlocked.*;
 
 public abstract class Thunk extends Closure {
@@ -279,7 +275,7 @@ protected static boolean handleException(StgContext context, java.lang.Exception
             if (raise == null) {
                 context.raise = raise = new Raise(((EtaException) thrw).exception);
             }
-            ui.updatee.updateCode(context, raise);
+            ui.getUpdatee().updateCode(context, raise);
         } //TODO: Handle EtaAsyncExceptions?
         throw thrw;
     }

rts/src/main/java/eta/runtime/thunk/UpdatableThunk.java → rts/src/main/java/eta/UpdatableThunk.java

@@ -1,7 +1,7 @@
-package eta.runtime.thunk;
+package eta;
 
-import eta.runtime.stg.Closure;
 import eta.runtime.stg.StgContext;
+import eta.runtime.thunk.UpdateInfo;
 
 public abstract class UpdatableThunk extends Thunk {
 
@@ -28,7 +28,7 @@ public final Closure evaluate(StgContext context) {
                     context.popUpdate();
                     context.trampoline = trampoline;
                 }
-                if (ui.marked) {
+                if (ui.isMarked()) {
                     return updateCode(context, result);
                 } else {
                     updateWithIndirection(result);

rts/src/main/java/eta/runtime/stg/Value.java → rts/src/main/java/eta/Value.java

@@ -1,5 +1,6 @@
-package eta.runtime.stg;
+package eta;
 
+import eta.runtime.stg.StgContext;
 import static eta.runtime.RuntimeLogging.barf;
 
 public abstract class Value extends Closure {

rts/src/main/java/eta/runtime/exception/EtaException.java → rts/src/main/java/eta/exception/EtaException.java

@@ -1,6 +1,7 @@
-package eta.runtime.exception;
+package eta.exception;
 
-import eta.runtime.stg.Closure;
+import eta.Closure;
+import eta.runtime.exception.StgException;
 import eta.runtime.stg.Closures;
 
 public class EtaException extends StgException {

rts/src/main/java/eta/runtime/exception/Exception.java → rts/src/main/java/eta/exception/Exception.java

@@ -1,15 +1,14 @@
-package eta.runtime.exception;
+package eta.exception;
 
 import java.util.Arrays;
-import java.util.ListIterator;
-
-import eta.runtime.stg.Capability;
+import eta.Closure;
+import eta.runtime.exception.StgException;
+import eta.runtime.exception.EtaAsyncException;
+import eta.runtime.Capability;
 import eta.runtime.stg.TSO;
-import eta.runtime.stg.Closure;
 import eta.runtime.stg.Closures;
 import eta.runtime.stg.StgContext;
 import eta.runtime.thunk.UpdateInfo;
-
 import eta.runtime.Runtime;
 import eta.runtime.message.MessageBlackHole;
 import eta.runtime.message.MessageThrowTo;