April 2009 - macruby-changes - lists.macosforge.org

[1497] MacRuby/branches/experimental
by source_changes＠macosforge.org 28 Apr '09

28 Apr '09

Revision: 1497 http://trac.macosforge.org/projects/ruby/changeset/1497 Author: lsansonetti(a)apple.com Date: 2009-04-27 21:25:21 -0700 (Mon, 27 Apr 2009) Log Message: ----------- more Pointer work (should be almost done) + misc fixes Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp MacRuby/branches/experimental/spec/macruby/pointer_spec.rb Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-04-28 03:11:40 UTC (rev 1496) +++ MacRuby/branches/experimental/roxor.cpp 2009-04-28 04:25:21 UTC (rev 1497) @@ -5624,6 +5624,7 @@ return Type::Int32Ty; case _C_LNG: + case _C_ULNG: #if __LP64__ return Type::Int64Ty; #else @@ -5659,8 +5660,7 @@ break; } - printf("unrecognized runtime type `%s' - aborting\n", type); - abort(); + rb_raise(rb_eTypeError, "unrecognized runtime type `%s'\n", type); } Function * @@ -9085,15 +9085,22 @@ void *val; } rb_vm_pointer_t; +static const char *convert_ffi_type(VALUE type, + bool raise_exception_if_unknown); + static VALUE -rb_pointer_new(VALUE rcv, SEL sel, VALUE type) +rb_pointer_new(VALUE rcv, SEL sel, int argc, VALUE *argv) { + VALUE type, len; + rb_scan_args(argc, argv, "11", &type, &len); + const size_t rlen = NIL_P(len) ? 1 : FIX2LONG(len); + StringValuePtr(type); + const char *type_str = convert_ffi_type(type, false); rb_vm_pointer_t *ptr = (rb_vm_pointer_t *)xmalloc(sizeof(rb_vm_pointer_t)); - GC_WB(&ptr->type, type); + GC_WB(&ptr->type, rb_str_new2(type_str)); - const char *type_str = RSTRING_PTR(type); ptr->convert_to_rval = (VALUE (*)(void *))GET_VM()->gen_to_rval_convertor(type_str); ptr->convert_to_ocval = @@ -9101,7 +9108,7 @@ ptr->type_size = GET_VM()->get_sizeof(type_str); assert(ptr->type_size > 0); - GC_WB(&ptr->val, xmalloc(ptr->type_size)); + GC_WB(&ptr->val, xmalloc(ptr->type_size * rlen)); return Data_Wrap_Struct(rb_cPointer, NULL, NULL, ptr); } @@ -9152,6 +9159,7 @@ void Init_BridgeSupport(void) { + // Boxed rb_cBoxed = rb_define_class("Boxed", rb_cObject); rb_objc_define_method(*(VALUE *)rb_cBoxed, "type", (void *)rb_boxed_objc_type, 0); @@ -9159,11 +9167,12 @@ (void *)rb_boxed_is_opaque, 0); boxed_ivar_type = rb_intern("__octype__"); + // Pointer rb_cPointer = rb_define_class("Pointer", rb_cObject); rb_objc_define_method(*(VALUE *)rb_cPointer, "new", - (void *)rb_pointer_new, 1); + (void *)rb_pointer_new, -1); rb_objc_define_method(*(VALUE *)rb_cPointer, "new_with_type", - (void *)rb_pointer_new, 1); + (void *)rb_pointer_new, -1); rb_objc_define_method(rb_cPointer, "[]", (void *)rb_pointer_aref, 1); rb_objc_define_method(rb_cPointer, "[]=", @@ -9515,12 +9524,12 @@ // FFI static const char * -convert_ffi_type(VALUE type) +convert_ffi_type(VALUE type, bool raise_exception_if_unknown) { const char *typestr = StringValueCStr(type); assert(typestr != NULL); - // Converting Ruby-FFI types to Objective-C runtime types. + // Ruby-FFI types. if (strcmp(typestr, "char") == 0) { return "c"; @@ -9565,8 +9574,17 @@ return "^"; } - rb_raise(rb_eArgError, "unrecognized string `%s' given as FFI type", - typestr); + // MacRuby extensions. + + if (strcmp(typestr, "object") == 0) { + return "@"; + } + + if (raise_exception_if_unknown) { + rb_raise(rb_eTypeError, "unrecognized string `%s' given as FFI type", + typestr); + } + return typestr; } Function * @@ -9644,12 +9662,12 @@ } std::string types; - types.append(convert_ffi_type(ret)); + types.append(convert_ffi_type(ret, true)); Check_Type(args, T_ARRAY); const int argc = RARRAY_LEN(args); for (int i = 0; i < argc; i++) { - types.append(convert_ffi_type(RARRAY_AT(args, i))); + types.append(convert_ffi_type(RARRAY_AT(args, i), true)); } rb_vm_c_stub_t *stub = (rb_vm_c_stub_t *)GET_VM()->gen_stub(types, argc, Modified: MacRuby/branches/experimental/spec/macruby/pointer_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/macruby/pointer_spec.rb 2009-04-28 03:11:40 UTC (rev 1496) +++ MacRuby/branches/experimental/spec/macruby/pointer_spec.rb 2009-04-28 04:25:21 UTC (rev 1497) @@ -3,7 +3,6 @@ framework 'Foundation' describe "A Pointer object" do -=begin # TODO it "can be created using the #new class method and with a valid Objective-C type or a valid Symbol object" do types = { :object => '@', @@ -31,22 +30,70 @@ end lambda { Pointer.new }.should raise_error(ArgumentError) - lambda { Pointer.new('invalid') }.should raise_error(TypeError) + lambda { Pointer.new(nil) }.should raise_error(TypeError) + lambda { Pointer.new(123) }.should raise_error(TypeError) + lambda { Pointer.new('x') }.should raise_error(TypeError) + + p = Pointer.new(NSRect.type) + p.type.should == NSRect.type end -=end -=begin # TODO - it "can be assigned an object of the given type and retrieve it later, using #[] and #[]=" - p = Pointer.new('@') + it "can be assigned an object of the given type and retrieve it later, using #[] and #[]=" do + p = Pointer.new('object') o = Object.new p[0] = o + p[0].object_id.should == o.object_id p[0].should == o - p = Pointer.new('i') - p[0] = 42 - p[0].should == 42 + p[0] = 123 + p[0].class.should == Fixnum + p[0].should == 123 - lambda { p[0] = Object.new }.should raise_error(TypeError) + int_types = %w{ char uchar short ushort int uint long ulong + long_long ulong_long } + int_types.each do |t| + p = Pointer.new(t) + p[0] = 42 + p[0].class.should == Fixnum + p[0].should == 42 + + o = Object.new + def o.to_i; 42; end + + p[0] = o + p[0].class.should == Fixnum + p[0].should == 42 + + lambda { p[0] = Object.new }.should raise_error(TypeError) + end + + float_types = %w{ float double } + float_types.each do |t| + p = Pointer.new(t) + p[0] = 42 + p[0].class.should == Float + p[0].should == 42.0 + + o = Object.new + def o.to_f; 42.0; end + + p[0] = o + p[0].class.should == Float + p[0].should == 42.0 + + lambda { p[0] = Object.new }.should raise_error(TypeError) + end + + struct_types = [[NSPoint, NSPoint.new(1, 2)], + [NSSize, NSSize.new(3, 4)], + [NSRect, NSRect.new(NSPoint.new(1, 2), NSSize.new(3, 4))]] + struct_types.each do |k, o| + p = Pointer.new(k.type) + p[0] = o + p[0].class.should == k + p[0].should == o + + lambda { p[0] = Object.new }.should raise_error(TypeError) + end end -=end end

1 0

[1496] MacRuby/branches/experimental/roxor.cpp
by source_changes＠macosforge.org 28 Apr '09

28 Apr '09

Revision: 1496 http://trac.macosforge.org/projects/ruby/changeset/1496 Author: lsansonetti(a)apple.com Date: 2009-04-27 20:11:40 -0700 (Mon, 27 Apr 2009) Log Message: ----------- more Pointer work Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-04-28 02:23:44 UTC (rev 1495) +++ MacRuby/branches/experimental/roxor.cpp 2009-04-28 03:11:40 UTC (rev 1496) @@ -206,6 +206,8 @@ Function *compile_to_rval_convertor(const char *type); Function *compile_to_ocval_convertor(const char *type); + const Type *convert_type(const char *type); + private: const char *fname; @@ -391,7 +393,6 @@ BasicBlock::InstListType::iterator iter); bool unbox_ruby_constant(Value *val, VALUE *rval); SEL mid_to_sel(ID mid, int arity); - const Type *convert_type(const char *type); }; llvm::Module *RoxorCompiler::module = NULL; @@ -630,6 +631,10 @@ return ee->getTargetData()->getTypeSizeInBits(type) / 8; } + size_t get_sizeof(const char *type) { + return get_sizeof(RoxorCompiler::shared->convert_type(type)); + } + bool is_large_struct_type(const Type *type) { return type->getTypeID() == Type::StructTyID && ee->getTargetData()->getTypeSizeInBits(type) > 128; @@ -9074,8 +9079,9 @@ typedef struct { VALUE type; + size_t type_size; VALUE (*convert_to_rval)(void *); - void (*convert_to_ocval)(VALUE rval, void **); + void (*convert_to_ocval)(VALUE rval, void *); void *val; } rb_vm_pointer_t; @@ -9091,35 +9097,52 @@ ptr->convert_to_rval = (VALUE (*)(void *))GET_VM()->gen_to_rval_convertor(type_str); ptr->convert_to_ocval = - (void (*)(VALUE, void **))GET_VM()->gen_to_ocval_convertor(type_str); - ptr->val = NULL; // TODO + (void (*)(VALUE, void *))GET_VM()->gen_to_ocval_convertor(type_str); + ptr->type_size = GET_VM()->get_sizeof(type_str); + assert(ptr->type_size > 0); + GC_WB(&ptr->val, xmalloc(ptr->type_size)); + return Data_Wrap_Struct(rb_cPointer, NULL, NULL, ptr); } +#define POINTER_VAL(ptr, idx) \ + (void *)((char *)ptr->val + (FIX2INT(idx) * ptr->type_size)) + static VALUE rb_pointer_aref(VALUE rcv, SEL sel, VALUE idx) { - return Qnil; + Check_Type(idx, T_FIXNUM); + + rb_vm_pointer_t *ptr; + Data_Get_Struct(rcv, rb_vm_pointer_t, ptr); + + return ptr->convert_to_rval(POINTER_VAL(ptr, idx)); } static VALUE -rb_pointer_asef(VALUE rcv, SEL sel, VALUE idx, VALUE val) +rb_pointer_aset(VALUE rcv, SEL sel, VALUE idx, VALUE val) { - return Qnil; + Check_Type(idx, T_FIXNUM); + + rb_vm_pointer_t *ptr; + Data_Get_Struct(rcv, rb_vm_pointer_t, ptr); + + ptr->convert_to_ocval(val, POINTER_VAL(ptr, idx)); + + return val; } static VALUE rb_pointer_assign(VALUE rcv, SEL sel, VALUE val) { - return rb_pointer_asef(rcv, 0, FIX2INT(0), val); + return rb_pointer_aset(rcv, 0, FIX2INT(0), val); } static VALUE rb_pointer_type(VALUE rcv, SEL sel) { rb_vm_pointer_t *ptr; - Data_Get_Struct(rcv, rb_vm_pointer_t, ptr); return ptr->type; @@ -9144,7 +9167,7 @@ rb_objc_define_method(rb_cPointer, "[]", (void *)rb_pointer_aref, 1); rb_objc_define_method(rb_cPointer, "[]=", - (void *)rb_pointer_asef, 2); + (void *)rb_pointer_aset, 2); rb_objc_define_method(rb_cPointer, "assign", (void *)rb_pointer_assign, 1); rb_objc_define_method(rb_cPointer, "type",

