September 2010 - macruby-changes - lists.macosforge.org

[4543] MacRuby/trunk
by source_changes＠macosforge.org 27 Sep '10

27 Sep '10

Revision: 4543 http://trac.macosforge.org/projects/ruby/changeset/4543 Author: lsansonetti(a)apple.com Date: 2010-09-27 14:28:06 -0700 (Mon, 27 Sep 2010) Log Message: ----------- when compiling write barriers, don't assert that the slot must be in the auto-zone, because it could potentially be used on locals from bindings originally situated on the stack Modified Paths: -------------- MacRuby/trunk/include/ruby/macruby.h MacRuby/trunk/kernel.c Modified: MacRuby/trunk/include/ruby/macruby.h =================================================================== --- MacRuby/trunk/include/ruby/macruby.h 2010-09-27 12:18:53 UTC (rev 4542) +++ MacRuby/trunk/include/ruby/macruby.h 2010-09-27 21:28:06 UTC (rev 4543) @@ -37,19 +37,23 @@ extern auto_zone_t *__auto_zone; #endif -#define GC_WB(dst, newval) \ +#define GC_WB_0(dst, newval, check) \ do { \ void *nv = (void *)newval; \ if (!SPECIAL_CONST_P(nv)) { \ if (!auto_zone_set_write_barrier(__auto_zone, \ (const void *)dst, (const void *)nv)) { \ - rb_bug("destination %p isn't in the auto zone", dst); \ + if (check) { \ + rb_bug("destination %p isn't in the auto zone", dst); \ + } \ } \ } \ *(void **)dst = nv; \ } \ while (0) +#define GC_WB(dst, newval) GC_WB_0(dst, newval, true) + static inline void * rb_objc_retain(void *addr) { Modified: MacRuby/trunk/kernel.c =================================================================== --- MacRuby/trunk/kernel.c 2010-09-27 12:18:53 UTC (rev 4542) +++ MacRuby/trunk/kernel.c 2010-09-27 21:28:06 UTC (rev 4543) @@ -27,7 +27,7 @@ PRIMITIVE VALUE vm_gc_wb(VALUE *slot, VALUE val) { - GC_WB(slot, val); + GC_WB_0(slot, val, false); return val; }

1 0

[4542] MacRuby/trunk/sample-macruby/Scripts/javascript.rb
by source_changes＠macosforge.org 27 Sep '10

27 Sep '10

Revision: 4542 http://trac.macosforge.org/projects/ruby/changeset/4542 Author: watson1978(a)gmail.com Date: 2010-09-27 05:18:53 -0700 (Mon, 27 Sep 2010) Log Message: ----------- Added the example that execute JavaScript. Added Paths: ----------- MacRuby/trunk/sample-macruby/Scripts/javascript.rb Added: MacRuby/trunk/sample-macruby/Scripts/javascript.rb =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/javascript.rb (rev 0) +++ MacRuby/trunk/sample-macruby/Scripts/javascript.rb 2010-09-27 12:18:53 UTC (rev 4542) @@ -0,0 +1,68 @@ +#!/usr/local/bin/macruby +# -*- coding: utf-8 -*- +framework "JavaScriptCore" + +module JSC + module_function + + def eval(program) + kJSPropertyAttributeNone = 0 unless(kJSPropertyAttributeNone) + + callback = Proc.new do |ctx, obj, this, len, args, exp| + if(len > 0) + tmp = args.cast!('^{OpaqueJSValue=}') + string = JSValueToStringCopy(ctx, tmp[0], exp) + size = JSStringGetMaximumUTF8CStringSize(string) + buffer = Pointer.new('c', size) + ret = JSStringGetUTF8CString(string, buffer, size) + JSStringRelease(string) + + ary = [] + (ret - 1).times { |i| ary << buffer[i] } + puts ary.pack('c*') + end + nil + end + + ctx = JSGlobalContextCreate(nil) + global = JSContextGetGlobalObject(ctx) + + print = JSStringCreateWithUTF8CString("print") + print_f = JSObjectMakeFunctionWithCallback(ctx, print, callback) + JSObjectSetProperty(ctx, global, print, print_f, kJSPropertyAttributeNone, nil) + JSStringRelease(print) + + source = JSStringCreateWithUTF8CString(program) + exception = Pointer.new('^{OpaqueJSValue}') + + if(JSCheckScriptSyntax(ctx, source, nil, 0, exception)) + JSEvaluateScript(ctx, source, nil, nil, 0, exception) + else + raise "Syntax error." + end + + JSStringRelease(source) + JSGlobalContextRelease(ctx) + end +end + +if($0 == __FILE__) + program =<<EOS + var sum = 0; + + for(var i = 1; i <= 10; i++) { + sum += i; + } + print("sum : " + sum); + + function fib(n) { + if(n == 0) return 0; + if(n == 1) return 1; + return fib(n - 1) + fib(n - 2); + } + var ret = fib(7); + print("fib(7) : " + ret); +EOS + + JSC.eval(program) +end Property changes on: MacRuby/trunk/sample-macruby/Scripts/javascript.rb ___________________________________________________________________ Added: svn:executable + *

