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

[2905] MacRuby/trunk/misc/xcode-templates
by source_changes＠macosforge.org 27 Oct '09

27 Oct '09

Revision: 2905 http://trac.macosforge.org/projects/ruby/changeset/2905 Author: lsansonetti(a)apple.com Date: 2009-10-27 16:10:10 -0700 (Tue, 27 Oct 2009) Log Message: ----------- updating the Embed MacRuby target to use macruby_deploy Modified Paths: -------------- MacRuby/trunk/misc/xcode-templates/Project Templates/Application/MacRuby Application/MacRubyApp.xcodeproj/project.pbxproj MacRuby/trunk/misc/xcode-templates/Target Templates/Ruby/Embed MacRuby.trgttmpl Modified: MacRuby/trunk/misc/xcode-templates/Project Templates/Application/MacRuby Application/MacRubyApp.xcodeproj/project.pbxproj =================================================================== --- MacRuby/trunk/misc/xcode-templates/Project Templates/Application/MacRuby Application/MacRubyApp.xcodeproj/project.pbxproj 2009-10-27 23:09:40 UTC (rev 2904) +++ MacRuby/trunk/misc/xcode-templates/Project Templates/Application/MacRuby Application/MacRubyApp.xcodeproj/project.pbxproj 2009-10-27 23:10:10 UTC (rev 2905) @@ -255,7 +255,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "PATH=\"$PATH:/usr/local/bin\" /usr/bin/env macruby -r hotcocoa/application_builder -e \"HotCocoa::ApplicationBuilder.deploy(ARGV[0])\" \"$TARGET_BUILD_DIR/$PROJECT_NAME.app\""; + shellScript = "# The macruby_deploy command-line tool will make sure your app will embed the MacRuby framework. Default options will be used. Pass the -h option to get more details.\nPATH=\"$PATH:/usr/local/bin\" macruby_deploy $TARGET_BUILD_DIR/$PROJECT_NAME.app"; }; /* End PBXShellScriptBuildPhase section */ Modified: MacRuby/trunk/misc/xcode-templates/Target Templates/Ruby/Embed MacRuby.trgttmpl =================================================================== --- MacRuby/trunk/misc/xcode-templates/Target Templates/Ruby/Embed MacRuby.trgttmpl 2009-10-27 23:09:40 UTC (rev 2904) +++ MacRuby/trunk/misc/xcode-templates/Target Templates/Ruby/Embed MacRuby.trgttmpl 2009-10-27 23:10:10 UTC (rev 2905) @@ -7,7 +7,7 @@ { Class = ShellScript; ShellPath = "/bin/sh"; - ShellScript = "PATH=\"$PATH:/usr/local/bin\" /usr/bin/env macruby -r hotcocoa/application_builder -e \"HotCocoa::ApplicationBuilder.deploy(ARGV[0])\" $TARGET_BUILD_DIR/$PROJECT_NAME.app"; + ShellScript = "# The macruby_deploy command-line tool will make sure your app will embed the MacRuby framework. Default options will be used. Pass the -h option to get more details.\nPATH=\"$PATH:/usr/local/bin\" macruby_deploy $TARGET_BUILD_DIR/$PROJECT_NAME.app"; }, ); }

1 0

[2904] MacRuby/trunk/bin/ruby_deploy
by source_changes＠macosforge.org 27 Oct '09

27 Oct '09

