ffi 0.6.3-x86-mingw32 → 1.0.1-x86-mingw32

data/ext/ffi_c/MappedType.c

@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 2010, Wayne Meissner
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ * * The name of the author or authors may not be used to endorse or promote
+ *   products derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <ruby.h>
+
+#include <ffi.h>
+#include "rbffi.h"
+
+#include "Type.h"
+#include "MappedType.h"
+
+
+static VALUE mapped_allocate(VALUE);
+static VALUE mapped_initialize(VALUE, VALUE);
+static void mapped_mark(MappedType *);
+static ID id_native_type, id_to_native, id_from_native;
+
+VALUE rbffi_MappedTypeClass = Qnil;
+
+static VALUE
+mapped_allocate(VALUE klass)
+{
+    MappedType* m;
+
+    VALUE obj = Data_Make_Struct(klass, MappedType, mapped_mark, -1, m);
+
+    m->rbConverter = Qnil;
+    m->rbType = Qnil;
+    m->type = NULL;
+    m->base.nativeType = NATIVE_MAPPED;
+    m->base.ffiType = &ffi_type_void;
+    
+    return obj;
+}
+
+static VALUE
+mapped_initialize(VALUE self, VALUE rbConverter)
+{
+    MappedType* m = NULL;
+    Type* t = NULL;
+    
+    if (!rb_respond_to(rbConverter, id_native_type)) {
+        rb_raise(rb_eNoMethodError, "native_type method not implemented");
+    }
+
+    if (!rb_respond_to(rbConverter, id_to_native)) {
+        rb_raise(rb_eNoMethodError, "to_native method not implemented");
+    }
+
+    if (!rb_respond_to(rbConverter, id_from_native)) {
+        rb_raise(rb_eNoMethodError, "from_native method not implemented");
+    }
+    
+    Data_Get_Struct(self, MappedType, m);
+    m->rbType = rb_funcall2(rbConverter, id_native_type, 0, NULL);
+    if (!(rb_obj_is_kind_of(m->rbType, rbffi_TypeClass))) {
+        rb_raise(rb_eTypeError, "native_type did not return instance of FFI::Type");
+    }
+
+    m->rbConverter = rbConverter;
+    Data_Get_Struct(m->rbType, Type, m->type);
+    m->base.ffiType = m->type->ffiType;
+    
+    return self;
+}
+
+static void
+mapped_mark(MappedType* m)
+{
+    rb_gc_mark(m->rbType);
+    rb_gc_mark(m->rbConverter);
+}
+
+static VALUE
+mapped_native_type(VALUE self)
+{
+    MappedType*m = NULL;
+    Data_Get_Struct(self, MappedType, m);
+
+    return m->rbType;
+}
+
+static VALUE
+mapped_to_native(int argc, VALUE* argv, VALUE self)
+{
+    MappedType*m = NULL;
+    
+    Data_Get_Struct(self, MappedType, m);
+    
+    return rb_funcall2(m->rbConverter, id_to_native, argc, argv);
+}
+
+static VALUE
+mapped_from_native(int argc, VALUE* argv, VALUE self)
+{
+    MappedType*m = NULL;
+    
+    Data_Get_Struct(self, MappedType, m);
+
+    return rb_funcall2(m->rbConverter, id_from_native, argc, argv);
+}
+
+void
+rbffi_MappedType_Init(VALUE moduleFFI)
+{
+    
+    rbffi_MappedTypeClass = rb_define_class_under(rbffi_TypeClass, "Mapped", rbffi_TypeClass);
+    
+    rb_global_variable(&rbffi_MappedTypeClass);
+
+    id_native_type = rb_intern("native_type");
+    id_to_native = rb_intern("to_native");
+    id_from_native = rb_intern("from_native");
+
+    rb_define_alloc_func(rbffi_MappedTypeClass, mapped_allocate);
+    rb_define_method(rbffi_MappedTypeClass, "initialize", mapped_initialize, 1);
+    rb_define_method(rbffi_MappedTypeClass, "type", mapped_native_type, 0);
+    rb_define_method(rbffi_MappedTypeClass, "native_type", mapped_native_type, 0);
+    rb_define_method(rbffi_MappedTypeClass, "to_native", mapped_to_native, -1);
+    rb_define_method(rbffi_MappedTypeClass, "from_native", mapped_from_native, -1);
+}
+

