@@ -92,7 +92,9 @@ llvm_builder_br(VALUE self, VALUE rblock) { BasicBlock *bb; Data_Get_Struct(rblock, BasicBlock, bb); - return llvm_value_wrap(builder->CreateBr(bb)); + + Value *branch_instr = builder->CreateBr(bb); + return Data_Wrap_Struct(cLLVMBranchInst, NULL, NULL, branch_instr); } VALUE @@ -106,7 +108,8 @@ llvm_builder_cond_br(VALUE self, VALUE rcond, VALUE rtrue_block, VALUE rfalse_bl Data_Get_Struct(rtrue_block, BasicBlock, true_block); Data_Get_Struct(rfalse_block, BasicBlock, false_block); - return llvm_value_wrap(builder->CreateCondBr(cond, true_block, false_block)); + Value *branch_instr = builder->CreateCondBr(cond, true_block, false_block); + return Data_Wrap_Struct(cLLVMBranchInst, NULL, NULL, branch_instr); } VALUE ext/llvm_basicblock.cpp @@ -26,6 +26,37 @@ llvm_instruction_get_opcode_name(VALUE self) { return rb_str_new2(name.c_str()); } +#define DATA_GET_BRANCH_INST BranchInst *bi; Data_Get_Struct(self, BranchInst, bi); + +VALUE +llvm_branch_inst_is_unconditional(VALUE self) { + DATA_GET_BRANCH_INST + return bi->isUnconditional() ? Qtrue : Qfalse; +} + +VALUE +llvm_branch_inst_is_conditional(VALUE self) { + DATA_GET_BRANCH_INST + return bi->isConditional() ? Qtrue : Qfalse; +} + +VALUE +llvm_branch_inst_get_condition(VALUE self) { + DATA_GET_BRANCH_INST + return llvm_value_wrap(bi->getCondition()); +} + +VALUE +llvm_branch_inst_set_condition(VALUE self, VALUE rv) { + DATA_GET_BRANCH_INST + + Value *v; + Data_Get_Struct(rv, Value, v); + + bi->setCondition(v); + return rv; +} + #define DATA_GET_SWITCH_INST SwitchInst *si; Data_Get_Struct(self, SwitchInst, si); VALUE ext/llvm_instruction.cpp @@ -13,6 +13,7 @@ VALUE cLLVMArrayType = Qnil; VALUE cLLVMVectorType = Qnil; VALUE cLLVMFunctionType = Qnil; VALUE cLLVMInstruction = Qnil; +VALUE cLLVMBranchInst = Qnil; VALUE cLLVMSwitchInst = Qnil; VALUE cLLVMPhi = Qnil; VALUE cLLVMBinaryOps = Qnil; @@ -53,6 +54,11 @@ VALUE llvm_basic_block_get_instruction_list(VALUE); VALUE llvm_instruction_inspect(VALUE); VALUE llvm_instruction_get_opcode_name(VALUE); +VALUE llvm_branch_inst_is_conditional(VALUE); +VALUE llvm_branch_inst_is_unconditional(VALUE); +VALUE llvm_branch_inst_get_condition(VALUE); +VALUE llvm_branch_inst_set_condition(VALUE, VALUE); + VALUE llvm_switch_inst_get_default_dest(VALUE); VALUE llvm_switch_inst_get_num_cases(VALUE); VALUE llvm_switch_inst_add_case(VALUE, VALUE, VALUE); @@ -117,6 +123,7 @@ void Init_llvmruby() { cLLVMBuilder = rb_define_class_under(cLLVMRuby, "Builder", rb_cObject); cLLVMInstruction = rb_define_class_under(cLLVMRuby, "Instruction", rb_cObject); + cLLVMBranchInst = rb_define_class_under(cLLVMRuby, "BranchInst", cLLVMInstruction); cLLVMSwitchInst = rb_define_class_under(cLLVMRuby, "SwitchInst", cLLVMInstruction); cLLVMBinaryOps = rb_define_class_under(cLLVMInstruction, "BinaryOps", rb_cObject); cLLVMPhi = rb_define_class_under(cLLVMRuby, "Phi", cLLVMValue); @@ -163,6 +170,11 @@ void Init_llvmruby() { rb_define_method(cLLVMInstruction, "inspect", llvm_instruction_inspect, 0); rb_define_method(cLLVMInstruction, "get_opcode_name", llvm_instruction_get_opcode_name, 0); + rb_define_method(cLLVMBranchInst, "conditional?", llvm_branch_inst_is_conditional, 0); + rb_define_method(cLLVMBranchInst, "unconditional?", llvm_branch_inst_is_unconditional, 0); + rb_define_method(cLLVMBranchInst, "condition", llvm_branch_inst_get_condition, 0); + rb_define_method(cLLVMBranchInst, "condition=", llvm_branch_inst_set_condition, 1); + rb_define_method(cLLVMSwitchInst, "get_default_dest", llvm_switch_inst_get_default_dest, 0); rb_define_method(cLLVMSwitchInst, "get_num_cases", llvm_switch_inst_get_num_cases, 0); rb_define_method(cLLVMSwitchInst, "add_case", llvm_switch_inst_add_case, 2); ext/llvmruby.c @@ -32,6 +32,7 @@ extern VALUE cLLVMArrayType; extern VALUE cLLVMVectorType; extern VALUE cLLVMFunctionType; extern VALUE cLLVMInstruction; +extern VALUE cLLVMBranchInst; extern VALUE cLLVMSwitchInst; extern VALUE cLLVMBinaryOps; extern VALUE cLLVMPhi; ext/llvmruby.h @@ -43,4 +43,41 @@ class InstructionTests < Test::Unit::TestCase assert(expected_opcodes_in_bswap, actual_opcodes_in_bswap) end + def test_branch_instructions + m = LLVM::Module.new('branch_instructions') + ExecutionEngine.get(m) + type = Type::function(MACHINE_WORD, []) + + f = m.get_or_insert_function("test_br", type) + b1 = f.create_block + b2 = f.create_block + b3 = f.create_block + b4 = f.create_block + + b = b1.builder + br_inst = b.br(b2) + + b = b2.builder + cmp1 = b.icmp_sgt(-1.llvm, 1.llvm) + cmp2 = b.icmp_slt(-1.llvm, 1.llvm) + cond_br_inst = b.cond_br(cmp1, b3, b4) + + b = b3.builder + b.return(23.llvm) + + b = b4.builder + b.return(5.llvm) + + assert_kind_of(BranchInst, br_inst) + assert(br_inst.unconditional?) + assert(!br_inst.conditional?) + + assert_kind_of(BranchInst, cond_br_inst) + assert(cond_br_inst.conditional?) + assert(!cond_br_inst.unconditional?) + assert_kind_of(Value, cond_br_inst.condition) + cond_br_inst.condition = cmp2 + + assert_equal(23, ExecutionEngine.run_autoconvert(f)) + end end test/test_instructions.rb 05ce65372eee190044e77150770984a992f46da3 Tom Bagby tomatobagby@gmail.com http://github.com/tombagby/llvmruby/commit/da0d2abff09f6f722bddc4dd9ba43045174e275c da0d2abff09f6f722bddc4dd9ba43045174e275c 2008-10-19T12:56:04-07:00 2008-10-19T12:56:04-07:00 more of the branch instruction class eec0b5e15175adc34c7434faeb16a53781bcbaf4 Tom Bagby tomatobagby@gmail.com