Revision: 2904 http://trac.macosforge.org/projects/ruby/changeset/2904 Author: lsansonetti(a)apple.com Date: 2009-10-27 16:09:40 -0700 (Tue, 27 Oct 2009) Log Message: ----------- adding macruby_deploy, a tool to help embedding macruby inside an application bundle Added Paths: ----------- MacRuby/trunk/bin/ruby_deploy Added: MacRuby/trunk/bin/ruby_deploy =================================================================== --- MacRuby/trunk/bin/ruby_deploy (rev 0) +++ MacRuby/trunk/bin/ruby_deploy 2009-10-27 23:09:40 UTC (rev 2904) @@ -0,0 +1,101 @@ +#!/usr/bin/ruby +# MacRuby Deployer. +# +# This file is covered by the Ruby license. +# +# Copyright (C) 2009, Apple Inc + +require 'optparse' +require 'rbconfig' +require 'fileutils' + +class Deployer + include FileUtils + + NAME = File.basename(__FILE__) + + def initialize(argv) + OptionParser.new do |opts| + opts.banner = "Usage: #{NAME} [options] application-bundle" + opts.on('--no-stdlib', "Do not include the standard library") do + @no_stdlib = true + end + opts.on('-v', '--version', 'Display the version') do + puts RUBY_DESCRIPTION + exit 1 + end + begin + opts.parse!(argv) + rescue OptionParser::InvalidOption => e + die e, opts + end + die opts if argv.size != 1 + @app_bundle = argv[0] + end + + if !File.exist?(@app_bundle) + die "Given path `#{@app_bundle}' doesn't exist" + end + if !File.directory?(@app_bundle) or !File.exist?(File.join(@app_bundle, 'Contents')) + die "Given path `#{@app_bundle}' doesn't seem to be a valid application bundle" + end + + # Locate necessary programs. + @install_name_tool = locate('install_name_tool') + + # Locate the MacRuby framework. + @macruby_framework_path = Config::CONFIG['libdir'].scan(/^.+MacRuby\.framework/)[0] + if !File.exist?(@macruby_framework_path) + die "Cannot locate MacRuby.framework from rbconfig.rb" + end + end + + def run + # Copy MacRuby.framework inside MyApp.app/Contents/Frameworks. + app_frameworks = File.join(@app_bundle, 'Contents/Frameworks') + mkdir_p(app_frameworks) + app_macruby = File.join(app_frameworks, 'MacRuby.framework') + rm_rf(app_macruby) + cp_r(@macruby_framework_path, app_frameworks) + + # Delete unnecessary things in the MacRuby.framework copy. + app_macruby_usr = File.join(app_macruby, 'Versions', MACRUBY_VERSION, 'usr') + macruby_usr = File.join(@macruby_framework_path, 'Versions', MACRUBY_VERSION, 'usr') + die "oops" if !File.exist?(app_macruby_usr) or !File.exist?(macruby_usr) + dirs = ['bin', 'include', 'lib/libmacruby-static.a', 'share'] + if @no_stdlib + dirs << 'lib/ruby' + end + dirs << 'lib/ruby/Gems' # TODO add gems support + dirs.each { |x| rm_rf(File.join(app_macruby_usr, x)) } + + # Hack the application binaries to link against the MacRuby.framework copy. + patterns = [File.join(@app_bundle, 'Contents/MacOS/*'), File.join(app_macruby_usr, 'lib/ruby/**/*.{bundle,rbo}')] + patterns.each do |pat| + Dir.glob(pat).each do |bin| + execute("#{@install_name_tool} -change #{macruby_usr}/lib/libmacruby.dylib @executable_path/../Frameworks/MacRuby.framework/Versions/#{MACRUBY_VERSION}/usr/lib/libmacruby.dylib '#{bin}'") + end + end + end + + private + + def execute(line) + ret = `#{line}` + die "Error when executing `#{line}'" unless $?.success? + ret + end + + def locate(progname) + path = `which #{progname}`.strip + die "Can't locate program `#{progname}'" if path.empty? + path + end + + def die(*args) + $stderr.puts args + exit 1 + end +end + +Deployer.new(ARGV).run

1 0

[2903] MacRuby/trunk/compiler.cpp
by source_changes＠macosforge.org 27 Oct '09

27 Oct '09

