From 091bfbc72af505578210a94a34cb69e5afc1f580 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20B=C3=BChler?= <david.buhler@cea.fr>
Date: Tue, 11 Jul 2023 17:59:32 +0200
Subject: [PATCH] [Eva] Callstack: renames [last_caller] to [top_caller].
---
src/kernel_services/abstract_interp/eva_types.ml | 2 +-
src/kernel_services/abstract_interp/eva_types.mli | 2 +-
src/plugins/eva/Eva.mli | 2 +-
src/plugins/eva/engine/function_calls.ml | 2 +-
src/plugins/eva/types/callstack.mli | 2 +-
src/plugins/eva/utils/eva_perf.ml | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/kernel_services/abstract_interp/eva_types.ml b/src/kernel_services/abstract_interp/eva_types.ml
index b04b176cbff..2873a253980 100644
--- a/src/kernel_services/abstract_interp/eva_types.ml
+++ b/src/kernel_services/abstract_interp/eva_types.ml
@@ -122,7 +122,7 @@ struct
| (kf, stmt) :: _ -> kf, Cil_types.Kstmt stmt
| [] -> cs.entry_point, Cil_types.Kglobal
- let last_caller cs =
+ let top_caller cs =
match cs.stack with
| _ :: (kf, _) :: _ -> Some kf
| [_] -> Some cs.entry_point
diff --git a/src/kernel_services/abstract_interp/eva_types.mli b/src/kernel_services/abstract_interp/eva_types.mli
index 5dadaf28974..3c4477c1e60 100644
--- a/src/kernel_services/abstract_interp/eva_types.mli
+++ b/src/kernel_services/abstract_interp/eva_types.mli
@@ -51,7 +51,7 @@ sig
val top_kf : t -> Cil_types.kernel_function
val top_callsite : t -> Cil_types.stmt option
val top_call : t -> Cil_types.kernel_function * Cil_types.kinstr
- val last_caller : t -> Cil_types.kernel_function option
+ val top_caller : t -> Cil_types.kernel_function option
val to_kf_list : t -> Cil_types.kernel_function list
val to_stmt_list : t -> Cil_types.stmt list
diff --git a/src/plugins/eva/Eva.mli b/src/plugins/eva/Eva.mli
index b1cda1de9bd..53a0656e153 100644
--- a/src/plugins/eva/Eva.mli
+++ b/src/plugins/eva/Eva.mli
@@ -166,7 +166,7 @@ module Callstack: sig
val top_call : t -> Cil_types.kernel_function * Cil_types.kinstr
(** Returns the function that called the topmost function of the callstack. *)
- val last_caller : t -> Cil_types.kernel_function option
+ val top_caller : t -> Cil_types.kernel_function option
(** {2 Conversion} *)
diff --git a/src/plugins/eva/engine/function_calls.ml b/src/plugins/eva/engine/function_calls.ml
index 044ee16e2bf..8e0817904ca 100644
--- a/src/plugins/eva/engine/function_calls.ml
+++ b/src/plugins/eva/engine/function_calls.ml
@@ -53,7 +53,7 @@ let register_call kinstr kf =
let kf', kinstr' = Callstack.top_call callstack in
assert (Kernel_function.equal kf kf');
assert (Cil_datatype.Kinstr.equal kinstr kinstr');
- match kinstr, Callstack.last_caller callstack with
+ match kinstr, Callstack.top_caller callstack with
| Kglobal, _ -> CallersTable.add kf Kernel_function.Map.empty
| Kstmt _, None -> assert false
| Kstmt stmt, Some caller ->
diff --git a/src/plugins/eva/types/callstack.mli b/src/plugins/eva/types/callstack.mli
index c3ede6737cf..a25b8cbe023 100644
--- a/src/plugins/eva/types/callstack.mli
+++ b/src/plugins/eva/types/callstack.mli
@@ -71,7 +71,7 @@ val top_callsite : t -> Cil_types.stmt option
val top_call : t -> Cil_types.kernel_function * Cil_types.kinstr
(** Returns the function that called the topmost function of the callstack. *)
-val last_caller : t -> Cil_types.kernel_function option
+val top_caller : t -> Cil_types.kernel_function option
(** {2 Conversion} *)
diff --git a/src/plugins/eva/utils/eva_perf.ml b/src/plugins/eva/utils/eva_perf.ml
index e8bd382190e..4c0ae010c6f 100644
--- a/src/plugins/eva/utils/eva_perf.ml
+++ b/src/plugins/eva/utils/eva_perf.ml
@@ -287,7 +287,7 @@ let display fmt =
;;
let caller_callee_callinfo callstack =
- match Callstack.last_caller callstack with
+ match Callstack.top_caller callstack with
| Some caller_kf ->
let callee_kf = Callstack.top_kf callstack in
let caller_flat = Kernel_function.Hashtbl.find flat caller_kf in
--
GitLab