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

[3070] MacRuby/trunk/instruby.rb
by source_changes＠macosforge.org 01 Dec '09

01 Dec '09

Revision: 3070 http://trac.macosforge.org/projects/ruby/changeset/3070 Author: lsansonetti(a)apple.com Date: 2009-12-01 13:36:04 -0800 (Tue, 01 Dec 2009) Log Message: ----------- find llc using rbconfig's LLVM_PATH Modified Paths: -------------- MacRuby/trunk/instruby.rb Modified: MacRuby/trunk/instruby.rb =================================================================== --- MacRuby/trunk/instruby.rb 2009-12-01 06:23:07 UTC (rev 3069) +++ MacRuby/trunk/instruby.rb 2009-12-01 21:36:04 UTC (rev 3070) @@ -515,6 +515,6 @@ puts "installing LLVM tools" llc_dest = File.join(CONFIG['bindir'], 'llc') -install('/usr/local/bin/llc', llc_dest, :mode => $prog_mode) +install(File.join(CONFIG['LLVM_PATH'], 'bin/llc'), llc_dest, :mode => $prog_mode) # vi:set sw=2:

1 0

[3069] MacRuby/trunk/bridgesupport.cpp
by source_changes＠macosforge.org 01 Dec '09

01 Dec '09

Revision: 3069 http://trac.macosforge.org/projects/ruby/changeset/3069 Author: lsansonetti(a)apple.com Date: 2009-11-30 22:23:07 -0800 (Mon, 30 Nov 2009) Log Message: ----------- property handle missing 64-bit bridgesupport annotations in informal protocols for pointer types Modified Paths: -------------- MacRuby/trunk/bridgesupport.cpp Modified: MacRuby/trunk/bridgesupport.cpp =================================================================== --- MacRuby/trunk/bridgesupport.cpp 2009-12-01 03:25:59 UTC (rev 3068) +++ MacRuby/trunk/bridgesupport.cpp 2009-12-01 06:23:07 UTC (rev 3069) @@ -1003,7 +1003,12 @@ const char *p = bs_inf_prot_method->type; do { const char *p2 = (char *)SkipFirstType(p); - const size_t len = p2 - p; + size_t len = p2 - p; + if (*p == _C_PTR && len > 1) { + strlcat(type, "^", typelen); + p++; + len--; + } if (len == 1 && *p == _C_FLT) { // float -> double strlcat(type, "d", typelen);

1 0

[3068] MacRuby/trunk
by source_changes＠macosforge.org 01 Dec '09

01 Dec '09

