Use plblockimp to provide imp_implementationWithBlock() for OS X 10.6…

… compatiblility

.gitignore

@@ -44,6 +44,8 @@ mspec/upstream_patches
 mspec_upstream
 node_name.inc
 parse.c
+plblockimp/blockimp_ARM*
+plblockimp/blockimp_x86*
 prelude.c
 rbconfig.rb
 revision.h

lib/mkmf.rb

@@ -1932,7 +1932,7 @@ def init_mkmf(config = CONFIG)
   $LDFLAGS = with_config("ldflags", arg_config("LDFLAGS", config["LDFLAGS"])).dup
   $INCFLAGS = "-I$(arch_hdrdir)"
   $INCFLAGS << " -I$(hdrdir)/ruby/backward" unless $extmk
-  $INCFLAGS << " -I$(hdrdir) -I$(srcdir)"
+  $INCFLAGS << " -I$(hdrdir) -I$(srcdir) -I$(top_srcdir)/plblockimp"
   $DLDFLAGS = with_config("dldflags", arg_config("DLDFLAGS", config["DLDFLAGS"])).dup
   $LIBEXT = config['LIBEXT'].dup
   $OBJEXT = config["OBJEXT"].dup

macruby_internal.h

@@ -13,6 +13,7 @@ extern "C" {
 #endif
 
 #include "ruby.h"
+#include "PLBlockIMP.h"
 
 #include <objc/objc.h>
 #include <objc/runtime.h>

plblockimp/ARM/blockimp_arm.tramp

@@ -0,0 +1,66 @@
+#!/bin/sh
+
+# -----------------------------------------------------------------------
+#  Copyright (c) 2010-2011, Plausible Labs Cooperative, Inc.
+#  All Rights Reserved.
+# 
+#  Permission is hereby granted, free of charge, to any person obtaining
+#  a copy of this software and associated documentation files (the
+#  ``Software''), to deal in the Software without restriction, including
+#  without limitation the rights to use, copy, modify, merge, publish,
+#  distribute, sublicense, and/or sell copies of the Software, and to
+#  permit persons to whom the Software is furnished to do so, subject to
+#  the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included
+#  in all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
+#  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+#  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+#  NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+#  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+#  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+#  DEALINGS IN THE SOFTWARE.
+#  -----------------------------------------------------------------------
+
+# Architecture definitions. We support either armv6 or armv7
+if [ "${CURRENT_ARCH}" = "armv6" ] || [ "${CURRENT_ARCH}" = "armv7" ]; then
+    ARCH="${CURRENT_ARCH}"
+else
+    ARCH=""
+fi
+
+PAGE_SIZE="4096"
+
+# The name of this page
+PAGE_NAME=pl_blockimp_table_page
+
+# Prefix to be placed at the start of the trampoline page
+trampoline_prefix () {
+asm << 'EOF'
+    _block_tramp_dispatch:
+        # trampoline address+8 is in r12 -- calculate our config page address
+        sub r12, #0x8
+        sub r12, #0x1000
+        
+        # Set the 'self' argument as the second argument
+        mov r1, r0
+        
+        # Load the block pointer as the first argument
+        ldr r0, [r12]
+
+        # Jump to the block pointer
+        ldr pc, [r0, #0xc]
+EOF
+}
+
+# Generate a single trampoline
+trampoline () {
+asm << 'EOF'
+    # Save pc+8, then jump to the shared prefix implementation
+    mov r12, pc
+    b _block_tramp_dispatch;
+EOF
+}

plblockimp/ARM/blockimp_arm_stret.tramp

@@ -0,0 +1,61 @@
+#!/bin/sh
+
+# -----------------------------------------------------------------------
+#  Copyright (c) 2010-2011, Plausible Labs Cooperative, Inc.
+#  All Rights Reserved.
+# 
+#  Permission is hereby granted, free of charge, to any person obtaining
+#  a copy of this software and associated documentation files (the
+#  ``Software''), to deal in the Software without restriction, including
+#  without limitation the rights to use, copy, modify, merge, publish,
+#  distribute, sublicense, and/or sell copies of the Software, and to
+#  permit persons to whom the Software is furnished to do so, subject to
+#  the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included
+#  in all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
+#  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+#  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+#  NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+#  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+#  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+#  DEALINGS IN THE SOFTWARE.
+#  -----------------------------------------------------------------------
+
+# Architecture definitions
+ARCH="${CURRENT_ARCH}"
+PAGE_SIZE="4096"
+
+# The name of this page
+PAGE_NAME=pl_blockimp_table_stret_page
+
+# Prefix to be placed at the start of the trampoline page
+trampoline_prefix () {
+asm << 'EOF'
+    _block_tramp_dispatch:
+        # trampoline address+8 is in r12 -- calculate our config page address
+        sub r12, #0x8
+        sub r12, #0x1000
+
+        # Set the 'self' argument as the third argument
+        mov r2, r1
+        
+        # Load the block pointer as the second argument
+        ldr r1, [r12]
+
+        # Jump to the block pointer
+        ldr pc, [r1, #0xc]
+EOF
+}
+
+# Generate a single trampoline
+trampoline () {
+asm << 'EOF'
+    # Save pc+8, then jump to the shared prefix implementation
+    mov r12, pc
+    b _block_tramp_dispatch;
+EOF
+}

plblockimp/LICENSE

@@ -0,0 +1,23 @@
+Author: Landon Fuller <landonf@plausible.coop>
+
+Copyright 2010-2011 Plausible Labs Cooperative, Inc.
+All rights reserved.
+
+Permission is hereby granted, free of charge,
+to any person obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to permit
+persons to whom the Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

plblockimp/PLBlockIMP.h

@@ -0,0 +1,28 @@
+/*
+ * Author: Landon Fuller <landonf@plausible.coop>
+ *
+ * Copyright 2010-2011 Plausible Labs Cooperative, Inc.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge,
+ * to any person obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to permit
+ * persons to whom the Software is furnished to do so, subject to the following
+ * conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#pragma once
+#include "blockimp.h"

plblockimp/blockimp.c

@@ -0,0 +1,117 @@
+/*
+ * Author: Landon Fuller <landonf@plausible.coop>
+ *
+ * Copyright 2010-2011 Plausible Labs Cooperative, Inc.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge,
+ * to any person obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to permit
+ * persons to whom the Software is furnished to do so, subject to the following
+ * conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "blockimp.h"
+#include "blockimp_private.h"
+
+#include "trampoline_table.h"
+
+#include <stdio.h>
+#include <Block.h>
+
+#pragma mark Trampolines
+
+/* Global lock for our mutable state. Must be held when accessing the trampoline tables. */
+static pthread_mutex_t blockimp_lock = PTHREAD_MUTEX_INITIALIZER;
+
+/* Trampoline tables for objc_msgSend_stret() dispatch. */
+static pl_trampoline_table *blockimp_table_stret = NULL;
+
+/* Trampoline tables for objc_msgSend() dispatch. */
+static pl_trampoline_table *blockimp_table = NULL;
+
+/**
+ * 
+ */
+IMP pl_imp_implementationWithBlock (void *block) {
+#if SUPPORT_APPLE_FALLBACK
+    /* Prefer Apple's implementation */
+    if (&imp_implementationWithBlock != NULL)
+        return imp_implementationWithBlock(block);
+#endif
+
+    /* Allocate the appropriate trampoline type. */
+    pl_trampoline *tramp;
+    struct Block_layout *bl = block;
+    if (bl->flags & BLOCK_USE_STRET) {
+        tramp = pl_trampoline_alloc(&pl_blockimp_table_stret_page_config, &blockimp_lock, &blockimp_table_stret);
+    } else {
+        tramp = pl_trampoline_alloc(&pl_blockimp_table_page_config, &blockimp_lock, &blockimp_table);
+    }
+
+    /* Configure the trampoline */
+    void **config = pl_trampoline_data_ptr(tramp->trampoline);
+    config[0] = Block_copy(block);
+    config[1] = tramp;
+
+    /* Return the function pointer. */
+    return (IMP) tramp->trampoline;
+}
+
+/**
+ *
+ */
+void *pl_imp_getBlock(IMP anImp) {
+#if SUPPORT_APPLE_FALLBACK
+    /* Prefer Apple's implementation */
+    if (&imp_getBlock != NULL) {
+        return imp_getBlock(anImp);
+    }
+#endif
+
+    /* Fetch the config data and return the block reference. */
+    void **config = pl_trampoline_data_ptr(anImp);
+    return config[0];
+}
+
+/**
+ *
+ */
+BOOL pl_imp_removeBlock(IMP anImp) {
+#if SUPPORT_APPLE_FALLBACK
+    /* Prefer Apple's implementation */
+    if (&imp_removeBlock != NULL)
+        return imp_removeBlock(anImp);
+#endif
+
+    /* Fetch the config data */
+    void **config = pl_trampoline_data_ptr(anImp);
+    struct Block_layout *bl = config[0];
+    pl_trampoline *tramp = config[1];
+
+    /* Drop the trampoline allocation */
+    if (bl->flags & BLOCK_USE_STRET) {
+        pl_trampoline_free(&blockimp_lock, &blockimp_table_stret, tramp);
+    } else {
+        pl_trampoline_free(&blockimp_lock, &blockimp_table, tramp);
+    }
+
+    /* Release the block */
+    Block_release(config[0]);
+
+    // TODO - what does this return value mean?
+    return YES;
+}

plblockimp/blockimp.h

@@ -0,0 +1,31 @@
+/*
+ * Author: Landon Fuller <landonf@plausible.coop>
+ *
+ * Copyright 2010-2011 Plausible Labs Cooperative, Inc.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge,
+ * to any person obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to permit
+ * persons to whom the Software is furnished to do so, subject to the following
+ * conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <objc/runtime.h>
+
+extern IMP pl_imp_implementationWithBlock(void *block);
+extern void *pl_imp_getBlock(IMP anImp);
+extern BOOL pl_imp_removeBlock(IMP anImp);