diff options
author | Xavier Leroy <xavier.leroy@inria.fr> | 2015-03-29 19:57:16 +0200 |
---|---|---|
committer | Xavier Leroy <xavier.leroy@inria.fr> | 2015-03-29 19:57:16 +0200 |
commit | daccc2928e6410c4e8c886ea7d019fd9a071b931 (patch) | |
tree | aa9fdc779723b2cb33154e45f65821ea46f22d4d /cfrontend/Clight.v | |
parent | 57d3627c69a812a037d2d4161941ce25d15082d1 (diff) | |
download | compcert-daccc2928e6410c4e8c886ea7d019fd9a071b931.tar.gz compcert-daccc2928e6410c4e8c886ea7d019fd9a071b931.zip |
Omission: forgot to treat pointer values in bool_of_val and sem_notbool.
Diffstat (limited to 'cfrontend/Clight.v')
-rw-r--r-- | cfrontend/Clight.v | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cfrontend/Clight.v b/cfrontend/Clight.v index 7a45b453..77511b2c 100644 --- a/cfrontend/Clight.v +++ b/cfrontend/Clight.v @@ -403,7 +403,7 @@ Inductive eval_expr: expr -> val -> Prop := eval_expr (Eaddrof a ty) (Vptr loc ofs) | eval_Eunop: forall op a ty v1 v, eval_expr a v1 -> - sem_unary_operation op v1 (typeof a) = Some v -> + sem_unary_operation op v1 (typeof a) m = Some v -> eval_expr (Eunop op a ty) v | eval_Ebinop: forall op a1 a2 ty v1 v2 v, eval_expr a1 v1 -> @@ -620,7 +620,7 @@ Inductive step: state -> trace -> state -> Prop := | step_ifthenelse: forall f a s1 s2 k e le m v1 b, eval_expr e le m a v1 -> - bool_val v1 (typeof a) = Some b -> + bool_val v1 (typeof a) m = Some b -> step (State f (Sifthenelse a s1 s2) k e le m) E0 (State f (if b then s1 else s2) k e le m) |