Revision: 2903 http://trac.macosforge.org/projects/ruby/changeset/2903 Author: lsansonetti(a)apple.com Date: 2009-10-26 19:26:42 -0700 (Mon, 26 Oct 2009) Log Message: ----------- naive implementation of the not-enough-registers x86-64 ABI Modified Paths: -------------- MacRuby/trunk/compiler.cpp Modified: MacRuby/trunk/compiler.cpp =================================================================== --- MacRuby/trunk/compiler.cpp 2009-10-27 02:25:44 UTC (rev 2902) +++ MacRuby/trunk/compiler.cpp 2009-10-27 02:26:42 UTC (rev 2903) @@ -6771,6 +6771,42 @@ return slot; } +#if __LP64__ +# define MAX_GPR_REGS 6 +# define MAX_SSE_REGS 8 +// The x86-64 ABI requires us to pass by reference arguments when there isn't +// enough registers anymore. We need to count both GPR and SEE registers usage. +// For more info: http://www.x86-64.org/documentation/abi.pdf +static void +examine(const Type *t, int *ngpr, int *nsse) +{ + switch (t->getTypeID()) { + case Type::IntegerTyID: + case Type::PointerTyID: + (*ngpr)++; + break; + + case Type::FloatTyID: + case Type::DoubleTyID: + (*nsse)++; + break; + + case Type::StructTyID: + { + const StructType *st = cast<StructType>(t); + for (unsigned i = 0; i < st->getNumElements(); i++) { + examine(st->getElementType(i), ngpr, nsse); + } + } + break; + + default: + // oops + break; + } +} +#endif + Function * RoxorCompiler::compile_objc_stub(Function *ruby_func, IMP ruby_imp, const rb_vm_arity_t &arity, const char *types) @@ -6781,6 +6817,10 @@ const char *p = types; std::vector<const Type *> f_types; +#if __LP64__ + int gprcount = 0, ssecount = 0; +#endif + // Return value. p = GetFirstType(p, buf, sizeof buf); std::string ret_type(buf); @@ -6793,6 +6833,9 @@ f_types.push_back(PointerType::getUnqual(f_ret_type)); f_sret_type = f_ret_type; f_ret_type = VoidTy; +#if __LP64__ + gprcount++; +#endif } // self @@ -6803,13 +6846,29 @@ f_types.push_back(PtrTy); p = SkipFirstType(p); p = SkipStackSize(p); +#if __LP64__ + gprcount += 2; +#endif // Arguments. std::vector<std::string> arg_types; std::vector<unsigned int> byval_args; for (int i = 0; i < arity.real; i++) { p = GetFirstType(p, buf, sizeof buf); const Type *t = convert_type(buf); - if (GET_CORE()->is_large_struct_type(t)) { + bool enough_registers = true; +#if __LP64__ + int ngpr = 0, nsse = 0; + examine(t, &ngpr, &nsse); + if (gprcount + ngpr > MAX_GPR_REGS || ssecount + nsse > MAX_SSE_REGS) { + enough_registers = false; + } + else { + gprcount += ngpr; + ssecount += nsse; + } + //printf("arg[%d] is using %d gpr %d sse\n", i, ngpr, nsse); +#endif + if (!enough_registers || GET_CORE()->is_large_struct_type(t)) { // We are passing a large struct, we need to mark this argument // with the byval attribute and configure the internal stub // call to pass a pointer to the structure, to conform to the ABI. @@ -6851,12 +6910,14 @@ // Convert every incoming argument into Ruby type. for (int i = 0; i < arity.real; i++) { Value *a = arg++; + const Type *t = f_types[i + 2 + sret_i]; if (std::find(byval_args.begin(), byval_args.end(), (unsigned int)i + 3 + sret_i) != byval_args.end()) { a = new LoadInst(a, "", bb); + t = cast<PointerType>(t)->getElementType(); } Value *ruby_arg = compile_conversion_to_ruby(arg_types[i].c_str(), - f_types[i + 2 + sret_i], a); + t, a); params.push_back(ruby_arg); }

1 0

[2902] MacRuby/trunk/spec/frozen/tags/macruby/library/rexml/attribute/ xpath_tags.txt
by source_changes＠macosforge.org 27 Oct '09

27 Oct '09

Revision: 2902 http://trac.macosforge.org/projects/ruby/changeset/2902 Author: lsansonetti(a)apple.com Date: 2009-10-26 19:25:44 -0700 (Mon, 26 Oct 2009) Log Message: ----------- this spec should be tagged as critical Modified Paths: -------------- MacRuby/trunk/spec/frozen/tags/macruby/library/rexml/attribute/xpath_tags.txt Modified: MacRuby/trunk/spec/frozen/tags/macruby/library/rexml/attribute/xpath_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/rexml/attribute/xpath_tags.txt 2009-10-26 22:05:40 UTC (rev 2901) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/rexml/attribute/xpath_tags.txt 2009-10-27 02:25:44 UTC (rev 2902) @@ -1,2 +1,2 @@ +critical:REXML::Attribute#xpath raises an error if attribute has no parent fails:REXML::Attribute#xpath returns the path for Attribute -fails:REXML::Attribute#xpath raises an error if attribute has no parent

1 0

[2901] MacRuby/trunk
by source_changes＠macosforge.org 26 Oct '09

26 Oct '09

