Add ARM CPU support

.travis.yml

@@ -1,10 +1,18 @@
 language: ruby
 rvm:
-  - "1.9.3"
-  - "2.0.0"
-  - "2.1.2"
+  - ruby-1.9.3-p551
+  - ruby-2.1.9
+  - ruby-2.2.5
+  - ruby-2.3.1
   - ruby-head
   - rbx-2
+  - rbx
   - jruby-19mode
+  - jruby-9.0.5.0
   - jruby-head
 sudo: false
+matrix:
+  allow_failures:
+    - rvm: jruby-head
+    - rvm: ruby-head
+    - rvm: rbx

Rakefile

@@ -24,7 +24,8 @@ end
 desc "FFI compiler"
 namespace "ffi-compiler" do
   FFI::Compiler::CompileTask.new('ext/scrypt/scrypt_ext') do |t|
-    t.cflags << "-Wall -msse -msse2"
+    t.cflags << "-Wall -std=c99"
+    t.cflags << "-msse -msse2" if t.platform.arch.include? "86"
     t.cflags << "-D_GNU_SOURCE=1" if RbConfig::CONFIG["host_os"].downcase =~ /mingw/
     t.cflags << "-arch x86_64 -arch i386" if t.platform.mac?
     t.ldflags << "-arch x86_64 -arch i386" if t.platform.mac?

certs/stakach.pem

@@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
 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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----

ext/scrypt/Rakefile

@@ -1,7 +1,8 @@
 require 'ffi-compiler/compile_task'
 
 FFI::Compiler::CompileTask.new('scrypt_ext') do |t|
-  t.cflags << "-Wall -msse -msse2"
+  t.cflags << "-Wall -std=c99"
+  t.cflags << "-msse -msse2" if t.platform.arch.include? "86"
   t.cflags << "-D_GNU_SOURCE=1" if RbConfig::CONFIG["host_os"].downcase =~ /mingw/
   t.cflags << "-arch x86_64 -arch i386" if t.platform.mac?
   t.ldflags << "-arch x86_64 -arch i386" if t.platform.mac?

ext/scrypt/cpusupport.h

