Expose Function::viewCFG and Function::viewCFGOnly to bindings.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@48982 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/bindings/ocaml/analysis/analysis_ocaml.c b/bindings/ocaml/analysis/analysis_ocaml.c
index e57c5a56d73b2b43048c6dba62d0aca2389f31ac..97167055f70e616f578dfb59d4369884763d6488 100644 (file)
--- a/bindings/ocaml/analysis/analysis_ocaml.c
+++ b/bindings/ocaml/analysis/analysis_ocaml.c
@@ -58,3 +58,15 @@ CAMLprim value llvm_assert_valid_function(LLVMValueRef Fn) {
   LLVMVerifyFunction(Fn, LLVMAbortProcessAction);
   return Val_unit;
 }
   LLVMVerifyFunction(Fn, LLVMAbortProcessAction);
   return Val_unit;
 }

+
+/* Llvm.llvalue -> unit */
+CAMLprim value llvm_view_function_cfg(LLVMValueRef Fn) {
+  LLVMViewFunctionCFG(Fn);
+  return Val_unit;
+}
+
+/* Llvm.llvalue -> unit */
+CAMLprim value llvm_view_function_cfg_only(LLVMValueRef Fn) {
+  LLVMViewFunctionCFGOnly(Fn);
+  return Val_unit;
+}

diff --git a/bindings/ocaml/analysis/llvm_analysis.ml b/bindings/ocaml/analysis/llvm_analysis.ml
index f4379f8f17ed6c6aa318fcca47f1d12b0a1a3975..fc4d20370747c724784054f6ff85ad9e5d533939 100644 (file)
--- a/bindings/ocaml/analysis/llvm_analysis.ml
+++ b/bindings/ocaml/analysis/llvm_analysis.ml
@@ -17,3 +17,6 @@ external assert_valid_module : Llvm.llmodule -> unit
 
 external assert_valid_function : Llvm.llvalue -> unit
                                = "llvm_assert_valid_function"
 
 external assert_valid_function : Llvm.llvalue -> unit
                                = "llvm_assert_valid_function"

+external view_function_cfg : Llvm.llvalue -> unit = "llvm_view_function_cfg"
+external view_function_cfg_only : Llvm.llvalue -> unit
+                                = "llvm_view_function_cfg_only"

diff --git a/bindings/ocaml/analysis/llvm_analysis.mli b/bindings/ocaml/analysis/llvm_analysis.mli
index a97bd7e9e26f523071f831c97cdd2aaf134629fc..793f482e3c6c7837d86123b2007f5a85d95c6b5d 100644 (file)
--- a/bindings/ocaml/analysis/llvm_analysis.mli
+++ b/bindings/ocaml/analysis/llvm_analysis.mli
@@ -33,3 +33,14 @@ external assert_valid_module : Llvm.llmodule -> unit
     [llvm::verifyFunction]. *)
 external assert_valid_function : Llvm.llvalue -> unit
                                = "llvm_assert_valid_function"
     [llvm::verifyFunction]. *)
 external assert_valid_function : Llvm.llvalue -> unit
                                = "llvm_assert_valid_function"

+
+(** [view_function_cfg f] opens up a ghostscript window displaying the CFG of
+    the current function with the code for each basic block inside.
+    See [llvm::Function::viewCFG]. *)
+external view_function_cfg : Llvm.llvalue -> unit = "llvm_view_function_cfg"
+
+(** [view_function_cfg_only f] works just like [view_function_cfg], but does not
+    include the contents of basic blocks into the nodes.
+    See [llvm::Function::viewCFGOnly]. *)
+external view_function_cfg_only : Llvm.llvalue -> unit
+                                = "llvm_view_function_cfg_only"

diff --git a/include/llvm-c/Analysis.h b/include/llvm-c/Analysis.h
index e8f27871cc1a92d85c8a2408d26584ca50cef598..68d8e65db49e096486571d48ed0cdf7832ea88d6 100644 (file)
--- a/include/llvm-c/Analysis.h
+++ b/include/llvm-c/Analysis.h
@@ -43,6 +43,10 @@ int LLVMVerifyModule(LLVMModuleRef M, LLVMVerifierFailureAction Action,
    for debugging. */
 int LLVMVerifyFunction(LLVMValueRef Fn, LLVMVerifierFailureAction Action);
 
    for debugging. */
 int LLVMVerifyFunction(LLVMValueRef Fn, LLVMVerifierFailureAction Action);
 

+/* Open up a ghostview window that displays the CFG of the current function.
+   Useful for debugging. */
+void LLVMViewFunctionCFG(LLVMValueRef Fn);
+void LLVMViewFunctionCFGOnly(LLVMValueRef Fn);

 
 #ifdef __cplusplus
 }
 
 #ifdef __cplusplus
 }

diff --git a/lib/Analysis/Analysis.cpp b/lib/Analysis/Analysis.cpp
index 6b741bc5bdfcdb7369855e5393e212980331b7ad..493c6e88b3f8ed978dab0daab73ec53833bdb54a 100644 (file)
--- a/lib/Analysis/Analysis.cpp
+++ b/lib/Analysis/Analysis.cpp
@@ -33,3 +33,12 @@ int LLVMVerifyFunction(LLVMValueRef Fn, LLVMVerifierFailureAction Action) {
                         static_cast<VerifierFailureAction>(Action));
 }
 
                         static_cast<VerifierFailureAction>(Action));
 }
 

+void LLVMViewFunctionCFG(LLVMValueRef Fn) {
+  Function *F = unwrap<Function>(Fn);
+  F->viewCFG();
+}
+
+void LLVMViewFunctionCFGOnly(LLVMValueRef Fn) {
+  Function *F = unwrap<Function>(Fn);
+  F->viewCFGOnly();
+}