1 0

[4541] MacRuby/trunk/sample-macruby/Scripts/webrick.rb
by source_changes＠macosforge.org 27 Sep '10

27 Sep '10

Revision: 4541 http://trac.macosforge.org/projects/ruby/changeset/4541 Author: watson1978(a)gmail.com Date: 2010-09-27 04:39:02 -0700 (Mon, 27 Sep 2010) Log Message: ----------- Added the exsample that use WEBrick and Bonjour. Added Paths: ----------- MacRuby/trunk/sample-macruby/Scripts/webrick.rb Added: MacRuby/trunk/sample-macruby/Scripts/webrick.rb =================================================================== --- MacRuby/trunk/sample-macruby/Scripts/webrick.rb (rev 0) +++ MacRuby/trunk/sample-macruby/Scripts/webrick.rb 2010-09-27 11:39:02 UTC (rev 4541) @@ -0,0 +1,22 @@ +#!/usr/local/bin/macruby +# -*- coding: utf-8 -*- +# This script is sample of WEBrick and Bonjour. +# You could look for this server using Bonjour on Safari. +framework "Foundation" +require "webrick" + +DOC_ROOT = "." +SERVER_PORT = 8000 +SERVER_NAME = "webrick" + +s = WEBrick::HTTPServer.new( + :Port => SERVER_PORT, + :DocumentRoot => File.join(Dir::pwd, DOC_ROOT) +) +trap("INT") { s.shutdown } + +# Bonjour +netservice = NSNetService.alloc.initWithDomain("", type:"_http._tcp", name:SERVER_NAME, port:SERVER_PORT) +netservice.publish() + +s.start Property changes on: MacRuby/trunk/sample-macruby/Scripts/webrick.rb ___________________________________________________________________ Added: svn:executable + *

1 0

[4540] MacRuby/trunk/ext/zlib/zlib.c
by source_changes＠macosforge.org 27 Sep '10

27 Sep '10

Revision: 4540 http://trac.macosforge.org/projects/ruby/changeset/4540 Author: watson1978(a)gmail.com Date: 2010-09-26 17:31:29 -0700 (Sun, 26 Sep 2010) Log Message: ----------- Zlib::GzipWriter#mtime= should set Time Object. Modified Paths: -------------- MacRuby/trunk/ext/zlib/zlib.c Modified: MacRuby/trunk/ext/zlib/zlib.c =================================================================== --- MacRuby/trunk/ext/zlib/zlib.c 2010-09-26 17:48:42 UTC (rev 4539) +++ MacRuby/trunk/ext/zlib/zlib.c 2010-09-27 00:31:29 UTC (rev 4540) @@ -2354,7 +2354,7 @@ rb_raise(cGzError, "header is already written"); } - if (FIXNUM_P(time)) { + if (FIXNUM_P(mtime)) { gz->mtime = FIX2INT(mtime); } else {

1 0

[4539] MacRuby/trunk/ext/zlib/zlib.c
by source_changes＠macosforge.org 26 Sep '10