data/ext/ffi_c/MappedType.h

@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2010, Wayne Meissner
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ * * The name of the author or authors may not be used to endorse or promote
+ *   products derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef RBFFI_MAPPEDTYPE_H
+#define	RBFFI_MAPPEDTYPE_H
+
+
+#include <ruby.h>
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+
+typedef struct MappedType_ {
+    Type base;
+    Type* type;
+    VALUE rbConverter;
+    VALUE rbType;
+    
+} MappedType;
+
+void rbffi_MappedType_Init(VALUE moduleFFI);
+
+extern VALUE rbffi_MappedTypeClass;
+
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* RBFFI_MAPPEDTYPE_H */
+

data/ext/ffi_c/MemoryPointer.c

@@ -4,27 +4,19 @@
  *
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * This file is part of ruby-ffi.
  *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * * The name of the author or authors may not be used to endorse or promote
- *   products derived from this software without specific prior written permission.
+ * This code is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3 only, as
+ * published by the Free Software Foundation.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 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 Lesser General Public License
+ * version 3 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdbool.h>
@@ -63,7 +55,7 @@ memptr_allocate(VALUE klass)
 {
     MemoryPointer* p;
     VALUE obj = Data_Make_Struct(klass, MemoryPointer, NULL, memptr_release, p);
-    p->memory.access = MEM_RD | MEM_WR;
+    p->memory.flags = MEM_RD | MEM_WR;
 
     return obj;
 }
@@ -113,18 +105,6 @@ memptr_malloc(VALUE self, long size, long count, bool clear)
     return self;
 }
 
-static VALUE
-memptr_inspect(VALUE self)
-{
-    MemoryPointer* ptr;
-    char tmp[100];
-
-    Data_Get_Struct(self, MemoryPointer, ptr);
-
-    snprintf(tmp, sizeof(tmp), "#<FFI::MemoryPointer address=%p size=%lu>", ptr->memory.address, ptr->memory.size);
-    return rb_str_new2(tmp);
-}
-
 static VALUE
 memptr_free(VALUE self)
 {
@@ -172,7 +152,6 @@ rbffi_MemoryPointer_Init(VALUE moduleFFI)
 
     rb_define_alloc_func(rbffi_MemoryPointerClass, memptr_allocate);
     rb_define_method(rbffi_MemoryPointerClass, "initialize", memptr_initialize, -1);
-    rb_define_method(rbffi_MemoryPointerClass, "inspect", memptr_inspect, 0);
     rb_define_method(rbffi_MemoryPointerClass, "autorelease=", memptr_autorelease, 1);
     rb_define_method(rbffi_MemoryPointerClass, "free", memptr_free, 0);
 }

data/ext/ffi_c/Platform.c

@@ -24,6 +24,8 @@ static VALUE PlatformModule = Qnil;
 #define CPU "sparc"
 #elif defined(__sparcv9__)
 #define CPU "sparcv9"
+#elif defined(__arm__)
+#define CPU "arm"
 #else
 #error "Unknown cpu type"
 #endif

data/ext/ffi_c/Pointer.c

@@ -3,27 +3,19 @@
  *
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * This file is part of ruby-ffi.
  *
- * * Redistributions of source code must retain the above copyright notice, this
- *   list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * * The name of the author or authors may not be used to endorse or promote
- *   products derived from this software without specific prior written permission.
+ * This code is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3 only, as
+ * published by the Free Software Foundation.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 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 Lesser General Public License
+ * version 3 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdbool.h>
@@ -59,7 +51,7 @@ rbffi_Pointer_NewInstance(void* addr)
     obj = Data_Make_Struct(rbffi_PointerClass, Pointer, NULL, -1, p);
     p->memory.address = addr;
     p->memory.size = LONG_MAX;
-    p->memory.access = (addr == NULL) ? 0 : (MEM_RD | MEM_WR);
+    p->memory.flags = (addr == NULL) ? 0 : (MEM_RD | MEM_WR);
     p->memory.typeSize = 1;
     p->parent = Qnil;
 
@@ -72,9 +64,9 @@ ptr_allocate(VALUE klass)
     Pointer* p;
     VALUE obj;
 