1 0

[1495] MacRuby/branches/experimental
by source_changes＠macosforge.org 28 Apr '09

28 Apr '09

Revision: 1495 http://trac.macosforge.org/projects/ruby/changeset/1495 Author: lsansonetti(a)apple.com Date: 2009-04-27 19:23:44 -0700 (Mon, 27 Apr 2009) Log Message: ----------- implemented BridgeSupport constants, some work on Pointer, extracted the objc specs of method_spec.rb into method_objc_spec.rb, started working on pointer_spec.rb Modified Paths: -------------- MacRuby/branches/experimental/objc.m MacRuby/branches/experimental/roxor.cpp MacRuby/branches/experimental/spec/macruby/method_spec.rb Added Paths: ----------- MacRuby/branches/experimental/spec/macruby/objc_method_spec.rb MacRuby/branches/experimental/spec/macruby/pointer_spec.rb Modified: MacRuby/branches/experimental/objc.m =================================================================== --- MacRuby/branches/experimental/objc.m 2009-04-27 02:04:56 UTC (rev 1494) +++ MacRuby/branches/experimental/objc.m 2009-04-28 02:23:44 UTC (rev 1495) @@ -75,7 +75,7 @@ static struct st_table *bs_inf_prot_imethods; static struct st_table *bs_cftypes; -VALUE rb_cPointer; +static VALUE rb_cPointer; struct RPointer { @@ -517,6 +517,7 @@ static void rb_objc_rval_to_ocval(VALUE, const char *, void **); +#if 0 static VALUE rb_pointer_new_with_type(VALUE recv, SEL sel, VALUE type) { @@ -572,6 +573,7 @@ return ret; } +#endif static bool rb_objc_rval_copy_boxed_data(VALUE rval, bs_element_boxed_t *bs_boxed, void *ocval) @@ -3264,11 +3266,13 @@ rb_install_boxed_primitives(); #endif +#if 0 rb_cPointer = rb_define_class("Pointer", rb_cObject); rb_undef_alloc_func(rb_cPointer); rb_objc_define_method(*(VALUE *)rb_cPointer, "new_with_type", rb_pointer_new_with_type, 1); rb_objc_define_method(rb_cPointer, "assign", rb_pointer_assign, 1); rb_objc_define_method(rb_cPointer, "[]", rb_pointer_aref, 1); +#endif rb_ivar_type = rb_intern("@__objc_type__"); Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-04-27 02:04:56 UTC (rev 1494) +++ MacRuby/branches/experimental/roxor.cpp 2009-04-28 02:23:44 UTC (rev 1495) @@ -203,6 +203,8 @@ Function *compile_bs_struct_writer(rb_vm_bs_boxed_t *bs_boxed, int field); Function *compile_ffi_function(void *stub, void *imp, int argc); + Function *compile_to_rval_convertor(const char *type); + Function *compile_to_ocval_convertor(const char *type); private: const char *fname; @@ -477,6 +479,8 @@ std::map<Class, std::map<ID, int> *> ivar_slots; std::map<SEL, GlobalVariable *> redefined_ops_gvars; std::map<Class, struct rb_vm_outer *> outers; + std::map<std::string, void *> c_stubs, objc_stubs, + to_rval_convertors, to_ocval_convertors; public: static RoxorVM *current; @@ -502,8 +506,6 @@ std::map<VALUE, rb_vm_catch_t *> catch_jmp_bufs; std::vector<jmp_buf *> return_from_block_jmp_bufs; - std::map<std::string, void *> c_stubs, objc_stubs; - bs_parser_t *bs_parser; std::map<std::string, rb_vm_bs_boxed_t *> bs_boxed; std::map<std::string, bs_element_function_t *> bs_funcs; @@ -516,6 +518,16 @@ rb_vm_bs_boxed_t *find_bs_struct(std::string type); rb_vm_bs_boxed_t *find_bs_opaque(std::string type); + void *gen_stub(std::string types, int argc, bool is_objc); + void *gen_to_rval_convertor(std::string type); + void *gen_to_ocval_convertor(std::string type); + + void insert_stub(const char *types, void *stub, bool is_objc) { + std::map<std::string, void *> &m = + is_objc ? objc_stubs : c_stubs; + m.insert(std::make_pair(types, stub)); + } + #if ROXOR_ULTRA_LAZY_JIT std::map<SEL, std::map<Class, rb_vm_method_source_t *> *> method_sources; @@ -7083,26 +7095,100 @@ return rb_vm_call(obj, selMethodMissing, argc + 1, new_argv, false); } -static void * -vm_gen_stub(std::string types, int argc, bool is_objc) +inline void * +RoxorVM::gen_stub(std::string types, int argc, bool is_objc) { - std::map<std::string, void *> &stubs = - is_objc ? GET_VM()->objc_stubs : GET_VM()->c_stubs; + std::map<std::string, void *> &stubs = is_objc ? objc_stubs : c_stubs; std::map<std::string, void *>::iterator iter = stubs.find(types); if (iter != stubs.end()) { return iter->second; } - //printf("generating %s stub %s argc %d\n", is_objc ? "objc" : "c", types, argc); - Function *f = RoxorCompiler::shared->compile_stub(types.c_str(), argc, is_objc); - void *stub = (void *)GET_VM()->compile(f); + void *stub = (void *)compile(f); stubs.insert(std::make_pair(types, stub)); return stub; } +Function * +RoxorCompiler::compile_to_rval_convertor(const char *type) +{ + // VALUE foo(void *ocval); + Function *f = cast<Function>(module->getOrInsertFunction("", + Type::VoidTy, PtrTy, NULL)); + Function::arg_iterator arg = f->arg_begin(); + Value *ocval = arg++; + + bb = BasicBlock::Create("EntryBlock", f); + + const Type *llvm_type = convert_type(type); + ocval = new BitCastInst(ocval, PointerType::getUnqual(llvm_type), "", bb); + ocval = new LoadInst(ocval, "", bb); + + Value *rval = compile_conversion_to_ruby(type, llvm_type, ocval); + + ReturnInst::Create(rval, bb); + + return f; +} + +inline void * +RoxorVM::gen_to_rval_convertor(std::string type) +{ + std::map<std::string, void *>::iterator iter = + to_rval_convertors.find(type); + if (iter != to_rval_convertors.end()) { + return iter->second; + } + + Function *f = RoxorCompiler::shared->compile_to_rval_convertor( + type.c_str()); + void *convertor = (void *)compile(f); + to_rval_convertors.insert(std::make_pair(type, convertor)); + + return convertor; +} + +Function * +RoxorCompiler::compile_to_ocval_convertor(const char *type) +{ + // void foo(VALUE rval, void **ocval); + Function *f = cast<Function>(module->getOrInsertFunction("", + Type::VoidTy, RubyObjTy, PtrTy, NULL)); + Function::arg_iterator arg = f->arg_begin(); + Value *rval = arg++; + Value *ocval = arg++; + + bb = BasicBlock::Create("EntryBlock", f); + + const Type *llvm_type = convert_type(type); + ocval = new BitCastInst(ocval, PointerType::getUnqual(llvm_type), "", bb); + compile_conversion_to_c(type, rval, ocval); + + ReturnInst::Create(bb); + + return f; +} + +inline void * +RoxorVM::gen_to_ocval_convertor(std::string type) +{ + std::map<std::string, void *>::iterator iter = + to_ocval_convertors.find(type); + if (iter != to_ocval_convertors.end()) { + return iter->second; + } + + Function *f = RoxorCompiler::shared->compile_to_ocval_convertor( + type.c_str()); + void *convertor = (void *)compile(f); + to_ocval_convertors.insert(std::make_pair(type, convertor)); + + return convertor; +} + static inline void vm_gen_bs_func_types(bs_element_function_t *bs_func, std::string &types) { @@ -7196,8 +7282,8 @@ sel_getName(sel)); abort(); } - ocache.stub = (rb_vm_objc_stub_t *)vm_gen_stub(types, argc, - true); + ocache.stub = (rb_vm_objc_stub_t *)GET_VM()->gen_stub(types, + argc, true); } } else { @@ -7235,8 +7321,8 @@ fcache.bs_function = bs_func; fcache.imp = (IMP)dlsym(RTLD_DEFAULT, bs_func->name); assert(fcache.imp != NULL); - fcache.stub = (rb_vm_c_stub_t *)vm_gen_stub(types, argc, - false); + fcache.stub = (rb_vm_c_stub_t *)GET_VM()->gen_stub(types, + argc, false); } else { // Still nothing, then let's call #method_missing. @@ -8568,9 +8654,8 @@ bs_const->name); } - // TODO - //rb_objc_ocval_to_rval(sym, bs_const->type, &v); - v = INT2FIX(42); + void *convertor = GET_VM()->gen_to_rval_convertor(bs_const->type); + v = ((VALUE (*)(void *))convertor)(sym); CFMutableDictionaryRef iv_dict = rb_class_ivar_dict(rb_cObject); assert(iv_dict != NULL); @@ -8580,6 +8665,8 @@ return v; } +VALUE rb_cBoxed; + extern "C" void rb_vm_check_arity(int given, int requested) @@ -8983,8 +9070,61 @@ return bs_boxed->bs_type == BS_ELEMENT_OPAQUE ? Qtrue : Qfalse; } -VALUE rb_cBoxed; +VALUE rb_cPointer; +typedef struct { + VALUE type; + VALUE (*convert_to_rval)(void *); + void (*convert_to_ocval)(VALUE rval, void **); + void *val; +} rb_vm_pointer_t; + +static VALUE +rb_pointer_new(VALUE rcv, SEL sel, VALUE type) +{ + StringValuePtr(type); + + rb_vm_pointer_t *ptr = (rb_vm_pointer_t *)xmalloc(sizeof(rb_vm_pointer_t)); + GC_WB(&ptr->type, type); + + const char *type_str = RSTRING_PTR(type); + ptr->convert_to_rval = + (VALUE (*)(void *))GET_VM()->gen_to_rval_convertor(type_str); + ptr->convert_to_ocval = + (void (*)(VALUE, void **))GET_VM()->gen_to_ocval_convertor(type_str); + ptr->val = NULL; // TODO + + return Data_Wrap_Struct(rb_cPointer, NULL, NULL, ptr); +} + +static VALUE +rb_pointer_aref(VALUE rcv, SEL sel, VALUE idx) +{ + return Qnil; +} + +static VALUE +rb_pointer_asef(VALUE rcv, SEL sel, VALUE idx, VALUE val) +{ + return Qnil; +} + +static VALUE +rb_pointer_assign(VALUE rcv, SEL sel, VALUE val) +{ + return rb_pointer_asef(rcv, 0, FIX2INT(0), val); +} + +static VALUE +rb_pointer_type(VALUE rcv, SEL sel) +{ + rb_vm_pointer_t *ptr; + + Data_Get_Struct(rcv, rb_vm_pointer_t, ptr); + + return ptr->type; +} + extern "C" void Init_BridgeSupport(void) @@ -8996,6 +9136,20 @@ (void *)rb_boxed_is_opaque, 0); boxed_ivar_type = rb_intern("__octype__"); + rb_cPointer = rb_define_class("Pointer", rb_cObject); + rb_objc_define_method(*(VALUE *)rb_cPointer, "new", + (void *)rb_pointer_new, 1); + rb_objc_define_method(*(VALUE *)rb_cPointer, "new_with_type", + (void *)rb_pointer_new, 1); + rb_objc_define_method(rb_cPointer, "[]", + (void *)rb_pointer_aref, 1); + rb_objc_define_method(rb_cPointer, "[]=", + (void *)rb_pointer_asef, 2); + rb_objc_define_method(rb_cPointer, "assign", + (void *)rb_pointer_assign, 1); + rb_objc_define_method(rb_cPointer, "type", + (void *)rb_pointer_type, 0); + bs_const_magic_cookie = rb_str_new2("bs_const_magic_cookie"); rb_objc_retain((void *)bs_const_magic_cookie); } @@ -9475,7 +9629,8 @@ types.append(convert_ffi_type(RARRAY_AT(args, i))); } - rb_vm_c_stub_t *stub = (rb_vm_c_stub_t *)vm_gen_stub(types, argc, false); + rb_vm_c_stub_t *stub = (rb_vm_c_stub_t *)GET_VM()->gen_stub(types, argc, + false); Function *f = RoxorCompiler::shared->compile_ffi_function((void *)stub, sym, argc); IMP imp = GET_VM()->compile(f); @@ -9507,8 +9662,8 @@ static void setup_builtin_stubs(void) { - GET_VM()->objc_stubs.insert(std::make_pair("@@:", (void *)builtin_ostub1)); - GET_VM()->objc_stubs.insert(std::make_pair("#@:", (void *)builtin_ostub1)); + GET_VM()->insert_stub("@@:", (void *)builtin_ostub1, true); + GET_VM()->insert_stub("#@:", (void *)builtin_ostub1, true); } #if ROXOR_ULTRA_LAZY_JIT Modified: MacRuby/branches/experimental/spec/macruby/method_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/macruby/method_spec.rb 2009-04-27 02:04:56 UTC (rev 1494) +++ MacRuby/branches/experimental/spec/macruby/method_spec.rb 2009-04-28 02:23:44 UTC (rev 1495) @@ -82,375 +82,6 @@ def @o.isFoo; end @o.should_not have_method(:'foo?') end -end -framework 'Foundation' - -fixture_source = File.dirname(__FILE__) + '/fixtures/method.m' -fixture_ext = '/tmp/method.bundle' -if !File.exist?(fixture_ext) or File.mtime(fixture_source) > File.mtime(fixture_ext) -=begin - # #system is currently broken - unless system("/usr/bin/gcc #{fixture_source} -o #{fixture_ext} -g -framework Foundation -dynamiclib -fobjc-gc -arch i386 -arch x86_64 -arch ppc") - $stderr.puts "cannot compile fixture source file `#{fixture_source}' - aborting" - exit 1 - end -=end - `/usr/bin/gcc #{fixture_source} -o #{fixture_ext} -g -framework Foundation -dynamiclib -fobjc-gc -arch i386 -arch x86_64 -arch ppc` + # TODO add overloading specs end -require '/tmp/method' -load_bridge_support_file File.dirname(__FILE__) + '/fixtures/method.bridgesupport' - -describe "A pure Objective-C method" do - before :each do - @o = TestMethod.new - end - - it "can be called with #foo= if it matches the #setFoo pattern" do - o = [] - - # TODO Stopped here: This should be sufficient, but doesn't work. - # o.should have_method(:'setArray', true) - # o.should have_method(:'array=', true) - - o.respond_to?(:'setArray').should == true - o.respond_to?(:'array=').should == true - o.array = [1, 2, 3] - o.should == [1, 2, 3] - end - - it "can be called with #foo? if it matches the #isFoo pattern" do - o = NSBundle.mainBundle - o.respond_to?(:'isLoaded').should == true - o.respond_to?(:'loaded?').should == true - o.loaded?.should == true - end - - it "is only exposed in #methods if the second argument is true" do - o = Object.new - o.methods.include?(:'performSelector').should == false - o.methods(true).include?(:'performSelector').should == false - o.methods(false).include?(:'performSelector').should == false - o.methods(true, true).include?(:'performSelector').should == true - o.methods(false, true).include?(:'performSelector').should == true - end - - it "can be called on an immediate object" do - 123.self.should == 123 - true.self.should == true - false.self.should == false - nil.self.should == nil - end - - it "returning void returns nil in Ruby" do - @o.methodReturningVoid.should == nil - end - - it "returning nil returns nil in Ruby" do - @o.methodReturningNil.should == nil - end - - it "returning self returns the same receiver object" do - @o.methodReturningSelf.should == @o - @o.methodReturningSelf.object_id == @o.object_id - end - - it "returning kCFBooleanTrue returns true in Ruby" do - @o.methodReturningCFTrue.should == true - @o.methodReturningCFTrue.class.should == TrueClass - end - - it "returning kCFBooleanFalse returns false in Ruby" do - @o.methodReturningCFFalse.should == false - @o.methodReturningCFFalse.class.should == FalseClass - end - - it "returning kCFNull returns nil in Ruby" do - @o.methodReturningCFNull.should == nil - @o.methodReturningCFNull.class.should == NilClass - end - - it "returning YES returns true in Ruby" do - @o.methodReturningYES.should == true - end - - it "returning NO returns true in Ruby" do - @o.methodReturningNO.should == false - end - - it "returning 'char' or 'unsigned char' returns a Fixnum in Ruby" do - @o.methodReturningChar.should == 42 - @o.methodReturningChar2.should == -42 - @o.methodReturningUnsignedChar.should == 42 - end - - it "returning 'short' or 'unsigned short' returns a Fixnum in Ruby" do - @o.methodReturningShort.should == 42 - @o.methodReturningShort2.should == -42 - @o.methodReturningUnsignedShort.should == 42 - end - - it "returning 'int' or 'unsigned int' returns a Fixnum in Ruby" do - @o.methodReturningInt.should == 42 - @o.methodReturningInt2.should == -42 - @o.methodReturningUnsignedInt.should == 42 - end - - it "returning 'long' or 'unsigned long' returns a Fixnum if possible in Ruby" do - @o.methodReturningLong.should == 42 - @o.methodReturningLong2.should == -42 - @o.methodReturningUnsignedLong.should == 42 - end - - it "returning 'long' or 'unsigned long' returns a Bignum if it cannot fix in a Fixnum in Ruby" do - @o.methodReturningLong3.should == - (RUBY_ARCH == 'x86_64' ? 4611686018427387904 : 1073741824) - @o.methodReturningLong3.class.should == Bignum - @o.methodReturningLong4.should == - (RUBY_ARCH == 'x86_64' ? -4611686018427387905 : -1073741825) - @o.methodReturningLong4.class.should == Bignum - @o.methodReturningUnsignedLong2.should == - (RUBY_ARCH == 'x86_64' ? 4611686018427387904 : 1073741824) - @o.methodReturningUnsignedLong2.class.should == Bignum - end - - it "returning 'float' returns a Float in Ruby" do - @o.methodReturningFloat.should be_close(3.1415, 0.0001) - @o.methodReturningFloat.class.should == Float - end - - it "returning 'double' returns a Float in Ruby" do - @o.methodReturningDouble.should be_close(3.1415, 0.0001) - @o.methodReturningDouble.class.should == Float - end - - it "returning 'SEL' returns a Symbol or nil in Ruby" do - @o.methodReturningSEL.class.should == Symbol - @o.methodReturningSEL.should == :'foo:with:with:' - @o.methodReturningSEL2.class.should == NilClass - @o.methodReturningSEL2.should == nil - end - - it "returning 'char *' returns a String or nil in Ruby" do - @o.methodReturningCharPtr.class.should == String - @o.methodReturningCharPtr.should == 'foo' - @o.methodReturningCharPtr2.class.should == NilClass - @o.methodReturningCharPtr2.should == nil - end - - it "returning 'NSPoint' returns an NSPoint boxed object in Ruby" do - b = @o.methodReturningNSPoint - b.class.should == NSPoint - b.x.class.should == Float - b.x.should == 1.0 - b.y.class.should == Float - b.y.should == 2.0 - end - - it "returning 'NSSize' returns an NSSize boxed object in Ruby" do - b = @o.methodReturningNSSize - b.class.should == NSSize - b.width.class.should == Float - b.width.should == 3.0 - b.height.class.should == Float - b.height.should == 4.0 - end - - it "returning 'NSRect' returns an NSRect boxed object in Ruby" do - b = @o.methodReturningNSRect - b.class.should == NSRect - b.origin.class.should == NSPoint - b.origin.x.should == 1.0 - b.origin.y.should == 2.0 - b.size.class.should == NSSize - b.size.width.should == 3.0 - b.size.height.should == 4.0 - end - - it "returning 'NSRange' returns an NSRange boxed object in Ruby" do - b = @o.methodReturningNSRange - b.class.should == NSRange - b.location.class.should == Fixnum - b.location.should == 0 - b.length.class.should == Fixnum - b.length.should == 42 - end - - it "accepting the receiver as 'id' should receive the exact same object" do - @o.methodAcceptingSelf(@o).should == 1 - end - - it "accepting the receiver's class as 'id' should receive the exact same object" do - @o.methodAcceptingSelfClass(@o.class).should == 1 - end - - it "accepting 'nil' as 'id' should receive Objective-C's nil" do - @o.methodAcceptingNil(nil).should == 1 - end - - it "accepting 'true' as 'id; should receive CF's kCFBooleanTrue" do - @o.methodAcceptingTrue(true).should == 1 - end - - it "accepting 'false' as 'id' should receive CF's kCFBooleanFalse" do - @o.methodAcceptingFalse(false).should == 1 - end - - it "accepting a Fixnum as 'id' should receive a Fixnum boxed object" do - @o.methodAcceptingFixnum(42).should == 1 - end - - it "accepting nil or false as 'BOOL' should receive NO, any other object should receive YES" do - @o.methodAcceptingFalseBOOL(nil).should == 1 - @o.methodAcceptingFalseBOOL(false).should == 1 - - @o.methodAcceptingTrueBOOL(true).should == 1 - @o.methodAcceptingTrueBOOL(0).should == 1 - @o.methodAcceptingTrueBOOL(123).should == 1 - @o.methodAcceptingTrueBOOL('foo').should == 1 - @o.methodAcceptingTrueBOOL(Object.new).should == 1 - end - - it "accepting a Fixnum-compatible object as 'char', 'unsigned char', 'short', 'unsigned short', 'int', 'unsigned int', 'long', 'unsigned long' should receive the converted data, or raise an exception" do - @o.methodAcceptingChar(42).should == 1 - @o.methodAcceptingUnsignedChar(42).should == 1 - @o.methodAcceptingShort(42).should == 1 - @o.methodAcceptingUnsignedShort(42).should == 1 - @o.methodAcceptingInt(42).should == 1 - @o.methodAcceptingUnsignedInt(42).should == 1 - @o.methodAcceptingLong(42).should == 1 - @o.methodAcceptingUnsignedLong(42).should == 1 - - @o.methodAcceptingChar(42.0).should == 1 - @o.methodAcceptingUnsignedChar(42.0).should == 1 - @o.methodAcceptingShort(42.0).should == 1 - @o.methodAcceptingUnsignedShort(42.0).should == 1 - @o.methodAcceptingInt(42.0).should == 1 - @o.methodAcceptingUnsignedInt(42.0).should == 1 - @o.methodAcceptingLong(42.0).should == 1 - @o.methodAcceptingUnsignedLong(42.0).should == 1 - - o2 = Object.new - def o2.to_i; 42; end - - @o.methodAcceptingChar(o2).should == 1 - @o.methodAcceptingUnsignedChar(o2).should == 1 - @o.methodAcceptingShort(o2).should == 1 - @o.methodAcceptingUnsignedShort(o2).should == 1 - @o.methodAcceptingInt(o2).should == 1 - @o.methodAcceptingUnsignedInt(o2).should == 1 - @o.methodAcceptingLong(o2).should == 1 - @o.methodAcceptingUnsignedLong(o2).should == 1 - - lambda { @o.methodAcceptingChar(nil) }.should raise_error(TypeError) - lambda { @o.methodAcceptingUnsignedChar(nil) }.should raise_error(TypeError) - lambda { @o.methodAcceptingShort(nil) }.should raise_error(TypeError) - lambda { @o.methodAcceptingUnsignedShort(nil) }.should raise_error(TypeError) - lambda { @o.methodAcceptingInt(nil) }.should raise_error(TypeError) - lambda { @o.methodAcceptingUnsignedInt(nil) }.should raise_error(TypeError) - lambda { @o.methodAcceptingLong(nil) }.should raise_error(TypeError) - lambda { @o.methodAcceptingUnsignedLong(nil) }.should raise_error(TypeError) - - lambda { @o.methodAcceptingChar(Object.new) }.should raise_error(TypeError) - lambda { @o.methodAcceptingUnsignedChar(Object.new) }.should raise_error(TypeError) - lambda { @o.methodAcceptingShort(Object.new) }.should raise_error(TypeError) - lambda { @o.methodAcceptingUnsignedShort(Object.new) }.should raise_error(TypeError) - lambda { @o.methodAcceptingInt(Object.new) }.should raise_error(TypeError) - lambda { @o.methodAcceptingUnsignedInt(Object.new) }.should raise_error(TypeError) - lambda { @o.methodAcceptingLong(Object.new) }.should raise_error(TypeError) - lambda { @o.methodAcceptingUnsignedLong(Object.new) }.should raise_error(TypeError) - end - - it "accepting a one-character string as 'char' or 'unsigned char' should receive the first character" do - @o.methodAcceptingChar('*').should == 1 - @o.methodAcceptingUnsignedChar('*').should == 1 - end - - it "accepting a String, Symbol or nil as 'SEL' should receive the appropriate selector" do - @o.methodAcceptingSEL(:'foo:with:with:').should == 1 - @o.methodAcceptingSEL('foo:with:with:').should == 1 - @o.methodAcceptingSEL2(nil).should == 1 - - lambda { @o.methodAcceptingSEL(123) }.should raise_error(TypeError) - lambda { @o.methodAcceptingSEL(Object.new) }.should raise_error(TypeError) - end - - it "accepting a Float-compatible object as 'float' or 'double' should receive the appropriate data" do - @o.methodAcceptingFloat(3.1415).should == 1 - @o.methodAcceptingDouble(3.1415).should == 1 - - o2 = Object.new - def o2.to_f; 3.1415; end - - @o.methodAcceptingFloat(o2).should == 1 - @o.methodAcceptingDouble(o2).should == 1 - - lambda { @o.methodAcceptingFloat(nil) }.should raise_error(TypeError) - lambda { @o.methodAcceptingDouble(nil) }.should raise_error(TypeError) - lambda { @o.methodAcceptingFloat(Object.new) }.should raise_error(TypeError) - lambda { @o.methodAcceptingDouble(Object.new) }.should raise_error(TypeError) - end - - it "accepting a String-compatible object as 'char *' should receive the appropriate data" do - @o.methodAcceptingCharPtr('foo').should == 1 - - o2 = Object.new - def o2.to_str; 'foo' end - - @o.methodAcceptingCharPtr(o2).should == 1 - - lambda { @o.methodAcceptingCharPtr(123) }.should raise_error(TypeError) - lambda { @o.methodAcceptingCharPtr([]) }.should raise_error(TypeError) - lambda { @o.methodAcceptingCharPtr(Object.new) }.should raise_error(TypeError) - - @o.methodAcceptingCharPtr2(nil).should == 1 - end - - it "accepting an NSPoint, NSSize, NSRange or NSRect object as 'NSPoint', 'NSSize', 'NSRange' or 'NSRect' should receive the C structure" do - p = @o.methodReturningNSPoint - @o.methodAcceptingNSPoint(p).should == 1 - p = @o.methodReturningNSSize - @o.methodAcceptingNSSize(p).should == 1 - p = @o.methodReturningNSRect - @o.methodAcceptingNSRect(p).should == 1 - p = @o.methodReturningNSRange - @o.methodAcceptingNSRange(p).should == 1 - - lambda { @o.methodAcceptingNSPoint(nil) }.should raise_error(TypeError) - lambda { @o.methodAcceptingNSPoint(123) }.should raise_error(TypeError) - lambda { @o.methodAcceptingNSPoint(Object.new) }.should raise_error(TypeError) - lambda { @o.methodAcceptingNSPoint(@o.methodReturningNSSize) }.should raise_error(TypeError) - lambda { @o.methodAcceptingNSSize(nil) }.should raise_error(TypeError) - lambda { @o.methodAcceptingNSSize(123) }.should raise_error(TypeError) - lambda { @o.methodAcceptingNSSize(Object.new) }.should raise_error(TypeError) - lambda { @o.methodAcceptingNSSize(@o.methodReturningNSPoint) }.should raise_error(TypeError) - lambda { @o.methodAcceptingNSRect(nil) }.should raise_error(TypeError) - lambda { @o.methodAcceptingNSRect(123) }.should raise_error(TypeError) - lambda { @o.methodAcceptingNSRect(Object.new) }.should raise_error(TypeError) - lambda { @o.methodAcceptingNSRect(@o.methodReturningNSPoint) }.should raise_error(TypeError) - lambda { @o.methodAcceptingNSRange(nil) }.should raise_error(TypeError) - lambda { @o.methodAcceptingNSRange(123) }.should raise_error(TypeError) - lambda { @o.methodAcceptingNSRange(Object.new) }.should raise_error(TypeError) - lambda { @o.methodAcceptingNSRange(@o.methodReturningNSPoint) }.should raise_error(TypeError) - end - - it "accepting an Array of valid objects as a structure type should receive the C structure" do - @o.methodAcceptingNSPoint([1, 2]).should == 1 - @o.methodAcceptingNSSize([3, 4]).should == 1 - @o.methodAcceptingNSRect([[1, 2], [3, 4]]).should == 1 - @o.methodAcceptingNSRect([1, 2, 3, 4]).should == 1 - @o.methodAcceptingNSRange([0, 42]).should == 1 - - lambda { @o.methodAcceptingNSPoint([1]) }.should raise_error(ArgumentError) - lambda { @o.methodAcceptingNSPoint([1, 2, 3]) }.should raise_error(ArgumentError) - lambda { @o.methodAcceptingNSRect([1, 2, 3]) }.should raise_error(ArgumentError) - lambda { @o.methodAcceptingNSRect([1, 2, 3, 4, 5]) }.should raise_error(ArgumentError) - lambda { @o.methodAcceptingNSRect([[1, 2], [3]]) }.should raise_error(ArgumentError) - lambda { @o.methodAcceptingNSRect([[1, 2], [3, 4, 5]]) }.should raise_error(ArgumentError) - end - - it "accepting various C types should receive these types as expected" do - @o.methodAcceptingInt(42, float:42, double:42, short:42, NSPoint:[42, 42], - NSRect:[42, 42, 42, 42], char:42).should == 1 - end -end Added: MacRuby/branches/experimental/spec/macruby/objc_method_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/macruby/objc_method_spec.rb (rev 0) +++ MacRuby/branches/experimental/spec/macruby/objc_method_spec.rb 2009-04-28 02:23:44 UTC (rev 1495) @@ -0,0 +1,372 @@ +require File.dirname(__FILE__) + '/../spec_helper' + +framework 'Foundation' + +fixture_source = File.dirname(__FILE__) + '/fixtures/method.m' +fixture_ext = '/tmp/method.bundle' +if !File.exist?(fixture_ext) or File.mtime(fixture_source) > File.mtime(fixture_ext) +=begin + # #system is currently broken + unless system("/usr/bin/gcc #{fixture_source} -o #{fixture_ext} -g -framework Foundation -dynamiclib -fobjc-gc -arch i386 -arch x86_64 -arch ppc") + $stderr.puts "cannot compile fixture source file `#{fixture_source}' - aborting" + exit 1 + end +=end + `/usr/bin/gcc #{fixture_source} -o #{fixture_ext} -g -framework Foundation -dynamiclib -fobjc-gc -arch i386 -arch x86_64 -arch ppc` +end +require '/tmp/method' +load_bridge_support_file File.dirname(__FILE__) + '/fixtures/method.bridgesupport' + +describe "A pure Objective-C method" do + before :each do + @o = TestMethod.new + end + + it "can be called with #foo= if it matches the #setFoo pattern" do + o = [] + + # TODO Stopped here: This should be sufficient, but doesn't work. + # o.should have_method(:'setArray', true) + # o.should have_method(:'array=', true) + + o.respond_to?(:'setArray').should == true + o.respond_to?(:'array=').should == true + o.array = [1, 2, 3] + o.should == [1, 2, 3] + end + + it "can be called with #foo? if it matches the #isFoo pattern" do + o = NSBundle.mainBundle + o.respond_to?(:'isLoaded').should == true + o.respond_to?(:'loaded?').should == true + o.loaded?.should == true + end + + it "is only exposed in #methods if the second argument is true" do + o = Object.new + o.methods.include?(:'performSelector').should == false + o.methods(true).include?(:'performSelector').should == false + o.methods(false).include?(:'performSelector').should == false + o.methods(true, true).include?(:'performSelector').should == true + o.methods(false, true).include?(:'performSelector').should == true + end + + it "can be called on an immediate object" do + 123.self.should == 123 + true.self.should == true + false.self.should == false + nil.self.should == nil + end + + it "returning void returns nil in Ruby" do + @o.methodReturningVoid.should == nil + end + + it "returning nil returns nil in Ruby" do + @o.methodReturningNil.should == nil + end + + it "returning self returns the same receiver object" do + @o.methodReturningSelf.should == @o + @o.methodReturningSelf.object_id == @o.object_id + end + + it "returning kCFBooleanTrue returns true in Ruby" do + @o.methodReturningCFTrue.should == true + @o.methodReturningCFTrue.class.should == TrueClass + end + + it "returning kCFBooleanFalse returns false in Ruby" do + @o.methodReturningCFFalse.should == false + @o.methodReturningCFFalse.class.should == FalseClass + end + + it "returning kCFNull returns nil in Ruby" do + @o.methodReturningCFNull.should == nil + @o.methodReturningCFNull.class.should == NilClass + end + + it "returning YES returns true in Ruby" do + @o.methodReturningYES.should == true + end + + it "returning NO returns true in Ruby" do + @o.methodReturningNO.should == false + end + + it "returning 'char' or 'unsigned char' returns a Fixnum in Ruby" do + @o.methodReturningChar.should == 42 + @o.methodReturningChar2.should == -42 + @o.methodReturningUnsignedChar.should == 42 + end + + it "returning 'short' or 'unsigned short' returns a Fixnum in Ruby" do + @o.methodReturningShort.should == 42 + @o.methodReturningShort2.should == -42 + @o.methodReturningUnsignedShort.should == 42 + end + + it "returning 'int' or 'unsigned int' returns a Fixnum in Ruby" do + @o.methodReturningInt.should == 42 + @o.methodReturningInt2.should == -42 + @o.methodReturningUnsignedInt.should == 42 + end + + it "returning 'long' or 'unsigned long' returns a Fixnum if possible in Ruby" do + @o.methodReturningLong.should == 42 + @o.methodReturningLong2.should == -42 + @o.methodReturningUnsignedLong.should == 42 + end + + it "returning 'long' or 'unsigned long' returns a Bignum if it cannot fix in a Fixnum in Ruby" do + @o.methodReturningLong3.should == + (RUBY_ARCH == 'x86_64' ? 4611686018427387904 : 1073741824) + @o.methodReturningLong3.class.should == Bignum + @o.methodReturningLong4.should == + (RUBY_ARCH == 'x86_64' ? -4611686018427387905 : -1073741825) + @o.methodReturningLong4.class.should == Bignum + @o.methodReturningUnsignedLong2.should == + (RUBY_ARCH == 'x86_64' ? 4611686018427387904 : 1073741824) + @o.methodReturningUnsignedLong2.class.should == Bignum + end + + it "returning 'float' returns a Float in Ruby" do + @o.methodReturningFloat.should be_close(3.1415, 0.0001) + @o.methodReturningFloat.class.should == Float + end + + it "returning 'double' returns a Float in Ruby" do + @o.methodReturningDouble.should be_close(3.1415, 0.0001) + @o.methodReturningDouble.class.should == Float + end + + it "returning 'SEL' returns a Symbol or nil in Ruby" do + @o.methodReturningSEL.class.should == Symbol + @o.methodReturningSEL.should == :'foo:with:with:' + @o.methodReturningSEL2.class.should == NilClass + @o.methodReturningSEL2.should == nil + end + + it "returning 'char *' returns a String or nil in Ruby" do + @o.methodReturningCharPtr.class.should == String + @o.methodReturningCharPtr.should == 'foo' + @o.methodReturningCharPtr2.class.should == NilClass + @o.methodReturningCharPtr2.should == nil + end + + it "returning 'NSPoint' returns an NSPoint boxed object in Ruby" do + b = @o.methodReturningNSPoint + b.class.should == NSPoint + b.x.class.should == Float + b.x.should == 1.0 + b.y.class.should == Float + b.y.should == 2.0 + end + + it "returning 'NSSize' returns an NSSize boxed object in Ruby" do + b = @o.methodReturningNSSize + b.class.should == NSSize + b.width.class.should == Float + b.width.should == 3.0 + b.height.class.should == Float + b.height.should == 4.0 + end + + it "returning 'NSRect' returns an NSRect boxed object in Ruby" do + b = @o.methodReturningNSRect + b.class.should == NSRect + b.origin.class.should == NSPoint + b.origin.x.should == 1.0 + b.origin.y.should == 2.0 + b.size.class.should == NSSize + b.size.width.should == 3.0 + b.size.height.should == 4.0 + end + + it "returning 'NSRange' returns an NSRange boxed object in Ruby" do + b = @o.methodReturningNSRange + b.class.should == NSRange + b.location.class.should == Fixnum + b.location.should == 0 + b.length.class.should == Fixnum + b.length.should == 42 + end + + it "accepting the receiver as 'id' should receive the exact same object" do + @o.methodAcceptingSelf(@o).should == 1 + end + + it "accepting the receiver's class as 'id' should receive the exact same object" do + @o.methodAcceptingSelfClass(@o.class).should == 1 + end + + it "accepting 'nil' as 'id' should receive Objective-C's nil" do + @o.methodAcceptingNil(nil).should == 1 + end + + it "accepting 'true' as 'id; should receive CF's kCFBooleanTrue" do + @o.methodAcceptingTrue(true).should == 1 + end + + it "accepting 'false' as 'id' should receive CF's kCFBooleanFalse" do + @o.methodAcceptingFalse(false).should == 1 + end + + it "accepting a Fixnum as 'id' should receive a Fixnum boxed object" do + @o.methodAcceptingFixnum(42).should == 1 + end + + it "accepting nil or false as 'BOOL' should receive NO, any other object should receive YES" do + @o.methodAcceptingFalseBOOL(nil).should == 1 + @o.methodAcceptingFalseBOOL(false).should == 1 + + @o.methodAcceptingTrueBOOL(true).should == 1 + @o.methodAcceptingTrueBOOL(0).should == 1 + @o.methodAcceptingTrueBOOL(123).should == 1 + @o.methodAcceptingTrueBOOL('foo').should == 1 + @o.methodAcceptingTrueBOOL(Object.new).should == 1 + end + + it "accepting a Fixnum-compatible object as 'char', 'unsigned char', 'short', 'unsigned short', 'int', 'unsigned int', 'long', 'unsigned long' should receive the converted data, or raise an exception" do + @o.methodAcceptingChar(42).should == 1 + @o.methodAcceptingUnsignedChar(42).should == 1 + @o.methodAcceptingShort(42).should == 1 + @o.methodAcceptingUnsignedShort(42).should == 1 + @o.methodAcceptingInt(42).should == 1 + @o.methodAcceptingUnsignedInt(42).should == 1 + @o.methodAcceptingLong(42).should == 1 + @o.methodAcceptingUnsignedLong(42).should == 1 + + @o.methodAcceptingChar(42.0).should == 1 + @o.methodAcceptingUnsignedChar(42.0).should == 1 + @o.methodAcceptingShort(42.0).should == 1 + @o.methodAcceptingUnsignedShort(42.0).should == 1 + @o.methodAcceptingInt(42.0).should == 1 + @o.methodAcceptingUnsignedInt(42.0).should == 1 + @o.methodAcceptingLong(42.0).should == 1 + @o.methodAcceptingUnsignedLong(42.0).should == 1 + + o2 = Object.new + def o2.to_i; 42; end + + @o.methodAcceptingChar(o2).should == 1 + @o.methodAcceptingUnsignedChar(o2).should == 1 + @o.methodAcceptingShort(o2).should == 1 + @o.methodAcceptingUnsignedShort(o2).should == 1 + @o.methodAcceptingInt(o2).should == 1 + @o.methodAcceptingUnsignedInt(o2).should == 1 + @o.methodAcceptingLong(o2).should == 1 + @o.methodAcceptingUnsignedLong(o2).should == 1 + + lambda { @o.methodAcceptingChar(nil) }.should raise_error(TypeError) + lambda { @o.methodAcceptingUnsignedChar(nil) }.should raise_error(TypeError) + lambda { @o.methodAcceptingShort(nil) }.should raise_error(TypeError) + lambda { @o.methodAcceptingUnsignedShort(nil) }.should raise_error(TypeError) + lambda { @o.methodAcceptingInt(nil) }.should raise_error(TypeError) + lambda { @o.methodAcceptingUnsignedInt(nil) }.should raise_error(TypeError) + lambda { @o.methodAcceptingLong(nil) }.should raise_error(TypeError) + lambda { @o.methodAcceptingUnsignedLong(nil) }.should raise_error(TypeError) + + lambda { @o.methodAcceptingChar(Object.new) }.should raise_error(TypeError) + lambda { @o.methodAcceptingUnsignedChar(Object.new) }.should raise_error(TypeError) + lambda { @o.methodAcceptingShort(Object.new) }.should raise_error(TypeError) + lambda { @o.methodAcceptingUnsignedShort(Object.new) }.should raise_error(TypeError) + lambda { @o.methodAcceptingInt(Object.new) }.should raise_error(TypeError) + lambda { @o.methodAcceptingUnsignedInt(Object.new) }.should raise_error(TypeError) + lambda { @o.methodAcceptingLong(Object.new) }.should raise_error(TypeError) + lambda { @o.methodAcceptingUnsignedLong(Object.new) }.should raise_error(TypeError) + end + + it "accepting a one-character string as 'char' or 'unsigned char' should receive the first character" do + @o.methodAcceptingChar('*').should == 1 + @o.methodAcceptingUnsignedChar('*').should == 1 + end + + it "accepting a String, Symbol or nil as 'SEL' should receive the appropriate selector" do + @o.methodAcceptingSEL(:'foo:with:with:').should == 1 + @o.methodAcceptingSEL('foo:with:with:').should == 1 + @o.methodAcceptingSEL2(nil).should == 1 + + lambda { @o.methodAcceptingSEL(123) }.should raise_error(TypeError) + lambda { @o.methodAcceptingSEL(Object.new) }.should raise_error(TypeError) + end + + it "accepting a Float-compatible object as 'float' or 'double' should receive the appropriate data" do + @o.methodAcceptingFloat(3.1415).should == 1 + @o.methodAcceptingDouble(3.1415).should == 1 + + o2 = Object.new + def o2.to_f; 3.1415; end + + @o.methodAcceptingFloat(o2).should == 1 + @o.methodAcceptingDouble(o2).should == 1 + + lambda { @o.methodAcceptingFloat(nil) }.should raise_error(TypeError) + lambda { @o.methodAcceptingDouble(nil) }.should raise_error(TypeError) + lambda { @o.methodAcceptingFloat(Object.new) }.should raise_error(TypeError) + lambda { @o.methodAcceptingDouble(Object.new) }.should raise_error(TypeError) + end + + it "accepting a String-compatible object as 'char *' should receive the appropriate data" do + @o.methodAcceptingCharPtr('foo').should == 1 + + o2 = Object.new + def o2.to_str; 'foo' end + + @o.methodAcceptingCharPtr(o2).should == 1 + + lambda { @o.methodAcceptingCharPtr(123) }.should raise_error(TypeError) + lambda { @o.methodAcceptingCharPtr([]) }.should raise_error(TypeError) + lambda { @o.methodAcceptingCharPtr(Object.new) }.should raise_error(TypeError) + + @o.methodAcceptingCharPtr2(nil).should == 1 + end + + it "accepting an NSPoint, NSSize, NSRange or NSRect object as 'NSPoint', 'NSSize', 'NSRange' or 'NSRect' should receive the C structure" do + p = @o.methodReturningNSPoint + @o.methodAcceptingNSPoint(p).should == 1 + p = @o.methodReturningNSSize + @o.methodAcceptingNSSize(p).should == 1 + p = @o.methodReturningNSRect + @o.methodAcceptingNSRect(p).should == 1 + p = @o.methodReturningNSRange + @o.methodAcceptingNSRange(p).should == 1 + + lambda { @o.methodAcceptingNSPoint(nil) }.should raise_error(TypeError) + lambda { @o.methodAcceptingNSPoint(123) }.should raise_error(TypeError) + lambda { @o.methodAcceptingNSPoint(Object.new) }.should raise_error(TypeError) + lambda { @o.methodAcceptingNSPoint(@o.methodReturningNSSize) }.should raise_error(TypeError) + lambda { @o.methodAcceptingNSSize(nil) }.should raise_error(TypeError) + lambda { @o.methodAcceptingNSSize(123) }.should raise_error(TypeError) + lambda { @o.methodAcceptingNSSize(Object.new) }.should raise_error(TypeError) + lambda { @o.methodAcceptingNSSize(@o.methodReturningNSPoint) }.should raise_error(TypeError) + lambda { @o.methodAcceptingNSRect(nil) }.should raise_error(TypeError) + lambda { @o.methodAcceptingNSRect(123) }.should raise_error(TypeError) + lambda { @o.methodAcceptingNSRect(Object.new) }.should raise_error(TypeError) + lambda { @o.methodAcceptingNSRect(@o.methodReturningNSPoint) }.should raise_error(TypeError) + lambda { @o.methodAcceptingNSRange(nil) }.should raise_error(TypeError) + lambda { @o.methodAcceptingNSRange(123) }.should raise_error(TypeError) + lambda { @o.methodAcceptingNSRange(Object.new) }.should raise_error(TypeError) + lambda { @o.methodAcceptingNSRange(@o.methodReturningNSPoint) }.should raise_error(TypeError) + end + + it "accepting an Array of valid objects as a structure type should receive the C structure" do + @o.methodAcceptingNSPoint([1, 2]).should == 1 + @o.methodAcceptingNSSize([3, 4]).should == 1 + @o.methodAcceptingNSRect([[1, 2], [3, 4]]).should == 1 + @o.methodAcceptingNSRect([1, 2, 3, 4]).should == 1 + @o.methodAcceptingNSRange([0, 42]).should == 1 + + lambda { @o.methodAcceptingNSPoint([1]) }.should raise_error(ArgumentError) + lambda { @o.methodAcceptingNSPoint([1, 2, 3]) }.should raise_error(ArgumentError) + lambda { @o.methodAcceptingNSRect([1, 2, 3]) }.should raise_error(ArgumentError) + lambda { @o.methodAcceptingNSRect([1, 2, 3, 4, 5]) }.should raise_error(ArgumentError) + lambda { @o.methodAcceptingNSRect([[1, 2], [3]]) }.should raise_error(ArgumentError) + lambda { @o.methodAcceptingNSRect([[1, 2], [3, 4, 5]]) }.should raise_error(ArgumentError) + end + + it "accepting various C types should receive these types as expected" do + @o.methodAcceptingInt(42, float:42, double:42, short:42, NSPoint:[42, 42], + NSRect:[42, 42, 42, 42], char:42).should == 1 + end +end Added: MacRuby/branches/experimental/spec/macruby/pointer_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/macruby/pointer_spec.rb (rev 0) +++ MacRuby/branches/experimental/spec/macruby/pointer_spec.rb 2009-04-28 02:23:44 UTC (rev 1495) @@ -0,0 +1,52 @@ +require File.dirname(__FILE__) + '/../spec_helper' + +framework 'Foundation' + +describe "A Pointer object" do +=begin # TODO + it "can be created using the #new class method and with a valid Objective-C type or a valid Symbol object" do + types = { + :object => '@', + :char => 'c', + :uchar => 'C', + :short => 's', + :ushort => 'S', + :int => 'i', + :uint => 'I', + :long => 'l', + :ulong => 'L', + :long_long => 'q', + :ulong_long => 'Q', + :float => 'f', + :double => 'd' + } + + types.each do |sym, typestr| + p = nil + lambda { p = Pointer.new(sym) }.should_not raise_error + p.type.should == typestr + + lambda { p = Pointer.new(typestr) }.should_not raise_error + p.type.should == typestr + end + + lambda { Pointer.new }.should raise_error(ArgumentError) + lambda { Pointer.new('invalid') }.should raise_error(TypeError) + end +=end + +=begin # TODO + it "can be assigned an object of the given type and retrieve it later, using #[] and #[]=" + p = Pointer.new('@') + o = Object.new + p[0] = o + p[0].should == o + + p = Pointer.new('i') + p[0] = 42 + p[0].should == 42 + + lambda { p[0] = Object.new }.should raise_error(TypeError) + end +=end +end