Revision: 3068 http://trac.macosforge.org/projects/ruby/changeset/3068 Author: lsansonetti(a)apple.com Date: 2009-11-30 19:25:59 -0800 (Mon, 30 Nov 2009) Log Message: ----------- introduced LLVM_PATH as a rake argument and rbconfig setting, changed macrubyc to use it to locate llc Modified Paths: -------------- MacRuby/trunk/bin/rubyc MacRuby/trunk/rakelib/builder.rake MacRuby/trunk/rakelib/builder.rb Modified: MacRuby/trunk/bin/rubyc =================================================================== --- MacRuby/trunk/bin/rubyc 2009-12-01 03:06:24 UTC (rev 3067) +++ MacRuby/trunk/bin/rubyc 2009-12-01 03:25:59 UTC (rev 3068) @@ -52,7 +52,12 @@ # Locate necessary programs. @macruby = locate(@internal ? './miniruby' : 'macruby') - @llc = locate('llc', !@internal) + if @internal + @llc = File.join(RbConfig::CONFIG['LLVM_PATH'], 'bin/llc') + die "llc not found as #{@llc}" unless File.exist?(@llc) + else + @llc = locate('llc', true) + end @gcc = locate('gcc') @gcxx = locate('g++') @nm = locate('nm') Modified: MacRuby/trunk/rakelib/builder.rake =================================================================== --- MacRuby/trunk/rakelib/builder.rake 2009-12-01 03:06:24 UTC (rev 3067) +++ MacRuby/trunk/rakelib/builder.rake 2009-12-01 03:25:59 UTC (rev 3068) @@ -249,6 +249,7 @@ CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)" CONFIG["vendorlibdir"] = "$(vendordir)/$(ruby_version)" CONFIG["vendorarchdir"] = "$(vendorlibdir)/$(sitearch)" + CONFIG["LLVM_PATH"] = "#{LLVM_PATH}" CONFIG["topdir"] = File.dirname(__FILE__) MAKEFILE_CONFIG = {} CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup} Modified: MacRuby/trunk/rakelib/builder.rb =================================================================== --- MacRuby/trunk/rakelib/builder.rb 2009-12-01 03:06:24 UTC (rev 3067) +++ MacRuby/trunk/rakelib/builder.rb 2009-12-01 03:25:59 UTC (rev 3068) @@ -28,7 +28,7 @@ else do_option('archs', `arch`.include?('ppc') ? 'ppc' : %w{i386 x86_64}) { |x| x.split(',') } end -LLVM_CONFIG = do_option('llvm_config', '/usr/local/bin/llvm-config') +LLVM_PATH = do_option('llvm_path', '/usr/local') FRAMEWORK_NAME = do_option('framework_name', 'MacRuby') FRAMEWORK_INSTDIR = do_option('framework_instdir', '/Library/Frameworks') SYM_INSTDIR = do_option('sym_instdir', '/usr/local') @@ -54,6 +54,7 @@ $stderr.puts "You appear to be using a PowerPC machine. MacRuby's primary architectures are Intel 32-bit and 64-bit (i386 and x86_64). Consequently, PowerPC support may be lacking some features." end +LLVM_CONFIG = File.join(LLVM_PATH, 'bin/llvm-config') unless File.exist?(LLVM_CONFIG) $stderr.puts "The llvm-config executable was not located as #{LLVM_CONFIG}. Please make sure LLVM is correctly installed on your machine and pass the llvm_config option to rake if necessary." exit 1

1 0

[3067] MacRuby/trunk/rakelib/builder.rb
by source_changes＠macosforge.org 01 Dec '09

01 Dec '09

Revision: 3067 http://trac.macosforge.org/projects/ruby/changeset/3067 Author: lsansonetti(a)apple.com Date: 2009-11-30 19:06:24 -0800 (Mon, 30 Nov 2009) Log Message: ----------- private LLVM_TOT variable Modified Paths: -------------- MacRuby/trunk/rakelib/builder.rb Modified: MacRuby/trunk/rakelib/builder.rb =================================================================== --- MacRuby/trunk/rakelib/builder.rb 2009-12-01 03:02:13 UTC (rev 3066) +++ MacRuby/trunk/rakelib/builder.rb 2009-12-01 03:06:24 UTC (rev 3067) @@ -95,6 +95,7 @@ CXXFLAGS = `#{LLVM_CONFIG} --cxxflags #{LLVM_MODULES}`.sub(/-DNDEBUG/, '').strip CXXFLAGS << " -I. -I./include -g -Wall #{ARCHFLAGS}" CXXFLAGS << " -Wno-parentheses -Wno-deprecated-declarations -Werror" if NO_WARN_BUILD +CXXFLAGS << " -DLLVM_TOT" if ENV['LLVM_TOT'] LDFLAGS = `#{LLVM_CONFIG} --ldflags --libs #{LLVM_MODULES}`.strip.gsub(/\n/, '') LDFLAGS << " -lpthread -ldl -lxml2 -lobjc -lauto -framework Foundation" DLDFLAGS = "-dynamiclib -undefined suppress -flat_namespace -install_name #{INSTALL_NAME} -current_version #{MACRUBY_VERSION} -compatibility_version #{MACRUBY_VERSION}"

1 0

[3066] MacRuby/trunk/rakelib/builder.rb
by source_changes＠macosforge.org 01 Dec '09

01 Dec '09