Revision: 2901 http://trac.macosforge.org/projects/ruby/changeset/2901 Author: lsansonetti(a)apple.com Date: 2009-10-26 15:05:40 -0700 (Mon, 26 Oct 2009) Log Message: ----------- create -copyWithZone: on every new Object-based Ruby class Modified Paths: -------------- MacRuby/trunk/class.c MacRuby/trunk/id.c MacRuby/trunk/id.h Modified: MacRuby/trunk/class.c =================================================================== --- MacRuby/trunk/class.c 2009-10-26 21:42:12 UTC (rev 2900) +++ MacRuby/trunk/class.c 2009-10-26 22:05:40 UTC (rev 2901) @@ -59,9 +59,21 @@ static void * rb_obj_imp_allocWithZone(void *rcv, SEL sel, void *zone) { + // XXX honor zone? return (void *)rb_robject_allocate_instance((VALUE)rcv); } +VALUE rb_obj_init_copy(VALUE, SEL, VALUE); + +static void * +rb_obj_imp_copyWithZone(void *rcv, SEL sel, void *zone) +{ + // XXX honor zone? + VALUE copy = rb_robject_allocate_instance(CLASS_OF(rcv)); + rb_obj_init_copy(copy, 0, (VALUE)rcv); + return (void *)copy; +} + static BOOL rb_obj_imp_isEqual(void *rcv, SEL sel, void *obj) { @@ -101,8 +113,6 @@ return rcv; } -VALUE rb_obj_init_copy(VALUE, SEL, VALUE); - VALUE rb_class_new_instance_imp(VALUE klass, SEL sel, int argc, VALUE *argv); void @@ -123,7 +133,16 @@ (IMP)rb_obj_imp_allocWithZone); rb_objc_install_method((Class)klass, selIsEqual, (IMP)rb_obj_imp_isEqual); rb_objc_install_method((Class)klass, selInit, (IMP)rb_obj_imp_init); - rb_objc_install_method((Class)klass, selDescription, (IMP)rb_obj_imp_description); + rb_objc_install_method((Class)klass, selDescription, + (IMP)rb_obj_imp_description); + + // Create -copyWithZone:, since the method doesn't exist yet we need to + // find the type encoding somewhere, here we check Symbol since it's + // created very early. + Method m = class_getInstanceMethod((Class)rb_cSymbol, selCopyWithZone); + assert(m != NULL); + class_replaceMethod((Class)klass, selCopyWithZone, + (IMP)rb_obj_imp_copyWithZone, method_getTypeEncoding(m)); } static VALUE Modified: MacRuby/trunk/id.c =================================================================== --- MacRuby/trunk/id.c 2009-10-26 21:42:12 UTC (rev 2900) +++ MacRuby/trunk/id.c 2009-10-26 22:05:40 UTC (rev 2901) @@ -63,6 +63,7 @@ selNot = sel_registerName("!"); selAlloc = sel_registerName("alloc"); selAllocWithZone = sel_registerName("allocWithZone:"); + selCopyWithZone = sel_registerName("copyWithZone:"); selInit = sel_registerName("init"); selInitialize = sel_registerName("initialize"); selInitialize2 = sel_registerName("initialize:"); Modified: MacRuby/trunk/id.h =================================================================== --- MacRuby/trunk/id.h 2009-10-26 21:42:12 UTC (rev 2900) +++ MacRuby/trunk/id.h 2009-10-26 22:05:40 UTC (rev 2901) @@ -73,6 +73,7 @@ extern SEL selNot; extern SEL selAlloc; extern SEL selAllocWithZone; +extern SEL selCopyWithZone; extern SEL selInit; extern SEL selInitialize; extern SEL selInitialize2;

1 0

[2900] MacRuby/trunk/compiler.cpp
by source_changes＠macosforge.org 26 Oct '09

26 Oct '09

Revision: 2900 http://trac.macosforge.org/projects/ruby/changeset/2900 Author: lsansonetti(a)apple.com Date: 2009-10-26 14:42:12 -0700 (Mon, 26 Oct 2009) Log Message: ----------- make sure break/next/redo inside exception handlers properly end the landing pad Modified Paths: -------------- MacRuby/trunk/compiler.cpp Modified: MacRuby/trunk/compiler.cpp =================================================================== --- MacRuby/trunk/compiler.cpp 2009-10-26 21:01:08 UTC (rev 2899) +++ MacRuby/trunk/compiler.cpp 2009-10-26 21:42:12 UTC (rev 2900) @@ -1703,6 +1703,9 @@ break; case NODE_BREAK: + if (current_rescue) { + compile_landing_pad_footer(); + } if (within_loop) { BranchInst::Create(current_loop_end_bb, bb); current_loop_exit_val->addIncoming(val, bb); @@ -1717,6 +1720,9 @@ break; case NODE_NEXT: + if (current_rescue) { + compile_landing_pad_footer(); + } if (within_loop) { BranchInst::Create(current_loop_begin_bb, bb); } @@ -1729,6 +1735,9 @@ break; case NODE_REDO: + if (current_rescue) { + compile_landing_pad_footer(); + } if (within_loop) { BranchInst::Create(current_loop_body_bb, bb); }

1 0