1 0

[1494] MacRuby/branches/experimental
by source_changes＠macosforge.org 27 Apr '09

27 Apr '09

Revision: 1494 http://trac.macosforge.org/projects/ruby/changeset/1494 Author: lsansonetti(a)apple.com Date: 2009-04-26 19:04:56 -0700 (Sun, 26 Apr 2009) Log Message: ----------- added support for incoming/outcoming 'char *' types Modified Paths: -------------- MacRuby/branches/experimental/objc.h MacRuby/branches/experimental/roxor.cpp MacRuby/branches/experimental/spec/macruby/fixtures/method.m MacRuby/branches/experimental/spec/macruby/method_spec.rb Modified: MacRuby/branches/experimental/objc.h =================================================================== --- MacRuby/branches/experimental/objc.h 2009-04-27 01:01:38 UTC (rev 1493) +++ MacRuby/branches/experimental/objc.h 2009-04-27 02:04:56 UTC (rev 1494) @@ -108,6 +108,26 @@ } static inline const char * +SkipTypeModifiers(const char *type) +{ + while (true) { + switch (*type) { + case _C_CONST: + case 'O': /* bycopy */ + case 'n': /* in */ + case 'o': /* out */ + case 'N': /* inout */ + case 'V': /* oneway */ + type++; + break; + + default: + return type; + } + } +} + +static inline const char * SkipFirstType(const char *type) { while (1) { Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-04-27 01:01:38 UTC (rev 1493) +++ MacRuby/branches/experimental/roxor.cpp 2009-04-27 02:04:56 UTC (rev 1494) @@ -4934,6 +4934,13 @@ } } +extern "C" +void +rb_vm_rval_to_charptr(VALUE rval, const char **ocval) +{ + *ocval = NIL_P(rval) ? NULL : StringValueCStr(rval); +} + static inline long rval_to_long(VALUE rval) { @@ -5195,6 +5202,8 @@ { const char *func_name = NULL; + type = SkipTypeModifiers(type); + switch (*type) { case _C_ID: case _C_CLASS: @@ -5257,6 +5266,10 @@ func_name = "rb_vm_rval_to_ocsel"; break; + case _C_CHARPTR: + func_name = "rb_vm_rval_to_charptr"; + break; + case _C_STRUCT_B: { rb_vm_bs_boxed_t *bs_boxed = GET_VM()->find_bs_struct(type); @@ -5371,6 +5384,13 @@ extern "C" VALUE +rb_vm_charptr_to_rval(const char *ptr) +{ + return ptr == NULL ? Qnil : rb_str_new2(ptr); +} + +extern "C" +VALUE rb_vm_new_struct(VALUE klass, int argc, ...) { assert(argc > 0); @@ -5437,6 +5457,8 @@ { const char *func_name = NULL; + type = SkipTypeModifiers(type); + switch (*type) { case _C_VOID: return nilVal; @@ -5501,6 +5523,10 @@ func_name = "rb_vm_sel_to_rval"; break; + case _C_CHARPTR: + func_name = "rb_vm_charptr_to_rval"; + break; + case _C_STRUCT_B: { rb_vm_bs_boxed_t *bs_boxed = GET_VM()->find_bs_struct(type); @@ -5552,6 +5578,8 @@ inline const Type * RoxorCompiler::convert_type(const char *type) { + type = SkipTypeModifiers(type); + switch (*type) { case _C_VOID: return Type::VoidTy; @@ -9316,6 +9344,7 @@ assert(typestr != NULL); // Converting Ruby-FFI types to Objective-C runtime types. + if (strcmp(typestr, "char") == 0) { return "c"; } @@ -9443,7 +9472,7 @@ Check_Type(args, T_ARRAY); const int argc = RARRAY_LEN(args); for (int i = 0; i < argc; i++) { - types.append(convert_ffi_type(ret)); + types.append(convert_ffi_type(RARRAY_AT(args, i))); } rb_vm_c_stub_t *stub = (rb_vm_c_stub_t *)vm_gen_stub(types, argc, false); Modified: MacRuby/branches/experimental/spec/macruby/fixtures/method.m =================================================================== --- MacRuby/branches/experimental/spec/macruby/fixtures/method.m 2009-04-27 01:01:38 UTC (rev 1493) +++ MacRuby/branches/experimental/spec/macruby/fixtures/method.m 2009-04-27 02:04:56 UTC (rev 1494) @@ -151,6 +151,16 @@ return 0; } +- (const char *)methodReturningCharPtr +{ + return "foo"; +} + +- (const char *)methodReturningCharPtr2 +{ + return NULL; +} + - (NSPoint)methodReturningNSPoint { return NSMakePoint(1, 2); @@ -261,6 +271,16 @@ return sel == 0; } +- (BOOL)methodAcceptingCharPtr:(const char *)s +{ + return strcmp(s, "foo") == 0; +} + +- (BOOL)methodAcceptingCharPtr2:(const char *)s +{ + return s == NULL; +} + - (BOOL)methodAcceptingFloat:(float)f { return f > 3.1414 && f < 3.1416; Modified: MacRuby/branches/experimental/spec/macruby/method_spec.rb =================================================================== --- MacRuby/branches/experimental/spec/macruby/method_spec.rb 2009-04-27 01:01:38 UTC (rev 1493) +++ MacRuby/branches/experimental/spec/macruby/method_spec.rb 2009-04-27 02:04:56 UTC (rev 1494) @@ -231,6 +231,13 @@ @o.methodReturningSEL2.should == nil end + it "returning 'char *' returns a String or nil in Ruby" do + @o.methodReturningCharPtr.class.should == String + @o.methodReturningCharPtr.should == 'foo' + @o.methodReturningCharPtr2.class.should == NilClass + @o.methodReturningCharPtr2.should == nil + end + it "returning 'NSPoint' returns an NSPoint boxed object in Ruby" do b = @o.methodReturningNSPoint b.class.should == NSPoint @@ -384,6 +391,21 @@ lambda { @o.methodAcceptingDouble(Object.new) }.should raise_error(TypeError) end + it "accepting a String-compatible object as 'char *' should receive the appropriate data" do + @o.methodAcceptingCharPtr('foo').should == 1 + + o2 = Object.new + def o2.to_str; 'foo' end + + @o.methodAcceptingCharPtr(o2).should == 1 + + lambda { @o.methodAcceptingCharPtr(123) }.should raise_error(TypeError) + lambda { @o.methodAcceptingCharPtr([]) }.should raise_error(TypeError) + lambda { @o.methodAcceptingCharPtr(Object.new) }.should raise_error(TypeError) + + @o.methodAcceptingCharPtr2(nil).should == 1 + end + it "accepting an NSPoint, NSSize, NSRange or NSRect object as 'NSPoint', 'NSSize', 'NSRange' or 'NSRect' should receive the C structure" do p = @o.methodReturningNSPoint @o.methodAcceptingNSPoint(p).should == 1