26 Sep '10

Revision: 4539 http://trac.macosforge.org/projects/ruby/changeset/4539 Author: watson1978(a)gmail.com Date: 2010-09-26 10:48:42 -0700 (Sun, 26 Sep 2010) Log Message: ----------- Fixed some following problems: - Can't write into file. - Should convert Object into String within rb_gzwriter_write(). - fix Zlib::Deflate#dup. - String's concatenation is not work definitely within zstream_append_buffer(). - Assertion fails with BSTRING_PTR(rs). Modified Paths: -------------- MacRuby/trunk/ext/zlib/zlib.c Modified: MacRuby/trunk/ext/zlib/zlib.c =================================================================== --- MacRuby/trunk/ext/zlib/zlib.c 2010-09-24 21:46:41 UTC (rev 4538) +++ MacRuby/trunk/ext/zlib/zlib.c 2010-09-26 17:48:42 UTC (rev 4539) @@ -452,16 +452,19 @@ z->stream.avail_out = 0; return; } - - if (rb_bstr_length(z->buf) < (z->buf_filled + len)) { - rb_bstr_resize(z->buf, z->buf_filled + len); + + if (BSTRING_LEN(z->buf) < (z->buf_filled + len)) { z->stream.avail_out = 0; - } else if (z->stream.avail_out >= len) { - z->stream.avail_out -= len; - } else { - z->stream.avail_out = 0; } + else { + if (z->stream.avail_out >= len) { + z->stream.avail_out -= len; + } else { + z->stream.avail_out = 0; + } + } + rb_bstr_resize(z->buf, z->buf_filled); rb_bstr_concat(z->buf, (const UInt8 *)src, len); z->buf_filled += len; z->stream.next_out = BSTRING_PTR_BYTEF(z->buf) + z->buf_filled; @@ -1058,14 +1061,19 @@ static VALUE rb_deflate_init_copy(VALUE self, SEL sel, VALUE orig) { - struct zstream *z1 = get_zstream(self); - struct zstream *z2 = get_zstream(orig); + struct zstream *z1, *z2; int err; - + + Data_Get_Struct(self, struct zstream, z1); + z2 = get_zstream(orig); + err = deflateCopy(&z1->stream, &z2->stream); if (err != Z_OK) { raise_zlib_error(err, 0); } + z1->input = NIL_P(z2->input) ? Qnil : rb_str_dup(z2->input); + z1->buf = NIL_P(z2->buf) ? Qnil : rb_str_dup(z2->buf); + z1->buf_filled = z2->buf_filled; z1->flags = z2->flags; return self; @@ -2228,8 +2236,12 @@ } filename = argv[0]; FilePathValue(filename); - io = rb_f_open(klass, 0, argc, argv); + VALUE args[2]; + args[0] = filename; + args[1] = rb_str_new2(mode); + io = rb_class_new_instance(2, args, rb_cFile); + argv[0] = io; return rb_gzfile_s_wrap(klass, 0, argc, argv); } @@ -2613,8 +2625,13 @@ { struct gzfile *gz = get_gzfile(obj); - StringValue(str); - str = rb_str_bstr(str); + if (TYPE(str) != T_STRING) { + str = rb_obj_as_string(str); + } + else { + StringValue(str); + str = rb_str_bstr(str); + } gzfile_write(gz, BSTRING_PTR_BYTEF(str), BSTRING_LEN(str)); return INT2FIX(BSTRING_LEN(str)); } @@ -2927,7 +2944,7 @@ static void rscheck(const char *rsptr, long rslen, VALUE rs) { - if ((const char*)BSTRING_PTR(rs) != rsptr && BSTRING_LEN(rs) != rslen) + if ((const char*)RSTRING_PTR(rs) != rsptr && RSTRING_LEN(rs) != rslen) rb_raise(rb_eRuntimeError, "rs modified"); } @@ -2960,13 +2977,13 @@ return dst; } - if (BSTRING_LEN(rs) == 0) { + if (RSTRING_LEN(rs) == 0) { rsptr = "\n\n"; rslen = 2; rspara = 1; } else { - rsptr = (const char*)BSTRING_PTR(rs); - rslen = BSTRING_LEN(rs); + rsptr = (const char*)RSTRING_PTR(rs); + rslen = RSTRING_LEN(rs); rspara = 0; }