-    obj = Data_Make_Struct(klass, Pointer, NULL, -1, p);
+    obj = Data_Make_Struct(klass, Pointer, ptr_mark, -1, p);
     p->parent = Qnil;
-    p->memory.access = MEM_RD | MEM_WR;
+    p->memory.flags = MEM_RD | MEM_WR;
 
     return obj;
 }
@@ -106,7 +98,7 @@ ptr_initialize(int argc, VALUE* argv, VALUE self)
             p->memory.address = (void*) (uintptr_t) NUM2LL(rbAddress);
             p->memory.size = LONG_MAX;
             if (p->memory.address == NULL) {
-                p->memory.access = 0;
+                p->memory.flags = 0;
             }
             break;
 
@@ -143,7 +135,7 @@ slice(VALUE self, long offset, long size)
 
     p->memory.address = ptr->address + offset;
     p->memory.size = size;
-    p->memory.access = ptr->access;
+    p->memory.flags = ptr->flags;
     p->memory.typeSize = ptr->typeSize;
     p->parent = self;
 
@@ -171,12 +163,12 @@ static VALUE
 ptr_inspect(VALUE self)
 {
     Pointer* ptr;
-    char tmp[100];
-
+    
     Data_Get_Struct(self, Pointer, ptr);
-    snprintf(tmp, sizeof(tmp), "#<FFI::Pointer address=%p>", ptr->memory.address);
 
-    return rb_str_new2(tmp);
+    return ptr->memory.size != LONG_MAX
+        ? rb_sprintf("#<%s address=%p size=%lu>", rb_obj_classname(self), ptr->memory.address, ptr->memory.size)
+        : rb_sprintf("#<%s address=%p>", rb_obj_classname(self), ptr->memory.address);
 }
 
 static VALUE
@@ -209,6 +201,50 @@ ptr_address(VALUE self)
     return ULL2NUM((uintptr_t) ptr->memory.address);
 }
 
