compile graphics/grDevices C code directly from GnuR; build fficall/common...

compile graphics/grDevices C code directly from GnuR; build fficall/common independent from fficall/jni

com.oracle.truffle.r.native/fficall/Makefile

@@ -21,10 +21,36 @@
 # questions.
 #
 
-.PHONY: all clean
+# Builds libR
 
-all:
+ifneq (,$(wildcard $(TOPDIR)/platform.mk))
+include $(TOPDIR)/platform.mk
+else
+ifneq ($(MAKECMDGOALS),clean)
+$(error no platform.mk available)
+endif
+endif
+
+.PHONY: all clean objs
+
+C_LIBNAME := libR$(DYLIB_EXT)
+C_LIB := $(FASTR_LIB_DIR)/$(C_LIBNAME)
+
+ifeq ($(OS_NAME), Darwin)
+VERSION_FLAGS := -current_version $(R_VERSION) -compatibility_version $(R_VERSION)
+endif
+
+all: $(C_LIB)
+
+$(C_LIB): objs 
+	$(DYLIB_LD) $(DYLIB_LDFLAGS) -o $(C_LIB) $(wildcard lib/*.o) $(VERSION_FLAGS)
+
+objs:
+	$(MAKE) -C src/common all
 	$(MAKE) -C src/jni all
 
 clean:
+	$(MAKE) -C src/common clean
 	$(MAKE) -C src/jni clean
+	rm -rf $(C_LIB)
+	

com.oracle.truffle.r.native/fficall/README

 fficall contains the implementation of the R FFI, as described in https://cran.r-project.org/doc/manuals/r-release/R-exts.html.
 It's actually a bit more than that as it also contains code copied from GnuR, for example that supports graphics or is sufficiently
-simple that it is neither necessary nor desirable to implement in Java.
+simple that it is neither necessary nor desirable to implement in Java. As this has evolved a better name for 'fficall' would be 'main'
+for compatibility with GnuR.
 
- There are two sub-directories:
+ There are four sub-directories:
+   include
    common
    jni
+   variable_defs
 
+include
+=======
+
+'include' should be thought as analgous to GnuR's src/include, i.e. internal headers needed by the code in 'src/main'.
+What are trying to do by redefining them here is provide a boundary so that we don't accidently capture code from GnuR that
+is specific to the implementation of GnuR that is different in FastR, e.g., the representation of R objects. Evidently not every
+piece of GnuR code or an internal header has that characteristic but this strategy allows us some control to draw the boundary as
+tight as possible. Obviously we want to avoid duplicating (copying) code, as this requires validating the copy when migrating GnuR versions,
+so there are three levels of implementation choice for the content of the header in this directory:
+
+* Leave empty. This allows a #include to succeed and, if code does not actually use any symbols from the header, is ok.
+* Indirect to the real GnuR header. This is potentially dangerous but a simple default for code that uses symbols from the header.
+* Extract specific definitions from the GnuR header into a cut-down version. While this copies code it may be necessary
+  to avoid unwanted aspects of the GnuR header. In principle this can be done by a 'copy with sed' approach.
+
+The indirection requires the use of the quote form of the #include directive. To avoid using a path that is GnuR version dependent,
+the file gnurheaders.mk provides a make variable GNUR_HEADER_DEFS with a set of appropriate -D CFLAGS.
+
+Ideally, code is always compiled in such a way that headers never implicitly read from GnuR, only via the 'include' directory.
+Unfortunately this cannot always be guaranteed as a directive of the form include "foo.h" (as opposed to include <foo.h>) in the
+GnuR C code will always access a header in the same directory as the code being compiled. I.e., only the angle-bracket form can be controlled
+by the -I compiler flag. If this is a problem, the only solution is to 'copy with sed' the .c file and convert the quote form to the
+angle bracket form.
+
+common
+======
 'common' contains code that has no explicit JNI dependencies and has been extracted for reuse in other implementations. This code is mostly
-copied/included from GnuR. 'jni' contains the implementation that is based on and has explicit dependencies on Java JNI.
+copied/included from GnuR. N.B. Some modified files have a "_fastr" suffix to avoid a clash with an existing file in GnuR that would match
+the Makefile rule for compiling directly from the GnuR file.
 
- Note that the 'common' files cannot all be compiled in isolation, as they typically depend on the implementation
- via rffiutils.h (and Rinternals.h). N.B. the GnuR code may "include" header files that are private to the GnuR implementation.
- These must always be replaced with local versions that make sense under FastR. Examples are Defn.h and Internal.h. When code
- is compiled the C compiler include path NEVER reaches into GnuR; all internal headers that are needed must exist in the
- common directory. They may explicitly include the original header but doing it this way ensures that we never accidently
- include an internal header. It is TBD to decide exactly what is needed from the GnuR internal headers. Ideally,
- we would provide versions that are absolutely minimal. Clearly it is a bug if any code that depends on the actual
- GnuR implementation ends up in the FastR library.
+jni
+===
+'jni' contains the implementation that is based on and has explicit dependencies on Java JNI.
 
- N.B. Some modified files have a "_fastr" suffix to avoid a clash with an existing file in GnuR that would match
- the Makefile rule for compiling directly from the GnuR file.
+The R FFI is rather baroque and defined in large set of header files in the 'include' directory that is a sibling of 'fficall'.
+In GnuR, the implementation of the functions is spread over the GnuR C files in 'src/main'. To ease navigation of the FastR implementation,
+in general, the implementation of the functions in a header file 'Rxxx.h' is stored in the file 'Rxxx.c'.
 
- The R FFI is rather baroque and defined in large set of header files in the sibling 'include' directory. In GnuR, the implementation
- of the functions is spread over the GnuR C files in 'src/main'. To ease navigation of the FastR implementation, in general,
- the implementation of the functions in a header file 'Rxxx.h' is stored in the file 'Rxxx.c'.
+The points of entry from Java are defined in the file rfficall.c. Various utility functions are defined in rffiutils.{h,c}.
 
-The points of entry from Java are defined in the file rfficall.c. Various utility functions are defined if rffiutils.{h,c}.
+variable_defs
+=============
 
+The GnuR FFI defines a large number of (extern) variables the defintiions of which, in GnuR, are scattered across the source files.
+In FastR these are collected into one file, variable_defs.h. However, the actual initialization of the variables is, in general, implementation
+dependent. In order to support a JNI and a non-JNI implementation, the file is stored in a seperate directory.

com.oracle.truffle.r.native/fficall/src/common/Makefile

+#
+# 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.
+#
+
+# This builds the GNUR files that are compiled directly, and local overrides
+
+ifneq ($(MAKECMDGOALS),clean)
+include $(TOPDIR)/platform.mk
+endif
+
+.PHONY: all clean copy_appl_objects
+
+# location of compiled code (.o files)
+OBJ = ../../lib
+
+GNUR_APPL_C_FILES = pretty.c interv.c
+GNUR_APPL_SRC = $(GNUR_HOME)/src/appl
+# the Fortran sources are not recompiled, just copied
+GNUR_APPL_F_OBJECTS := $(wildcard $(GNUR_APPL_SRC)/d*.o)
+
+GNUR_MAIN_C_FILES = colors.c devices.c engine.c format.c graphics.c plot.c plot3d.c plotmath.c rlocale.c sort.c
+GNUR_MAIN_SRC = $(GNUR_HOME)/src/main
+
+GNUR_C_OBJECTS := $(addprefix $(OBJ)/, $(GNUR_APPL_C_FILES:.c=.o) $(GNUR_MAIN_C_FILES:.c=.o))
+GNUR_F_OBJECTS := $(GNUR_APPL_F_OBJECTS)
+
+C_SOURCES = $(wildcard *.c)
+C_OBJECTS := $(patsubst %.c,$(OBJ)/%.o,$(C_SOURCES))
+
+F_SOURCES = $(wildcard *.f)
+F_OBJECTS := $(patsubst %.f,$(OBJ)/%.o,$(F_SOURCES))
+
+JNI_INCLUDES = -I $(JAVA_HOME)/include -I $(JAVA_HOME)/include/$(JDK_OS_DIR)
+FFI_INCLUDES = -I$(TOPDIR)/include -I$(TOPDIR)/include/R_ext
+INCLUDES := -I $(abspath ../include) $(JNI_INCLUDES) $(FFI_INCLUDES)
+
+include ../include/gnurheaders.mk
+
+SUPPRESS_WARNINGS := -Wno-int-conversion -Wno-implicit-function-declaration
+
+all: Makefile $(C_OBJECTS) $(F_OBJECTS) $(GNUR_C_OBJECTS) $(GNUR_F_OBJECTS) copy_appl_objects
+
+copy_appl_objects: $(GNUR_APPL_F_OBJECTS)
+	cp $(GNUR_APPL_F_OBJECTS) $(OBJ)
+
+$(C_OBJECTS): | $(OBJ)
+
+$(GNUR_C_OBJECTS): | $(OBJ)
+
+$(GNUR_F_OBJECTS): | $(OBJ)
+
+#CFLAGS := $(CFLAGS) -H
+
+
+$(OBJ):
+	mkdir -p $(OBJ)
+
+$(OBJ)/%.o: $(GNUR_APPL_SRC)/%.c
+	$(CC) $(CFLAGS) $(INCLUDES) $(GNUR_HEADER_DEFS) $(SUPPRESS_WARNINGS) -c $< -o $@
+
+$(OBJ)/%.o: $(GNUR_MAIN_SRC)/%.c
+	$(CC) $(CFLAGS) $(INCLUDES) $(GNUR_HEADER_DEFS) $(SUPPRESS_WARNINGS) -c $< -o $@
+
+$(OBJ)/%.o: %.c $(TOPDIR)/include/Rinternals.h
+	$(CC) $(CFLAGS) $(INCLUDES) $(GNUR_HEADER_DEFS) $(SUPPRESS_WARNINGS) -c $< -o $@
+
+$(OBJ)/%.o: %.f
+	$(F77) $(FFLAGS) $(FPICFLAGS) -c $< -o $@
+
+clean:
+	rm -rf $(OBJ)
+

com.oracle.truffle.r.native/fficall/src/common/arithmetic_fastr.c

@@ -11,7 +11,7 @@
  * All rights reserved.
  */
 
-#include <rffiutils.h>
+#include <Rinternals.h>
 #include <stdlib.h>
 
 // FastR: selected functions from arithmetic.c:

com.oracle.truffle.r.native/fficall/src/common/coerce_fastr.c

@@ -11,7 +11,7 @@
  * All rights reserved.
  */
 
-#include <rffiutils.h>
+#include <Rinternals.h>
 
 #define _(Source) (Source)
 

com.oracle.truffle.r.native/fficall/src/common/inlined_fastr.c

@@ -11,7 +11,7 @@
  * All rights reserved.
  */
 
-#include <rffiutils.h>
+#include <Rinternals.h>
 
 #define INLINE_FUN
 

com.oracle.truffle.r.native/fficall/src/common/print_fastr.c

@@ -76,7 +76,6 @@
 #include <config.h>
 #endif
 
-#include <rffiutils.h>
 #include <Defn.h>
 #include <Print.h>
 #include <R_ext/RS.h>

com.oracle.truffle.r.native/fficall/src/common/printutils_fastr.c

@@ -17,7 +17,6 @@
 #include <config.h>
 #endif
 
-#include <rffiutils.h>
 #include <Defn.h>
 #include <Print.h>
 

com.oracle.truffle.r.native/fficall/src/common/sys_fastr.c

@@ -10,10 +10,11 @@
  * All rights reserved.
  */
 
-#include <rffiutils.h>
+#include <Rinternals.h>
 
 // selected functions copied from sys-unix.c and sysutils.c:
 
+#include <stdlib.h>
 #include <sys/stat.h>
 
 static char newFileName[PATH_MAX];

com.oracle.truffle.r.native/fficall/src/common/util_fastr.c

@@ -10,7 +10,7 @@
  * All rights reserved.
  */
 
-#include "rffiutils.h"
+#include <Rinternals.h>
 #include <stdlib.h>
 #include <R_ext/RS.h>
 

com.oracle.truffle.r.native/fficall/src/common/Defn.h → com.oracle.truffle.r.native/fficall/src/include/Defn.h

@@ -16,7 +16,8 @@
 #ifndef DEFN_H_
 #define DEFN_H_
 
-#include <jni.h>
+#define HAVE_ERRNO_H 1
+
 #include <stdlib.h>
 #include <Rinternals.h>
 
@@ -49,6 +50,8 @@ extern SEXP R_DevicesSymbol;
 extern Rboolean R_Interactive;
 extern Rboolean R_Visible;
 int	R_ReadConsole(const char *, unsigned char *, int, int);
+extern const char *R_Home;
+extern const char *R_TempDir;
 
 //#define HAVE_MBSTATE_T 1 // actually from config.h
 
@@ -56,6 +59,11 @@ extern Rboolean utf8locale;
 extern Rboolean mbcslocale;
 extern Rboolean latin1locale;
 
+#define INI_as(v)
+extern char OutDec	INI_as('.');
+extern Rboolean known_to_be_latin1 INI_as(FALSE);
+extern Rboolean known_to_be_utf8 INI_as(FALSE);
+
 extern int R_dec_min_exponent;
 extern unsigned int max_contour_segments;
 
@@ -63,5 +71,21 @@ typedef SEXP (*CCODE)(SEXP, SEXP, SEXP, SEXP);
 
 CCODE (PRIMFUN)(SEXP x);
 
+#define Unix
+#ifdef Unix
+# define OSTYPE      "unix"
+# define FILESEP     "/"
+#endif /* Unix */
+
+#ifdef Win32
+# define OSTYPE      "windows"
+# define FILESEP     "/"
+#endif /* Win32 */
+
+#include <wchar.h>
+
+typedef unsigned short ucs2_t;
+
+#define streql(s, t)	(!strcmp((s), (t)))
 
 #endif /* DEFN_H_ */

com.oracle.truffle.r.native/fficall/src/include/Fileio.h

+/*
+ * This material is distributed under the GNU General Public License
+ * Version 2. You may review the terms of this license at
+ * http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * Copyright (c) 1995, 1996, 1997  Robert Gentleman and Ross Ihaka
+ * Copyright (c) 1995-2014, The R Core Team
+ * Copyright (c) 2002-2008, The R Foundation
+ * Copyright (c) 2015, Oracle and/or its affiliates
+ *
+ * All rights reserved.
+ */
+
+// This is a version of src/include/Fileio.h that is a safe replacement for use with FastR
+// Currently simply redirects to the GnuR version
+
+#include GNUR_FILEIO_H

com.oracle.truffle.r.native/library/grDevices/src/Defn.h → com.oracle.truffle.r.native/fficall/src/include/config.h

@@ -21,69 +21,5 @@
  * questions.
  */
 
-// selected definitions from the original Defn.h file:
+// (currently) empty replacememnt for GnuR's config.h
 
-/*
- *  R : A Computer Language for Statistical Data Analysis
- *  Copyright (C) 1995, 1996  Robert Gentleman and Ross Ihaka
- *  Copyright (C) 1998--2013  The R Core Team.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, a copy is available at
- *  http://www.r-project.org/Licenses/
- */
-
-#ifndef DEFN_H_
-#define DEFN_H_
-
-#define HAVE_ERRNO_H 1
-
-#include <Rinternals.h>
-
-#define f_tell ftell
-
-#define INI_as(v)
-#define extern0 extern
-#define attribute_hidden
-
-#define F77_SYMBOL(x)	x ## _
-#define F77_QSYMBOL(x)	#x "_"
-
-extern char OutDec	INI_as('.');
-extern Rboolean known_to_be_latin1 INI_as(FALSE);
-extern Rboolean known_to_be_utf8 INI_as(FALSE);
-extern unsigned int max_contour_segments INI_as(25000);
-
-#define streql(s, t)	(!strcmp((s), (t)))
-
-
-#define Unix
-#ifdef Unix
-# define OSTYPE      "unix"
-# define FILESEP     "/"
-#endif /* Unix */
-
-#ifdef Win32
-# define OSTYPE      "windows"
-# define FILESEP     "/"
-#endif /* Win32 */
-
-#include <wchar.h>
-
-typedef unsigned short ucs2_t;
-
-extern Rboolean R_Visible;
-extern const char *R_Home;
-extern const char *R_TempDir;
-
-#endif /* DEFN_H_ */

com.oracle.truffle.r.native/fficall/src/include/contour-common.h

+/*
+ * This material is distributed under the GNU General Public License
+ * Version 2. You may review the terms of this license at
+ * http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * Copyright (c) 1995, 1996, 1997  Robert Gentleman and Ross Ihaka
+ * Copyright (c) 1995-2014, The R Core Team
+ * Copyright (c) 2002-2008, The R Foundation
+ * Copyright (c) 2015, Oracle and/or its affiliates
+ *
+ * All rights reserved.
+ */
+
+// This is a version of src/main/contour_common.h that is a safe replacement for use with FastR
+// Currently simply redirects to the GnuR version
+
+#include GNUR_CONTOUR_COMMON_H

com.oracle.truffle.r.native/fficall/src/common/common.mk → com.oracle.truffle.r.native/fficall/src/include/gnurheaders.mk

@@ -21,25 +21,12 @@
 # questions.
 #
 
-# This defines the GNUR files that are compiled directly, local overrides, plus -D defines that allow the
-# header files that redirect to GnuR versions to be location/version independent. It is included
-# by the actual implementation Makefile, e.g.in ../jni
-
-GNUR_APPL_C_FILES = pretty.c interv.c
-GNUR_APPL_SRC = $(GNUR_HOME)/src/appl
-# the Fortran sources are not recompiled
-GNUR_APPL_F_OBJECTS := $(wildcard $(GNUR_APPL_SRC)/d*.o)
-
-
-GNUR_MAIN_C_FILES = colors.c devices.c engine.c format.c graphics.c plot.c plot3d.c plotmath.c rlocale.c sort.c
-GNUR_MAIN_SRC = $(GNUR_HOME)/src/main
-
-GNUR_C_OBJECTS := $(addprefix $(OBJ)/, $(GNUR_APPL_C_FILES:.c=.o) $(GNUR_MAIN_C_FILES:.c=.o))
-GNUR_F_OBJECTS := $(GNUR_APPL_F_OBJECTS)
-
 # headers that we refer to indirectly (allows version/location independence in source)
+GNUR_CONFIG_H := $(GNUR_HOME)/src/include/config.h
+GNUR_CONTOUR_COMMON_H := $(GNUR_HOME)/src/main/contour-common.h
 GNUR_GRAPHICS_H := $(GNUR_HOME)/src/include/Graphics.h
 GNUR_GRAPHICSBASE_H := $(GNUR_HOME)/src/include/GraphicsBase.h
+GNUR_FILEIO_H := $(GNUR_HOME)/src/include/Fileio.h
 GNUR_RGRAPHICS_H := $(GNUR_HOME)/src/include/Rgraphics.h
 GNUR_INTERNAL_H := $(GNUR_HOME)/src/include/Internal.h
 GNUR_NMATH_H := $(GNUR_HOME)/src/nmath/nmath.h
@@ -48,12 +35,6 @@ GNUR_RLOCALE_H := $(GNUR_HOME)/src/include/rlocale.h
 
 GNUR_HEADER_DEFS := -DGNUR_GRAPHICS_H=\"$(GNUR_GRAPHICS_H)\" -DGNUR_GRAPHICSBASE_H=\"$(GNUR_GRAPHICSBASE_H)\" \
     -DGNUR_RGRAPHICS_H=\"$(GNUR_RGRAPHICS_H)\" -DGNUR_INTERNAL_H=\"$(GNUR_INTERNAL_H)\" \
-	-DGNUR_NMATH_H=\"$(GNUR_NMATH_H)\" -DGNUR_PRINT_H=\"$(GNUR_PRINT_H)\" -DGNUR_RLOCALE_H=\"$(GNUR_RLOCALE_H)\"
-
-SUPPRESS_WARNINGS := -Wno-int-conversion -Wno-implicit-function-declaration
-
-$(OBJ)/%.o: $(GNUR_APPL_SRC)/%.c
-	$(CC) $(CFLAGS) $(INCLUDES) $(GNUR_HEADER_DEFS) $(SUPPRESS_WARNINGS) -c $< -o $@
-
-$(OBJ)/%.o: $(GNUR_MAIN_SRC)/%.c
-	$(CC) $(CFLAGS) $(INCLUDES) $(GNUR_HEADER_DEFS) $(SUPPRESS_WARNINGS) -c $< -o $@
+	-DGNUR_NMATH_H=\"$(GNUR_NMATH_H)\" -DGNUR_PRINT_H=\"$(GNUR_PRINT_H)\" -DGNUR_RLOCALE_H=\"$(GNUR_RLOCALE_H)\" \
+	-DGNUR_FILEIO_H=\"$(GNUR_FILEIO_H)\" -DGNUR_CONFIG_H=\"$(GNUR_CONFIG_H)\" \
+	-DGNUR_CONTOUR_COMMON_H=\"$(GNUR_CONTOUR_COMMON_H)\"