[2899] MacRuby/trunk/sprintf.cpp
by source_changes＠macosforge.org 26 Oct '09

26 Oct '09

Revision: 2899 http://trac.macosforge.org/projects/ruby/changeset/2899 Author: lsansonetti(a)apple.com Date: 2009-10-26 14:01:08 -0700 (Mon, 26 Oct 2009) Log Message: ----------- pass the object as is for %p (note: immediate types will be converted, but it may not matter) Modified Paths: -------------- MacRuby/trunk/sprintf.cpp Modified: MacRuby/trunk/sprintf.cpp =================================================================== --- MacRuby/trunk/sprintf.cpp 2009-10-25 22:52:51 UTC (rev 2898) +++ MacRuby/trunk/sprintf.cpp 2009-10-26 21:01:08 UTC (rev 2899) @@ -413,9 +413,6 @@ break; case 'p': - type = _C_PTR; - break; - case '@': type = _C_ID; break;

1 0

[2898] MacRuby/trunk/test_vm/exception.rb
by source_changes＠macosforge.org 25 Oct '09

25 Oct '09

Revision: 2898 http://trac.macosforge.org/projects/ruby/changeset/2898 Author: vincent.isambart(a)gmail.com Date: 2009-10-25 15:52:51 -0700 (Sun, 25 Oct 2009) Log Message: ----------- added a test case for bug #403 Modified Paths: -------------- MacRuby/trunk/test_vm/exception.rb Modified: MacRuby/trunk/test_vm/exception.rb =================================================================== --- MacRuby/trunk/test_vm/exception.rb 2009-10-25 04:23:32 UTC (rev 2897) +++ MacRuby/trunk/test_vm/exception.rb 2009-10-25 22:52:51 UTC (rev 2898) @@ -381,3 +381,19 @@ end $p.call } + +assert "b0\na1", %{ + def foo + 2.times do |i| + begin + raise StandardError if i == 0 + puts "a\#{i}" + return + rescue StandardError + puts "b\#{i}" + next + end + end + end + foo +}

1 0

[2897] MacRuby/trunk/io.c
by source_changes＠macosforge.org 25 Oct '09

25 Oct '09

Revision: 2897 http://trac.macosforge.org/projects/ruby/changeset/2897 Author: lsansonetti(a)apple.com Date: 2009-10-24 21:23:32 -0700 (Sat, 24 Oct 2009) Log Message: ----------- fixing a bug in IO.popen Modified Paths: -------------- MacRuby/trunk/io.c Modified: MacRuby/trunk/io.c =================================================================== --- MacRuby/trunk/io.c 2009-10-25 03:22:59 UTC (rev 2896) +++ MacRuby/trunk/io.c 2009-10-25 04:23:32 UTC (rev 2897) @@ -2075,19 +2075,19 @@ io_struct->pid = pid; io_struct->mode = mode; - // Confusingly enough, FMODE_WRITABLE means 'write-only' - // and FMODE_READABLE means 'read-only'. const int fmode = convert_mode_string_to_fmode(mode); - if (fmode != FMODE_WRITABLE) { + if (fmode & FMODE_READABLE) { io_struct->read_fd = fd[0]; } - if (fmode != FMODE_READABLE) { + else { + close(fd[0]); + } + if (fmode & FMODE_WRITABLE) { io_struct->write_fd = fd[1]; } else { - close(fd[1]); + close(fd[1]); } - return io; }

1 0

[2896] MacRuby/trunk/rakelib/builder.rake
by source_changes＠macosforge.org 25 Oct '09

25 Oct '09

Revision: 2896 http://trac.macosforge.org/projects/ruby/changeset/2896 Author: lsansonetti(a)apple.com Date: 2009-10-24 20:22:59 -0700 (Sat, 24 Oct 2009) Log Message: ----------- oops Modified Paths: -------------- MacRuby/trunk/rakelib/builder.rake Modified: MacRuby/trunk/rakelib/builder.rake =================================================================== --- MacRuby/trunk/rakelib/builder.rake 2009-10-25 03:06:21 UTC (rev 2895) +++ MacRuby/trunk/rakelib/builder.rake 2009-10-25 03:22:59 UTC (rev 2896) @@ -406,7 +406,7 @@ desc "Touch .rbo files to ignore their build" task :touch do files = ["*.rbo", "lib/**/*.rbo"] - files.each { |pat| Dir.glob(pat) }.flatten.each { |p| sh "/usr/bin/touch #{p}" } + files.map { |pat| Dir.glob(pat) }.flatten.each { |p| sh "/usr/bin/touch #{p}" } end end

1 0