From 59db63d5fc8aea272097b1d7492f704b465baa3d Mon Sep 17 00:00:00 2001 From: Gordon Henriksen Date: Thu, 20 Dec 2007 00:13:26 +0000 Subject: [PATCH] Use a module to group calling convention values, too. llvm-svn: 45236 --- llvm/bindings/ocaml/llvm/llvm.ml | 12 +++++++----- llvm/bindings/ocaml/llvm/llvm.mli | 12 +++++++----- llvm/test/Bindings/Ocaml/vmcore.ml | 6 +++--- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/llvm/bindings/ocaml/llvm/llvm.ml b/llvm/bindings/ocaml/llvm/llvm.ml index c2c4e46ce7bb..ef63e137b365 100644 --- a/llvm/bindings/ocaml/llvm/llvm.ml +++ b/llvm/bindings/ocaml/llvm/llvm.ml @@ -55,11 +55,13 @@ module Visibility = struct | Protected end -let ccc = 0 -let fastcc = 8 -let coldcc = 9 -let x86_stdcallcc = 64 -let x86_fastcallcc = 65 +module CallConv = struct + let c = 0 + let fast = 8 + let cold = 9 + let x86_stdcall = 64 + let x86_fastcall = 65 +end module Icmp = struct type t = diff --git a/llvm/bindings/ocaml/llvm/llvm.mli b/llvm/bindings/ocaml/llvm/llvm.mli index 4f3bee7fabeb..22d359181c0d 100644 --- a/llvm/bindings/ocaml/llvm/llvm.mli +++ b/llvm/bindings/ocaml/llvm/llvm.mli @@ -95,16 +95,18 @@ end (* The following calling convention values may be accessed with [function_call_conv f] and [set_function_call_conv conv f]. Calling conventions are open-ended. *) -val ccc : int (** [ccc] is the C calling convention. **) -val fastcc : int (** [fastcc] is the calling convention to allow LLVM +module CallConv : sig + val c : int (** [c] is the C calling convention. **) + val fast : int (** [fast] is the calling convention to allow LLVM maximum optimization opportunities. Use only with internal linkage. **) -val coldcc : int (** [coldcc] is the calling convention for + val cold : int (** [cold] is the calling convention for callee-save. **) -val x86_stdcallcc : int (** [x86_stdcallcc] is the familiar stdcall calling + val x86_stdcall : int (** [x86_stdcall] is the familiar stdcall calling convention from C. **) -val x86_fastcallcc : int (** [x86_fastcallcc] is the familiar fastcall calling + val x86_fastcall : int (** [x86_fastcall] is the familiar fastcall calling convention from C. **) +end (** The predicate for an integer comparison ([icmp]) instruction. See the [llvm::ICmpInst::Predicate] enumeration. **) diff --git a/llvm/test/Bindings/Ocaml/vmcore.ml b/llvm/test/Bindings/Ocaml/vmcore.ml index c0afd7e51895..fb8445bbcbd5 100644 --- a/llvm/test/Bindings/Ocaml/vmcore.ml +++ b/llvm/test/Bindings/Ocaml/vmcore.ml @@ -496,9 +496,9 @@ let test_functions () = *) group "callconv"; let fn = define_function "Fn5" ty m in - insist (ccc = function_call_conv fn); - set_function_call_conv fastcc fn; - insist (fastcc = function_call_conv fn); + insist (CallConv.c = function_call_conv fn); + set_function_call_conv CallConv.fast fn; + insist (CallConv.fast = function_call_conv fn); ignore (build_unreachable (builder_at_end (entry_block fn))); begin group "collector";