Skip to content

Commit

Permalink
moving to LLVM r82747
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.macosforge.org/repository/ruby/MacRuby/trunk@2630 23306eb0-4c56-4727-a40e-e92c0eb68959
  • Loading branch information
@lrz
lrz committed Sep 25, 2009
1 parent 4e92c12 commit bb0b28c
Show file tree
Hide file tree
Showing 9 changed files with 616 additions and 554 deletions.
7 changes: 4 additions & 3 deletions README.rdoc
View file
Expand Up @@ -21,11 +21,12 @@ http://macruby.org

* Mac OS X 10.5.6 or later.

* LLVM trunk, compiled for both i386 and x86_64.
* LLVM ToT, compiled for both i386 and x86_64.

In case trunk reveals to be unstable we recommend revision 72741.
LLVM is a moving target and breaks periodically. We recommend to install
revision 82747.

$ svn co -r 72741 https://llvm.org/svn/llvm-project/llvm/trunk llvm-trunk
$ svn co -r 82747 https://llvm.org/svn/llvm-project/llvm/trunk llvm-trunk
$ cd llvm-trunk
$ ./configure
$ UNIVERSAL=1 UNIVERSAL_ARCH="i386 x86_64" ENABLE_OPTIMIZED=1 make
Expand Down
2 changes: 1 addition & 1 deletion bin/rubyc
View file
Expand Up @@ -101,7 +101,7 @@ class Compiler

# Compile the bitcode as assembly.
asm = gen_tmpfile(base, 's')
execute("#{@llc} -f #{bc} -o=#{asm}")
execute("#{@llc} -f #{bc} -o=#{asm} -march=x86-64 -enable-eh")

# Finally compile the assembly.
execute("#{@gcc} -c -arch x86_64 #{asm} -o #{output}")
Expand Down
46 changes: 23 additions & 23 deletions bridgesupport.cpp
View file
Expand Up @@ -92,7 +92,7 @@ RoxorCompiler::compile_check_arity(Value *given, Value *requested)
// void rb_vm_check_arity(int given, int requested);
checkArityFunc = cast<Function>(module->getOrInsertFunction(
"rb_vm_check_arity",
Type::VoidTy, Type::Int32Ty, Type::Int32Ty, NULL));
VoidTy, Int32Ty, Int32Ty, NULL));
}

std::vector<Value *> params;
Expand All @@ -118,12 +118,12 @@ RoxorCompiler::compile_set_struct(Value *rcv, int field, Value *val)
// void rb_vm_set_struct(VALUE rcv, int field, VALUE val);
setStructFunc = cast<Function>(module->getOrInsertFunction(
"rb_vm_set_struct",
Type::VoidTy, RubyObjTy, Type::Int32Ty, RubyObjTy, NULL));
VoidTy, RubyObjTy, Int32Ty, RubyObjTy, NULL));
}

std::vector<Value *> params;
params.push_back(rcv);
params.push_back(ConstantInt::get(Type::Int32Ty, field));
params.push_back(ConstantInt::get(Int32Ty, field));
params.push_back(val);

CallInst::Create(setStructFunc, params.begin(), params.end(), "", bb);
Expand All @@ -140,7 +140,7 @@ RoxorCompiler::compile_bs_struct_writer(rb_vm_bs_boxed_t *bs_boxed, int field)
arg++; // sel
Value *val = arg++; // val

bb = BasicBlock::Create("EntryBlock", f);
bb = BasicBlock::Create(context, "EntryBlock", f);

assert((unsigned)field < bs_boxed->as.s->fields_count);
const char *ftype = bs_boxed->as.s->fields[field].type;
Expand All @@ -152,7 +152,7 @@ RoxorCompiler::compile_bs_struct_writer(rb_vm_bs_boxed_t *bs_boxed, int field)

compile_set_struct(self, field, val);

ReturnInst::Create(val, bb);
ReturnInst::Create(context, val, bb);