1 0

[1493] MacRuby/branches/experimental/lib/ffi.rb
by source_changes＠macosforge.org 27 Apr '09

27 Apr '09

Revision: 1493 http://trac.macosforge.org/projects/ruby/changeset/1493 Author: lsansonetti(a)apple.com Date: 2009-04-26 18:01:38 -0700 (Sun, 26 Apr 2009) Log Message: ----------- added an empty ffi.rb file Added Paths: ----------- MacRuby/branches/experimental/lib/ffi.rb Added: MacRuby/branches/experimental/lib/ffi.rb =================================================================== --- MacRuby/branches/experimental/lib/ffi.rb (rev 0) +++ MacRuby/branches/experimental/lib/ffi.rb 2009-04-27 01:01:38 UTC (rev 1493) @@ -0,0 +1,2 @@ +# The FFI Ruby API is implemented in MacRuby core, this file exists for compatibility with the others +# Ruby implementations.

1 0

[1492] MacRuby/branches/experimental/roxor.cpp
by source_changes＠macosforge.org 27 Apr '09

27 Apr '09

Revision: 1492 http://trac.macosforge.org/projects/ruby/changeset/1492 Author: lsansonetti(a)apple.com Date: 2009-04-26 17:53:39 -0700 (Sun, 26 Apr 2009) Log Message: ----------- oops Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-04-26 08:26:47 UTC (rev 1491) +++ MacRuby/branches/experimental/roxor.cpp 2009-04-27 00:53:39 UTC (rev 1492) @@ -9399,7 +9399,8 @@ // Third is an array of arguments. Value *argv; if (argc == 0) { - argv = compile_const_pointer(NULL); + argv = new BitCastInst(compile_const_pointer(NULL), RubyObjPtrTy, + "", bb); } else { argv = new AllocaInst(RubyObjTy, ConstantInt::get(Type::Int32Ty, argc),

