[macruby-changes] [4787] MacRuby/trunk/vm.cpp

source_changes at macosforge.org source_changes at macosforge.org
Mon Oct 11 17:58:46 PDT 2010


Revision: 4787
          http://trac.macosforge.org/projects/ruby/changeset/4787
Author:   lsansonetti at apple.com
Date:     2010-10-11 17:58:44 -0700 (Mon, 11 Oct 2010)
Log Message:
-----------
another ajustment in backtracing logic

Modified Paths:
--------------
    MacRuby/trunk/vm.cpp

Modified: MacRuby/trunk/vm.cpp
===================================================================
--- MacRuby/trunk/vm.cpp	2010-10-12 00:54:52 UTC (rev 4786)
+++ MacRuby/trunk/vm.cpp	2010-10-12 00:58:44 UTC (rev 4787)
@@ -269,6 +269,7 @@
 		if (path.size() == 0) {
 		    RoxorCompiler::shared->generate_location_path(path, loc);
 		}
+//printf("%p -> %d\n", (void*)iter->Address, loc.getLineNumber());
 		RoxorFunction::Line line(iter->Address, loc.getLineNumber());
 		function->lines.push_back(line);
 	    }
@@ -706,10 +707,10 @@
 	    *ln = 0;
 	    for (std::vector<RoxorFunction::Line>::iterator iter =
 		    f->lines.begin(); iter != f->lines.end(); ++iter) {
-		*ln = (*iter).line;
-		if ((uintptr_t)addr < (*iter).address) {
+		if ((uintptr_t)addr <= (*iter).address) {
 		    break;
 		}
+		*ln = (*iter).line;
 	    }
 	}
 	if (path != NULL) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20101011/a6367ac1/attachment.html>


More information about the macruby-changes mailing list