1 0

[4538] MacRuby/trunk/ext/libyaml/rubyext.c
by source_changes＠macosforge.org 24 Sep '10

24 Sep '10

Revision: 4538 http://trac.macosforge.org/projects/ruby/changeset/4538 Author: lsansonetti(a)apple.com Date: 2010-09-24 14:46:41 -0700 (Fri, 24 Sep 2010) Log Message: ----------- fix compilation warnings Modified Paths: -------------- MacRuby/trunk/ext/libyaml/rubyext.c Modified: MacRuby/trunk/ext/libyaml/rubyext.c =================================================================== --- MacRuby/trunk/ext/libyaml/rubyext.c 2010-09-24 08:32:18 UTC (rev 4537) +++ MacRuby/trunk/ext/libyaml/rubyext.c 2010-09-24 21:46:41 UTC (rev 4538) @@ -167,14 +167,14 @@ if (parser->problem != NULL) { if (parser->context != NULL) { asprintf(&msg, - "%s error encountered during parsing: %s (line %d, column %d), context %s (line %d, column %d)", + "%s error encountered during parsing: %s (line %ld, column %ld), context %s (line %ld, column %ld)", descriptor, parser->problem, parser->problem_mark.line, parser->problem_mark.column, parser->context, parser->context_mark.line, parser->context_mark.column); } else { asprintf(&msg, - "%s error encountered during parsing: %s (line %d, column %d)", + "%s error encountered during parsing: %s (line %ld, column %ld)", descriptor, parser->problem, parser->problem_mark.line, parser->problem_mark.column); }

1 0

[4537] MacRuby/trunk
by source_changes＠macosforge.org 24 Sep '10

24 Sep '10

Revision: 4537 http://trac.macosforge.org/projects/ruby/changeset/4537 Author: lsansonetti(a)apple.com Date: 2010-09-24 01:32:18 -0700 (Fri, 24 Sep 2010) Log Message: ----------- fix a bug when exceptions raised inside .rbo entry point functions would not be properly propagated since the entry point was directly executed from the dylib constructor trampoline which isn't compiled with unwind tables; instead we now call the entry point right after dlopen() (which is exception safe) and use the constructor to register a pointer to it Modified Paths: -------------- MacRuby/trunk/bin/rubyc MacRuby/trunk/dln.c Modified: MacRuby/trunk/bin/rubyc =================================================================== --- MacRuby/trunk/bin/rubyc 2010-09-23 21:33:11 UTC (rev 4536) +++ MacRuby/trunk/bin/rubyc 2010-09-24 08:32:18 UTC (rev 4537) @@ -177,7 +177,7 @@ # Compile the assembly. tmp_obj = gen_tmpfile(base + arch, 'o') - execute("#{@gcc} -c -arch #{arch} \"#{asm}\" -o \"#{tmp_obj}\"") + execute("#{@gcc} -fexceptions -c -arch #{arch} \"#{asm}\" -o \"#{tmp_obj}\"") tmp_objs << tmp_obj end @@ -200,10 +200,10 @@ # Generate main file. main_txt = <<EOS extern "C" { + void rb_mrep_register(void *); void *#{init_func}(void *, void *); - void *rb_vm_top_self(void); __attribute__((constructor)) static void __init__(void) { - #{init_func}(rb_vm_top_self(), 0); + rb_mrep_register((void *)#{init_func}); } } EOS @@ -212,7 +212,7 @@ main = gen_tmpfile('main', 'c') File.open(main, 'w') { |io| io.write(main_txt) } linkf = @internal ? "-L. -lmacruby" : "-L#{RbConfig::CONFIG['libdir']} -lmacruby" - execute("#{@gcxx} \"#{main}\" -dynamic -bundle -undefined suppress -flat_namespace #{arch_flags} #{linkf} \"#{obj}\" -o \"#{output}\"") + execute("#{@gcxx} \"#{main}\" -fexceptions -dynamic -bundle -undefined suppress -flat_namespace #{arch_flags} #{linkf} \"#{obj}\" -o \"#{output}\"") strip(output) end Modified: MacRuby/trunk/dln.c =================================================================== --- MacRuby/trunk/dln.c 2010-09-23 21:33:11 UTC (rev 4536) +++ MacRuby/trunk/dln.c 2010-09-24 08:32:18 UTC (rev 4537) @@ -10,7 +10,10 @@ **********************************************************************/ #include "ruby/macruby.h" +#include "ruby/node.h" +#include "vm.h" #include "dln.h" + #include <stdlib.h> #include <alloca.h> #include <string.h> @@ -73,6 +76,17 @@ bool ruby_is_miniruby = false; +// This function is called back from .rbo files' gcc constructors, passing a +// pointer to their entry point function, during dlopen(). The entry point +// function is called right after dlopen() directly. This is because C++ +// exceptions raised within a gcc constructor are not properly propagated. +static void *__mrep__ = NULL; +void +rb_mrep_register(void *imp) +{ + __mrep__ = imp; +} + void* dln_load(const char *file, bool call_init) { @@ -92,6 +106,7 @@ void *handle; /* Load file */ + __mrep__ = NULL; if ((handle = (void*)dlopen(file, RTLD_LAZY|RTLD_GLOBAL)) == NULL) { error = dln_strerror(); goto failed; @@ -108,6 +123,10 @@ /* Call the init code */ (*init_fct)(); } + else { + assert(__mrep__ != NULL); + ((IMP)__mrep__)((id)rb_vm_top_self(), 0); + } return handle; }

