diff --git a/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/graphics/RGraphics.java b/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/graphics/RGraphics.java
index 4338551854e3883f72824d00df9435b1796a3a3f..10857927267401ec2e6b7cf63bd739b0a9e5848a 100644
--- a/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/graphics/RGraphics.java
+++ b/com.oracle.truffle.r.library/src/com/oracle/truffle/r/library/graphics/RGraphics.java
@@ -15,9 +15,14 @@
package com.oracle.truffle.r.library.graphics;
import com.oracle.truffle.r.library.graphics.core.*;
+import com.oracle.truffle.r.runtime.FastROptions;
import com.oracle.truffle.r.runtime.context.*;
import com.oracle.truffle.r.runtime.data.*;
import com.oracle.truffle.r.runtime.env.*;
+import com.oracle.truffle.r.runtime.ffi.CallRFFI;
+import com.oracle.truffle.r.runtime.ffi.DLL;
+import com.oracle.truffle.r.runtime.ffi.DLL.SymbolInfo;
+import com.oracle.truffle.r.runtime.ffi.RFFIFactory;
/**
* A placeholder to keep {@code REngine} limited to calling the {@link #initialize} method. It sets
@@ -36,11 +41,16 @@ public class RGraphics {
private static final String DOT_DEVICES = ".Devices";
public static void initialize() {
- REnvironment baseEnv = REnvironment.baseEnv();
- baseEnv.safePut(DOT_DEVICE, NULL_DEVICE);
- RPairList devices = RDataFactory.createPairList(NULL_DEVICE);
- baseEnv.safePut(DOT_DEVICES, devices);
- registerBaseGraphicsSystem();
+ if (FastROptions.UseInternalGraphics) {
+ REnvironment baseEnv = REnvironment.baseEnv();
+ baseEnv.safePut(DOT_DEVICE, NULL_DEVICE);
+ RPairList devices = RDataFactory.createPairList(NULL_DEVICE);
+ baseEnv.safePut(DOT_DEVICES, devices);
+ registerBaseGraphicsSystem();
+ } else {
+ SymbolInfo symbolInfo = DLL.findSymbolInfo("InitGraphics", null);
+ RFFIFactory.getRFFI().getCRFFI().invoke(symbolInfo.address, new Object[0]);
+ }
}
private static void registerBaseGraphicsSystem() {
diff --git a/com.oracle.truffle.r.native/fficall/jni/src/graphicsengine.c b/com.oracle.truffle.r.native/fficall/jni/src/graphicsengine.c
deleted file mode 100644
index e33fd21b515251a057fb4d3338312f175d8a4da7..0000000000000000000000000000000000000000
--- a/com.oracle.truffle.r.native/fficall/jni/src/graphicsengine.c
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
- * Copyright (c) 2015, 2015, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-// For now, failing implementations of the functions from GnuR src/main/engine.c
-
-#include "rffiutils.h"
-#include <GraphicsEngine.h>
-
-void init_graphicsengine(JNIEnv *env) {
-}
-
-R_GE_lineend GE_LENDpar(SEXP value, int ind) {
- return (R_GE_lineend) unimplemented("GE_LENDpar");
-}
-
-SEXP GE_LENDget(R_GE_lineend lend) {
- return (SEXP) unimplemented("GE_LENDget");
-}
-
-R_GE_linejoin GE_LJOINpar(SEXP value, int ind) {
- return (R_GE_linejoin) unimplemented("GE_LJOINpar");
-}
-
-SEXP GE_LJOINget(R_GE_linejoin ljoin) {
- return (SEXP) unimplemented("GE_LJOINget");
-}
-
-
-void GESetClip(double x1, double y1, double x2, double y2, pGEDevDesc dd) {
- unimplemented("GESetClip");
-}
-
-void GENewPage(const pGEcontext gc, pGEDevDesc dd) {
- unimplemented("GENewPage");
-}
-
-void GELine(double x1, double y1, double x2, double y2,
- const pGEcontext gc, pGEDevDesc dd) {
- unimplemented("GELine");
-}
-
-void GEPolyline(int n, double *x, double *y,
- const pGEcontext gc, pGEDevDesc dd) {
- unimplemented("GEPolyline");
-}
-
-void GEPolygon(int n, double *x, double *y,
- const pGEcontext gc, pGEDevDesc dd) {
- unimplemented("GEPolygon");
-}
-
-SEXP GEXspline(int n, double *x, double *y, double *s, Rboolean open,
- Rboolean repEnds, Rboolean draw,
- const pGEcontext gc, pGEDevDesc dd) {
- return (SEXP) unimplemented("GEXspline");
-}
-
-void GECircle(double x, double y, double radius,
- const pGEcontext gc, pGEDevDesc dd) {
- unimplemented("");
-}
-
-void GERect(double x0, double y0, double x1, double y1,
- const pGEcontext gc, pGEDevDesc dd) {
- unimplemented("GECircle");
-}
-
-void GEPath(double *x, double *y,
- int npoly, int *nper,
- Rboolean winding,
- const pGEcontext gc, pGEDevDesc dd) {
- unimplemented("GEPath");
-}
-
-void GERaster(unsigned int *raster, int w, int h,
- double x, double y, double width, double height,
- double angle, Rboolean interpolate,
- const pGEcontext gc, pGEDevDesc dd) {
- unimplemented("GERaster");
-}
-
-SEXP GECap(pGEDevDesc dd) {
- return (SEXP) unimplemented("GECap");
-}
-
-void GEText(double x, double y, const char * const str, cetype_t enc,
- double xc, double yc, double rot,
- const pGEcontext gc, pGEDevDesc dd) {
- unimplemented("GEText");
-}
-
-void GEMode(int mode, pGEDevDesc dd) {
- unimplemented("GEText");
-}
-
-void GESymbol(double x, double y, int pch, double size,
- const pGEcontext gc, pGEDevDesc dd) {
- unimplemented("GESymbol");
-}
-
-void GEPretty(double *lo, double *up, int *ndiv) {
- unimplemented("GEPretty");
-}
-
-void GEMetricInfo(int c, const pGEcontext gc,
- double *ascent, double *descent, double *width,
- pGEDevDesc dd) {
- unimplemented("GEPretty");
-}
-
-double GEStrWidth(const char *str, cetype_t enc,
- const pGEcontext gc, pGEDevDesc dd) {
- unimplemented("GEStrWidth");
- return 0.0;
-}
-
-double GEStrHeight(const char *str, cetype_t enc,
- const pGEcontext gc, pGEDevDesc dd) {
- unimplemented("GEStrHeight");
- return 0.0;
-}
-
-void GEStrMetric(const char *str, cetype_t enc, const pGEcontext gc,
- double *ascent, double *descent, double *width,
- pGEDevDesc dd) {
- unimplemented("GEStrMetric");
-}
-
-int GEstring_to_pch(SEXP pch) {
- return (int) unimplemented("GEstring_to_pch");
-}
-
-unsigned int GE_LTYpar(SEXP x, int y) {
- unimplemented("GE_LTYpar");
- return 0;
-}
-
-SEXP GE_LTYget(unsigned int x) {
- return (SEXP) unimplemented("GE_LTYget");
-}
-
-void R_GE_rasterScale(unsigned int *sraster, int sw, int sh,
- unsigned int *draster, int dw, int dh) {
- unimplemented("R_GE_rasterScale");
-}
-
-void R_GE_rasterInterpolate(unsigned int *sraster, int sw, int sh,
- unsigned int *draster, int dw, int dh) {
- unimplemented("R_GE_rasterInterpolate");
-}
-
-void R_GE_rasterRotatedSize(int w, int h, double angle,
- int *wnew, int *hnew) {
- unimplemented("R_GE_rasterRotatedSize");
-}
-
-void R_GE_rasterRotatedOffset(int w, int h, double angle, int botleft,
- double *xoff, double *yoff) {
- unimplemented("R_GE_rasterRotatedOffset");
-}
-
-void R_GE_rasterResizeForRotation(unsigned int *sraster,
- int w, int h,
- unsigned int *newRaster,
- int wnew, int hnew,
- const pGEcontext gc) {
- unimplemented("R_GE_rasterResizeForRotation");
-}
-
-void R_GE_rasterRotate(unsigned int *sraster, int w, int h, double angle,
- unsigned int *draster, const pGEcontext gc,
- Rboolean perPixelAlpha) {
- unimplemented("R_GE_rasterRotate");
-}
-
-double GEExpressionWidth(SEXP expr,
- const pGEcontext gc, pGEDevDesc dd) {
- unimplemented("");
- return 0.0;
-}
-
-double GEExpressionHeight(SEXP expr,
- const pGEcontext gc, pGEDevDesc dd) {
- unimplemented("GEExpressionHeight");
- return 0.0;
-}
-
-void GEExpressionMetric(SEXP expr, const pGEcontext gc,
- double *ascent, double *descent, double *width,
- pGEDevDesc dd) {
- unimplemented("GEExpressionMetric");
-}
-
-void GEMathText(double x, double y, SEXP expr,
- double xc, double yc, double rot,
- const pGEcontext gc, pGEDevDesc dd) {
- unimplemented("GEMathText");
-}
-
-SEXP GEcontourLines(double *x, int nx, double *y, int ny,
- double *z, double *levels, int nl) {
- return (SEXP) unimplemented("GEcontourLines");
-}
-
-double R_GE_VStrWidth(const char *s, cetype_t enc, const pGEcontext gc, pGEDevDesc dd) {
- unimplemented("R_GE_VStrWidth");
- return 0.0;
-}
-
-
-double R_GE_VStrHeight(const char *s, cetype_t enc, const pGEcontext gc, pGEDevDesc dd) {
- unimplemented("R_GE_VStrHeight");
- return 0.0;
-}
-
-void R_GE_VText(double x, double y, const char * const s, cetype_t enc,
- double x_justify, double y_justify, double rotation,
- const pGEcontext gc, pGEDevDesc dd) {
- unimplemented("R_GE_VText");
-}
-
-pGEDevDesc GEcurrentDevice(void) {
- return (pGEDevDesc) unimplemented("GEcurrentDevice");
-}
-
-Rboolean GEdeviceDirty(pGEDevDesc dd) {
- unimplemented("GEcurrentDevice");
- return FALSE;
-}
-
-void GEdirtyDevice(pGEDevDesc dd) {
- unimplemented("GEdirtyDevice");
-}
-
-Rboolean GEcheckState(pGEDevDesc dd) {
- unimplemented("GEcheckState");
- return FALSE;
-}
-
-Rboolean GErecording(SEXP call, pGEDevDesc dd) {
- unimplemented("GErecording");
- return FALSE;
-}
-
-void GErecordGraphicOperation(SEXP op, SEXP args, pGEDevDesc dd) {
- unimplemented("GErecordGraphicOperation");
-}
-
-void GEinitDisplayList(pGEDevDesc dd) {
- unimplemented("GEinitDisplayList");
-}
-
-void GEplayDisplayList(pGEDevDesc dd) {
- unimplemented("GEplayDisplayList");
-}
-
-void GEcopyDisplayList(int fromDevice) {
- unimplemented("GEcopyDisplayList");
-}
-
-SEXP GEcreateSnapshot(pGEDevDesc dd) {
- return (SEXP) unimplemented("GEcreateSnapshot");
-}
-
-void GEplaySnapshot(SEXP snapshot, pGEDevDesc dd) {
- unimplemented("");
-}
-
-void GEonExit(void) {
- unimplemented("GEplaySnapshot");
-}
-
-void GEnullDevice(void) {
- unimplemented("GEnullDevice");
-}
-
-SEXP CreateAtVector(double* x, double* y, int z, Rboolean w) {
- return (SEXP) unimplemented("CreateAtVector");
-}
-
-void GAxisPars(double *min, double *max, int *n, Rboolean log, int axis) {
- unimplemented("GAxisPars");
-}
-
-pGEDevDesc desc2GEDesc(pDevDesc dd) {
- return (pGEDevDesc) unimplemented("desc2GEDesc");
-}
-
-int GEdeviceNumber(pGEDevDesc x) {
- return (int) unimplemented("GEdeviceNumber");
-}
-
-pGEDevDesc GEgetDevice(int x) {
- return (pGEDevDesc) unimplemented("GEgetDevice");
-}
-
-void GEaddDevice(pGEDevDesc x) {
- unimplemented("GEaddDevice");
-}
-
-void GEaddDevice2(pGEDevDesc x, const char *y) {
- unimplemented("GEaddDevice2");
-}
-
-void GEkillDevice(pGEDevDesc x) {
- unimplemented("GEkillDevice");
-}
-
-pGEDevDesc GEcreateDevDesc(pDevDesc dev) {
- return (pGEDevDesc) unimplemented("");
-}
-
-void GEdestroyDevDesc(pGEDevDesc dd) {
- unimplemented("GEdestroyDevDesc");
-}
-
-void *GEsystemState(pGEDevDesc dd, int index) {
- return unimplemented("GEsystemState");
-}
-
-void GEregisterWithDevice(pGEDevDesc dd) {
- unimplemented("GEregisterWithDevice");
-}
-
-void GEregisterSystem(GEcallback callback, int *systemRegisterIndex) {
- // TODO for now we just ignore this to allow the grid package to load
-}
-
-void GEunregisterSystem(int registerIndex) {
- // TODO for now we just ignore this to allow the grid package to unload
-}
-
-SEXP GEhandleEvent(GEevent event, pDevDesc dev, SEXP data) {
- return (SEXP) unimplemented("GEhandleEvent");
-}
-
-
-double fromDeviceX(double value, GEUnit to, pGEDevDesc dd) {
- unimplemented("fromDeviceX");
- return 0.0;
-}
-
-double toDeviceX(double value, GEUnit from, pGEDevDesc dd) {
- unimplemented("toDeviceX");
- return 0.0;
-}
-
-double fromDeviceY(double value, GEUnit to, pGEDevDesc dd) {
- unimplemented("fromDeviceY");
- return 0.0;
-}
-
-double toDeviceY(double value, GEUnit from, pGEDevDesc dd) {
- unimplemented("toDeviceY");
- return 0.0;
-}
-
-double fromDeviceWidth(double value, GEUnit to, pGEDevDesc dd) {
- unimplemented("fromDeviceWidth");
- return 0.0;
-}
-
-double toDeviceWidth(double value, GEUnit from, pGEDevDesc dd) {
- unimplemented("toDeviceWidth");
- return 0.0;
-}
-
-double fromDeviceHeight(double value, GEUnit to, pGEDevDesc dd) {
- unimplemented("fromDeviceHeight");
- return 0.0;
-}
-
-double toDeviceHeight(double value, GEUnit from, pGEDevDesc dd) {
- unimplemented("toDeviceHeight");
- return 0.0;
-}
diff --git a/com.oracle.truffle.r.native/fficall/jni/src/graphicsdevices.c b/com.oracle.truffle.r.native/fficall/jni/src/main_devices.c
similarity index 52%
rename from com.oracle.truffle.r.native/fficall/jni/src/graphicsdevices.c
rename to com.oracle.truffle.r.native/fficall/jni/src/main_devices.c
index 0f71b495b826a6f655fc23be01db907aa92ed81b..77f8c951fc17fce2dd2dde461b5f4e94a1c0a80f 100644
--- a/com.oracle.truffle.r.native/fficall/jni/src/graphicsdevices.c
+++ b/com.oracle.truffle.r.native/fficall/jni/src/main_devices.c
@@ -21,65 +21,12 @@
* questions.
*/
-// For now, failing implementations of the functions from GnuR src/main/engine.c
-
#include "rffiutils.h"
-#include <GraphicsEngine.h>
-
-void init_graphicsdevices(JNIEnv *env) {
-}
-
-int ndevNumber(pDevDesc x) {
- return (int) unimplemented("ndevNumber");
-}
-
-
-int NumDevices(void) {
- return (int)unimplemented("NumDevices");
-}
-
-
-void R_CheckDeviceAvailable(void) {
- unimplemented("R_CheckDeviceAvailable");
-}
-
-Rboolean R_CheckDeviceAvailableBool(void) {
- unimplemented("R_CheckDeviceAvailable");
- return FALSE;
-}
-
-
-int curDevice(void) {
- return (int) unimplemented("curDevice");
-}
-
-
-int nextDevice(int x) {
- return (int) unimplemented("curDevice");
-}
-
-
-int prevDevice(int x) {
- return (int) unimplemented("prevDevice");
-}
-
-
-int selectDevice(int x) {
- return (int) unimplemented("selectDevice");
-}
-
-
-void killDevice(int x) {
- unimplemented("killDevice");
-}
-
-
-int NoDevices(void) {
- return (int) unimplemented("killDevice");
-}
-
+#include "Defn.h"
-void NewFrameConfirm(pDevDesc x) {
- unimplemented("NoDevices");
-}
+extern SEXP R_DevicesSymbol; /* ".Devices" */
+extern Rboolean R_Interactive;
+#define attribute_hidden
+#define R_MaxDevices 64
+#include "../../../gnur/R-3.1.3/src/main/devices.c"
diff --git a/com.oracle.truffle.r.native/fficall/jni/src/main_engine.c b/com.oracle.truffle.r.native/fficall/jni/src/main_engine.c
new file mode 100644
index 0000000000000000000000000000000000000000..35e4c4644358e7d787bc0519506fc9a71e185c15
--- /dev/null
+++ b/com.oracle.truffle.r.native/fficall/jni/src/main_engine.c
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2015, 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+#include "rffiutils.h"
+#include "Defn.h"
+
+extern SEXP R_DevicesSymbol;
+extern Rboolean R_Interactive;
+extern Rboolean R_Visible;
+
+#define attribute_hidden
+#define R_MaxDevices 64
+
+#define HAVE_MBSTATE_T 1
+
+extern Rboolean utf8locale;
+extern Rboolean mbcslocale;
+extern Rboolean latin1locale;
+
+#include <wchar.h>
+
+
+/* The type of the do_xxxx functions. */
+/* These are the built-in R functions. */
+typedef SEXP (*CCODE)(SEXP, SEXP, SEXP, SEXP);
+
+CCODE (PRIMFUN)(SEXP x);
+
+#define streql(s, t) (!strcmp((s), (t)))
+
+
+/* main/util.c */
+void UNIMPLEMENTED_TYPE(const char *s, SEXP x);
+void UNIMPLEMENTED_TYPEt(const char *s, SEXPTYPE t);
+Rboolean Rf_strIsASCII(const char *str);
+int utf8clen(char c);
+
+typedef unsigned short ucs2_t;
+size_t mbcsToUcs2(const char *in, ucs2_t *out, int nout, int enc);
+/* size_t mbcsMblen(char *in);
+size_t ucs2ToMbcs(ucs2_t *in, char *out);
+size_t ucs2Mblen(ucs2_t *in); */
+size_t utf8toucs(wchar_t *wc, const char *s);
+size_t utf8towcs(wchar_t *wc, const char *s, size_t n);
+size_t ucstomb(char *s, const unsigned int wc);
+size_t ucstoutf8(char *s, const unsigned int wc);
+size_t mbtoucs(unsigned int *wc, const char *s, size_t n);
+size_t wcstoutf8(char *s, const wchar_t *wc, size_t n);
+
+SEXP Rf_installTrChar(SEXP);
+
+const wchar_t *wtransChar(SEXP x); /* from sysutils.c */
+
+#define mbs_init(x) memset(x, 0, sizeof(mbstate_t))
+size_t Mbrtowc(wchar_t *wc, const char *s, size_t n, mbstate_t *ps);
+Rboolean mbcsValid(const char *str);
+Rboolean utf8Valid(const char *str);
+char *Rf_strchr(const char *s, int c);
+char *Rf_strrchr(const char *s, int c);
+
+#include "../../../gnur/R-3.1.3/src/main/engine.c"
diff --git a/com.oracle.truffle.r.native/fficall/jni/src/rfficall.c b/com.oracle.truffle.r.native/fficall/jni/src/rfficall.c
index d71fec9a7f1f6572c300b0365c69af5f643be133..64c24ee89e44b79f1ff79ff98f92c8c914a59081 100644
--- a/com.oracle.truffle.r.native/fficall/jni/src/rfficall.c
+++ b/com.oracle.truffle.r.native/fficall/jni/src/rfficall.c
@@ -41,8 +41,6 @@ Java_com_oracle_truffle_r_runtime_ffi_jnr_CallRFFIWithJNI_initialize(JNIEnv *env
init_optim(env);
init_vectoraccess(env);
init_listaccess(env);
- init_graphicsengine(env);
- init_graphicsdevices(env);
}
static jmp_buf error_jmpbuf;
diff --git a/com.oracle.truffle.r.native/fficall/jni/src/rffiutils.h b/com.oracle.truffle.r.native/fficall/jni/src/rffiutils.h
index 6d5025eef1162d89fd011def1e4781c00589ec9b..1181bc5aeb6cfef4717e95d637bfe3210f5b91dd 100644
--- a/com.oracle.truffle.r.native/fficall/jni/src/rffiutils.h
+++ b/com.oracle.truffle.r.native/fficall/jni/src/rffiutils.h
@@ -67,8 +67,6 @@ void *findCopiedObject(JNIEnv *env, SEXP x);
void addCopiedObject(JNIEnv *env, SEXP x, SEXPTYPE type, void *jArray, void *data);
void init_rmath(JNIEnv *env);
-void init_graphicsengine(JNIEnv *env);
-void init_graphicsdevices(JNIEnv *env);
void init_variables(JNIEnv *env, jobjectArray initialValues);
void init_register(JNIEnv *env);
void init_rf_functions(JNIEnv *env);