Revision: 3066 http://trac.macosforge.org/projects/ruby/changeset/3066 Author: lsansonetti(a)apple.com Date: 2009-11-30 19:02:13 -0800 (Mon, 30 Nov 2009) Log Message: ----------- llvm-config is now a rake variable Modified Paths: -------------- MacRuby/trunk/rakelib/builder.rb Modified: MacRuby/trunk/rakelib/builder.rb =================================================================== --- MacRuby/trunk/rakelib/builder.rb 2009-12-01 02:42:59 UTC (rev 3065) +++ MacRuby/trunk/rakelib/builder.rb 2009-12-01 03:02:13 UTC (rev 3066) @@ -28,6 +28,7 @@ else do_option('archs', `arch`.include?('ppc') ? 'ppc' : %w{i386 x86_64}) { |x| x.split(',') } end +LLVM_CONFIG = do_option('llvm_config', '/usr/local/bin/llvm-config') FRAMEWORK_NAME = do_option('framework_name', 'MacRuby') FRAMEWORK_INSTDIR = do_option('framework_instdir', '/Library/Frameworks') SYM_INSTDIR = do_option('sym_instdir', '/usr/local') @@ -53,9 +54,8 @@ $stderr.puts "You appear to be using a PowerPC machine. MacRuby's primary architectures are Intel 32-bit and 64-bit (i386 and x86_64). Consequently, PowerPC support may be lacking some features." end -LLVM_CONFIG = `which llvm-config`.strip -if LLVM_CONFIG.empty? - $stderr.puts "The `llvm-config' executable was not located in your PATH. Please make sure LLVM is correctly installed on your machine or that your PATH is correctly set." +unless File.exist?(LLVM_CONFIG) + $stderr.puts "The llvm-config executable was not located as #{LLVM_CONFIG}. Please make sure LLVM is correctly installed on your machine and pass the llvm_config option to rake if necessary." exit 1 end

1 0

[3065] MacRuby/trunk
by source_changes＠macosforge.org 01 Dec '09

01 Dec '09