1 0

[4536] MacRuby/trunk
by source_changes＠macosforge.org 23 Sep '10

23 Sep '10

Revision: 4536 http://trac.macosforge.org/projects/ruby/changeset/4536 Author: lsansonetti(a)apple.com Date: 2010-09-23 14:33:11 -0700 (Thu, 23 Sep 2010) Log Message: ----------- #require: forget about the current binding during parsing Modified Paths: -------------- MacRuby/trunk/load.c MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/load.c =================================================================== --- MacRuby/trunk/load.c 2010-09-23 00:44:01 UTC (rev 4535) +++ MacRuby/trunk/load.c 2010-09-23 21:33:11 UTC (rev 4536) @@ -87,7 +87,15 @@ // Load it. const char *fname_str = RSTRING_PTR(fname); //printf("load %s\n", fname_str); + + rb_vm_binding_t *b = rb_vm_current_binding(); + if (b != NULL) { + rb_vm_pop_binding(); + } NODE *node = (NODE *)rb_load_file(fname_str); + if (b != NULL) { + rb_vm_add_binding(b); + } if (node == NULL) { rb_raise(rb_eSyntaxError, "compile error"); } Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2010-09-23 00:44:01 UTC (rev 4535) +++ MacRuby/trunk/vm.cpp 2010-09-23 21:33:11 UTC (rev 4536) @@ -3734,7 +3734,7 @@ if (create) { GC_WB(l, xmalloc(sizeof(rb_vm_local_t))); (*l)->name = name; - GC_WB(&(*l)->value, xmalloc(sizeof(VALUE))); + GC_WB(&(*l)->value, xmalloc(sizeof(VALUE *))); (*l)->next = NULL; return (*l)->value; }

1 0

[4535] MacRuby/trunk
by source_changes＠macosforge.org 23 Sep '10

23 Sep '10

