From 71daeb0b2b390f5f5a34addd3993f28851c91d72 Mon Sep 17 00:00:00 2001
From: Ali Saidi <Ali.Saidi@ARM.com>
Date: Fri, 29 Jun 2012 11:18:29 -0400
Subject: ARM: Fix identification of one RAS pop instruction.

The check should be with the op2 field, not with the op1 field.
---
 src/arch/arm/isa/templates/pred.isa | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/arch/arm/isa/templates/pred.isa')

diff --git a/src/arch/arm/isa/templates/pred.isa b/src/arch/arm/isa/templates/pred.isa
index efb8e470b..88e8fecd1 100644
--- a/src/arch/arm/isa/templates/pred.isa
+++ b/src/arch/arm/isa/templates/pred.isa
@@ -115,11 +115,12 @@ def template DataRegConstructor {{
                 flags[IsUncondControl] = true;
             else
                 flags[IsCondControl] = true;
-        }
 
-        if (%(is_ras_pop)s) {
-            flags[IsReturn] = true;
+            if (%(is_ras_pop)s) {
+                flags[IsReturn] = true;
+            }
         }
+
     }
 }};
 
-- 
cgit v1.2.3