aboutsummaryrefslogtreecommitdiffstats
path: root/arm/Op.v
diff options
context:
space:
mode:
authorBernhard Schommer <bernhardschommer@gmail.com>2015-04-04 11:51:22 +0200
committerBernhard Schommer <bernhardschommer@gmail.com>2015-04-04 11:51:22 +0200
commit0ae69bc62cbe50e1fb426c4816aef689c359c75a (patch)
treecc05bd32da40c373f95b23a36162f31d1c2d19c8 /arm/Op.v
parent170284b51766112e29d6bbfe519bad9f6da95269 (diff)
parent428e71dc00798d49244088ba4a0c46ee11c79c61 (diff)
downloadcompcert-0ae69bc62cbe50e1fb426c4816aef689c359c75a.tar.gz
compcert-0ae69bc62cbe50e1fb426c4816aef689c359c75a.zip
Merge branch 'master' into dwarf
Diffstat (limited to 'arm/Op.v')
-rw-r--r--arm/Op.v2
1 files changed, 1 insertions, 1 deletions
diff --git a/arm/Op.v b/arm/Op.v
index bda99e3c..bbdcd123 100644
--- a/arm/Op.v
+++ b/arm/Op.v
@@ -707,7 +707,7 @@ Definition is_trivial_op (op: operation) : bool :=
Definition op_depends_on_memory (op: operation) : bool :=
match op with
- | Ocmp (Ccompu _ | Ccompushift _ _) => true
+ | Ocmp (Ccompu _ | Ccompushift _ _| Ccompuimm _ _) => true
| _ => false
end.