Revision: 3065 http://trac.macosforge.org/projects/ruby/changeset/3065 Author: lsansonetti(a)apple.com Date: 2009-11-30 18:42:59 -0800 (Mon, 30 Nov 2009) Log Message: ----------- prepare MacRuby for another LLVM transition Modified Paths: -------------- MacRuby/trunk/compiler.cpp MacRuby/trunk/rakelib/builder.rb MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/compiler.cpp =================================================================== --- MacRuby/trunk/compiler.cpp 2009-11-30 21:04:26 UTC (rev 3064) +++ MacRuby/trunk/compiler.cpp 2009-12-01 02:42:59 UTC (rev 3065) @@ -1116,7 +1116,11 @@ Instruction *slot_insn = dyn_cast<Instruction>(slot); if (slot_insn != NULL) { +#if LLVM_TOT + Instruction *insn = slot_insn->clone(); +#else Instruction *insn = slot_insn->clone(context); +#endif BasicBlock::InstListType &list = bb->getInstList(); list.insert(list.end(), insn); return insn; @@ -1849,12 +1853,17 @@ Intrinsic::eh_exception); Value *eh_ptr = CallInst::Create(eh_exception_f, "", bb); -#if __LP64__ +#if LLVM_TOT Function *eh_selector_f = Intrinsic::getDeclaration(module, + Intrinsic::eh_selector); +#else +# if __LP64__ + Function *eh_selector_f = Intrinsic::getDeclaration(module, Intrinsic::eh_selector_i64); -#else +# else Function *eh_selector_f = Intrinsic::getDeclaration(module, Intrinsic::eh_selector_i32); +# endif #endif std::vector<Value *> params; @@ -1882,12 +1891,17 @@ if (eh_type != typeid(void)) { // TODO: this doesn't work yet, the type id must be a GlobalVariable... -#if __LP64__ +#if LLVM_TOT Function *eh_typeid_for_f = Intrinsic::getDeclaration(module, - Intrinsic::eh_typeid_for_i64); + Intrinsic::eh_typeid_for); #else +# if __LP64__ Function *eh_typeid_for_f = Intrinsic::getDeclaration(module, + Intrinsic::eh_typeid_for_i64); +# else + Function *eh_typeid_for_f = Intrinsic::getDeclaration(module, Intrinsic::eh_typeid_for_i32); +# endif #endif std::vector<Value *> params; params.push_back(compile_const_pointer((void *)&eh_type)); @@ -2943,7 +2957,11 @@ Instruction *slot_insn = dyn_cast<Instruction>(ivar_slot); if (slot_insn != NULL) { +#if LLVM_TOT + Instruction *insn = slot_insn->clone(); +#else Instruction *insn = slot_insn->clone(context); +#endif list.insert(list_iter, insn); params.push_back(insn); } @@ -5711,13 +5729,17 @@ list.insert(list.begin(), load); } + Function *ivarSlotAlloc = cast<Function>(module->getOrInsertFunction( + "rb_vm_ivar_slot_allocate", + Int32PtrTy, NULL)); + for (std::vector<GlobalVariable *>::iterator i = ivar_slots.begin(); i != ivar_slots.end(); ++i) { GlobalVariable *gvar = *i; - Instruction *call = new MallocInst(Int32Ty, ""); + Instruction *call = CallInst::Create(ivarSlotAlloc, ""); Instruction *assign1 = new StoreInst(ConstantInt::getSigned(Int32Ty, -1), call, ""); Instruction *assign2 = new StoreInst(call, gvar, ""); Modified: MacRuby/trunk/rakelib/builder.rb =================================================================== --- MacRuby/trunk/rakelib/builder.rb 2009-11-30 21:04:26 UTC (rev 3064) +++ MacRuby/trunk/rakelib/builder.rb 2009-12-01 02:42:59 UTC (rev 3065) @@ -92,7 +92,7 @@ CFLAGS = "-I. -I./include -I./onig -I/usr/include/libxml2 #{ARCHFLAGS} -fno-common -pipe -O3 -g -Wall -fexceptions" CFLAGS << " -Wno-parentheses -Wno-deprecated-declarations -Werror" if NO_WARN_BUILD OBJC_CFLAGS = CFLAGS + " -fobjc-gc-only" -CXXFLAGS = `#{LLVM_CONFIG} --cxxflags #{LLVM_MODULES}`.strip +CXXFLAGS = `#{LLVM_CONFIG} --cxxflags #{LLVM_MODULES}`.sub(/-DNDEBUG/, '').strip CXXFLAGS << " -I. -I./include -g -Wall #{ARCHFLAGS}" CXXFLAGS << " -Wno-parentheses -Wno-deprecated-declarations -Werror" if NO_WARN_BUILD LDFLAGS = `#{LLVM_CONFIG} --ldflags --libs #{LLVM_MODULES}`.strip.gsub(/\n/, '') @@ -116,7 +116,7 @@ OBJS_CFLAGS = { # Make sure everything gets inlined properly + compile as Objective-C++. - 'dispatcher' => '-Winline --param inline-unit-growth=10000 --param large-function-growth=10000 -x objective-c++' + 'dispatcher' => '--param inline-unit-growth=10000 --param large-function-growth=10000 -x objective-c++' } class Builder Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2009-11-30 21:04:26 UTC (rev 3064) +++ MacRuby/trunk/vm.cpp 2009-12-01 02:42:59 UTC (rev 3065) @@ -29,6 +29,9 @@ #include <llvm/Support/raw_ostream.h> #include <llvm/Intrinsics.h> #include <llvm/Bitcode/ReaderWriter.h> +#if LLVM_TOT +# include <llvm/LLVMContext.h> +#endif using namespace llvm; #if ROXOR_COMPILER_DEBUG @@ -174,9 +177,19 @@ FunctionEnd)); } +#if LLVM_TOT + void deallocateFunctionBody(void *data) { + mm->deallocateFunctionBody(data); + } + + void deallocateExceptionTable(void *data) { + mm->deallocateExceptionTable(data); + } +#else void deallocateMemForFunction(const Function *F) { mm->deallocateMemForFunction(F); } +#endif uint8_t* startExceptionTable(const Function* F, uintptr_t &ActualSize) { @@ -1304,6 +1317,13 @@ } extern "C" +int * +rb_vm_ivar_slot_allocate(void) +{ + return (int *)malloc(sizeof(int)); +} + +extern "C" VALUE rb_vm_ivar_get(VALUE obj, ID name, int *slot_cache) {

1 0