|
 |
c4dea8 |
diff --git a/ext/fiddle/closure.c b/ext/fiddle/closure.c
|
|
|
c4dea8 |
index 1a80b2b..b997e23 100644
|
|
|
c4dea8 |
--- a/ext/fiddle/closure.c
|
|
|
c4dea8 |
+++ b/ext/fiddle/closure.c
|
|
|
c4dea8 |
@@ -13,25 +13,11 @@ typedef struct {
|
|
|
c4dea8 |
ffi_type **argv;
|
|
|
c4dea8 |
} fiddle_closure;
|
|
|
c4dea8 |
|
|
|
c4dea8 |
-#if defined(USE_FFI_CLOSURE_ALLOC)
|
|
|
c4dea8 |
-#elif defined(__OpenBSD__) || defined(__APPLE__) || defined(__linux__)
|
|
|
c4dea8 |
-# define USE_FFI_CLOSURE_ALLOC 0
|
|
|
c4dea8 |
-#elif defined(RUBY_LIBFFI_MODVERSION) && RUBY_LIBFFI_MODVERSION < 3000005 && \
|
|
|
c4dea8 |
- (defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || defined(_M_AMD64))
|
|
|
c4dea8 |
-# define USE_FFI_CLOSURE_ALLOC 0
|
|
|
c4dea8 |
-#else
|
|
|
c4dea8 |
-# define USE_FFI_CLOSURE_ALLOC 1
|
|
|
c4dea8 |
-#endif
|
|
|
c4dea8 |
-
|
|
|
c4dea8 |
static void
|
|
|
c4dea8 |
dealloc(void * ptr)
|
|
|
c4dea8 |
{
|
|
|
c4dea8 |
fiddle_closure * cls = (fiddle_closure *)ptr;
|
|
|
c4dea8 |
-#if USE_FFI_CLOSURE_ALLOC
|
|
|
c4dea8 |
ffi_closure_free(cls->pcl);
|
|
|
c4dea8 |
-#else
|
|
|
c4dea8 |
- munmap(cls->pcl, sizeof(*cls->pcl));
|
|
|
c4dea8 |
-#endif
|
|
|
c4dea8 |
if (cls->argv) xfree(cls->argv);
|
|
|
c4dea8 |
xfree(cls);
|
|
|
c4dea8 |
}
|
|
|
c4dea8 |
@@ -205,12 +191,7 @@ allocate(VALUE klass)
|
|
|
c4dea8 |
VALUE i = TypedData_Make_Struct(klass, fiddle_closure,
|
|
|
c4dea8 |
&closure_data_type, closure);
|
|
|
c4dea8 |
|
|
|
c4dea8 |
-#if USE_FFI_CLOSURE_ALLOC
|
|
|
c4dea8 |
closure->pcl = ffi_closure_alloc(sizeof(ffi_closure), &closure->code);
|
|
|
c4dea8 |
-#else
|
|
|
c4dea8 |
- closure->pcl = mmap(NULL, sizeof(ffi_closure), PROT_READ | PROT_WRITE,
|
|
|
c4dea8 |
- MAP_ANON | MAP_PRIVATE, -1, 0);
|
|
|
c4dea8 |
-#endif
|
|
|
c4dea8 |
|
|
|
c4dea8 |
return i;
|
|
|
c4dea8 |
}
|
|
|
c4dea8 |
@@ -257,17 +238,8 @@ initialize(int rbargc, VALUE argv[], VALUE self)
|
|
|
c4dea8 |
if (FFI_OK != result)
|
|
|
c4dea8 |
rb_raise(rb_eRuntimeError, "error prepping CIF %d", result);
|
|
|
c4dea8 |
|
|
|
c4dea8 |
-#if USE_FFI_CLOSURE_ALLOC
|
|
|
c4dea8 |
result = ffi_prep_closure_loc(pcl, cif, callback,
|
|
|
c4dea8 |
(void *)self, cl->code);
|
|
|
c4dea8 |
-#else
|
|
|
c4dea8 |
- result = ffi_prep_closure(pcl, cif, callback, (void *)self);
|
|
|
c4dea8 |
- cl->code = (void *)pcl;
|
|
|
c4dea8 |
- i = mprotect(pcl, sizeof(*pcl), PROT_READ | PROT_EXEC);
|
|
|
c4dea8 |
- if (i) {
|
|
|
c4dea8 |
- rb_sys_fail("mprotect");
|
|
|
c4dea8 |
- }
|
|
|
c4dea8 |
-#endif
|
|
|
c4dea8 |
|
|
|
c4dea8 |
if (FFI_OK != result)
|
|
|
c4dea8 |
rb_raise(rb_eRuntimeError, "error prepping closure %d", result);
|