@@ -0,0 +1,105 @@
+#ifndef _CPUSUPPORT_H_
+#define _CPUSUPPORT_H_
+
+/*
+ * To enable support for non-portable CPU features at compile time, one or
+ * more CPUSUPPORT_ARCH_FEATURE macros should be defined.  This can be done
+ * directly on the compiler command line via -D CPUSUPPORT_ARCH_FEATURE or
+ * -D CPUSUPPORT_ARCH_FEATURE=1; or a file can be created with the
+ * necessary #define lines and then -D CPUSUPPORT_CONFIG_FILE=cpuconfig.h
+ * (or similar) can be provided to include that file here.
+ */
+#ifdef CPUSUPPORT_CONFIG_FILE
+#include CPUSUPPORT_CONFIG_FILE
+#endif
+
+/**
+ * The CPUSUPPORT_FEATURE macro declares the necessary variables and
+ * functions for detecting CPU feature support at run time.  The function
+ * defined in the macro acts to cache the result of the ..._detect function
+ * using the ..._present and ..._init variables.  The _detect function and the
+ * _present and _init variables are turn defined by CPUSUPPORT_FEATURE_DECL in
+ * appropriate cpusupport_foo_bar.c file.
+ *
+ * In order to allow CPUSUPPORT_FEATURE to be used for features which do not
+ * have corresponding CPUSUPPORT_FEATURE_DECL blocks in another source file,
+ * we abuse the C preprocessor: If CPUSUPPORT_${enabler} is defined to 1, then
+ * we access _present_1, _init_1, and _detect_1; but if it is not defined, we
+ * access _present_CPUSUPPORT_${enabler} etc., which we define as static, thus
+ * preventing the compiler from emitting a reference to an external symbol.
+ *
+ * In this way, it becomes possible to issue CPUSUPPORT_FEATURE invocations
+ * for nonexistent features without running afoul of the requirement that
+ * "If an identifier declared with external linkage is used... in the entire
+ * program there shall be exactly one external definition" (C99 standard, 6.9
+ * paragraph 5).  In practice, this means that users of the cpusupport code
+ * can omit build and runtime detection files without changing the framework
+ * code.
+ */
+#define CPUSUPPORT_FEATURE__(arch_feature, enabler, enabled)					\
+	static int cpusupport_ ## arch_feature ## _present ## _CPUSUPPORT_ ## enabler;		\
+	static int cpusupport_ ## arch_feature ## _init ## _CPUSUPPORT_ ## enabler;		\
+	static inline int cpusupport_ ## arch_feature ## _detect ## _CPUSUPPORT_ ## enabler(void) { return (0); }	\
+	extern int cpusupport_ ## arch_feature ## _present_ ## enabled;				\
+	extern int cpusupport_ ## arch_feature ## _init_ ## enabled;				\
+	int cpusupport_ ## arch_feature ## _detect_ ## enabled(void);				\
+												\
+	static inline int									\
+	cpusupport_ ## arch_feature(void)							\
+	{											\
+												\
+		if (cpusupport_ ## arch_feature ## _present_ ## enabled)			\
+			return (1);								\
+		else if (cpusupport_ ## arch_feature ## _init_ ## enabled)			\
+			return (0);								\
+		cpusupport_ ## arch_feature ## _present_ ## enabled = 				\
+		    cpusupport_ ## arch_feature ## _detect_ ## enabled();			\
+		cpusupport_ ## arch_feature ## _init_ ## enabled = 1;				\
+		return (cpusupport_ ## arch_feature ## _present_ ## enabled); 			\
+	}											\
+	static void (* cpusupport_ ## arch_feature ## _dummyptr)(void);				\
+	static inline void									\
+	cpusupport_ ## arch_feature ## _dummyfunc(void)						\
+	{											\
+												\
+		(void)cpusupport_ ## arch_feature ## _present ## _CPUSUPPORT_ ## enabler;	\
+		(void)cpusupport_ ## arch_feature ## _init ## _CPUSUPPORT_ ## enabler;		\
+		(void)cpusupport_ ## arch_feature ## _detect ## _CPUSUPPORT_ ## enabler;	\
+		(void)cpusupport_ ## arch_feature ## _present_ ## enabled;			\
+		(void)cpusupport_ ## arch_feature ## _init_ ## enabled;				\
+		(void)cpusupport_ ## arch_feature ## _detect_ ## enabled;			\
+		(void)cpusupport_ ## arch_feature ## _dummyptr;					\
+	}											\
+	static void (* cpusupport_ ## arch_feature ## _dummyptr)(void) = cpusupport_ ## arch_feature ## _dummyfunc;	\
+	struct cpusupport_ ## arch_feature ## _dummy
+#define CPUSUPPORT_FEATURE_(arch_feature, enabler, enabled)	\
+	CPUSUPPORT_FEATURE__(arch_feature, enabler, enabled)
+#define CPUSUPPORT_FEATURE(arch, feature, enabler)				\
+	CPUSUPPORT_FEATURE_(arch ## _ ## feature, enabler, CPUSUPPORT_ ## enabler)
+
+/*
+ * CPUSUPPORT_FEATURE_DECL(arch, feature):
+ * Macro which defines variables and provides a function declaration for
+ * detecting the presence of "feature" on the "arch" architecture.  The
+ * function body following this macro expansion must return nonzero if the
+ * feature is present, or zero if the feature is not present or the detection
+ * fails for any reason.
+ */
+#define CPUSUPPORT_FEATURE_DECL(arch, feature)				\
+	int cpusupport_ ## arch ## _ ## feature ## _present_1 = 0;	\
+	int cpusupport_ ## arch ## _ ## feature ## _init_1 = 0;		\
+	int								\
+	cpusupport_ ## arch ## _ ## feature ## _detect_1(void)
+
+/*
+ * List of features.  If a feature here is not enabled by the appropriate
+ * CPUSUPPORT_ARCH_FEATURE macro being defined, it has no effect; but if the
+ * relevant macro may be defined (e.g., by Build/cpusupport.sh successfully
+ * compiling Build/cpusupport-ARCH-FEATURE.c) then the C file containing the
+ * corresponding run-time detection code (cpusupport_arch_feature.c) must be
+ * compiled and linked in.
+ */
+CPUSUPPORT_FEATURE(x86, aesni, X86_AESNI);
+CPUSUPPORT_FEATURE(x86, sse2, X86_SSE2);
+
+#endif /* !_CPUSUPPORT_H_ */