<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[1969] MacRuby/branches/experimental</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/ruby/changeset/1969">1969</a></dd>
<dt>Author</dt> <dd>lsansonetti@apple.com</dd>
<dt>Date</dt> <dd>2009-07-01 18:31:22 -0700 (Wed, 01 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>AOT compiler: fixed dvars</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#MacRubybranchesexperimentalcompilercpp">MacRuby/branches/experimental/compiler.cpp</a></li>
<li><a href="#MacRubybranchesexperimentalvmcpp">MacRuby/branches/experimental/vm.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="MacRubybranchesexperimentalcompilercpp"></a>
<div class="modfile"><h4>Modified: MacRuby/branches/experimental/compiler.cpp (1968 => 1969)</h4>
<pre class="diff"><span>
<span class="info">--- MacRuby/branches/experimental/compiler.cpp 2009-07-01 23:53:26 UTC (rev 1968)
+++ MacRuby/branches/experimental/compiler.cpp 2009-07-02 01:31:22 UTC (rev 1969)
</span><span class="lines">@@ -2585,21 +2585,6 @@
</span><span class="cx">
</span><span class="cx"> std::vector<Value *> params;
</span><span class="cx">
</span><del>- params.push_back(NULL); // will be filled later
- params.push_back(NULL); // idem
- int vars_count = 0;
- for (std::map<ID, Value *>::iterator iter = lvars.begin();
- iter != lvars.end(); ++iter) {
- ID name = iter->first;
- Value *slot = iter->second;
- if (std::find(dvars.begin(), dvars.end(), name) == dvars.end()) {
- params.push_back(compile_id(name));
- params.push_back(slot);
- vars_count++;
- }
- }
- params[1] = ConstantInt::get(Type::Int32Ty, vars_count);
-
</del><span class="cx"> // searches all ReturnInst in the function we just created and add before
</span><span class="cx"> // a call to the function to save the local variables if necessary
</span><span class="cx"> // (we can't do this before finishing compiling the whole function
</span><span class="lines">@@ -2611,9 +2596,26 @@
</span><span class="cx"> inst_it != block_it->end();
</span><span class="cx"> ++inst_it) {
</span><span class="cx"> if (dyn_cast<ReturnInst>(inst_it)) {
</span><del>- // LoadInst needs to be inserted in a BasicBlock
- // so we has to wait before putting it in params
- params[0] = new LoadInst(current_var_uses, "", inst_it);
</del><ins>+ if (params.empty()) {
+ params.push_back(new LoadInst(current_var_uses, "", inst_it));
+ params.push_back(NULL); // filled right after.
+ int vars_count = 0;
+ for (std::map<ID, Value *>::iterator iter = lvars.begin();
+ iter != lvars.end(); ++iter) {
+ ID name = iter->first;
+ Value *slot = iter->second;
+ if (std::find(dvars.begin(), dvars.end(), name) == dvars.end()) {
+ Value *id_val = compile_id(name);
+ if (Instruction::classof(id_val)) {
+ cast<Instruction>(id_val)->moveBefore(inst_it);
+ }
+ params.push_back(id_val);
+ params.push_back(slot);
+ vars_count++;
+ }
+ }
+ params[1] = ConstantInt::get(Type::Int32Ty, vars_count);
+ }
</ins><span class="cx">
</span><span class="cx"> // TODO: only call the function if current_use is not NULL
</span><span class="cx"> CallInst::Create(keepVarsFunc, params.begin(), params.end(), "",
</span></span></pre></div>
<a id="MacRubybranchesexperimentalvmcpp"></a>
<div class="modfile"><h4>Modified: MacRuby/branches/experimental/vm.cpp (1968 => 1969)</h4>
<pre class="diff"><span>
<span class="info">--- MacRuby/branches/experimental/vm.cpp 2009-07-01 23:53:26 UTC (rev 1968)
+++ MacRuby/branches/experimental/vm.cpp 2009-07-02 01:31:22 UTC (rev 1969)
</span><span class="lines">@@ -2950,13 +2950,18 @@
</span><span class="cx"> rb_vm_block_t *b = GET_VM()->uncache_or_create_block(function, &cached,
</span><span class="cx"> dvars_size);
</span><span class="cx">
</span><ins>+ bool aot_block = false;
+ if ((flags & VM_BLOCK_AOT) == VM_BLOCK_AOT) {
+ flags ^= VM_BLOCK_AOT;
+ aot_block = true;
+ }
+
</ins><span class="cx"> if (!cached) {
</span><span class="cx"> if ((flags & VM_BLOCK_IFUNC) == VM_BLOCK_IFUNC) {
</span><span class="cx"> b->imp = (IMP)function;
</span><span class="cx"> }
</span><span class="cx"> else {
</span><del>- if ((flags & VM_BLOCK_AOT) == VM_BLOCK_AOT) {
- flags ^= VM_BLOCK_AOT;
</del><ins>+ if (aot_block) {
</ins><span class="cx"> b->imp = (IMP)function;
</span><span class="cx"> }
</span><span class="cx"> else {
</span></span></pre>
</div>
</div>
</body>
</html>