Skip to content
Snippets Groups Projects
Commit 80ba6abb authored by Mick Jordan's avatar Mick Jordan
Browse files

move FFI impls into separate project, establish dependency from engine for mx canon

parent 320e4e34
Branches
No related tags found
No related merge requests found
......@@ -44,6 +44,7 @@ import com.oracle.truffle.r.runtime.RContext.ConsoleHandler;
import com.oracle.truffle.r.runtime.REnvironment.PutException;
import com.oracle.truffle.r.runtime.data.*;
import com.oracle.truffle.r.runtime.rng.*;
import com.oracle.truffle.r.runtime.ffi.Load_RFFIFactory;
/**
* The engine for the FastR implementation. Handles parsing and evaluation. There is exactly one
......@@ -77,6 +78,7 @@ public final class REngine implements RContext.Engine {
childTimes = new long[]{0, 0};
Locale.setDefault(Locale.ROOT);
FastROptions.initialize();
Load_RFFIFactory.initialize();
RPerfAnalysis.initialize();
crashOnFatalError = crashOnFatalErrorArg;
builtinLookup = RBuiltinPackages.getInstance();
......
......@@ -106,7 +106,7 @@ project@com.oracle.truffle.r.nodes.processor@workingSets=Truffle,FastR
# com.oracle.truffle.r.nodes
project@com.oracle.truffle.r.nodes@sourceDirs=src
project@com.oracle.truffle.r.nodes@dependencies=com.oracle.truffle.api.dsl,com.oracle.truffle.r.parser,com.oracle.truffle.r.options
project@com.oracle.truffle.r.nodes@dependencies=com.oracle.truffle.r.options,com.oracle.truffle.api.dsl,com.oracle.truffle.r.parser,com.oracle.graal.debug
project@com.oracle.truffle.r.nodes@checkstyle=com.oracle.truffle.r.runtime
project@com.oracle.truffle.r.nodes@javaCompliance=1.8
project@com.oracle.truffle.r.nodes@annotationProcessors=com.oracle.truffle.dsl.processor,com.oracle.truffle.r.nodes.processor
......@@ -134,7 +134,7 @@ project@com.oracle.truffle.r.test.native@workingSets=FastR
# com.oracle.truffle.r.engine
project@com.oracle.truffle.r.engine@sourceDirs=src
project@com.oracle.truffle.r.engine@dependencies=com.oracle.truffle.r.nodes
project@com.oracle.truffle.r.engine@dependencies=com.oracle.truffle.r.nodes,com.oracle.truffle.r.runtime.ffi
project@com.oracle.truffle.r.engine@checkstyle=com.oracle.truffle.r.runtime
project@com.oracle.truffle.r.engine@javaCompliance=1.8
project@com.oracle.truffle.r.engine@workingSets=Truffle,FastR
......@@ -148,11 +148,18 @@ project@com.oracle.truffle.r.shell@workingSets=Truffle,FastR
# com.oracle.truffle.r.runtime
project@com.oracle.truffle.r.runtime@sourceDirs=src
project@com.oracle.truffle.r.runtime@dependencies=com.oracle.truffle.api,ASM_ANALYSIS,JNR_POSIX,ASM_UTIL,JFFI,JNR_FFI,NETLIB,JNR_CONSTANTS,JFFI_NATIVE,JNR_INVOKE,JNR_UDIS86,ASM,ASM_TREE,ASM_COMMONS,JNR_X86ASM,com.oracle.graal.runtime
project@com.oracle.truffle.r.runtime@dependencies=com.oracle.truffle.api,FINDBUGS
project@com.oracle.truffle.r.runtime@checkstyle=com.oracle.truffle.r.runtime
project@com.oracle.truffle.r.runtime@javaCompliance=1.8
project@com.oracle.truffle.r.runtime@workingSets=Truffle,FastR
# com.oracle.truffle.r.runtime.ffi
project@com.oracle.truffle.r.runtime.ffi@sourceDirs=src
project@com.oracle.truffle.r.runtime.ffi@dependencies=com.oracle.graal.runtime,com.oracle.truffle.r.runtime,ASM_ANALYSIS,JNR_POSIX,ASM_UTIL,JFFI,JNR_FFI,NETLIB,JNR_CONSTANTS,JFFI_NATIVE,JNR_INVOKE,JNR_UDIS86,ASM,ASM_TREE,ASM_COMMONS,JNR_X86ASM
project@com.oracle.truffle.r.runtime.ffi@checkstyle=com.oracle.truffle.r.runtime
project@com.oracle.truffle.r.runtime.ffi@javaCompliance=1.8
project@com.oracle.truffle.r.runtime.ffi@workingSets=Truffle,FastR
# com.oracle.truffle.r.native
project@com.oracle.truffle.r.native@sourceDirs=
project@com.oracle.truffle.r.native@native=true
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment