[macruby-changes] [1954] MacRuby/branches/experimental
source_changes at macosforge.org
source_changes at macosforge.org
Tue Jun 30 13:34:23 PDT 2009
Revision: 1954
http://trac.macosforge.org/projects/ruby/changeset/1954
Author: lsansonetti at apple.com
Date: 2009-06-30 13:34:22 -0700 (Tue, 30 Jun 2009)
Log Message:
-----------
AOT compiler: added support for NSObject and ID compilation
Modified Paths:
--------------
MacRuby/branches/experimental/compiler.cpp
MacRuby/branches/experimental/compiler.h
MacRuby/branches/experimental/vm.cpp
Modified: MacRuby/branches/experimental/compiler.cpp
===================================================================
--- MacRuby/branches/experimental/compiler.cpp 2009-06-29 23:17:43 UTC (rev 1953)
+++ MacRuby/branches/experimental/compiler.cpp 2009-06-30 20:34:22 UTC (rev 1954)
@@ -142,6 +142,12 @@
#endif
}
+RoxorAOTCompiler::RoxorAOTCompiler(const char *_fname)
+ : RoxorCompiler(_fname)
+{
+ cObject_gvar = NULL;
+}
+
inline SEL
RoxorCompiler::mid_to_sel(ID mid, int arity)
{
@@ -856,7 +862,7 @@
iter != lvars.end(); ++iter) {
ID name = iter->first;
Value *slot = iter->second;
- params.push_back(ConstantInt::get(IntTy, (long)name));
+ params.push_back(compile_id((long)name));
params.push_back(slot);
}
@@ -899,7 +905,7 @@
iter != lvars.end(); ++iter) {
ID lvar = iter->first;
- params.push_back(ConstantInt::get(IntTy, lvar));
+ params.push_back(compile_id(lvar));
params.push_back(iter->second);
}
@@ -917,13 +923,10 @@
}
std::vector<Value *> params;
- Value *val;
params.push_back(current_self);
+ params.push_back(compile_id(vid));
- val = ConstantInt::get(IntTy, vid);
- params.push_back(val);
-
int *slot_cache = get_slot_cache(vid);
params.push_back(compile_const_pointer(slot_cache));
@@ -944,7 +947,7 @@
std::vector<Value *> params;
params.push_back(current_self);
- params.push_back(ConstantInt::get(IntTy, (long)vid));
+ params.push_back(compile_id(vid));
params.push_back(val);
int *slot_cache = get_slot_cache(vid);
@@ -968,7 +971,7 @@
std::vector<Value *> params;
params.push_back(compile_current_class());
- params.push_back(ConstantInt::get(IntTy, (long)name));
+ params.push_back(compile_id(name));
params.push_back(val);
return CallInst::Create(cvarSetFunc, params.begin(),
@@ -1008,13 +1011,13 @@
if (node->nd_vid > 0) {
params.push_back(compile_current_class());
- params.push_back(ConstantInt::get(IntTy, (long)node->nd_vid));
+ params.push_back(compile_id(node->nd_vid));
}
else {
assert(node->nd_else != NULL);
params.push_back(compile_class_path(node->nd_else));
assert(node->nd_else->nd_mid > 0);
- params.push_back(ConstantInt::get(IntTy, (long)node->nd_else->nd_mid));
+ params.push_back(compile_id(node->nd_else->nd_mid));
}
params.push_back(val);
@@ -1028,11 +1031,61 @@
RoxorCompiler::compile_current_class(void)
{
if (current_opened_class == NULL) {
- return cObject;
+ return compile_nsobject();
}
return new LoadInst(current_opened_class, "", bb);
}
+inline Value *
+RoxorCompiler::compile_nsobject(void)
+{
+ return cObject;
+}
+
+inline Value *
+RoxorAOTCompiler::compile_nsobject(void)
+{
+ if (cObject_gvar == NULL) {
+ cObject_gvar = new GlobalVariable(
+ RubyObjTy,
+ false,
+ GlobalValue::InternalLinkage,
+ zeroVal,
+ "NSObject",
+ RoxorCompiler::module);
+ }
+ return new LoadInst(cObject_gvar, "", bb);
+}
+
+inline Value *
+RoxorCompiler::compile_id(ID id)
+{
+ return ConstantInt::get(IntTy, (long)id);
+}
+
+inline Value *
+RoxorAOTCompiler::compile_id(ID id)
+{
+ std::map<ID, GlobalVariable *>::iterator iter = ids.find(id);
+
+ GlobalVariable *gvar;
+ if (iter == ids.end()) {
+ gvar = new GlobalVariable(
+ IntTy,
+ false,
+ GlobalValue::InternalLinkage,
+ ConstantInt::get(IntTy, 0),
+ rb_id2name(id),
+ RoxorCompiler::module);
+ ids[id] = gvar;
+ }
+ else {
+ gvar = iter->second;
+ }
+
+ return new LoadInst(gvar, "", bb);
+}
+
Value *
RoxorCompiler::compile_const(ID id, Value *outer)
{
@@ -1055,7 +1108,7 @@
params.push_back(outer);
params.push_back(ConstantInt::get(Type::Int8Ty, outer_given ? 0 : 1));
params.push_back(compile_ccache(id));
- params.push_back(ConstantInt::get(IntTy, id));
+ params.push_back(compile_id(id));
return compile_protected_call(getConstFunc, params);
}
@@ -1177,7 +1230,7 @@
case NODE_COLON3:
what2 = nd_type(node) == NODE_COLON2
? compile_node(node->nd_head)
- : cObject;
+ : compile_nsobject();
if (rb_is_const_id(node->nd_mid)) {
type = DEFINED_CONST;
what1 = (VALUE)node->nd_mid;
@@ -1433,7 +1486,7 @@
{
if (nd_type(node) == NODE_COLON3) {
// ::Foo
- return cObject;
+ return compile_nsobject();
}
else if (node->nd_head != NULL) {
// Bar::Foo
@@ -2290,7 +2343,7 @@
std::vector<Value *> params;
params.push_back(klass);
- params.push_back(ConstantInt::get(IntTy, iter->first));
+ params.push_back(compile_id(iter->first));
Instruction *ptr = compile_const_pointer(iter->second, false);
list.insert(list_iter, ptr);
params.push_back(ptr);
@@ -2520,7 +2573,7 @@
ID name = iter->first;
Value *slot = iter->second;
if (std::find(dvars.begin(), dvars.end(), name) == dvars.end()) {
- params.push_back(ConstantInt::get(IntTy, (long)name));
+ params.push_back(compile_id(name));
params.push_back(slot);
vars_count++;
}
@@ -2615,7 +2668,7 @@
std::vector<Value *> params;
params.push_back(compile_current_class());
- params.push_back(ConstantInt::get(IntTy, (long)node->nd_vid));
+ params.push_back(compile_id(node->nd_vid));
return compile_protected_call(cvarGetFunc, params);
}
@@ -3099,7 +3152,7 @@
std::vector<Value *> params;
- params.push_back(ConstantInt::get(IntTy, (long)path));
+ params.push_back(compile_id(path));
params.push_back(compile_class_path(node->nd_cpath));
params.push_back(super == NULL ? zeroVal : compile_node(super));
params.push_back(ConstantInt::get(Type::Int8Ty,
@@ -3632,8 +3685,8 @@
std::vector<Value *> params;
assert(node->u1.id > 0 && node->u2.id > 0);
- params.push_back(ConstantInt::get(IntTy, node->u1.id));
- params.push_back(ConstantInt::get(IntTy, node->u2.id));
+ params.push_back(compile_id(node->u1.id));
+ params.push_back(compile_id(node->u2.id));
CallInst::Create(valiasFunc, params.begin(), params.end(), "", bb);
@@ -3652,8 +3705,8 @@
std::vector<Value *> params;
params.push_back(compile_current_class());
- params.push_back(ConstantInt::get(IntTy, node->u1.node->u1.node->u2.id));
- params.push_back(ConstantInt::get(IntTy, node->u2.node->u1.node->u2.id));
+ params.push_back(compile_id(node->u1.node->u1.node->u2.id));
+ params.push_back(compile_id(node->u2.node->u1.node->u2.id));
compile_protected_call(aliasFunc, params);
@@ -3726,7 +3779,7 @@
std::vector<Value *> params;
params.push_back(compile_current_class());
- params.push_back(ConstantInt::get(IntTy, name));
+ params.push_back(compile_id(name));
compile_protected_call(undefFunc, params);
@@ -4176,7 +4229,7 @@
case NODE_COLON3:
assert(node->nd_mid > 0);
- return compile_const(node->nd_mid, cObject);
+ return compile_const(node->nd_mid, compile_nsobject());
case NODE_CASE:
{
@@ -4363,6 +4416,68 @@
list.insert(list.begin(), load);
}
+ // Compile IDs.
+
+ Function *rbInternFunc = cast<Function>(module->getOrInsertFunction(
+ "rb_intern",
+ IntTy, PtrTy, NULL));
+
+ for (std::map<ID, GlobalVariable *>::iterator i = ids.begin();
+ i != ids.end();
+ ++i) {
+
+ ID name = i->first;
+ GlobalVariable *gvar = i->second;
+
+ GlobalVariable *name_gvar = compile_const_global_string(rb_id2name(name));
+
+ std::vector<Value *> idxs;
+ idxs.push_back(ConstantInt::get(Type::Int32Ty, 0));
+ idxs.push_back(ConstantInt::get(Type::Int32Ty, 0));
+ Instruction *load = GetElementPtrInst::Create(name_gvar,
+ idxs.begin(), idxs.end(), "");
+
+ std::vector<Value *> params;
+ params.push_back(load);
+
+ Instruction *call = CallInst::Create(rbInternFunc, params.begin(),
+ params.end(), "");
+
+ Instruction *assign = new StoreInst(call, gvar, "");
+
+ list.insert(list.begin(), assign);
+ list.insert(list.begin(), call);
+ list.insert(list.begin(), load);
+ }
+
+ // Compile NSObject reference.
+
+ Function *objcGetClassFunc = cast<Function>(module->getOrInsertFunction(
+ "objc_getClass",
+ RubyObjTy, PtrTy, NULL));
+
+ if (cObject_gvar != NULL) {
+ GlobalVariable *nsobject = compile_const_global_string("NSObject");
+
+ std::vector<Value *> idxs;
+ idxs.push_back(ConstantInt::get(Type::Int32Ty, 0));
+ idxs.push_back(ConstantInt::get(Type::Int32Ty, 0));
+ Instruction *load = GetElementPtrInst::Create(nsobject,
+ idxs.begin(), idxs.end(), "");
+
+ std::vector<Value *> params;
+ params.push_back(load);
+
+ Instruction *call = CallInst::Create(objcGetClassFunc, params.begin(),
+ params.end(), "");
+
+ Instruction *assign = new StoreInst(call, cObject_gvar, "");
+
+ list.insert(list.begin(), assign);
+ list.insert(list.begin(), call);
+ list.insert(list.begin(), load);
+ }
+
return function;
}
Modified: MacRuby/branches/experimental/compiler.h
===================================================================
--- MacRuby/branches/experimental/compiler.h 2009-06-29 23:17:43 UTC (rev 1953)
+++ MacRuby/branches/experimental/compiler.h 2009-06-30 20:34:22 UTC (rev 1954)
@@ -214,6 +214,7 @@
Value *compile_multiple_assignment(NODE *node, Value *val);
void compile_multiple_assignment_element(NODE *node, Value *val);
Value *compile_current_class(void);
+ virtual Value *compile_nsobject(void);
Value *compile_class_path(NODE *node);
Value *compile_const(ID id, Value *outer);
Value *compile_singleton_class(Value *obj);
@@ -227,6 +228,7 @@
virtual Instruction *compile_sel(SEL sel, bool add_to_bb=true) {
return compile_const_pointer(sel, add_to_bb);
}
+ virtual Value *compile_id(ID id);
GlobalVariable *compile_const_global_string(const char *str);
void compile_landing_pad_header(void);
@@ -283,7 +285,7 @@
class RoxorAOTCompiler : public RoxorCompiler {
public:
- RoxorAOTCompiler(const char *fname) : RoxorCompiler(fname) { }
+ RoxorAOTCompiler(const char *fname);
Function *compile_main_function(NODE *node);
@@ -291,12 +293,16 @@
std::map<SEL, GlobalVariable *> mcaches;
std::map<ID, GlobalVariable *> ccaches;
std::map<SEL, GlobalVariable *> sels;
+ std::map<ID, GlobalVariable *> ids;
+ GlobalVariable *cObject_gvar;
Value *compile_mcache(SEL sel, bool super);
Value *compile_ccache(ID id);
Instruction *compile_sel(SEL sel, bool add_to_bb=true);
void compile_prepare_method(Value *classVal, Value *sel,
Function *new_function, rb_vm_arity_t &arity, NODE *body);
+ Value *compile_nsobject(void);
+ Value *compile_id(ID id);
Instruction *
compile_const_pointer(void *ptr, bool insert_to_bb=true) {
Modified: MacRuby/branches/experimental/vm.cpp
===================================================================
--- MacRuby/branches/experimental/vm.cpp 2009-06-29 23:17:43 UTC (rev 1953)
+++ MacRuby/branches/experimental/vm.cpp 2009-06-30 20:34:22 UTC (rev 1954)
@@ -4104,8 +4104,6 @@
"line was: %s", gcc_line.c_str());
exit(1);
}
-
- //RoxorCompiler::module->dump();
}
extern "C"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20090630/cf85cd11/attachment-0001.html>
More information about the macruby-changes
mailing list