Skip to content
Snippets Groups Projects
Commit 162d52cb authored by Adam Welc's avatar Adam Welc
Browse files

Merge pull request #90 in G/fastr from...

Merge pull request #90 in G/fastr from ~ADAM.WELC_ORACLE.COM/fastr:feature/running_svm_app to master

* commit '530c6eb7':
  Fixed compilation problem by putting methods beyond Truffle boundary that should be there in any case.
parents 78ecf6bc 530c6eb7
Branches
No related tags found
No related merge requests found
......@@ -11,6 +11,7 @@
*/
package com.oracle.truffle.r.runtime.rng.mm;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.r.runtime.rng.RNGInitAdapter;
import com.oracle.truffle.r.runtime.rng.RRNG;
import com.oracle.truffle.r.runtime.rng.RRNG.Kind;
......@@ -21,6 +22,7 @@ import com.oracle.truffle.r.runtime.rng.RRNG.Kind;
public final class MarsagliaMulticarry extends RNGInitAdapter {
@Override
@TruffleBoundary
public void init(int seedParam) {
int seed = seedParam;
for (int i = 0; i < getNSeed(); i++) {
......@@ -31,6 +33,7 @@ public final class MarsagliaMulticarry extends RNGInitAdapter {
}
@Override
@TruffleBoundary
public void fixupSeeds(boolean initial) {
if (iSeed[0] == 0) {
iSeed[0] = 1;
......
......@@ -122,6 +122,7 @@ public final class MersenneTwister extends RNGInitAdapter {
*
*/
@Override
@TruffleBoundary
public void init(int seedParam) {
int seed = seedParam;
for (int i = 0; i < getNSeed(); i++) {
......@@ -132,6 +133,7 @@ public final class MersenneTwister extends RNGInitAdapter {
}
@Override
@TruffleBoundary
public void fixupSeeds(boolean initial) {
if (initial) {
iSeed[0] = N;
......
......@@ -22,6 +22,7 @@
*/
package com.oracle.truffle.r.runtime.rng.user;
import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
import com.oracle.truffle.r.runtime.RError;
import com.oracle.truffle.r.runtime.ffi.DLL;
import com.oracle.truffle.r.runtime.ffi.DLL.DLLInfo;
......@@ -47,6 +48,7 @@ public final class UserRNG extends RNGInitAdapter {
private int nSeeds = 0;
@Override
@TruffleBoundary
public void init(int seed) {
DLLInfo dllInfo = DLL.findLibraryContainingSymbol(USER_UNIF_RAND);
if (dllInfo == null) {
......@@ -86,6 +88,7 @@ public final class UserRNG extends RNGInitAdapter {
}
@Override
@TruffleBoundary
public void fixupSeeds(boolean initial) {
// no fixup
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment