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

[4553] MacRuby/trunk/string.c
by source_changes＠macosforge.org 28 Sep '10

28 Sep '10

Revision: 4553 http://trac.macosforge.org/projects/ruby/changeset/4553 Author: lsansonetti(a)apple.com Date: 2010-09-28 15:32:38 -0700 (Tue, 28 Sep 2010) Log Message: ----------- fix a silly bug in String#setbyte Modified Paths: -------------- MacRuby/trunk/string.c Modified: MacRuby/trunk/string.c =================================================================== --- MacRuby/trunk/string.c 2010-09-28 22:32:14 UTC (rev 4552) +++ MacRuby/trunk/string.c 2010-09-28 22:32:38 UTC (rev 4553) @@ -1760,10 +1760,12 @@ */ static VALUE -rstr_setbyte(VALUE self, SEL sel, VALUE index, VALUE value) +rstr_setbyte(VALUE self, SEL sel, VALUE idx, VALUE value) { rstr_modify(self); str_make_data_binary(RSTR(self)); + + long index = NUM2LONG(idx); if ((index < -RSTR(self)->length_in_bytes) || (index >= RSTR(self)->length_in_bytes)) { rb_raise(rb_eIndexError, "index %ld out of string", index);

1 0

[4552] MacRuby/trunk/gc.c
by source_changes＠macosforge.org 28 Sep '10

28 Sep '10

Revision: 4552 http://trac.macosforge.org/projects/ruby/changeset/4552 Author: lsansonetti(a)apple.com Date: 2010-09-28 15:32:14 -0700 (Tue, 28 Sep 2010) Log Message: ----------- this is always false Modified Paths: -------------- MacRuby/trunk/gc.c Modified: MacRuby/trunk/gc.c =================================================================== --- MacRuby/trunk/gc.c 2010-09-28 14:01:57 UTC (rev 4551) +++ MacRuby/trunk/gc.c 2010-09-28 22:32:14 UTC (rev 4552) @@ -155,9 +155,6 @@ void * ruby_xrealloc(void *ptr, size_t size) { - if (size < 0) { - rb_raise(rb_eArgError, "negative re-allocation size"); - } if (ptr == NULL) { return ruby_xmalloc(size); }

1 0

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

28 Sep '10

Revision: 4551 http://trac.macosforge.org/projects/ruby/changeset/4551 Author: watson1978(a)gmail.com Date: 2010-09-28 07:01:57 -0700 (Tue, 28 Sep 2010) Log Message: ----------- oops, I forgot to make BSTR. Modified Paths: -------------- MacRuby/trunk/ext/zlib/zlib.c Modified: MacRuby/trunk/ext/zlib/zlib.c =================================================================== --- MacRuby/trunk/ext/zlib/zlib.c 2010-09-28 13:35:28 UTC (rev 4550) +++ MacRuby/trunk/ext/zlib/zlib.c 2010-09-28 14:01:57 UTC (rev 4551) @@ -502,7 +502,7 @@ return zstream_detach_buffer(z); } - dst = rb_str_subseq(z->buf, 0, len); + dst = rb_str_bstr(rb_str_subseq(z->buf, 0, len)); z->buf_filled -= len; UInt8 *buf = BSTRING_PTR(z->buf); memmove(buf, buf + len, z->buf_filled);

1 0

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

28 Sep '10

Revision: 4550 http://trac.macosforge.org/projects/ruby/changeset/4550 Author: watson1978(a)gmail.com Date: 2010-09-28 06:35:28 -0700 (Tue, 28 Sep 2010) Log Message: ----------- Fixed a Zlib::GzipReader#readlines. Modified Paths: -------------- MacRuby/trunk/ext/zlib/zlib.c Modified: MacRuby/trunk/ext/zlib/zlib.c =================================================================== --- MacRuby/trunk/ext/zlib/zlib.c 2010-09-28 08:28:37 UTC (rev 4549) +++ MacRuby/trunk/ext/zlib/zlib.c 2010-09-28 13:35:28 UTC (rev 4550) @@ -502,8 +502,7 @@ return zstream_detach_buffer(z); } - rb_bstr_resize(z->buf, len); - dst = z->buf; + dst = rb_str_subseq(z->buf, 0, len); z->buf_filled -= len; UInt8 *buf = BSTRING_PTR(z->buf); memmove(buf, buf + len, z->buf_filled);

1 0

[4549] MacRuby/trunk/file.c
by source_changes＠macosforge.org 28 Sep '10

28 Sep '10

Revision: 4549 http://trac.macosforge.org/projects/ruby/changeset/4549 Author: lsansonetti(a)apple.com Date: 2010-09-28 01:28:37 -0700 (Tue, 28 Sep 2010) Log Message: ----------- File.unlink: rewrote so that the arguments aren't wrapped inside an array anymore, to avoid a resurrection error in lib/tempfile.rb Modified Paths: -------------- MacRuby/trunk/file.c Modified: MacRuby/trunk/file.c =================================================================== --- MacRuby/trunk/file.c 2010-09-28 06:49:18 UTC (rev 4548) +++ MacRuby/trunk/file.c 2010-09-28 08:28:37 UTC (rev 4549) @@ -135,18 +135,15 @@ } static long -apply2files(void (*func)(const char *, void *), VALUE vargs, void *arg) +apply2files(void (*func)(const char *, void *), long argc, VALUE *argv, + void *arg) { - long i; - volatile VALUE path; - rb_secure(4); - for (i = 0; i < RARRAY_LEN(vargs); i++) { - path = rb_get_path(RARRAY_AT(vargs, i)); + for (long i = 0; i < argc; i++) { + VALUE path = rb_get_path(argv[i]); (*func)(StringValueCStr(path), arg); } - - return RARRAY_LEN(vargs); + return argc; } /* @@ -1758,20 +1755,18 @@ static VALUE rb_file_s_chmod(VALUE rcv, SEL sel, int argc, VALUE *argv) { - VALUE vmode; - VALUE rest; - int mode; - long n; - rb_secure(2); - rb_scan_args(argc, argv, "1*", &vmode, &rest); + if (argc < 1) { + rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc); + } + VALUE vmode = argv[0]; vmode = rb_check_to_integer(vmode, "to_int"); if (NIL_P(vmode)) { rb_raise(rb_eTypeError, "chmod() takes a numeric argument"); } - mode = NUM2INT(vmode); + int mode = NUM2INT(vmode); - n = apply2files(chmod_internal, rest, &mode); + long n = apply2files(chmod_internal, argc - 1, &argv[1], &mode); return LONG2FIX(n); } @@ -1824,15 +1819,15 @@ static VALUE rb_file_s_lchmod(VALUE rcv, SEL sel, int argc, VALUE *argv) { - VALUE vmode; - VALUE rest; - long mode, n; - rb_secure(2); - rb_scan_args(argc, argv, "1*", &vmode, &rest); - mode = NUM2INT(vmode); + if (argc < 1) { + rb_raise(rb_eArgError, "wrong number of arguments (%d for 1)", argc); + } + VALUE vmode = argv[0]; + int mode = NUM2INT(vmode); - n = apply2files(lchmod_internal, rest, (void *)(long)mode); + long n = apply2files(lchmod_internal, argc - 1, &argv[1], + (void *)(long)mode); return LONG2FIX(n); } #else @@ -1870,12 +1865,13 @@ static VALUE rb_file_s_chown(VALUE rcv, SEL sel, int argc, VALUE *argv) { - VALUE o, g, rest; - struct chown_args arg; - long n; - rb_secure(2); - rb_scan_args(argc, argv, "2*", &o, &g, &rest); + if (argc < 2) { + rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)", argc); + } + VALUE o = argv[0]; + VALUE g = argv[1]; + struct chown_args arg; if (NIL_P(o)) { arg.owner = -1; } @@ -1889,7 +1885,7 @@ arg.group = NUM2GIDT(g); } - n = apply2files(chown_internal, rest, &arg); + long n = apply2files(chown_internal, argc - 2, &argv[2], &arg); return LONG2FIX(n); } @@ -1948,12 +1944,13 @@ static VALUE rb_file_s_lchown(VALUE rcv, SEL sel, int argc, VALUE *argv) { - VALUE o, g, rest; - struct chown_args arg; - long n; - rb_secure(2); - rb_scan_args(argc, argv, "2*", &o, &g, &rest); + if (argc < 2) { + rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)", argc); + } + VALUE o = argv[0]; + VALUE g = argv[1]; + struct chown_args arg; if (NIL_P(o)) { arg.owner = -1; } @@ -1967,7 +1964,7 @@ arg.group = NUM2GIDT(g); } - n = apply2files(lchown_internal, rest, &arg); + long n = apply2files(lchown_internal, argc - 2, &argv[2], &arg); return LONG2FIX(n); } #else @@ -2049,20 +2046,21 @@ static VALUE rb_file_s_utime(VALUE rcv, SEL sel, int argc, VALUE *argv) { - VALUE atime, mtime, rest; - struct timespec tss[2], *tsp = NULL; - long n; - rb_secure(2); - rb_scan_args(argc, argv, "2*", &atime, &mtime, &rest); + if (argc < 2) { + rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)", argc); + } + VALUE atime = argv[0]; + VALUE mtime = argv[1]; + struct timespec tss[2], *tsp = NULL; if (!NIL_P(atime) || !NIL_P(mtime)) { tsp = tss; tsp[0] = rb_time_timespec(atime); tsp[1] = rb_time_timespec(mtime); } - n = apply2files(utime_internal, rest, tsp); + long n = apply2files(utime_internal, argc - 2, &argv[2], tsp); return LONG2FIX(n); } @@ -2220,12 +2218,12 @@ */ static VALUE -rb_file_s_unlink(VALUE klass, SEL sel, VALUE args) +rb_file_s_unlink(VALUE klass, SEL sel, int argc, VALUE *argv) { long n; rb_secure(2); - n = apply2files(unlink_internal, args, 0); + n = apply2files(unlink_internal, argc, argv, 0); return LONG2FIX(n); } @@ -4253,8 +4251,8 @@ rb_objc_define_method(rb_ccFile, "symlink", rb_file_s_symlink, 2); rb_objc_define_method(rb_ccFile, "readlink", rb_file_s_readlink, 1); - rb_objc_define_method(rb_ccFile, "unlink", rb_file_s_unlink, -2); - rb_objc_define_method(rb_ccFile, "delete", rb_file_s_unlink, -2); + rb_objc_define_method(rb_ccFile, "unlink", rb_file_s_unlink, -1); + rb_objc_define_method(rb_ccFile, "delete", rb_file_s_unlink, -1); rb_objc_define_method(rb_ccFile, "rename", rb_file_s_rename, 2); rb_objc_define_method(rb_ccFile, "umask", rb_file_s_umask, -1); rb_objc_define_method(rb_ccFile, "truncate", rb_file_s_truncate, 2);

1 0

[4548] MacRuby/trunk/spec/frozen/tags/macruby/library/bigdecimal
by source_changes＠macosforge.org 28 Sep '10

28 Sep '10

Revision: 4548 http://trac.macosforge.org/projects/ruby/changeset/4548 Author: lsansonetti(a)apple.com Date: 2010-09-27 23:49:18 -0700 (Mon, 27 Sep 2010) Log Message: ----------- tag failing specs Modified Paths: -------------- MacRuby/trunk/spec/frozen/tags/macruby/library/bigdecimal/mode_tags.txt Added Paths: ----------- MacRuby/trunk/spec/frozen/tags/macruby/library/bigdecimal/precs_tags.txt Modified: MacRuby/trunk/spec/frozen/tags/macruby/library/bigdecimal/mode_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/bigdecimal/mode_tags.txt 2010-09-28 06:04:36 UTC (rev 4547) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/bigdecimal/mode_tags.txt 2010-09-28 06:49:18 UTC (rev 4548) @@ -1 +1,2 @@ fails:BigDecimal.mode returns Infinity when too big +fails:BigDecimal.mode raise an exception if the flag is true Added: MacRuby/trunk/spec/frozen/tags/macruby/library/bigdecimal/precs_tags.txt =================================================================== --- MacRuby/trunk/spec/frozen/tags/macruby/library/bigdecimal/precs_tags.txt (rev 0) +++ MacRuby/trunk/spec/frozen/tags/macruby/library/bigdecimal/precs_tags.txt 2010-09-28 06:49:18 UTC (rev 4548) @@ -0,0 +1 @@ +fails:BigDecimal#precs returns the current value of significant digits as the first value

1 0

[4547] MacRuby/trunk
by source_changes＠macosforge.org 28 Sep '10

28 Sep '10

Revision: 4547 http://trac.macosforge.org/projects/ruby/changeset/4547 Author: lsansonetti(a)apple.com Date: 2010-09-27 23:04:36 -0700 (Mon, 27 Sep 2010) Log Message: ----------- when calculating a backtrace path from a -e script, omit the current directory Modified Paths: -------------- MacRuby/trunk/compiler.cpp MacRuby/trunk/compiler.h MacRuby/trunk/interpreter.cpp MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/compiler.cpp =================================================================== --- MacRuby/trunk/compiler.cpp 2010-09-28 05:47:47 UTC (rev 4546) +++ MacRuby/trunk/compiler.cpp 2010-09-28 06:04:36 UTC (rev 4547) @@ -832,6 +832,19 @@ } } +void +RoxorCompiler::generate_location_path(std::string &path, DILocation loc) +{ + if (loc.getFilename() == "-e") { + path.append(loc.getFilename()); + } + else { + path.append(loc.getDirectory()); + path.append("/"); + path.append(loc.getFilename()); + } +} + Value * RoxorCompiler::recompile_dispatch_argv(std::vector<Value *> &params, int offset) { Modified: MacRuby/trunk/compiler.h =================================================================== --- MacRuby/trunk/compiler.h 2010-09-28 05:47:47 UTC (rev 4546) +++ MacRuby/trunk/compiler.h 2010-09-28 06:04:36 UTC (rev 4547) @@ -76,6 +76,8 @@ bool is_dynamic_class(void) { return dynamic_class; } void set_dynamic_class(bool flag) { dynamic_class = flag; } + void generate_location_path(std::string &path, DILocation loc); + protected: DIFactory *debug_info; DICompileUnit debug_compile_unit; Modified: MacRuby/trunk/interpreter.cpp =================================================================== --- MacRuby/trunk/interpreter.cpp 2010-09-28 05:47:47 UTC (rev 4546) +++ MacRuby/trunk/interpreter.cpp 2010-09-28 06:04:36 UTC (rev 4547) @@ -84,11 +84,9 @@ MDNode *node = call->getMetadata(RoxorCompiler::shared->dbg_mdkind); if (node != NULL) { - DILocation loc(node); std::string path; - path.append(loc.getDirectory()); - path.append("/"); - path.append(loc.getFilename()); + DILocation loc(node); + RoxorCompiler::shared->generate_location_path(path, loc); Frame frame; frame.name = (const char *)sel; Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2010-09-28 05:47:47 UTC (rev 4546) +++ MacRuby/trunk/vm.cpp 2010-09-28 06:04:36 UTC (rev 4547) @@ -265,14 +265,11 @@ std::string path; for (std::vector<EmittedFunctionDetails::LineStart>::const_iterator iter = Details.LineStarts.begin(); iter != Details.LineStarts.end(); ++iter) { MDNode *scope = iter->Loc.getAsMDNode(F.getContext()); - DILocation dil = DILocation(scope); + DILocation loc = DILocation(scope); if (path.size() == 0) { - DIScope scope = dil.getScope(); - path.append(scope.getDirectory()); - path.append("/"); - path.append(scope.getFilename()); + RoxorCompiler::shared->generate_location_path(path, loc); } - RoxorFunction::Line line(iter->Address, dil.getLineNumber()); + RoxorFunction::Line line(iter->Address, loc.getLineNumber()); function->lines.push_back(line); }

1 0

[4546] MacRuby/trunk
by source_changes＠macosforge.org 28 Sep '10

28 Sep '10

Revision: 4546 http://trac.macosforge.org/projects/ruby/changeset/4546 Author: lsansonetti(a)apple.com Date: 2010-09-27 22:47:47 -0700 (Mon, 27 Sep 2010) Log Message: ----------- add backtracing support for interpreted dispatch calls + cleanup useless code Modified Paths: -------------- MacRuby/trunk/dispatcher.cpp MacRuby/trunk/interpreter.cpp MacRuby/trunk/interpreter.h MacRuby/trunk/objc.h MacRuby/trunk/objc.m MacRuby/trunk/vm.cpp MacRuby/trunk/vm.h Modified: MacRuby/trunk/dispatcher.cpp =================================================================== --- MacRuby/trunk/dispatcher.cpp 2010-09-27 23:05:30 UTC (rev 4545) +++ MacRuby/trunk/dispatcher.cpp 2010-09-28 05:47:47 UTC (rev 4546) @@ -821,8 +821,8 @@ char *method_name = (char *)sel_getName(sel); char file[PATH_MAX]; unsigned long line = 0; - GET_CORE()->symbolize_backtrace_entry(1, NULL, file, sizeof file, - &line, NULL, 0); + GET_CORE()->symbolize_backtrace_entry(1, file, sizeof file, &line, + NULL, 0); MACRUBY_METHOD_ENTRY(class_name, method_name, file, line); } @@ -835,8 +835,8 @@ char *method_name = (char *)sel_getName(sel); char file[PATH_MAX]; unsigned long line = 0; - GET_CORE()->symbolize_backtrace_entry(1, NULL, file, sizeof file, - &line, NULL, 0); + GET_CORE()->symbolize_backtrace_entry(1, file, sizeof file, &line, + NULL, 0); MACRUBY_METHOD_RETURN(class_name, method_name, file, line); } Modified: MacRuby/trunk/interpreter.cpp =================================================================== --- MacRuby/trunk/interpreter.cpp 2010-09-27 23:05:30 UTC (rev 4545) +++ MacRuby/trunk/interpreter.cpp 2010-09-28 05:47:47 UTC (rev 4546) @@ -82,6 +82,35 @@ int argc = value_as(call_arg(call, 5), int); VALUE *argv = value_as(call_arg(call, 6), VALUE *); + MDNode *node = call->getMetadata(RoxorCompiler::shared->dbg_mdkind); + if (node != NULL) { + DILocation loc(node); + std::string path; + path.append(loc.getDirectory()); + path.append("/"); + path.append(loc.getFilename()); + + Frame frame; + frame.name = (const char *)sel; + frame.path = path; + frame.line = loc.getLineNumber(); + frames.push_back(frame); + } + + struct Finally { + RoxorInterpreter *ir; + bool pop; + Finally(RoxorInterpreter *_ir, bool _pop) { + ir = _ir; + pop = _pop; + } + ~Finally() { + if (pop) { + ir->frames.pop_back(); + } + } + } finalizer(this, node != NULL); + return vm_dispatch(top, self, sel, block, opt, argc, argv); } else if (called == RoxorCompiler::shared->singletonClassFunc) { @@ -93,6 +122,27 @@ oops("unrecognized call instruction:", call); } +bool +RoxorInterpreter::frame_at_index(unsigned int idx, void *addr, + std::string *name, std::string *path, unsigned int *line) +{ + if ((uintptr_t)addr < (uintptr_t)(void *)&vm_dispatch + || (uintptr_t)addr > (uintptr_t)(void *)&vm_dispatch + 5000) { + // Likely not an interpreted dispatch call. + return false; + } + if (idx >= frames.size()) { + // Not enough frames! + return false; + } + + Frame &frame = frames[idx]; + *name = frame.name; + *path = frame.path; + *line = frame.line; + return true; +} + #define return_if_cached(__insn) \ std::map<Instruction *, VALUE>::iterator __i = insns.find(__insn); \ if (__i != insns.end()) { \ Modified: MacRuby/trunk/interpreter.h =================================================================== --- MacRuby/trunk/interpreter.h 2010-09-27 23:05:30 UTC (rev 4545) +++ MacRuby/trunk/interpreter.h 2010-09-28 05:47:47 UTC (rev 4546) @@ -22,6 +22,9 @@ VALUE interpret(Function *func, VALUE self, SEL sel); + bool frame_at_index(unsigned int idx, void *addr, std::string *name, + std::string *path, unsigned int *line); + private: VALUE self_arg; SEL sel_arg; @@ -29,6 +32,13 @@ unsigned int stack_p; #define INTERPRETER_STACK_SIZE 1000 std::map<Instruction *, VALUE> insns; + class Frame { + public: + std::string name; + std::string path; + unsigned int line; + }; + std::vector<Frame> frames; VALUE interpret_basicblock(BasicBlock *bb); VALUE interpret_instruction(Instruction *insn); Modified: MacRuby/trunk/objc.h =================================================================== --- MacRuby/trunk/objc.h 2010-09-27 23:05:30 UTC (rev 4545) +++ MacRuby/trunk/objc.h 2010-09-28 05:47:47 UTC (rev 4546) @@ -73,9 +73,6 @@ return false; } -bool rb_objc_symbolize_address(void *addr, void **start, char *name, - size_t name_len); - id rb_rb2oc_exception(VALUE exc); VALUE rb_oc2rb_exception(id exc, bool *created); Modified: MacRuby/trunk/objc.m =================================================================== --- MacRuby/trunk/objc.m 2010-09-27 23:05:30 UTC (rev 4545) +++ MacRuby/trunk/objc.m 2010-09-28 05:47:47 UTC (rev 4546) @@ -109,26 +109,6 @@ return false; } -bool -rb_objc_symbolize_address(void *addr, void **start, char *name, - size_t name_len) -{ - Dl_info info; - if (dladdr(addr, &info) != 0) { - if (info.dli_saddr != NULL) { - if (start != NULL) { - *start = info.dli_saddr; - } - if (name != NULL) { - strncpy(name, info.dli_sname, name_len); - } - return true; - } - } - - return false; -} - VALUE rb_home_dir(VALUE user_name) { Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2010-09-27 23:05:30 UTC (rev 4545) +++ MacRuby/trunk/vm.cpp 2010-09-28 05:47:47 UTC (rev 4546) @@ -651,14 +651,13 @@ void rb_symbolicate(void *addr) { - void *start = NULL; char path[1000]; char name[100]; unsigned long ln = 0; - if (GET_CORE()->symbolize_call_address(addr, &start, path, sizeof path, - &ln, name, sizeof name)) { - printf("addr %p start %p selector %s location %s:%ld\n", - addr, start, name, path, ln); + if (GET_CORE()->symbolize_call_address(addr, path, sizeof path, + &ln, name, sizeof name, NULL)) { + printf("addr %p selector %s location %s:%ld\n", + addr, name, path, ln); } else { printf("addr %p unknown\n", addr); @@ -666,8 +665,9 @@ } bool -RoxorCore::symbolize_call_address(void *addr, void **startp, char *path, - size_t path_len, unsigned long *ln, char *name, size_t name_len) +RoxorCore::symbolize_call_address(void *addr, char *path, size_t path_len, + unsigned long *ln, char *name, size_t name_len, + unsigned int *interpreter_frame_idx) { #if MACRUBY_STATIC return false; @@ -676,25 +676,34 @@ return false; } - void *start = NULL; RoxorFunction *f = jmm->find_function((unsigned char *)addr); if (f != NULL) { if (f->imp == NULL) { f->imp = ee->getPointerToFunctionOrStub(f->f); } - start = f->imp; } else { - if (!rb_objc_symbolize_address(addr, &start, NULL, 0)) { + std::string fr_name; + std::string fr_path; + unsigned int fr_line = 0; + if (interpreter_frame_idx == NULL + || !RoxorInterpreter::shared->frame_at_index(*interpreter_frame_idx, + addr, &fr_name, &fr_path, &fr_line)) { return false; } + (*interpreter_frame_idx)++; + if (name != NULL) { + strlcpy(name, fr_name.c_str(), name_len); + } + if (path != NULL) { + strlcpy(path, fr_path.c_str(), path_len); + } + if (ln != NULL) { + *ln = fr_line; + } + return true; } - assert(start != NULL); - if (startp != NULL) { - *startp = start; - } - if (f != NULL) { if (ln != NULL) { *ln = 0; @@ -711,7 +720,7 @@ } if (name != NULL) { std::map<IMP, rb_vm_method_node_t *>::iterator iter = - ruby_imps.find((IMP)start); + ruby_imps.find((IMP)f->imp); if (iter == ruby_imps.end()) { strncpy(name, "block", name_len); } @@ -737,8 +746,8 @@ } void -RoxorCore::symbolize_backtrace_entry(int index, void **startp, char *path, - size_t path_len, unsigned long *ln, char *name, size_t name_len) +RoxorCore::symbolize_backtrace_entry(int index, char *path, size_t path_len, + unsigned long *ln, char *name, size_t name_len) { void *callstack[10]; const int callstack_n = backtrace(callstack, 10); @@ -746,8 +755,8 @@ index++; // count us! if (callstack_n < index - || !GET_CORE()->symbolize_call_address(callstack[index], startp, - path, path_len, ln, name, name_len)) { + || !GET_CORE()->symbolize_call_address(callstack[index], path, + path_len, ln, name, name_len, NULL)) { if (path != NULL) { strncpy(path, "core", path_len); } @@ -3330,8 +3339,8 @@ char *classname = (char *)rb_class2name(CLASS_OF(rb_exc)); char file[PATH_MAX]; unsigned long line = 0; - GET_CORE()->symbolize_backtrace_entry(2, NULL, file, sizeof file, - &line, NULL, 0); + GET_CORE()->symbolize_backtrace_entry(2, file, sizeof file, &line, + NULL, 0); MACRUBY_RAISE(classname, file, line); } #if __LP64__ @@ -3583,6 +3592,8 @@ VALUE ary = rb_ary_new(); + unsigned int interpreter_frame_idx = 0; + for (int i = 0; i < callstack_n; i++) { char path[PATH_MAX]; char name[100]; @@ -3590,8 +3601,8 @@ path[0] = name[0] = '\0'; - if (GET_CORE()->symbolize_call_address(callstack[i], NULL, - path, sizeof path, &ln, name, sizeof name) + if (GET_CORE()->symbolize_call_address(callstack[i], path, sizeof path, + &ln, name, sizeof name, &interpreter_frame_idx) && name[0] != '\0' && path[0] != '\0') { char entry[PATH_MAX]; if (ln == 0) { Modified: MacRuby/trunk/vm.h =================================================================== --- MacRuby/trunk/vm.h 2010-09-27 23:05:30 UTC (rev 4545) +++ MacRuby/trunk/vm.h 2010-09-28 05:47:47 UTC (rev 4546) @@ -848,13 +848,12 @@ } #endif - bool symbolize_call_address(void *addr, void **startp, - char *path, size_t path_len, unsigned long *ln, - char *name, size_t name_len); + bool symbolize_call_address(void *addr, char *path, size_t path_len, + unsigned long *ln, char *name, size_t name_len, + unsigned int *interpreter_frame_idx); - void symbolize_backtrace_entry(int index, void **startp, - char *path, size_t path_len, unsigned long *ln, - char *name, size_t name_len); + void symbolize_backtrace_entry(int index, char *path, size_t path_len, + unsigned long *ln, char *name, size_t name_len); void invalidate_method_cache(SEL sel); rb_vm_method_node_t *method_node_get(IMP imp, bool create=false);

1 0

[4545] MacRuby/trunk/vm.cpp
by source_changes＠macosforge.org 27 Sep '10

27 Sep '10

Revision: 4545 http://trac.macosforge.org/projects/ruby/changeset/4545 Author: lsansonetti(a)apple.com Date: 2010-09-27 16:05:30 -0700 (Mon, 27 Sep 2010) Log Message: ----------- don't invalidate respond_to and dispatch caches while we are still booting the runtime Modified Paths: -------------- MacRuby/trunk/vm.cpp Modified: MacRuby/trunk/vm.cpp =================================================================== --- MacRuby/trunk/vm.cpp 2010-09-27 22:55:31 UTC (rev 4544) +++ MacRuby/trunk/vm.cpp 2010-09-27 23:05:30 UTC (rev 4545) @@ -1018,15 +1018,15 @@ ruby_imps[ruby_imp] = node; } - // Invalidate respond_to cache. - invalidate_respond_to_cache(); + if (running) { + // Invalidate respond_to cache. + invalidate_respond_to_cache(); - // Invalidate dispatch cache. - invalidate_method_cache(sel); + // Invalidate dispatch cache. + invalidate_method_cache(sel); - // Invalidate inline operations. + // Invalidate inline operations. #if !defined(MACRUBY_STATIC) - if (running) { GlobalVariable *gvar = redefined_op_gvar(sel, false); if (gvar != NULL && should_invalidate_inline_op(sel, klass)) { void *val = ee->getOrEmitGlobalVariable(gvar); @@ -1038,8 +1038,8 @@ assert(val != NULL); *(unsigned char *)val = 1; } +#endif } -#endif // If alloc is redefined, mark the class as such. if (sel == selAlloc

1 0

[4544] MacRuby/trunk/vm_method.c
by source_changes＠macosforge.org 27 Sep '10

27 Sep '10

Revision: 4544 http://trac.macosforge.org/projects/ruby/changeset/4544 Author: lsansonetti(a)apple.com Date: 2010-09-27 15:55:31 -0700 (Mon, 27 Sep 2010) Log Message: ----------- fix a bug when changing a method's visibility to public would not be taken into account Modified Paths: -------------- MacRuby/trunk/vm_method.c Modified: MacRuby/trunk/vm_method.c =================================================================== --- MacRuby/trunk/vm_method.c 2010-09-27 21:28:06 UTC (rev 4543) +++ MacRuby/trunk/vm_method.c 2010-09-27 22:55:31 UTC (rev 4544) @@ -90,7 +90,7 @@ sel_getName(sel)); } - long flags = 0; + long flags = (node->flags & ~VM_METHOD_PRIVATE) & ~VM_METHOD_PROTECTED; switch (noex) { case NOEX_PRIVATE: flags |= VM_METHOD_PRIVATE; @@ -125,7 +125,7 @@ } } - node->flags |= flags; + node->flags = flags; } void

1 0