Revision: 4535 http://trac.macosforge.org/projects/ruby/changeset/4535 Author: lsansonetti(a)apple.com Date: 2010-09-22 17:44:01 -0700 (Wed, 22 Sep 2010) Log Message: ----------- fix a bug in the super dispatcher: in case we can't locate the receiver's class in the ancestors chain, because it may have been extended, let's assume the super method will be in the direct superclass instead Modified Paths: -------------- MacRuby/trunk/class.c MacRuby/trunk/dispatcher.cpp Modified: MacRuby/trunk/class.c =================================================================== --- MacRuby/trunk/class.c 2010-09-22 20:53:10 UTC (rev 4534) +++ MacRuby/trunk/class.c 2010-09-23 00:44:01 UTC (rev 4535) @@ -714,8 +714,6 @@ * Math.ancestors #=> [Math] */ -static void rb_mod_included_modules_nosuper(VALUE, VALUE); - VALUE rb_mod_ancestors_nocopy(VALUE mod) { Modified: MacRuby/trunk/dispatcher.cpp =================================================================== --- MacRuby/trunk/dispatcher.cpp 2010-09-22 20:53:10 UTC (rev 4534) +++ MacRuby/trunk/dispatcher.cpp 2010-09-23 00:44:01 UTC (rev 4535) @@ -282,13 +282,15 @@ const int count = RARRAY_LEN(ary); bool klass_located = false; #if ROXOR_VM_DEBUG - printf("locating super method %s of class %s in ancestor chain: ", - sel_getName(sel), rb_class2name((VALUE)klass)); + printf("locating super method %s of class %s (%p) in ancestor chain: ", + sel_getName(sel), rb_class2name((VALUE)klass), klass); for (int i = 0; i < count; i++) { - printf("%s ", rb_class2name(RARRAY_AT(ary, i))); + VALUE sk = RARRAY_AT(ary, i); + printf("%s (%p) ", rb_class2name(sk), (void *)sk); } printf("\n"); #endif +try_again: for (int i = 0; i < count; i++) { if (!klass_located && RARRAY_AT(ary, i) == (VALUE)self_class) { klass_located = true; @@ -296,6 +298,9 @@ if (klass_located) { if (i < count - 1) { VALUE k = RARRAY_AT(ary, i + 1); +#if ROXOR_VM_DEBUG + printf("looking in %s\n", rb_class2name((VALUE)k)); +#endif Method method = class_getInstanceMethod((Class)k, sel); if (method == NULL) { @@ -323,6 +328,14 @@ } } } + if (!klass_located) { + // Could not locate the receiver's class in the ancestors list. + // It probably means that the receiver has been extended somehow. + // We therefore assume that the super method will be in the direct + // superclass. + klass_located = true; + goto try_again; + } *super_class_p = NULL; return NULL;

1 0

[4534] MacRuby/trunk
by source_changes＠macosforge.org 22 Sep '10

22 Sep '10

Revision: 4534 http://trac.macosforge.org/projects/ruby/changeset/4534 Author: lsansonetti(a)apple.com Date: 2010-09-22 13:53:10 -0700 (Wed, 22 Sep 2010) Log Message: ----------- fix a regression with earlier LLVM versions Modified Paths: -------------- MacRuby/trunk/compiler.cpp MacRuby/trunk/kernel.c Modified: MacRuby/trunk/compiler.cpp =================================================================== --- MacRuby/trunk/compiler.cpp 2010-09-22 01:00:06 UTC (rev 4533) +++ MacRuby/trunk/compiler.cpp 2010-09-22 20:53:10 UTC (rev 4534) @@ -6181,7 +6181,10 @@ bool need_wb = false; Value *slot = compile_lvar_slot(vid, &need_wb); if (need_wb) { - Value *args[] = { slot, val }; + Value *args[] = { + new BitCastInst(slot, RubyObjPtrTy, "", bb), + new BitCastInst(val, RubyObjTy, "", bb) + }; return CallInst::Create(writeBarrierFunc, args, args + 2, "", bb); } else { Modified: MacRuby/trunk/kernel.c =================================================================== --- MacRuby/trunk/kernel.c 2010-09-22 01:00:06 UTC (rev 4533) +++ MacRuby/trunk/kernel.c 2010-09-22 20:53:10 UTC (rev 4534) @@ -25,10 +25,10 @@ #endif PRIMITIVE VALUE -vm_gc_wb(void *slot, void *val) +vm_gc_wb(VALUE *slot, VALUE val) { GC_WB(slot, val); - return (VALUE)val; + return val; } PRIMITIVE VALUE

1 0