move fft.c to stats library, modify source from GnuR with sed

.hgignore

@@ -91,6 +91,7 @@ R.tokens
 findbugs.html
 com.oracle.truffle.r.native/builtinlibs/lib/*
 com.oracle.truffle.r.native/library/*/lib/*
+com.oracle.truffle.r.native/library/stats/src/fft.c
 com.oracle.truffle.r.native/platform.mk
 com.oracle.truffle.r.native/gnur/Makeconf.done
 com.oracle.truffle.r.native/include/jni/include

com.oracle.truffle.r.native/Makefile

 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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
@@ -42,4 +42,3 @@ clean:
 	$(MAKE) -C library clean
 	$(MAKE) -C run clean
 	$(MAKE) -C gnur clean
-	
\ No newline at end of file

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

@@ -32,4 +32,3 @@ clean:
 	$(MAKE) -f Makefile.gnur clean
 	$(MAKE) -f Makefile.libs clean
 	$(MAKE) -f Makefile.platform clean
-	
\ No newline at end of file

com.oracle.truffle.r.native/library/base/Makefile

@@ -23,14 +23,14 @@
 
 RPROFILE := $(FASTR_LIBDIR)/base/R/Rprofile
 RPROFILE_ORIG := $(RPROFILE).orig
-PKG_EXTRAS = $(RPROFILE)
+LIB_PKG_POST = $(RPROFILE)
 
 include ../lib.mk
 
 # edit the Rprofile to add fastr as a default package
 # sed's edit in place option with backup is not portable
 
-$(PKG_EXTRAS): $(RPROFILE_ORIG)
+$(LIB_PKG_POST): $(RPROFILE_ORIG)
 
 $(RPROFILE_ORIG):
 	cp $(RPROFILE) $(RPROFILE_ORIG)

com.oracle.truffle.r.native/library/lib.mk

@@ -27,6 +27,9 @@
 # and overwrites the default. The libraries are stored in the directory denoted
 # FASTR_LIBDIR.
 
+# A package that requires special processing before the library is built should
+# define LIB_PKG_PRE and for post processing define LIB_PKG_POST
+
 include $(TOPDIR)/platform.mk
 
 .PHONY: all clean cleanlib cleanobj force libr libcommon 
@@ -59,9 +62,9 @@ INCLUDES := $(JNI_INCLUDES) $(FFI_INCLUDES)
 PKGDIR := $(FASTR_LIBDIR)/$(PKG)
 
 ifneq ($(C_SOURCES),)
-all: libcommon $(LIB_PKG) $(PKG_EXTRAS)
+all: $(LIB_PKG_PRE) libcommon $(LIB_PKG) $(LIB_PKG_POST)
 else
-all: libcommon
+all: $(LIB_PKG_PRE) libcommon $(LIB_PKG_POST) 
 endif
 
 libcommon: $(PKGDIR)

com.oracle.truffle.r.native/library/stats/Makefile

@@ -21,4 +21,12 @@
 # questions.
 #
 
+LIB_PKG_PRE = lib/fft.o
+GNUR_FFT := $(GNUR_DIR)/src/library/stats/src/fft.c
+
 include ../lib.mk
+
+C_SOURCES := $(C_SOURCES) src/fft.c
+
+src/fft.c: $(GNUR_FFT) src/ed_fft
+	ed $(GNUR_FFT) < src/ed_fft

com.oracle.truffle.r.native/library/stats/src/ed_fft

+/HAVE_CONFIG.H/
+s!^!//!
++1
+s!^!//!
++1
+s!^!//!
+/include <Rmath.h>/
+s!^!//!
++1
+s!^!//!
+a
+#define imax2(_x,_y) ((_x<_y) ? _y : _x)
+#define imin2(_x,_y) ((_x<_y) ? _x : _y)
+#define Rboolean int
+#define FALSE 0
+#define TRUE 1
+#define M_SQRT_3	1.732050807568877293527446341506
+.
+/^void fft_factor(int n/
+s!int n!int *nptr!
+i
+// signature modification (pointers to scalars) required to enable JNR call
+.
+/int j/
+i
+    int n = *nptr;
+.
+/fft_work(double/
+d
+i
+// signature modification (pointers to scalars) required to enable JNR call
+// we also need to do pointer shift for imaginary parts on the callee side (below)
+// rather than on the caller side as in GNU R
+Rboolean fft_work(double *a, int *nsegptr, int *nptr, int *nspnptr, int *isnptr,
+.
+/int nf/
+i
+    int nseg = *nsegptr;
+    int n = *nptr;
+    int nspn = *nspnptr;
+    int isn = *isnptr;
+    double *b=&(a[1]);
+.
+w src/fft.c

com.oracle.truffle.r.runtime.ffi/src/com/oracle/truffle/r/runtime/ffi/jnr/JNR_RFFIFactory.java

@@ -33,6 +33,7 @@ import jnr.posix.*;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.r.runtime.*;
 import com.oracle.truffle.r.runtime.ffi.*;
+import com.oracle.truffle.r.runtime.ffi.DLL.DLLInfo;
 
 /**
  * JNR-based factory.
@@ -389,7 +390,9 @@ public class JNR_RFFIFactory extends RFFIFactory implements RFFI, BaseRFFI, Stat
 
         @TruffleBoundary
         private static Stats createAndLoadLib() {
-            return LibraryLoader.create(Stats.class).load("appl");
+            // fft is in the stats package .so
+            DLLInfo dllInfo = DLL.findLibraryContainingSymbol("fft");
+            return LibraryLoader.create(Stats.class).load(dllInfo.path);
         }
 
         static Stats fft() {

com.oracle.truffle.r.test/rpackages/rffi/testrffi/src/Makefile

 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 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