6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-12 17:32:19 +00:00
Code Issues Projects Releases Wiki Activity

[OCaml] Accept context explicitly in Llvm_target functions

Browse Source 
Llvm_target.intptr_type used to implicitly use global context. As
none of other functions in OCaml bindings do, it is changed to
accept context explicitly.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@194381 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Peter Zotov 2013-11-11 14:47:20 +00:00
parent 26f3bd8966
commit 786a43e2d8
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bindings/ocaml/target/llvm_target.ml
View File

@ -24,7 +24,8 @@ end
external byte_order : DataLayout.t -> Endian.t = "llvm_byte_order"
external pointer_size : DataLayout.t -> int = "llvm_pointer_size"
external intptr_type : DataLayout.t -> Llvm.lltype = "llvm_intptr_type"
external intptr_type : DataLayout.t -> Llvm.llcontext -> Llvm.lltype
= "llvm_intptr_type"
external size_in_bits : DataLayout.t -> Llvm.lltype -> Int64.t
= "llvm_size_in_bits"
external store_size : DataLayout.t -> Llvm.lltype -> Int64.t = "llvm_store_size"

3
bindings/ocaml/target/llvm_target.mli
View File

@ -47,7 +47,8 @@ external pointer_size : DataLayout.t -> int = "llvm_pointer_size"
(** Returns the integer type that is the same size as a pointer on a target.
See the method llvm::DataLayout::getIntPtrType. *)
external intptr_type : DataLayout.t -> Llvm.lltype = "llvm_intptr_type"
external intptr_type : DataLayout.t -> Llvm.llcontext -> Llvm.lltype
= "llvm_intptr_type"
(** Computes the size of a type in bits for a target.
See the method llvm::DataLayout::getTypeSizeInBits. *)

6
bindings/ocaml/target/target_ocaml.c
View File

@ -72,9 +72,9 @@ CAMLprim value llvm_pointer_size(value TD) {
return Val_int(LLVMPointerSize(TargetData_val(TD)));
}
/* DataLayout.t -> int -> Llvm.lltype */
CAMLprim LLVMTypeRef llvm_intptr_type(value TD) {
return LLVMIntPtrType(TargetData_val(TD));;
/* DataLayout.t -> Llvm.llcontext -> Llvm.lltype */
CAMLprim LLVMTypeRef llvm_intptr_type(value TD, LLVMContextRef C) {
return LLVMIntPtrTypeInContext(C, TargetData_val(TD));;
}
/* DataLayout.t -> Llvm.lltype -> Int64.t */

2
test/Bindings/Ocaml/executionengine.ml
View File

@ -107,7 +107,7 @@ let test_executionengine () =
let td = ExecutionEngine.target_data ee in
(* Demonstrate that a garbage pointer wasn't returned. *)
let ty = intptr_type td in
let ty = intptr_type td context in
if ty != i32_type && ty != i64_type then bomb "target_data did not work";
(* dispose *)

2
test/Bindings/Ocaml/target.ml
View File

@ -46,7 +46,7 @@ let test_target_data () =
assert_equal (DataLayout.as_string td) layout;
assert_equal (byte_order td) Endian.Little;
assert_equal (pointer_size td) 4;
assert_equal (intptr_type td) i32_type;
assert_equal (intptr_type td context) i32_type;
assert_equal (size_in_bits td sty) (Int64.of_int 96);
assert_equal (store_size td sty) (Int64.of_int 12);
assert_equal (abi_size td sty) (Int64.of_int 12);