return f;
}
Expand All @@ -162,20 +162,20 @@ RoxorCompiler::compile_bs_struct_new(rb_vm_bs_boxed_t *bs_boxed)
{
// VALUE foo(VALUE self, SEL sel, int argc, VALUE *argv);
Function *f = cast<Function>(module->getOrInsertFunction("",
RubyObjTy, RubyObjTy, PtrTy, Type::Int32Ty, RubyObjPtrTy,
RubyObjTy, RubyObjTy, PtrTy, Int32Ty, RubyObjPtrTy,
NULL));
Function::arg_iterator arg = f->arg_begin();
Value *klass = arg++; // self
arg++; // sel
Value *argc = arg++; // argc
Value *argv = arg++; // argv

bb = BasicBlock::Create("EntryBlock", f);
bb = BasicBlock::Create(context, "EntryBlock", f);

BasicBlock *no_args_bb = BasicBlock::Create("no_args", f);
BasicBlock *args_bb = BasicBlock::Create("args", f);
Value *has_args = new ICmpInst(ICmpInst::ICMP_EQ, argc,
ConstantInt::get(Type::Int32Ty, 0), "", bb);
BasicBlock *no_args_bb = BasicBlock::Create(context, "no_args", f);
BasicBlock *args_bb = BasicBlock::Create(context, "args", f);
Value *has_args = new ICmpInst(*bb, ICmpInst::ICMP_EQ, argc,
ConstantInt::get(Int32Ty, 0));

BranchInst::Create(no_args_bb, args_bb, has_args, bb);

Expand All @@ -196,10 +196,10 @@ RoxorCompiler::compile_bs_struct_new(rb_vm_bs_boxed_t *bs_boxed)

std::vector<Value *> params;
params.push_back(new BitCastInst(fval, PtrTy, "", bb));
params.push_back(ConstantInt::get(Type::Int8Ty, 0));
params.push_back(ConstantInt::get(Int8Ty, 0));
params.push_back(ConstantInt::get(IntTy,
GET_CORE()->get_sizeof(llvm_type)));
params.push_back(ConstantInt::get(Type::Int32Ty, 0));
params.push_back(ConstantInt::get(Int32Ty, 0));
CallInst::Create(memset_func, params.begin(), params.end(), "", bb);

fval = new LoadInst(fval, "", bb);
Expand All @@ -208,22 +208,22 @@ RoxorCompiler::compile_bs_struct_new(rb_vm_bs_boxed_t *bs_boxed)
fields.push_back(fval);
}

ReturnInst::Create(compile_new_struct(klass, fields), bb);
ReturnInst::Create(context, compile_new_struct(klass, fields), bb);

// Arguments are given. Need to check given arity, then convert the given
// Ruby values into the requested struct field types.
bb = args_bb;
fields.clear();

compile_check_arity(argc,
ConstantInt::get(Type::Int32Ty, bs_boxed->as.s->fields_count));
ConstantInt::get(Int32Ty, bs_boxed->as.s->fields_count));

for (unsigned i = 0; i < bs_boxed->as.s->fields_count; i++) {
const char *ftype = bs_boxed->as.s->fields[i].type;
const Type *llvm_type = convert_type(ftype);
Value *fval = new AllocaInst(llvm_type, "", bb);

Value *index = ConstantInt::get(Type::Int32Ty, i);
Value *index = ConstantInt::get(Int32Ty, i);
Value *arg = GetElementPtrInst::Create(argv, index, "", bb);
arg = new LoadInst(arg, "", bb);
arg = compile_conversion_to_c(ftype, arg, fval);
Expand All @@ -232,7 +232,7 @@ RoxorCompiler::compile_bs_struct_new(rb_vm_bs_boxed_t *bs_boxed)
fields.push_back(arg);
}

ReturnInst::Create(compile_new_struct(klass, fields), bb);
ReturnInst::Create(context, compile_new_struct(klass, fields), bb);

return f;
}
Expand Down Expand Up @@ -1233,7 +1233,7 @@ RoxorCompiler::compile_ffi_function(void *stub, void *imp, int argc)
FunctionType *ft = FunctionType::get(RubyObjTy, f_types, false);
Function *f = cast<Function>(module->getOrInsertFunction("", ft));

bb = BasicBlock::Create("EntryBlock", f);
bb = BasicBlock::Create(context, "EntryBlock", f);

Function::arg_iterator arg = f->arg_begin();
arg++; // skip self
Expand All @@ -1247,8 +1247,8 @@ RoxorCompiler::compile_ffi_function(void *stub, void *imp, int argc)
stub_types.push_back(PtrTy);

// Second argument is arity;
params.push_back(ConstantInt::get(Type::Int32Ty, argc));
stub_types.push_back(Type::Int32Ty);
params.push_back(ConstantInt::get(Int32Ty, argc));
stub_types.push_back(Int32Ty);

// Third is an array of arguments.
Value *argv;
Expand All @@ -1257,10 +1257,10 @@ RoxorCompiler::compile_ffi_function(void *stub, void *imp, int argc)
"", bb);
}
else {
argv = new AllocaInst(RubyObjTy, ConstantInt::get(Type::Int32Ty, argc),
argv = new AllocaInst(RubyObjTy, ConstantInt::get(Int32Ty, argc),
"", bb);
for (int i = 0; i < argc; i++) {
Value *index = ConstantInt::get(Type::Int32Ty, i);
Value *index = ConstantInt::get(Int32Ty, i);
Value *slot = GetElementPtrInst::Create(argv, index, "", bb);
new StoreInst(arg++, slot, "", bb);
}
Expand All @@ -1276,7 +1276,7 @@ RoxorCompiler::compile_ffi_function(void *stub, void *imp, int argc)
// Call the stub and return its return value.
CallInst *stub_call = CallInst::Create(stub_val, params.begin(),
params.end(), "", bb);
ReturnInst::Create(stub_call, bb);
ReturnInst::Create(context, stub_call, bb);

return f;
}
Expand Down

0 comments on commit bb0b28c

Please sign in to comment.