1 0

[1491] MacRuby/branches/experimental/roxor.cpp
by source_changes＠macosforge.org 26 Apr '09

26 Apr '09

Revision: 1491 http://trac.macosforge.org/projects/ruby/changeset/1491 Author: lsansonetti(a)apple.com Date: 2009-04-26 01:26:47 -0700 (Sun, 26 Apr 2009) Log Message: ----------- support float/double FFI types + fixed a problem when calling the stub with arguments (this will be optimized later, though) Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-04-26 02:25:59 UTC (rev 1490) +++ MacRuby/branches/experimental/roxor.cpp 2009-04-26 08:26:47 UTC (rev 1491) @@ -9346,6 +9346,12 @@ if (strcmp(typestr, "ulong_long") == 0) { return "Q"; } + if (strcmp(typestr, "float") == 0) { + return "f"; + } + if (strcmp(typestr, "double") == 0) { + return "d"; + } if (strcmp(typestr, "string") == 0) { return "*"; } @@ -9361,7 +9367,8 @@ RoxorCompiler::compile_ffi_function(void *stub, void *imp, int argc) { // VALUE func(VALUE rcv, SEL sel, VALUE arg1, VALUE arg2, ...) { - // return stub(imp, arg2, arg1, ...); + // VALUE *argv = alloca(...); + // return stub(imp, argc, argv); // } std::vector<const Type *> f_types; f_types.push_back(RubyObjTy); @@ -9385,11 +9392,26 @@ params.push_back(compile_const_pointer(imp)); stub_types.push_back(PtrTy); - // Following arguments are the given arguments. - for (int i = 0; i < argc; i++) { - params.push_back(arg++); - stub_types.push_back(RubyObjTy); + // Second argument is arity; + params.push_back(ConstantInt::get(Type::Int32Ty, argc)); + stub_types.push_back(Type::Int32Ty); + + // Third is an array of arguments. + Value *argv; + if (argc == 0) { + argv = compile_const_pointer(NULL); } + else { + argv = new AllocaInst(RubyObjTy, ConstantInt::get(Type::Int32Ty, argc), + "", bb); + for (int i = 0; i < argc; i++) { + Value *index = ConstantInt::get(Type::Int32Ty, i); + Value *slot = GetElementPtrInst::Create(argv, index, "", bb); + new StoreInst(arg++, slot, "", bb); + } + } + params.push_back(argv); + stub_types.push_back(RubyObjPtrTy); // Cast the given stub using the correct function signature. FunctionType *stub_ft = FunctionType::get(RubyObjTy, stub_types, false);

