From 566b2ff20c311375a1d25cde735ddfb70706b581 Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Wed, 2 Jun 2010 12:58:07 -0500
Subject: ARM: Decode the nop instruction.

---
 src/arch/arm/isa/formats/branch.isa | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/arch/arm/isa/formats/branch.isa')

diff --git a/src/arch/arm/isa/formats/branch.isa b/src/arch/arm/isa/formats/branch.isa
index 865a73b32..999126081 100644
--- a/src/arch/arm/isa/formats/branch.isa
+++ b/src/arch/arm/isa/formats/branch.isa
@@ -157,7 +157,7 @@ def format Thumb32BranchesAndMiscCtrl() {{
                         } else {
                             switch (op2) {
                               case 0x0:
-                                return new WarnUnimplemented("nop", machInst);
+                                return new NopInst(machInst);
                               case 0x1:
                                 return new WarnUnimplemented("yield", machInst);
                               case 0x2:
-- 
cgit v1.2.3