diff options
| -rw-r--r-- | Xcode/LLVM.xcodeproj/project.pbxproj | 53 | ||||
| -rw-r--r-- | bindings/ocaml/Makefile.ocaml | 2 | ||||
| -rw-r--r-- | bindings/ocaml/bitwriter/Makefile | 1 | ||||
| -rw-r--r-- | bindings/ocaml/llvm/llvm.ml | 202 | ||||
| -rw-r--r-- | bindings/ocaml/llvm/llvm.mli | 199 | ||||
| -rw-r--r-- | bindings/ocaml/llvm/llvm_ocaml.c | 817 | ||||
| -rw-r--r-- | include/llvm-c/Core.h | 222 | ||||
| -rw-r--r-- | include/llvm/CHelpers.h | 10 | ||||
| -rw-r--r-- | lib/VMCore/Core.cpp | 462 | ||||
| -rw-r--r-- | test/Bindings/Ocaml/bitwriter.ml | 2 | ||||
| -rw-r--r-- | test/Bindings/Ocaml/vmcore.ml | 350 |
11 files changed, 2087 insertions, 233 deletions
diff --git a/Xcode/LLVM.xcodeproj/project.pbxproj b/Xcode/LLVM.xcodeproj/project.pbxproj index 1ae711ab4b..0763ae3256 100644 --- a/Xcode/LLVM.xcodeproj/project.pbxproj +++ b/Xcode/LLVM.xcodeproj/project.pbxproj @@ -153,6 +153,16 @@ 9FA638EA0C77B252007F12AE /* InlinerPass.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = InlinerPass.h; sourceTree = "<group>"; }; 9FA638EB0C77B26B007F12AE /* BasicInliner.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = BasicInliner.h; sourceTree = "<group>"; }; 9FA638EC0C77B26B007F12AE /* InlineCost.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = InlineCost.h; sourceTree = "<group>"; }; + 9FD3E5710CA0116100E54D15 /* bitwriter_ocaml.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = bitwriter_ocaml.c; sourceTree = "<group>"; }; + 9FD3E5720CA0116100E54D15 /* llvm_bitwriter.ml */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = llvm_bitwriter.ml; sourceTree = "<group>"; }; + 9FD3E5730CA0116100E54D15 /* llvm_bitwriter.mli */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = llvm_bitwriter.mli; sourceTree = "<group>"; }; + 9FD3E57B0CA0116100E54D15 /* llvm.ml */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = llvm.ml; sourceTree = "<group>"; }; + 9FD3E57C0CA0116100E54D15 /* llvm.mli */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = llvm.mli; sourceTree = "<group>"; }; + 9FD3E57D0CA0116100E54D15 /* llvm_ocaml.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = llvm_ocaml.c; sourceTree = "<group>"; }; + 9FD3E58D0CA0125F00E54D15 /* BitWriter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = BitWriter.h; sourceTree = "<group>"; }; + 9FD3E58E0CA0125F00E54D15 /* Core.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Core.h; sourceTree = "<group>"; }; + 9FD3E5900CA0129D00E54D15 /* Core.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = Core.cpp; path = ../lib/VMCore/Core.cpp; sourceTree = SOURCE_ROOT; }; + 9FD3E5920CA012B300E54D15 /* BitWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = BitWriter.cpp; sourceTree = "<group>"; }; 9FE4508B0C77A77000C4FEA4 /* ARMCodeEmitter.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ARMCodeEmitter.cpp; sourceTree = "<group>"; }; 9FE4508C0C77A77000C4FEA4 /* ARMGenAsmWriter.inc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.pascal; path = ARMGenAsmWriter.inc; sourceTree = "<group>"; }; 9FE4508D0C77A77000C4FEA4 /* ARMGenDAGISel.inc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.pascal; path = ARMGenDAGISel.inc; sourceTree = "<group>"; }; @@ -1049,6 +1059,7 @@ DE66F2BD08ABF14400323D32 /* tools */, DE816FAC08CFB44C0093BDEF /* utils */, DE66F38D08ABF35C00323D32 /* docs */, + 9FD3E56D0CA0116100E54D15 /* bindings */, DE66F3FD08ABF37000323D32 /* examples */, DE66F38C08ABF35300323D32 /* CREDITS.TXT */, CFD99AA80AFE827B0068D19C /* LICENSE.TXT */, @@ -1079,6 +1090,7 @@ 9F68EB110C77AD2C004AA152 /* Writer */ = { isa = PBXGroup; children = ( + 9FD3E5920CA012B300E54D15 /* BitWriter.cpp */, 9F68EB120C77AD2C004AA152 /* BitcodeWriter.cpp */, 9F68EB130C77AD2C004AA152 /* BitcodeWriterPass.cpp */, 9F68EB250C77AD2C004AA152 /* ValueEnumerator.cpp */, @@ -1145,6 +1157,44 @@ path = IPO; sourceTree = "<group>"; }; + 9FD3E56D0CA0116100E54D15 /* bindings */ = { + isa = PBXGroup; + children = ( + 9FD3E56F0CA0116100E54D15 /* ocaml */, + ); + name = bindings; + path = ../bindings; + sourceTree = SOURCE_ROOT; + }; + 9FD3E56F0CA0116100E54D15 /* ocaml */ = { + isa = PBXGroup; + children = ( + 9FD3E5700CA0116100E54D15 /* bitwriter */, + 9FD3E57A0CA0116100E54D15 /* llvm */, + ); + path = ocaml; + sourceTree = "<group>"; + }; + 9FD3E5700CA0116100E54D15 /* bitwriter */ = { + isa = PBXGroup; + children = ( + 9FD3E5710CA0116100E54D15 /* bitwriter_ocaml.c */, + 9FD3E5720CA0116100E54D15 /* llvm_bitwriter.ml */, + 9FD3E5730CA0116100E54D15 /* llvm_bitwriter.mli */, + ); + path = bitwriter; + sourceTree = "<group>"; + }; + 9FD3E57A0CA0116100E54D15 /* llvm */ = { + isa = PBXGroup; + children = ( + 9FD3E57B0CA0116100E54D15 /* llvm.ml */, + 9FD3E57C0CA0116100E54D15 /* llvm.mli */, + 9FD3E57D0CA0116100E54D15 /* llvm_ocaml.c */, + ); + path = llvm; + sourceTree = "<group>"; + }; 9FE450DE0C77ABE400C4FEA4 /* lib/Archive */ = { isa = PBXGroup; children = ( @@ -1160,6 +1210,8 @@ CF8F1B480B64F7AB00BB4199 /* llvm-c */ = { isa = PBXGroup; children = ( + 9FD3E58D0CA0125F00E54D15 /* BitWriter.h */, + 9FD3E58E0CA0125F00E54D15 /* Core.h */, CF8F1B490B64F7AB00BB4199 /* LinkTimeOptimizer.h */, ); name = "llvm-c"; @@ -1283,6 +1335,7 @@ 9F77937C0C73C4F400551F9C /* ConstantFold.cpp */, 9F77937D0C73C4F400551F9C /* ConstantFold.h */, DE66EC6008ABE86A00323D32 /* Constants.cpp */, + 9FD3E5900CA0129D00E54D15 /* Core.cpp */, DE66EC6108ABE86A00323D32 /* Dominators.cpp */, DE66EC6208ABE86A00323D32 /* Function.cpp */, DE66EC6308ABE86A00323D32 /* Globals.cpp */, diff --git a/bindings/ocaml/Makefile.ocaml b/bindings/ocaml/Makefile.ocaml index 4c65ca8ffc..8ad085ecad 100644 --- a/bindings/ocaml/Makefile.ocaml +++ b/bindings/ocaml/Makefile.ocaml @@ -92,6 +92,8 @@ $(ObjDir)/$(LIBRARYNAME).ocamldep: $(OcamlSources) $(OcamlHeaders) \ $(OcamlDir)/.dir $(ObjDir)/.dir $(Verb) $(OCAMLDEP) $(OCAMLCFLAGS) $(OcamlSources) $(OcamlHeader) > $@ +$(ObjectsCMI): $(UsedOcamlInterfaces:%=$(OcamlDir)/%.cmi) + -include $(ObjDir)/$(LIBRARYNAME).ocamldep diff --git a/bindings/ocaml/bitwriter/Makefile b/bindings/ocaml/bitwriter/Makefile index aef41f5009..953ab4c082 100644 --- a/bindings/ocaml/bitwriter/Makefile +++ b/bindings/ocaml/bitwriter/Makefile @@ -19,5 +19,6 @@ LEVEL := ../../.. LIBRARYNAME := llvm_bitwriter DONT_BUILD_RELINKED := 1 UsedComponents := bitwriter +UsedOcamlInterfaces := llvm include ../Makefile.ocaml diff --git a/bindings/ocaml/llvm/llvm.ml b/bindings/ocaml/llvm/llvm.ml index b8a62dcb68..63079f2107 100644 --- a/bindings/ocaml/llvm/llvm.ml +++ b/bindings/ocaml/llvm/llvm.ml @@ -17,6 +17,9 @@ type llmodule type lltype type llvalue +type llbasicblock (* These are actually values, but + benefit from type checking. *) +type llbuilder type type_kind = Void_type @@ -50,6 +53,42 @@ type visibility = | Hidden_visibility | Protected_visibility +let ccc = 0 +let fastcc = 8 +let coldcc = 9 +let x86_stdcallcc = 64 +let x86_fastcallcc = 65 + +type int_predicate = + Icmp_eq +| Icmp_ne +| Icmp_ugt +| Icmp_uge +| Icmp_ult +| Icmp_ule +| Icmp_sgt +| Icmp_sge +| Icmp_slt +| Icmp_sle + +type real_predicate = + Fcmp_false +| Fcmp_oeq +| Fcmp_ogt +| Fcmp_oge +| Fcmp_olt +| Fcmp_ole +| Fcmp_one +| Fcmp_ord +| Fcmp_uno +| Fcmp_ueq +| Fcmp_ugt +| Fcmp_uge +| Fcmp_ult +| Fcmp_ule +| Fcmp_une +| Fcmp_true + (*===-- Modules -----------------------------------------------------------===*) @@ -63,8 +102,11 @@ external dispose_module : llmodule -> unit = "llvm_dispose_module" (* Adds a named type to the module's symbol table. Returns true if successful. If such a name already exists, then no entry is added and returns false. *) -external add_type_name : string -> lltype -> llmodule -> bool - = "llvm_add_type_name" +external define_type_name : string -> lltype -> llmodule -> bool + = "llvm_add_type_name" + +external delete_type_name : string -> llmodule -> unit + = "llvm_delete_type_name" (*===-- Types -------------------------------------------------------------===*) @@ -142,9 +184,9 @@ external set_value_name : string -> llvalue -> unit = "llvm_set_value_name" (*--... Operations on constants of (mostly) any type .......................--*) external is_constant : llvalue -> bool = "llvm_is_constant" -external make_null : lltype -> llvalue = "llvm_make_null" -external make_all_ones : (*int|vec*)lltype -> llvalue = "llvm_make_all_ones" -external make_undef : lltype -> llvalue = "llvm_make_undef" +external make_null : lltype -> llvalue = "LLVMGetNull" +external make_all_ones : (*int|vec*)lltype -> llvalue = "LLVMGetAllOnes" +external make_undef : lltype -> llvalue = "LLVMGetUndef" external is_null : llvalue -> bool = "llvm_is_null" external is_undef : llvalue -> bool = "llvm_is_undef" @@ -183,12 +225,160 @@ external declare_global : lltype -> string -> llmodule -> llvalue external define_global : string -> llvalue -> llmodule -> llvalue = "llvm_define_global" external delete_global : llvalue -> unit = "llvm_delete_global" -external global_initializer : llvalue -> llvalue = "llvm_global_initializer" +external global_initializer : llvalue -> llvalue = "LLVMGetInitializer" external set_initializer : llvalue -> llvalue -> unit = "llvm_set_initializer" external remove_initializer : llvalue -> unit = "llvm_remove_initializer" external is_thread_local : llvalue -> bool = "llvm_is_thread_local" external set_thread_local : bool -> llvalue -> unit = "llvm_set_thread_local" +(*--... Operations on functions ............................................--*) +external declare_function : string -> lltype -> llmodule -> llvalue + = "llvm_declare_function" +external define_function : string -> lltype -> llmodule -> llvalue + = "llvm_define_function" +external delete_function : llvalue -> unit = "llvm_delete_function" +external params : llvalue -> llvalue array = "llvm_params" +external param : llvalue -> int -> llvalue = "llvm_param" +external is_intrinsic : llvalue -> bool = "llvm_is_intrinsic" +external function_call_conv : llvalue -> int = "llvm_function_call_conv" +external set_function_call_conv : int -> llvalue -> unit + = "llvm_set_function_call_conv" + +(* TODO: param attrs *) + +(*--... Operations on basic blocks .........................................--*) +external basic_blocks : llvalue -> llbasicblock array = "llvm_basic_blocks" +external entry_block : llvalue -> llbasicblock = "LLVMGetEntryBasicBlock" +external delete_block : llbasicblock -> unit = "llvm_delete_block" +external append_block : string -> llvalue -> llbasicblock = "llvm_append_block" +external insert_block : string -> llbasicblock -> llbasicblock + = "llvm_insert_block" +external value_of_block : llbasicblock -> llvalue = "LLVMBasicBlockAsValue" +external value_is_block : llvalue -> bool = "llvm_value_is_block" +external block_of_value : llvalue -> llbasicblock = "LLVMValueAsBasicBlock" + + +(*===-- Instruction builders ----------------------------------------------===*) +external builder_before : llvalue -> llbuilder = "llvm_builder_before" +external builder_at_end : llbasicblock -> llbuilder = "llvm_builder_at_end" +external position_before : llvalue -> llbuilder -> unit = "llvm_position_before" +external position_at_end : llbasicblock -> llbuilder -> unit + = "llvm_position_at_end" + +(*--... Terminators ........................................................--*) +external build_ret_void : llbuilder -> llvalue = "llvm_build_ret_void" +external build_ret : llvalue -> llbuilder -> llvalue = "llvm_build_ret" +external build_br : llbasicblock -> llbuilder -> llvalue = "llvm_build_br" +external build_cond_br : llvalue -> llbasicblock -> llbasicblock -> llbuilder -> + llvalue = "llvm_build_cond_br" +external build_switch : llvalue -> llbasicblock -> int -> llbuilder -> llvalue + = "llvm_build_switch" +external build_invoke : llvalue -> llvalue array -> llbasicblock -> + llbasicblock -> string -> llbuilder -> llvalue + = "llvm_build_invoke_bc" "llvm_build_invoke_nat" +external build_unwind : llbuilder -> llvalue = "llvm_build_unwind" +external build_unreachable : llbuilder -> llvalue = "llvm_build_unreachable" + +(*--... Arithmetic .........................................................--*) +external build_add : llvalue -> llvalue -> string -> llbuilder -> llvalue + = "llvm_build_add" +external build_sub : llvalue -> llvalue -> string -> llbuilder -> llvalue + = "llvm_build_sub" +external build_mul : llvalue -> llvalue -> string -> llbuilder -> llvalue + = "llvm_build_mul" +external build_udiv : llvalue -> llvalue -> string -> llbuilder -> llvalue + = "llvm_build_udiv" +external build_sdiv : llvalue -> llvalue -> string -> llbuilder -> llvalue + = "llvm_build_sdiv" +external build_fdiv : llvalue -> llvalue -> string -> llbuilder -> llvalue + = "llvm_build_fdiv" +external build_urem : llvalue -> llvalue -> string -> llbuilder -> llvalue + = "llvm_build_urem" +external build_srem : llvalue -> llvalue -> string -> llbuilder -> llvalue + = "llvm_build_srem" +external build_frem : llvalue -> llvalue -> string -> llbuilder -> llvalue + = "llvm_build_frem" +external build_shl : llvalue -> llvalue -> string -> llbuilder -> llvalue + = "llvm_build_shl" +external build_lshr : llvalue -> llvalue -> string -> llbuilder -> llvalue + = "llvm_build_lshr" +external build_ashr : llvalue -> llvalue -> string -> llbuilder -> llvalue + = "llvm_build_ashr" +external build_and : llvalue -> llvalue -> string -> llbuilder -> llvalue + = "llvm_build_and" +external build_or : llvalue -> llvalue -> string -> llbuilder -> llvalue + = "llvm_build_or" +external build_xor : llvalue -> llvalue -> string -> llbuilder -> llvalue + = "llvm_build_xor" +external build_neg : llvalue -> string -> llbuilder -> llvalue + = "llvm_build_neg" +external build_not : llvalue -> string -> llbuilder -> llvalue + = "llvm_build_not" + +(*--... Memory .............................................................--*) +external build_malloc : lltype -> string -> llbuilder -> llvalue + = "llvm_build_malloc" +external build_array_malloc : lltype -> llvalue -> string -> llbuilder -> + llvalue = "llvm_build_array_malloc" +external build_alloca : lltype -> string -> llbuilder -> llvalue + = "llvm_build_alloca" +external build_array_alloca : lltype -> llvalue -> string -> llbuilder -> + llvalue = "llvm_build_array_alloca" +external build_free : llvalue -> llbuilder -> llvalue = "llvm_build_free" +external build_load : llvalue -> string -> llbuilder -> llvalue + = "llvm_build_load" +external build_store : llvalue -> llvalue -> llbuilder -> llvalue + = "llvm_build_store" +external build_gep : llvalue -> llvalue array -> string -> llbuilder -> llvalue + = "llvm_build_gep" + +(*--... Casts ..............................................................--*) +external build_trunc : llvalue -> lltype -> string -> llbuilder -> llvalue + = "llvm_build_trunc" +external build_zext : llvalue -> lltype -> string -> llbuilder -> llvalue + = "llvm_build_zext" +external build_sext : llvalue -> lltype -> string -> llbuilder -> llvalue + = "llvm_build_sext" +external build_fptoui : llvalue -> lltype -> string -> llbuilder -> llvalue + = "llvm_build_fptoui" +external build_fptosi : llvalue -> lltype -> string -> llbuilder -> llvalue + = "llvm_build_fptosi" +external build_uitofp : llvalue -> lltype -> string -> llbuilder -> llvalue + = "llvm_build_uitofp" +external build_sitofp : llvalue -> lltype -> string -> llbuilder -> llvalue + = "llvm_build_sitofp" +external build_fptrunc : llvalue -> lltype -> string -> llbuilder -> llvalue + = "llvm_build_fptrunc" +external build_fpext : llvalue -> lltype -> string -> llbuilder -> llvalue + = "llvm_build_fpext" +external build_ptrtoint : llvalue -> lltype -> string -> llbuilder -> llvalue + = "llvm_build_prttoint" +external build_inttoptr : llvalue -> lltype -> string -> llbuilder -> llvalue + = "llvm_build_inttoptr" +external build_bitcast : llvalue -> lltype -> string -> llbuilder -> llvalue + = "llvm_build_bitcast" + +(*--... Comparisons ........................................................--*) +external build_icmp : int_predicate -> llvalue -> llvalue -> string -> + llbuilder -> llvalue = "llvm_build_icmp" +external build_fcmp : real_predicate -> llvalue -> llvalue -> string -> + llbuilder -> llvalue = "llvm_build_fcmp" + +(*--... Miscellaneous instructions .........................................--*) +external build_phi : lltype -> string -> llbuilder -> llvalue = "llvm_build_phi" +external build_call : llvalue -> llvalue array -> string -> llbuilder -> llvalue + = "llvm_build_call" +external build_select : llvalue -> llvalue -> llvalue -> string -> llbuilder -> + llvalue = "llvm_build_select" +external build_va_arg : llvalue -> lltype -> string -> llbuilder -> llvalue + = "llvm_build_va_arg" +external build_extractelement : llvalue -> llvalue -> string -> llbuilder -> + llvalue = "llvm_build_extractelement" +external build_insertelement : llvalue -> llvalue -> llvalue -> string -> + llbuilder -> llvalue = "llvm_build_insertelement" +external build_shufflevector : llvalue -> llvalue -> llvalue -> string -> + llbuilder -> llvalue = "llvm_build_shufflevector" + (*===-- Non-Externs -------------------------------------------------------===*) (* These functions are built using the externals, so must be declared late. *) diff --git a/bindings/ocaml/llvm/llvm.mli b/bindings/ocaml/llvm/llvm.mli index 0e38ca0ef2..627594170b 100644 --- a/bindings/ocaml/llvm/llvm.mli +++ b/bindings/ocaml/llvm/llvm.mli @@ -17,6 +17,9 @@ type llmodule type lltype type llvalue +type llbasicblock (* These are actually values, but + benefit from type checking. *) +type llbuilder type type_kind = Void_type @@ -50,6 +53,42 @@ type visibility = | Hidden_visibility | Protected_visibility +val ccc : int +val fastcc : int +val coldcc : int +val x86_stdcallcc : int +val x86_fastcallcc : int + +type int_predicate = + Icmp_eq +| Icmp_ne +| Icmp_ugt +| Icmp_uge +| Icmp_ult +| Icmp_ule +| Icmp_sgt +| Icmp_sge +| Icmp_slt +| Icmp_sle + +type real_predicate = + Fcmp_false +| Fcmp_oeq +| Fcmp_ogt +| Fcmp_oge +| Fcmp_olt +| Fcmp_ole +| Fcmp_one +| Fcmp_ord +| Fcmp_uno +| Fcmp_ueq +| Fcmp_ugt +| Fcmp_uge +| Fcmp_ult +| Fcmp_ule +| Fcmp_une +| Fcmp_true + (*===-- Modules -----------------------------------------------------------===*) @@ -63,8 +102,11 @@ external dispose_module : llmodule -> unit = "llvm_dispose_module" (* Adds a named type to the module's symbol table. Returns true if successful. If such a name already exists, then no entry is added and returns false. *) -external add_type_name : string -> lltype -> llmodule -> bool - = "llvm_add_type_name" +external define_type_name : string -> lltype -> llmodule -> bool + = "llvm_add_type_name" + +external delete_type_name : string -> llmodule -> unit + = "llvm_delete_type_name" (*===-- Types -------------------------------------------------------------===*) @@ -125,9 +167,9 @@ external set_value_name : string -> llvalue -> unit = "llvm_set_value_name" (*--... Operations on constants of (mostly) any type .......................--*) external is_constant : llvalue -> bool = "llvm_is_constant" -external make_null : lltype -> llvalue = "llvm_make_null" -external make_all_ones : (*int|vec*)lltype -> llvalue = "llvm_make_all_ones" -external make_undef : lltype -> llvalue = "llvm_make_undef" +external make_null : lltype -> llvalue = "LLVMGetNull" +external make_all_ones : (*int|vec*)lltype -> llvalue = "LLVMGetAllOnes" +external make_undef : lltype -> llvalue = "LLVMGetUndef" external is_null : llvalue -> bool = "llvm_is_null" external is_undef : llvalue -> bool = "llvm_is_undef" @@ -166,9 +208,154 @@ external declare_global : lltype -> string -> llmodule -> llvalue external define_global : string -> llvalue -> llmodule -> llvalue = "llvm_define_global" external delete_global : llvalue -> unit = "llvm_delete_global" -external global_initializer : llvalue -> llvalue = "llvm_global_initializer" +external global_initializer : llvalue -> llvalue = "LLVMGetInitializer" external set_initializer : llvalue -> llvalue -> unit = "llvm_set_initializer" external remove_initializer : llvalue -> unit = "llvm_remove_initializer" external is_thread_local : llvalue -> bool = "llvm_is_thread_local" external set_thread_local : bool -> llvalue -> unit = "llvm_set_thread_local" +(*--... Operations on functions ............................................--*) +external declare_function : string -> lltype -> llmodule -> llvalue + = "llvm_declare_function" +external define_function : string -> lltype -> llmodule -> llvalue + = "llvm_define_function" +external delete_function : llvalue -> unit = "llvm_delete_function" +external params : llvalue -> llvalue array = "llvm_params" +external param : llvalue -> int -> llvalue = "llvm_param" +external is_intrinsic : llvalue -> bool = "llvm_is_intrinsic" +external function_call_conv : llvalue -> int = "llvm_function_call_conv" +external set_function_call_conv : int -> llvalue -> unit + = "llvm_set_function_call_conv" + +(*--... Operations on basic blocks .........................................--*) +external basic_blocks : llvalue -> llbasicblock array = "llvm_basic_blocks" +external entry_block : llvalue -> llbasicblock = "LLVMGetEntryBasicBlock" +external delete_block : llbasicblock -> unit = "llvm_delete_block" +external append_block : string -> llvalue -> llbasicblock = "llvm_append_block" +external insert_block : string -> llbasicblock -> llbasicblock + = "llvm_insert_block" +external value_of_block : llbasicblock -> llvalue = "LLVMBasicBlockAsValue" +external value_is_block : llvalue -> bool = "llvm_value_is_block" +external block_of_value : llvalue -> llbasicblock = "LLVMValueAsBasicBlock" + + +(*===-- Instruction builders ----------------------------------------------===*) +external builder_before : llvalue -> llbuilder = "llvm_builder_before" +external builder_at_end : llbasicblock -> llbuilder = "llvm_builder_at_end" +external position_before : llvalue -> llbuilder -> unit = "llvm_position_before" +external position_at_end : llbasicblock -> llbuilder -> unit + = "llvm_position_at_end" + +(*--... Terminators ........................................................--*) +external build_ret_void : llbuilder -> llvalue = "llvm_build_ret_void" +external build_ret : llvalue -> llbuilder -> llvalue = "llvm_build_ret" +external build_br : llbasicblock -> llbuilder -> llvalue = "llvm_build_br" +external build_cond_br : llvalue -> llbasicblock -> llbasicblock -> llbuilder -> + llvalue = "llvm_build_cond_br" +external build_switch : llvalue -> llbasicblock -> int -> llbuilder -> llvalue + = "llvm_build_switch" +external build_invoke : llvalue -> llvalue array -> llbasicblock -> + llbasicblock -> string -> llbuilder -> llvalue + = "llvm_build_invoke_bc" "llvm_build_invoke_nat" +external build_unwind : llbuilder -> llvalue = "llvm_build_unwind" +external build_unreachable : llbuilder -> llvalue = "llvm_build_unreachable" + +(*--... Arithmetic .........................................................--*) +external build_add : llvalue -> llvalue -> string -> llbuilder -> llvalue + = "llvm_build_add" +external build_sub : llvalue -> llvalue -> string -> llbuilder -> llvalue + = "llvm_build_sub" +external build_mul : llvalue -> llvalue -> string -> llbuilder -> llvalue + = "llvm_build_mul" +external build_udiv : llvalue -> llvalue -> string -> llbuilder -> llvalue + = "llvm_build_udiv" +external build_sdiv : llvalue -> llvalue -> string -> llbuilder -> llvalue + = "llvm_build_sdiv" +external build_fdiv : llvalue -> llvalue -> string -> llbuilder -> llvalue + = "llvm_build_fdiv" +external build_urem : llvalue -> llvalue -> string -> llbuilder -> llvalue + = "llvm_build_urem" +external build_srem : llvalue -> llvalue -> string -> llbuilder -> llvalue + = "llvm_build_srem" +external build_frem : llvalue -> llvalue -> string -> llbuilder -> llvalue + = "llvm_build_frem" +external build_shl : llvalue -> llvalue -> string -> llbuilder -> llvalue + = "llvm_build_shl" +external build_lshr : llvalue -> llvalue -> string -> llbuilder -> llvalue + = "llvm_build_lshr" +external build_ashr : llvalue -> llvalue -> string -> llbuilder -> llvalue + = "llvm_build_ashr" +external build_and : llvalue -> llvalue -> string -> llbuilder -> llvalue + = "llvm_build_and" +external build_or : llvalue -> llvalue -> string -> llbuilder -> llvalue + = "llvm_build_or" +external build_xor : llvalue -> llvalue -> string -> llbuilder -> llvalue + = "llvm_build_xor" +external build_neg : llvalue -> string -> llbuilder -> llvalue + = "llvm_build_neg" +external build_not : llvalue -> string -> llbuilder -> llvalue + = "llvm_build_not" + +(*--... Memory .............................................................--*) +external build_malloc : lltype -> string -> llbuilder -> llvalue + = "llvm_build_malloc" +external build_array_malloc : lltype -> llvalue -> string -> llbuilder -> + llvalue = "llvm_build_array_malloc" +external build_alloca : lltype -> string -> llbuilder -> llvalue + = "llvm_build_alloca" +external build_array_alloca : lltype -> llvalue -> string -> llbuilder -> + llvalue = "llvm_build_array_alloca" +external build_free : llvalue -> llbuilder -> llvalue = "llvm_build_free" +external build_load : llvalue -> string -> llbuilder -> llvalue + = "llvm_build_load" +external build_store : llvalue -> llvalue -> llbuilder -> llvalue + = "llvm_build_store" +external build_gep : llvalue -> llvalue array -> string -> llbuilder -> llvalue + = "llvm_build_gep" + +(*--... Casts ..............................................................--*) +external build_trunc : llvalue -> lltype -> string -> llbuilder -> llvalue + = "llvm_build_trunc" +external build_zext : llvalue -> lltype -> string -> llbuilder -> llvalue + = "llvm_build_zext" +external build_sext : llvalue -> lltype -> string -> llbuilder -> llvalue + = "llvm_build_sext" +external build_fptoui : llvalue -> lltype -> string -> llbuilder -> llvalue + = "llvm_build_fptoui" +external build_fptosi : llvalue -> lltype -> string -> llbuilder -> llvalue + = "llvm_build_fptosi" +external build_uitofp : llvalue -> lltype -> string -> llbuilder -> llvalue + = "llvm_build_uitofp" +external build_sitofp : llvalue -> lltype -> string -> llbuilder -> llvalue + = "llvm_build_sitofp" +external build_fptrunc : llvalue -> lltype -> string -> llbuilder -> llvalue + = "llvm_build_fptrunc" +external build_fpext : llvalue -> lltype -> string -> llbuilder -> llvalue + = "llvm_build_fpext" +external build_ptrtoint : llvalue -> lltype -> string -> llbuilder -> llvalue + = "llvm_build_prttoint" +external build_inttoptr : llvalue -> lltype -> string -> llbuilder -> llvalue + = "llvm_build_inttoptr" +external build_bitcast : llvalue -> lltype -> string -> llbuilder -> llvalue + = "llvm_build_bitcast" + +(*--... Comparisons ........................................................--*) +external build_icmp : int_predicate -> llvalue -> llvalue -> string -> + llbuilder -> llvalue = "llvm_build_icmp" +external build_fcmp : real_predicate -> llvalue -> llvalue -> string -> + llbuilder -> llvalue = "llvm_build_fcmp" + +(*--... Miscellaneous instructions .........................................--*) +external build_phi : lltype -> string -> llbuilder -> llvalue = "llvm_build_phi" +external build_call : llvalue -> llvalue array -> string -> llbuilder -> llvalue + = "llvm_build_call" +external build_select : llvalue -> llvalue -> llvalue -> string -> llbuilder -> + llvalue = "llvm_build_select" +external build_va_arg : llvalue -> lltype -> string -> llbuilder -> llvalue + = "llvm_build_va_arg" +external build_extractelement : llvalue -> llvalue -> string -> llbuilder -> + llvalue = "llvm_build_extractelement" +external build_insertelement : llvalue -> llvalue -> llvalue -> string -> + llbuilder -> llvalue = "llvm_build_insertelement" +external build_shufflevector : llvalue -> llvalue -> llvalue -> string -> + llbuilder -> llvalue = "llvm_build_shufflevector" diff --git a/bindings/ocaml/llvm/llvm_ocaml.c b/bindings/ocaml/llvm/llvm_ocaml.c index f7356668a2..ffa872da6b 100644 --- a/bindings/ocaml/llvm/llvm_ocaml.c +++ b/bindings/ocaml/llvm/llvm_ocaml.c @@ -17,130 +17,125 @@ #include "llvm-c/Core.h" #include "caml/alloc.h" +#include "caml/custom.h" #include "caml/mlvalues.h" #include "caml/memory.h" #include "llvm/Config/config.h" #include <stdio.h> -#ifdef HAVE_ALLOCA_H -#include <alloca.h> -#endif +#include <string.h> /*===-- Modules -----------------------------------------------------------===*/ /* string -> llmodule */ -CAMLprim value llvm_create_module(value ModuleID) { - return (value) LLVMModuleCreateWithName(String_val(ModuleID)); +CAMLprim LLVMModuleRef llvm_create_module(value ModuleID) { + return LLVMModuleCreateWithName(String_val(ModuleID)); } /* llmodule -> unit */ -CAMLprim value llvm_dispose_module(value M) { - LLVMDisposeModule((LLVMModuleRef) M); +CAMLprim value llvm_dispose_module(LLVMModuleRef M) { + LLVMDisposeModule(M); return Val_unit; } /* string -> lltype -> llmodule -> bool */ -CAMLprim value llvm_add_type_name(value Name, value Ty, value M) { - int res = LLVMAddTypeName((LLVMModuleRef) M, - String_val(Name), (LLVMTypeRef) Ty); +CAMLprim value llvm_add_type_name(value Name, LLVMTypeRef Ty, LLVMModuleRef M) { + int res = LLVMAddTypeName(M, String_val(Name), Ty); return Val_bool(res == 0); } +/* string -> llmodule -> unit */ +CAMLprim value llvm_delete_type_name(value Name, LLVMModuleRef M) { + LLVMDeleteTypeName(M, String_val(Name)); + return Val_unit; +} + /*===-- Types -------------------------------------------------------------===*/ /* lltype -> type_kind */ -CAMLprim value llvm_classify_type(value Ty) { - return Val_int(LLVMGetTypeKind((LLVMTypeRef) Ty)); +CAMLprim value llvm_classify_type(LLVMTypeRef Ty) { + return Val_int(LLVMGetTypeKind(Ty)); } /* lltype -> lltype -> unit */ -CAMLprim value llvm_refine_abstract_type(value ConcreteTy, value AbstractTy) { - LLVMRefineAbstractType((LLVMTypeRef) AbstractTy, (LLVMTypeRef) ConcreteTy); - return (value) Val_unit; +CAMLprim value llvm_refine_abstract_type(LLVMTypeRef ConcreteTy, + LLVMTypeRef AbstractTy) { + LLVMRefineAbstractType(AbstractTy, ConcreteTy); + return Val_unit; } /*--... Operations on integer types ........................................--*/ /* unit -> lltype */ -CAMLprim value llvm_i1_type (value Unit) { return (value) LLVMInt1Type(); } -CAMLprim value llvm_i8_type (value Unit) { return (value) LLVMInt8Type(); } -CAMLprim value llvm_i16_type(value Unit) { return (value) LLVMInt16Type(); } -CAMLprim value llvm_i32_type(value Unit) { return (value) LLVMInt32Type(); } -CAMLprim value llvm_i64_type(value Unit) { return (value) LLVMInt64Type(); } +CAMLprim LLVMTypeRef llvm_i1_type (value Unit) { return LLVMInt1Type(); } +CAMLprim LLVMTypeRef llvm_i8_type (value Unit) { return LLVMInt8Type(); } +CAMLprim LLVMTypeRef llvm_i16_type(value Unit) { return LLVMInt16Type(); } +CAMLprim LLVMTypeRef llvm_i32_type(value Unit) { return LLVMInt32Type(); } +CAMLprim LLVMTypeRef llvm_i64_type(value Unit) { return LLVMInt64Type(); } /* int -> lltype */ -CAMLprim value llvm_make_integer_type(value Width) { - return (value) LLVMCreateIntegerType(Int_val(Width)); +CAMLprim LLVMTypeRef llvm_make_integer_type(value Width) { + return LLVMCreateIntType(Int_val(Width)); } /* lltype -> int */ -CAMLprim value llvm_integer_bitwidth(value IntegerTy) { - return Val_int(LLVMGetIntegerTypeWidth((LLVMTypeRef) IntegerTy)); +CAMLprim value llvm_integer_bitwidth(LLVMTypeRef IntegerTy) { + return Val_int(LLVMGetIntTypeWidth(IntegerTy)); } /*--... Operations on real types ...........................................--*/ /* unit -> lltype */ -CAMLprim value llvm_float_type(value Unit) { - return (value) LLVMFloatType(); +CAMLprim LLVMTypeRef llvm_float_type(value Unit) { + return LLVMFloatType(); } /* unit -> lltype */ -CAMLprim value llvm_double_type(value Unit) { - return (value) LLVMDoubleType(); +CAMLprim LLVMTypeRef llvm_double_type(value Unit) { + return LLVMDoubleType(); } /* unit -> lltype */ -CAMLprim value llvm_x86fp80_type(value Unit) { - return (value) LLVMX86FP80Type(); +CAMLprim LLVMTypeRef llvm_x86fp80_type(value Unit) { + return LLVMX86FP80Type(); } /* unit -> lltype */ -CAMLprim value llvm_fp128_type(value Unit) { |