1 0

[1490] MacRuby/branches/experimental
by source_changes＠macosforge.org 26 Apr '09

26 Apr '09

Revision: 1490 http://trac.macosforge.org/projects/ruby/changeset/1490 Author: lsansonetti(a)apple.com Date: 2009-04-25 19:25:59 -0700 (Sat, 25 Apr 2009) Log Message: ----------- working on a ruby-FFI compatible API Modified Paths: -------------- MacRuby/branches/experimental/inits.c MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/inits.c =================================================================== --- MacRuby/branches/experimental/inits.c 2009-04-25 04:21:25 UTC (rev 1489) +++ MacRuby/branches/experimental/inits.c 2009-04-26 02:25:59 UTC (rev 1490) @@ -55,6 +55,8 @@ void Init_Encoding(void); void Init_PostGC(void); void Init_ObjC(void); +void Init_BridgeSupport(void); +void Init_FFI(void); void rb_call_inits() @@ -103,4 +105,6 @@ Init_version(); Init_PostGC(); Init_ObjC(); + Init_BridgeSupport(); + Init_FFI(); } Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-04-25 04:21:25 UTC (rev 1489) +++ MacRuby/branches/experimental/roxor.cpp 2009-04-26 02:25:59 UTC (rev 1490) @@ -202,6 +202,7 @@ Function *compile_bs_struct_new(rb_vm_bs_boxed_t *bs_boxed); Function *compile_bs_struct_writer(rb_vm_bs_boxed_t *bs_boxed, int field); + Function *compile_ffi_function(void *stub, void *imp, int argc); private: const char *fname; @@ -8954,10 +8955,10 @@ return bs_boxed->bs_type == BS_ELEMENT_OPAQUE ? Qtrue : Qfalse; } -static VALUE rb_mVM; VALUE rb_cBoxed; -static void +extern "C" +void Init_BridgeSupport(void) { rb_cBoxed = rb_define_class("Boxed", rb_cObject); @@ -8967,7 +8968,8 @@ (void *)rb_boxed_is_opaque, 0); boxed_ivar_type = rb_intern("__octype__"); - //VALUE rb_mBS = rb_define_module_under(rb_mVM, "BridgeSupport"); + bs_const_magic_cookie = rb_str_new2("bs_const_magic_cookie"); + rb_objc_retain((void *)bs_const_magic_cookie); } static inline void @@ -9305,6 +9307,143 @@ #endif } +// FFI + +static const char * +convert_ffi_type(VALUE type) +{ + const char *typestr = StringValueCStr(type); + assert(typestr != NULL); + + // Converting Ruby-FFI types to Objective-C runtime types. + if (strcmp(typestr, "char") == 0) { + return "c"; + } + if (strcmp(typestr, "uchar") == 0) { + return "C"; + } + if (strcmp(typestr, "short") == 0) { + return "s"; + } + if (strcmp(typestr, "ushort") == 0) { + return "S"; + } + if (strcmp(typestr, "int") == 0) { + return "i"; + } + if (strcmp(typestr, "uint") == 0) { + return "I"; + } + if (strcmp(typestr, "long") == 0) { + return "l"; + } + if (strcmp(typestr, "ulong") == 0) { + return "L"; + } + if (strcmp(typestr, "long_long") == 0) { + return "q"; + } + if (strcmp(typestr, "ulong_long") == 0) { + return "Q"; + } + if (strcmp(typestr, "string") == 0) { + return "*"; + } + if (strcmp(typestr, "pointer") == 0) { + return "^"; + } + + rb_raise(rb_eArgError, "unrecognized string `%s' given as FFI type", + typestr); +} + +Function * +RoxorCompiler::compile_ffi_function(void *stub, void *imp, int argc) +{ + // VALUE func(VALUE rcv, SEL sel, VALUE arg1, VALUE arg2, ...) { + // return stub(imp, arg2, arg1, ...); + // } + std::vector<const Type *> f_types; + f_types.push_back(RubyObjTy); + f_types.push_back(PtrTy); + for (int i = 0; i < argc; i++) { + f_types.push_back(RubyObjTy); + } + FunctionType *ft = FunctionType::get(RubyObjTy, f_types, false); + Function *f = cast<Function>(module->getOrInsertFunction("", ft)); + + bb = BasicBlock::Create("EntryBlock", f); + + Function::arg_iterator arg = f->arg_begin(); + arg++; // skip self + arg++; // skip sel + + std::vector<Value *> params; + std::vector<const Type *> stub_types; + + // First argument is the function implementation. + params.push_back(compile_const_pointer(imp)); + stub_types.push_back(PtrTy); + + // Following arguments are the given arguments. + for (int i = 0; i < argc; i++) { + params.push_back(arg++); + stub_types.push_back(RubyObjTy); + } + + // Cast the given stub using the correct function signature. + FunctionType *stub_ft = FunctionType::get(RubyObjTy, stub_types, false); + Value *stub_val = new BitCastInst(compile_const_pointer(stub), + PointerType::getUnqual(stub_ft), "", bb); + + // Call the stub and return its return value. + CallInst *stub_call = CallInst::Create(stub_val, params.begin(), + params.end(), "", bb); + ReturnInst::Create(stub_call, bb); + + return f; +} + +static VALUE +rb_ffi_attach_function(VALUE rcv, SEL sel, VALUE name, VALUE args, VALUE ret) +{ + const char *symname = StringValueCStr(name); + void *sym = dlsym(RTLD_DEFAULT, symname); + if (sym == NULL) { + rb_raise(rb_eArgError, "given function `%s' could not be located", + symname); + } + + std::string types; + types.append(convert_ffi_type(ret)); + + Check_Type(args, T_ARRAY); + const int argc = RARRAY_LEN(args); + for (int i = 0; i < argc; i++) { + types.append(convert_ffi_type(ret)); + } + + rb_vm_c_stub_t *stub = (rb_vm_c_stub_t *)vm_gen_stub(types, argc, false); + Function *f = RoxorCompiler::shared->compile_ffi_function((void *)stub, + sym, argc); + IMP imp = GET_VM()->compile(f); + + VALUE klass = rb_singleton_class(rcv); + rb_objc_define_method(klass, symname, (void *)imp, argc); + + return Qnil; +} + +extern "C" +void +Init_FFI(void) +{ + VALUE mFFI = rb_define_module("FFI"); + VALUE mFFILib = rb_define_module_under(mFFI, "Library"); + rb_objc_define_method(mFFILib, "attach_function", + (void *)rb_ffi_attach_function, 3); +} + // stubs static VALUE @@ -9391,12 +9530,6 @@ VALUE top_self = rb_obj_alloc(rb_cTopLevel); rb_objc_retain((void *)top_self); GET_VM()->current_top_object = top_self; - - bs_const_magic_cookie = rb_str_new2("bs_const_magic_cookie"); - rb_objc_retain((void *)bs_const_magic_cookie); - - rb_mVM = rb_define_module("RubyVM"); - Init_BridgeSupport(); } extern "C"

