diff options
| -rw-r--r-- | bindings/ocaml/llvm/llvm.ml | 6 | ||||
| -rw-r--r-- | bindings/ocaml/llvm/llvm.mli | 14 | ||||
| -rw-r--r-- | bindings/ocaml/llvm/llvm_ocaml.c | 13 | ||||
| -rw-r--r-- | include/llvm-c/Core.h | 4 | ||||
| -rw-r--r-- | test/Bindings/Ocaml/vmcore.ml | 9 |
5 files changed, 44 insertions, 2 deletions
diff --git a/bindings/ocaml/llvm/llvm.ml b/bindings/ocaml/llvm/llvm.ml index 457677b..fa4db0e 100644 --- a/bindings/ocaml/llvm/llvm.ml +++ b/bindings/ocaml/llvm/llvm.ml @@ -328,6 +328,12 @@ external value_of_block : llbasicblock -> llvalue = "LLVMBasicBlockAsValue" external value_is_block : llvalue -> bool = "llvm_value_is_block" external block_of_value : llvalue -> llbasicblock = "LLVMValueAsBasicBlock" +(*--... Operations on call sites ...........................................--*) +external instruction_call_conv: llvalue -> int + = "llvm_instruction_call_conv" +external set_instruction_call_conv: int -> llvalue -> unit + = "llvm_set_instruction_call_conv" + (*--... Operations on phi nodes ............................................--*) external add_incoming : (llvalue * llbasicblock) -> llvalue -> unit = "llvm_add_incoming" diff --git a/bindings/ocaml/llvm/llvm.mli b/bindings/ocaml/llvm/llvm.mli index 8f2c921..6d980a1 100644 --- a/bindings/ocaml/llvm/llvm.mli +++ b/bindings/ocaml/llvm/llvm.mli @@ -854,6 +854,20 @@ external value_is_block : llvalue -> bool = "llvm_value_is_block" (** [block_of_value v] losslessly casts [v] to an [llbasicblock]. **) external block_of_value : llvalue -> llbasicblock = "LLVMValueAsBasicBlock" +(*--... Operations on call sites ...........................................--*) + +(** [inst_call_conv ci] is the calling convention for the call or invoke + instruction [ci], which may be one of the values from the module [CallConv]. + See the method [CallSite:: **) +external instruction_call_conv: llvalue -> int + = "llvm_instruction_call_conv" + +(** [set_inst_call_conv cc ci] sets the calling convention for the call or + invoke instruction [ci] to the integer [cc], which can be one of the values + from the module [CallConv]. See the method [CallSite::]. **) +external set_instruction_call_conv: int -> llvalue -> unit + = "llvm_set_instruction_call_conv" + (*--... Operations on phi nodes ............................................--*) (** [add_incoming (v, bb) pn] adds the value [v] to the phi node [pn] for use diff --git a/bindings/ocaml/llvm/llvm_ocaml.c b/bindings/ocaml/llvm/llvm_ocaml.c index d095550..35c2c8d 100644 --- a/bindings/ocaml/llvm/llvm_ocaml.c +++ b/bindings/ocaml/llvm/llvm_ocaml.c @@ -652,6 +652,19 @@ CAMLprim value llvm_value_is_block(LLVMValueRef Val) { return Val_bool(LLVMValueIsBasicBlock(Val)); } +/*--... Operations on call sites ...........................................--*/ + +/* llvalue -> int */ +CAMLprim value llvm_instruction_call_conv(LLVMValueRef Inst) { + return Val_int(LLVMGetInstructionCallConv(Inst)); +} + +/* int -> llvalue -> unit */ +CAMLprim value llvm_set_instruction_call_conv(value CC, LLVMValueRef Inst) { + LLVMSetInstructionCallConv(Inst, Int_val(CC)); + return Val_unit; +} + /*--... Operations on phi nodes ............................................--*/ /* (llvalue * llbasicblock) -> llvalue -> unit */ diff --git a/include/llvm-c/Core.h b/include/llvm-c/Core.h index 21c319c..b286e6f 100644 --- a/include/llvm-c/Core.h +++ b/include/llvm-c/Core.h @@ -378,6 +378,10 @@ LLVMBasicBlockRef LLVMInsertBasicBlock(LLVMBasicBlockRef InsertBeforeBB, const char *Name); void LLVMDeleteBasicBlock(LLVMBasicBlockRef BB); +/* Operations on call sites */ +void LLVMSetInstructionCallConv(LLVMValueRef Instr, unsigned CC); +unsigned LLVMGetInstructionCallConv(LLVMValueRef Instr); + /* Operations on phi nodes */ void LLVMAddIncoming(LLVMValueRef PhiNode, LLVMValueRef *IncomingValues, LLVMBasicBlockRef *IncomingBlocks, unsigned Count); diff --git a/test/Bindings/Ocaml/vmcore.ml b/test/Bindings/Ocaml/vmcore.ml index 6b103cb..457e766 100644 --- a/test/Bindings/Ocaml/vmcore.ml +++ b/test/Bindings/Ocaml/vmcore.ml @@ -768,14 +768,19 @@ let test_builder () = end; group "miscellaneous"; begin - (* RUN: grep {Inst45.*call.*P2.*P1} < %t.ll + (* RUN: grep {CallInst.*call.*P2.*P1} < %t.ll + * RUN: grep {CallInst.*cc63} < %t.ll * RUN: grep {Inst47.*select.*Inst46.*P1.*P2} < %t.ll * RUN: grep {Inst48.*va_arg.*null.*i32} < %t.ll * RUN: grep {Inst49.*extractelement.*Vec1.*P2} < %t.ll * RUN: grep {Inst50.*insertelement.*Vec1.*P1.*P2} < %t.ll * RUN: grep {Inst51.*shufflevector.*Vec1.*Vec2.*1.*1.*0.*0} < %t.ll *) - ignore (build_call fn [| p2; p1 |] "Inst45" atentry); + let ci = build_call fn [| p2; p1 |] "CallInst" atentry in + insist (CallConv.c = instruction_call_conv ci); + set_instruction_call_conv 63 ci; + insist (63 = instruction_call_conv ci); + let inst46 = build_icmp Icmp.Eq p1 p2 "Inst46" atentry in ignore (build_select inst46 p1 p2 "Inst47" atentry); ignore (build_va_arg |