aboutsummaryrefslogtreecommitdiffstats
path: root/backend/LTL.v
diff options
context:
space:
mode:
authorFrançois Pottier <francois.pottier@inria.fr>2015-10-23 15:08:33 +0200
committerFrançois Pottier <francois.pottier@inria.fr>2015-10-23 15:08:33 +0200
commit8b817cda643d180d43ab8c84809ca2d55c7dd3df (patch)
tree812fe2f7ec68c03c5f0762f1266f383193bbfe92 /backend/LTL.v
parentc46723c0169145d41d1879c236f53314456f1ba1 (diff)
parent1cb3d93ff278ebbd0c6967c5f9401a97f9b618b4 (diff)
downloadcompcert-8b817cda643d180d43ab8c84809ca2d55c7dd3df.tar.gz
compcert-8b817cda643d180d43ab8c84809ca2d55c7dd3df.zip
Merge remote branch 'upstream/master' into clean
Conflicts: Makefile.extr
Diffstat (limited to 'backend/LTL.v')
-rw-r--r--backend/LTL.v6
1 files changed, 3 insertions, 3 deletions
diff --git a/backend/LTL.v b/backend/LTL.v
index 67fb0197..48c5c850 100644
--- a/backend/LTL.v
+++ b/backend/LTL.v
@@ -77,8 +77,8 @@ Definition genv := Genv.t fundef unit.
Definition locset := Locmap.t.
(** Calling conventions are reflected at the level of location sets
- (environments mapping locations to values) by the following two
- functions.
+ (environments mapping locations to values) by the following two
+ functions.
[call_regs caller] returns the location set at function entry,
as a function of the location set [caller] of the calling function.
@@ -87,7 +87,7 @@ Definition locset := Locmap.t.
values as the corresponding outgoing stack slots (used for argument
passing) in the caller.
- Local and outgoing stack slots are initialized to undefined values.
-*)
+*)
Definition call_regs (caller: locset) : locset :=
fun (l: loc) =>