1 0

[1489] MacRuby/branches/experimental/roxor.cpp
by source_changes＠macosforge.org 25 Apr '09

25 Apr '09

Revision: 1489 http://trac.macosforge.org/projects/ruby/changeset/1489 Author: lsansonetti(a)apple.com Date: 2009-04-24 21:21:25 -0700 (Fri, 24 Apr 2009) Log Message: ----------- introduce the VM_DUMP_IR environment variable (set it to anything to dump the LLVM IR before exiting) + make sure we mark sret calls with the sret attribute, even if it doesn't seem necessary, but we never know with LLVM what can happen in the future, do we? Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-04-25 04:13:51 UTC (rev 1488) +++ MacRuby/branches/experimental/roxor.cpp 2009-04-25 04:21:25 UTC (rev 1489) @@ -2,7 +2,6 @@ #define ROXOR_COMPILER_DEBUG 0 #define ROXOR_VM_DEBUG 0 -#define ROXOR_DUMP_IR_BEFORE_EXIT 0 #define ROXOR_ULTRA_LAZY_JIT 1 #define ROXOR_INTERPRET_EVAL 0 @@ -5727,6 +5726,7 @@ // Compile retval. Value *retval; if (sret != NULL) { + imp_call->addAttribute(0, Attribute::StructRet); retval = new LoadInst(sret, "", bb); } else { @@ -9403,11 +9403,11 @@ void rb_vm_finalize(void) { -#if ROXOR_DUMP_IR_BEFORE_EXIT - printf("IR dump ----------------------------------------------\n"); - RoxorCompiler::module->dump(); - printf("------------------------------------------------------\n"); -#endif + if (getenv("VM_DUMP_IR") != NULL) { + printf("IR dump ----------------------------------------------\n"); + RoxorCompiler::module->dump(); + printf("------------------------------------------------------\n"); + } #if ROXOR_VM_DEBUG printf("functions all=%ld compiled=%ld\n", RoxorCompiler::module->size(), GET_VM()->functions_compiled);