+#if BYTE_ORDER == LITTLE_ENDIAN
+# define SWAPPED_ORDER BIG_ENDIAN
+#else
+# define SWAPPED_ORDER LITTLE_ENDIAN
+#endif
+
+static VALUE
+ptr_order(int argc, VALUE* argv, VALUE self)
+{
+    Pointer* ptr;
+
+    Data_Get_Struct(self, Pointer, ptr);
+    if (argc == 0) {
+        int order = (ptr->memory.flags & MEM_SWAP) == 0 ? BYTE_ORDER : SWAPPED_ORDER;
+        return order == BIG_ENDIAN ? ID2SYM(rb_intern("big")) : ID2SYM(rb_intern("little"));
+    } else {
+        VALUE rbOrder = Qnil;
+        int order = BYTE_ORDER;
+
+        if (rb_scan_args(argc, argv, "1", &rbOrder) < 1) {
+            rb_raise(rb_eArgError, "need byte order");
+        }
+        if (SYMBOL_P(rbOrder)) {
+            ID id = SYM2ID(rbOrder);
+            if (id == rb_intern("little")) {
+                order = LITTLE_ENDIAN;
+
+            } else if (id == rb_intern("big") || id == rb_intern("network")) {
+                order = BIG_ENDIAN;
+            }
+        }
+        if (order != BYTE_ORDER) {
+            Pointer* p2;
+            VALUE retval = slice(self, 0, ptr->memory.size);
+
+            Data_Get_Struct(retval, Pointer, p2);
+            p2->memory.flags |= MEM_SWAP;
+            return retval;
+        }
+
+        return self;
+    }
+}
+
 static void
 ptr_mark(Pointer* ptr)
 {
@@ -226,12 +262,14 @@ rbffi_Pointer_Init(VALUE moduleFFI)
     rb_define_alloc_func(rbffi_PointerClass, ptr_allocate);
     rb_define_method(rbffi_PointerClass, "initialize", ptr_initialize, -1);
     rb_define_method(rbffi_PointerClass, "inspect", ptr_inspect, 0);
+    rb_define_method(rbffi_PointerClass, "to_s", ptr_inspect, 0);
     rb_define_method(rbffi_PointerClass, "+", ptr_plus, 1);
     rb_define_method(rbffi_PointerClass, "slice", ptr_slice, 2);
     rb_define_method(rbffi_PointerClass, "null?", ptr_null_p, 0);
     rb_define_method(rbffi_PointerClass, "address", ptr_address, 0);
     rb_define_alias(rbffi_PointerClass, "to_i", "address");
     rb_define_method(rbffi_PointerClass, "==", ptr_equals, 1);
+    rb_define_method(rbffi_PointerClass, "order", ptr_order, -1);
 
     rbffi_NullPointerSingleton = rb_class_new_instance(1, &rbNullAddress, rbffi_PointerClass);
     rb_define_const(rbffi_PointerClass, "NULL", rbffi_NullPointerSingleton);

data/ext/ffi_c/Struct.c

@@ -45,16 +45,6 @@
 #include "StructByValue.h"
 #include "ArrayType.h"
 
-#define FFI_ALIGN(v, a)  (((((size_t) (v))-1) | ((a)-1))+1)
-
-typedef struct StructLayoutBuilder {
-    VALUE rbFieldNames;
-    VALUE rbFieldMap;
-    unsigned int size;
-    unsigned int alignment;
-    bool isUnion;
-} StructLayoutBuilder;
-
 typedef struct InlineArray_ {
     VALUE rbMemory;
     VALUE rbField;
@@ -69,16 +59,11 @@ typedef struct InlineArray_ {
 
 
 static void struct_mark(Struct *);
-static void struct_layout_builder_mark(StructLayoutBuilder *);
-static void struct_layout_builder_free(StructLayoutBuilder *);
 static VALUE struct_class_layout(VALUE klass);
 static void struct_malloc(Struct* s);
 static void inline_array_mark(InlineArray *);
 
-static inline int align(int offset, int align);
-
 VALUE rbffi_StructClass = Qnil;
-static VALUE StructLayoutBuilderClass = Qnil;
 
 VALUE rbffi_StructInlineArrayClass = Qnil;
 VALUE rbffi_StructLayoutCharArrayClass = Qnil;
@@ -213,6 +198,10 @@ struct_field(Struct* s, VALUE fieldName)
     StructLayout* layout = s->layout;
     VALUE rbField;
 
+    if (likely(SYMBOL_P(fieldName) && st_lookup(layout->fieldSymbolTable, fieldName, (st_data_t *) &rbField))) {
+        return rbField;
+    }
+
     rbField = rb_hash_aref(layout->rbFieldMap, fieldName);
     if (rbField == Qnil) {
         VALUE str = rb_funcall2(fieldName, id_to_s, 0, NULL);
@@ -345,293 +334,35 @@ struct_get_layout(VALUE self)
     return s->rbLayout;
 }
 
-static VALUE
-struct_layout_builder_allocate(VALUE klass)
-{
-    StructLayoutBuilder* builder;
-    VALUE obj;
-
-    obj = Data_Make_Struct(klass, StructLayoutBuilder, struct_layout_builder_mark, struct_layout_builder_free, builder);
-
-    builder->size = 0;
-    builder->alignment = 1;
-    builder->isUnion = false;
-    builder->rbFieldNames = rb_ary_new();
-    builder->rbFieldMap = rb_hash_new();
-
-    return obj;
-}
-
-static void
-struct_layout_builder_mark(StructLayoutBuilder* builder)
-{
-    rb_gc_mark(builder->rbFieldNames);
-    rb_gc_mark(builder->rbFieldMap);
-}
-
-static void
-struct_layout_builder_free(StructLayoutBuilder* builder)
-{
-    xfree(builder);
-}
-
-static VALUE
-struct_layout_builder_initialize(VALUE self)
-{
-    StructLayoutBuilder* builder;
-
-    Data_Get_Struct(self, StructLayoutBuilder, builder);
-
-    return self;
-}
-
-static VALUE
-struct_layout_builder_get_size(VALUE self)
-{
-    StructLayoutBuilder* builder;
-
-    Data_Get_Struct(self, StructLayoutBuilder, builder);
-
-    return UINT2NUM(builder->size);
-}
-
-static VALUE
-struct_layout_builder_set_size(VALUE self, VALUE rbSize)
-{
-    StructLayoutBuilder* builder;
-    unsigned int size = NUM2UINT(rbSize);
-
-    Data_Get_Struct(self, StructLayoutBuilder, builder);
-    builder->size = MAX(size, builder->size);
-
-    return UINT2NUM(builder->size);
-}
-
-static VALUE
-struct_layout_builder_get_alignment(VALUE self)
-{
-    StructLayoutBuilder* builder;
-
-    Data_Get_Struct(self, StructLayoutBuilder, builder);
-
-    return UINT2NUM(builder->alignment);
-}
-
-static VALUE
-struct_layout_builder_set_alignment(VALUE self, VALUE rbAlign)
-{
-    StructLayoutBuilder* builder;
-    unsigned int align = NUM2UINT(rbAlign);
-
-    Data_Get_Struct(self, StructLayoutBuilder, builder);
-    builder->size = MAX(align, builder->alignment);
-
-    return UINT2NUM(builder->alignment);
-}
 
 static VALUE
-struct_layout_builder_set_union(VALUE self, VALUE rbUnion)
+struct_null_p(VALUE self)
 {
-    StructLayoutBuilder* builder;
-
+    Struct* s;
 
-    Data_Get_Struct(self, StructLayoutBuilder, builder);
-    builder->isUnion = RTEST(rbUnion);
+    Data_Get_Struct(self, Struct, s);
 
-    return rbUnion;
+    return s->pointer->address == NULL ? Qtrue : Qfalse;
 }
 
 static VALUE
-struct_layout_builder_union_p(VALUE self)
-{
-    StructLayoutBuilder* builder;
-
-
-    Data_Get_Struct(self, StructLayoutBuilder, builder);
-
-
-    return builder->isUnion ? Qtrue : Qfalse;
-}
-
-static void
-store_field(StructLayoutBuilder* builder, VALUE rbName, VALUE rbField, 
-    unsigned int offset, unsigned int size, unsigned int alignment)
+struct_order(int argc, VALUE* argv, VALUE self)
 {
-    rb_ary_push(builder->rbFieldNames, rbName);
-    rb_hash_aset(builder->rbFieldMap, rbName, rbField);
-
-    builder->alignment = MAX(builder->alignment, alignment);
+    Struct* s;
 
-    if (builder->isUnion) {
-        builder->size = MAX(builder->size, size);
-    } else {
-        builder->size = MAX(builder->size, offset + size);
-    }
-}
+    Data_Get_Struct(self, Struct, s);
+    if (argc == 0) {
+        return rb_funcall(s->rbPointer, rb_intern("order"), 0);
 
-static int
-calculate_offset(StructLayoutBuilder* builder, int alignment, VALUE rbOffset)
-{
-    if (rbOffset != Qnil) {
-        return NUM2UINT(rbOffset);
     } else {
-        return builder->isUnion ? 0 : align(builder->size, alignment);
-    }
-}
-
-static VALUE
-struct_layout_builder_add_field(int argc, VALUE* argv, VALUE self)
-{
-    StructLayoutBuilder* builder;
-    VALUE rbName = Qnil, rbType = Qnil, rbOffset = Qnil, rbField = Qnil;
-    unsigned int size, alignment, offset;
-    int nargs;
-
-    nargs = rb_scan_args(argc, argv, "21", &rbName, &rbType, &rbOffset);
-    
-    Data_Get_Struct(self, StructLayoutBuilder, builder);
-
-    alignment = NUM2UINT(rb_funcall2(rbType, rb_intern("alignment"), 0, NULL));
-    size = NUM2UINT(rb_funcall2(rbType, rb_intern("size"), 0, NULL));
-
-    offset = calculate_offset(builder, alignment, rbOffset);
-
-    //
-    // If a primitive type was passed in as the type arg, try and convert
-    //
-    if (!rb_obj_is_kind_of(rbType, rbffi_StructLayoutFieldClass)) {
-        VALUE fargv[3], rbFieldClass;
-        fargv[0] = rbName;
-        fargv[1] = UINT2NUM(offset);
-        fargv[2] = rbType;
+        VALUE retval = rb_obj_dup(self);
+        VALUE rbPointer = rb_funcall2(s->rbPointer, rb_intern("order"), argc, argv);
+        struct_set_pointer(retval, rbPointer);
         
-        if (rb_obj_is_kind_of(rbType, rbffi_FunctionTypeClass)) {
-
-            rbFieldClass = rbffi_StructLayoutFunctionFieldClass;
-
-        } else if (rb_obj_is_kind_of(rbType, rbffi_StructByValueClass)) {
-            
-            rbFieldClass = rb_const_get(rbffi_StructLayoutClass, rb_intern("InlineStruct"));
-
-        } else if (rb_obj_is_kind_of(rbType, rbffi_ArrayTypeClass)) {
-
-            rbFieldClass = rbffi_StructLayoutArrayFieldClass;
-
-        } else if (rb_obj_is_kind_of(rbType, rbffi_EnumTypeClass)) {
-
-            rbFieldClass = rb_const_get(rbffi_StructLayoutClass, rb_intern("Enum"));
-
-        } else {
-            rbFieldClass = rbffi_StructLayoutFieldClass;
-        }
-
-        if (!RTEST(rbFieldClass)) {
-            rb_raise(rb_eTypeError, "invalid struct field type (%s)", rb_obj_classname(rbType));
-            return Qnil;
-        }
-
-        rbField = rb_class_new_instance(3, fargv, rbFieldClass);
-    } else {
-        rbField = rbType;
-    }
-
-    store_field(builder, rbName, rbField, offset, size, alignment);
-    
-    return self;
-}
-
-static VALUE
-struct_layout_builder_add_struct(int argc, VALUE* argv, VALUE self)
-{
-    StructLayoutBuilder* builder;
-    VALUE rbName = Qnil, rbType = Qnil, rbOffset = Qnil, rbField = Qnil;
-    VALUE rbFieldClass = Qnil, rbStructClass = Qnil;
-    VALUE fargv[3];
-    unsigned int size, alignment, offset;
-    int nargs;
-
-    nargs = rb_scan_args(argc, argv, "21", &rbName, &rbStructClass, &rbOffset);
-
-    if (!rb_obj_is_instance_of(rbStructClass, rb_cClass) || !rb_class_inherited(rbStructClass, rbffi_StructClass)) {
-        rb_raise(rb_eTypeError, "wrong argument type.  Expected subclass of FFI::Struct");
-    }
-
-    rbType = rb_class_new_instance(1, &rbStructClass, rbffi_StructByValueClass);
-
-    alignment = NUM2UINT(rb_funcall2(rbType, rb_intern("alignment"), 0, NULL));
-    size = NUM2UINT(rb_funcall2(rbType, rb_intern("size"), 0, NULL));
-
-    Data_Get_Struct(self, StructLayoutBuilder, builder);
-
-    offset = calculate_offset(builder, alignment, rbOffset);
-
-    fargv[0] = rbName;
-    fargv[1] = UINT2NUM(offset);
-    fargv[2] = rbType;
-    rbFieldClass = rb_const_get(rbffi_StructLayoutClass, rb_intern("InlineStruct"));
-    if (!RTEST(rbFieldClass)) {
-        rb_raise(rb_eRuntimeError, "could not locate StructLayout::InlineStruct");
-        return Qnil;
+        return retval;
     }
-    
-    rbField = rb_class_new_instance(3, fargv, rbFieldClass);
-
-    store_field(builder, rbName, rbField, offset, size, alignment);
-
-    return self;
-}
-
-static VALUE
-struct_layout_builder_add_array(int argc, VALUE* argv, VALUE self)
-{
-    StructLayoutBuilder* builder;
-    VALUE rbName = Qnil, rbType = Qnil, rbLength = Qnil, rbOffset = Qnil, rbField;
-    VALUE fargv[3], aargv[2];
-    unsigned int size, alignment, offset;
-    int nargs;
-
-    nargs = rb_scan_args(argc, argv, "31", &rbName, &rbType, &rbLength, &rbOffset);
-
-    Data_Get_Struct(self, StructLayoutBuilder, builder);
-
-    alignment = NUM2UINT(rb_funcall2(rbType, rb_intern("alignment"), 0, NULL));
-    size = NUM2UINT(rb_funcall2(rbType, rb_intern("size"), 0, NULL)) * NUM2UINT(rbLength);
-
-    offset = calculate_offset(builder, alignment, rbOffset);
-
-    aargv[0] = rbType;
-    aargv[1] = rbLength;
-    fargv[0] = rbName;
-    fargv[1] = UINT2NUM(offset);
-    fargv[2] = rb_class_new_instance(2, aargv, rbffi_ArrayTypeClass);
-    rbField = rb_class_new_instance(3, fargv, rbffi_StructLayoutArrayFieldClass);
-
-    store_field(builder, rbName, rbField, offset, size, alignment);
-
-    return self;
 }
 
-static inline int
-align(int offset, int align)
-{
-    return align + ((offset - 1) & ~(align - 1));
-}
-
-static VALUE
-struct_layout_builder_build(VALUE self)
-{
-    StructLayoutBuilder* builder;
-    VALUE argv[4];
-
-    Data_Get_Struct(self, StructLayoutBuilder, builder);
-
-    argv[0] = builder->rbFieldNames;
-    argv[1] = builder->rbFieldMap;
-    argv[2] = UINT2NUM(align(builder->size, builder->alignment)); // tail padding
-    argv[3] = UINT2NUM(builder->alignment);
-
-    return rb_class_new_instance(4, argv, rbffi_StructLayoutClass);
-}
 
 static VALUE
 inline_array_allocate(VALUE klass)
@@ -848,10 +579,6 @@ rbffi_Struct_Init(VALUE moduleFFI)
     rbffi_StructClass = StructClass = rb_define_class_under(moduleFFI, "Struct", rb_cObject);
     rb_global_variable(&rbffi_StructClass);
 
-
-    StructLayoutBuilderClass = rb_define_class_under(moduleFFI, "StructLayoutBuilder", rb_cObject);
-    rb_global_variable(&StructLayoutBuilderClass);
-
     rbffi_StructInlineArrayClass = rb_define_class_under(rbffi_StructClass, "InlineArray", rb_cObject);
     rb_global_variable(&rbffi_StructInlineArrayClass);
 
@@ -862,6 +589,7 @@ rbffi_Struct_Init(VALUE moduleFFI)
 
     rb_define_alloc_func(StructClass, struct_allocate);
     rb_define_method(StructClass, "initialize", struct_initialize, -1);
+    rb_define_method(StructClass, "order", struct_order, -1);
     
     rb_define_alias(rb_singleton_class(StructClass), "alloc_in", "new");
     rb_define_alias(rb_singleton_class(StructClass), "alloc_out", "new");
@@ -878,22 +606,7 @@ rbffi_Struct_Init(VALUE moduleFFI)
 
     rb_define_method(StructClass, "[]", struct_aref, 1);
     rb_define_method(StructClass, "[]=", struct_aset, 2);
-    
-    
-
-    rb_define_alloc_func(StructLayoutBuilderClass, struct_layout_builder_allocate);
-    rb_define_method(StructLayoutBuilderClass, "initialize", struct_layout_builder_initialize, 0);
-    rb_define_method(StructLayoutBuilderClass, "build", struct_layout_builder_build, 0);
-
-    rb_define_method(StructLayoutBuilderClass, "alignment", struct_layout_builder_get_alignment, 0);
-    rb_define_method(StructLayoutBuilderClass, "alignment=", struct_layout_builder_set_alignment, 1);
-    rb_define_method(StructLayoutBuilderClass, "size", struct_layout_builder_get_size, 0);
-    rb_define_method(StructLayoutBuilderClass, "size=", struct_layout_builder_set_size, 1);
-    rb_define_method(StructLayoutBuilderClass, "union=", struct_layout_builder_set_union, 1);
-    rb_define_method(StructLayoutBuilderClass, "union?", struct_layout_builder_union_p, 0);
-    rb_define_method(StructLayoutBuilderClass, "add_field", struct_layout_builder_add_field, -1);
-    rb_define_method(StructLayoutBuilderClass, "add_array", struct_layout_builder_add_array, -1);
-    rb_define_method(StructLayoutBuilderClass, "add_struct", struct_layout_builder_add_struct, -1);
+    rb_define_method(StructClass, "null?", struct_null_p, 0);
 
     rb_include_module(rbffi_StructInlineArrayClass, rb_mEnumerable);
     rb_define_alloc_func(rbffi_StructInlineArrayClass, inline_array_allocate);