1 0

[1488] MacRuby/branches/experimental/roxor.cpp
by source_changes＠macosforge.org 25 Apr '09

25 Apr '09

Revision: 1488 http://trac.macosforge.org/projects/ruby/changeset/1488 Author: lsansonetti(a)apple.com Date: 2009-04-24 21:13:51 -0700 (Fri, 24 Apr 2009) Log Message: ----------- implement C functions dispatch Modified Paths: -------------- MacRuby/branches/experimental/roxor.cpp Modified: MacRuby/branches/experimental/roxor.cpp =================================================================== --- MacRuby/branches/experimental/roxor.cpp 2009-04-25 00:39:26 UTC (rev 1487) +++ MacRuby/branches/experimental/roxor.cpp 2009-04-25 04:13:51 UTC (rev 1488) @@ -403,10 +403,12 @@ typedef VALUE rb_vm_objc_stub_t(IMP imp, id self, SEL sel, int argc, const VALUE *argv); +typedef VALUE rb_vm_c_stub_t(IMP imp, int argc, const VALUE *argv); + struct mcache { -#define MCACHE_RCALL 0x1 -#define MCACHE_OCALL 0x2 -#define MCACHE_BCALL 0x4 +#define MCACHE_RCALL 0x1 // Ruby call +#define MCACHE_OCALL 0x2 // Objective-C call +#define MCACHE_FCALL 0x4 // C call uint8_t flag; union { struct { @@ -421,6 +423,11 @@ bs_element_method_t *bs_method; rb_vm_objc_stub_t *stub; } ocall; + struct { + IMP imp; + bs_element_function_t *bs_function; + rb_vm_c_stub_t *stub; + } fcall; } as; }; @@ -499,7 +506,7 @@ bs_parser_t *bs_parser; std::map<std::string, rb_vm_bs_boxed_t *> bs_boxed; - std::map<ID, bs_element_function_t *> bs_funcs; + std::map<std::string, bs_element_function_t *> bs_funcs; std::map<ID, bs_element_constant_t *> bs_consts; std::map<std::string, std::map<SEL, bs_element_method_t *> *> bs_classes_class_methods, bs_classes_instance_methods; @@ -2727,7 +2734,7 @@ // Cache the method node. NODE *old_node = method_node_get(imp); - if (old_node == NULL) { + if (old_node == NULL && old_node != node) { ruby_imps[imp] = new RoxorFunctionIMP(node, sel); } // else { @@ -5614,24 +5621,33 @@ Function * RoxorCompiler::compile_stub(const char *types, int argc, bool is_objc) { - assert(is_objc); // for now + Function *f; - // VALUE stub(IMP imp, VALUE self, SEL sel, int argc, VALUE *argv) - // { - // return (*imp)(self, sel, argv[0], argv[1], ...); - // } - Function *f = cast<Function>(module->getOrInsertFunction("", - RubyObjTy, PtrTy, RubyObjTy, PtrTy, Type::Int32Ty, RubyObjPtrTy, - NULL)); + if (is_objc) { + // VALUE stub(IMP imp, VALUE self, SEL sel, int argc, VALUE *argv) + // { + // return (*imp)(self, sel, argv[0], argv[1], ...); + // } + f = cast<Function>(module->getOrInsertFunction("", + RubyObjTy, + PtrTy, RubyObjTy, PtrTy, Type::Int32Ty, RubyObjPtrTy, + NULL)); + } + else { + // VALUE stub(IMP imp, int argc, VALUE *argv) + // { + // return (*imp)(argv[0], argv[1], ...); + // } + f = cast<Function>(module->getOrInsertFunction("", + RubyObjTy, + PtrTy, Type::Int32Ty, RubyObjPtrTy, + NULL)); + } bb = BasicBlock::Create("EntryBlock", f); Function::arg_iterator arg = f->arg_begin(); Value *imp_arg = arg++; - Value *self_arg = arg++; - Value *sel_arg = arg++; - /*Value *argc_arg =*/ arg++; // XXX do we really need this argument? - Value *argv_arg = arg++; std::vector<const Type *> f_types; std::vector<Value *> params; @@ -5642,7 +5658,6 @@ const Type *ret_type = convert_type(buf); Value *sret = NULL; - if (GET_VM()->is_large_struct_type(ret_type)) { // We are returning a large struct, we need to pass a pointer as the // first argument to the structure data and return void to conform to @@ -5653,16 +5668,23 @@ ret_type = Type::VoidTy; } - // self - p = SkipFirstType(p); - f_types.push_back(RubyObjTy); - params.push_back(self_arg); + if (is_objc) { + // self + p = SkipFirstType(p); + f_types.push_back(RubyObjTy); + Value *self_arg = arg++; + params.push_back(self_arg); - // sel - p = SkipFirstType(p); - f_types.push_back(PtrTy); - params.push_back(sel_arg); + // sel + p = SkipFirstType(p); + f_types.push_back(PtrTy); + Value *sel_arg = arg++; + params.push_back(sel_arg); + } + /*Value *argc_arg =*/ arg++; // XXX do we really need this argument? + Value *argv_arg = arg++; + // Arguments. std::vector<int> byval_args; for (int i = 0; i < argc; i++) { @@ -7033,7 +7055,7 @@ } static void * -vm_gen_stub(const char *types, int argc, bool is_objc) +vm_gen_stub(std::string types, int argc, bool is_objc) { std::map<std::string, void *> &stubs = is_objc ? GET_VM()->objc_stubs : GET_VM()->c_stubs; @@ -7044,13 +7066,23 @@ //printf("generating %s stub %s argc %d\n", is_objc ? "objc" : "c", types, argc); - Function *f = RoxorCompiler::shared->compile_stub(types, argc, is_objc); + Function *f = RoxorCompiler::shared->compile_stub(types.c_str(), argc, + is_objc); void *stub = (void *)GET_VM()->compile(f); stubs.insert(std::make_pair(types, stub)); return stub; } +static inline void +vm_gen_bs_func_types(bs_element_function_t *bs_func, std::string &types) +{ + types.append(bs_func->retval == NULL ? "v" : bs_func->retval->type); + for (unsigned i = 0; i < bs_func->args_count; i++) { + types.append(bs_func->args[i].type); + } +} + static inline SEL helper_sel(SEL sel) { @@ -7105,6 +7137,7 @@ #define rcache cache->as.rcall #define ocache cache->as.ocall +#define fcache cache->as.fcall if (method != NULL) { IMP imp = method_getImplementation(method); @@ -7139,6 +7172,8 @@ } } else { + // Method is not found... let's try to see if we are not given a + // helper selector. SEL new_sel = helper_sel(sel); if (new_sel != NULL) { Method m = class_getInstanceMethod(klass, new_sel); @@ -7152,8 +7187,32 @@ } } - // TODO bridgesupport C call? - return method_missing((VALUE)self, sel, argc, argv, opt); + // Then let's see if we are not trying to call a not-yet-JITed + // BridgeSupport function. + const char *selname = (const char *)sel; + size_t selnamelen = strlen(selname); + if (selname[selnamelen - 1] == ':') { + selnamelen--; + } + std::string name(selname, selnamelen); + std::map<std::string, bs_element_function_t *>::iterator iter = + GET_VM()->bs_funcs.find(name); + if (iter != GET_VM()->bs_funcs.end()) { + bs_element_function_t *bs_func = iter->second; + std::string types; + vm_gen_bs_func_types(bs_func, types); + + cache->flag = MCACHE_FCALL; + fcache.bs_function = bs_func; + fcache.imp = (IMP)dlsym(RTLD_DEFAULT, bs_func->name); + assert(fcache.imp != NULL); + fcache.stub = (rb_vm_c_stub_t *)vm_gen_stub(types, argc, + false); + } + else { + // Still nothing, then let's call #method_missing. + return method_missing((VALUE)self, sel, argc, argv, opt); + } } } @@ -7257,20 +7316,21 @@ cached ? "true" : "false"); #endif -#if 0 - return rb_objc_call2((VALUE)self, - (VALUE)klass, - sel, - ocache.imp, - &ocache.helper->sig, - ocache.helper->bs_method, - argc, - (VALUE *)argv); -#endif return (*ocache.stub)(ocache.imp, RB2OC(self), sel, argc, argv); } + else if (cache->flag == MCACHE_FCALL) { +#if ROXOR_VM_DEBUG + printf("C dispatch %s() imp=%p (cached=%s)\n", + fcache.bs_function->name, + fcache.imp, + cached ? "true" : "false"); +#endif + return (*fcache.stub)(fcache.imp, argc, argv); + } + #undef rcache #undef ocache +#undef fcache printf("BOUH %s\n", (char *)sel); abort(); @@ -9085,9 +9145,9 @@ case BS_ELEMENT_FUNCTION: { bs_element_function_t *bs_func = (bs_element_function_t *)value; - ID name = rb_intern(bs_func->name); + std::string name(bs_func->name); - std::map<ID, bs_element_function_t *>::iterator iter = + std::map<std::string, bs_element_function_t *>::iterator iter = GET_VM()->bs_funcs.find(name); if (iter == GET_VM()->bs_funcs.end()) { GET_VM()->bs_funcs[name] = bs_func;

1 0