ARM: Replace the "never" condition with the "unconditional" condition.

4 files changed, 25 insertions, 4 deletions

diff --git a/src/arch/arm/insts/static_inst.cc b/src/arch/arm/insts/static_inst.cc
index 77d329564..d62c671fc 100644
--- a/src/arch/arm/insts/static_inst.cc
+++ b/src/arch/arm/insts/static_inst.cc
@@ -338,8 +338,8 @@ ArmStaticInstBase::printMnemonic(std::ostream &os,
           case COND_AL:
             // This one is implicit.
             break;
-          case COND_NV:
-            os << "nv";
+          case COND_UC:
+            // Unconditional.
             break;
           default:
             panic("Unrecognized condition code %d.\n", condCode);
diff --git a/src/arch/arm/miscregs.hh b/src/arch/arm/miscregs.hh
index cff6b8f2a..99bb57391 100644
--- a/src/arch/arm/miscregs.hh
+++ b/src/arch/arm/miscregs.hh
@@ -62,7 +62,7 @@ namespace ArmISA
         COND_GT, // 12
         COND_LE, // 13
         COND_AL, // 14
-        COND_NV  // 15
+        COND_UC  // 15
     };
 
     enum MiscRegIndex {
diff --git a/src/arch/arm/utility.cc b/src/arch/arm/utility.cc
index 5ce32542b..cecd459f3 100644
--- a/src/arch/arm/utility.cc
+++ b/src/arch/arm/utility.cc
@@ -2,6 +2,15 @@
  * Copyright (c) 2009 ARM Limited
  * All rights reserved.
  *
+ * The license below extends only to copyright in the software and shall
+ * not be construed as granting a license to any other intellectual
+ * property including but not limited to intellectual property relating
+ * to a hardware implementation of the functionality of the software
+ * licensed hereunder.  You may use the software subject to the license
+ * terms below provided that you ensure that this notice is replicated
+ * unmodified and in its entirety in all distributions of the software,
+ * modified or unmodified, in source code or in binary form.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met: redistributions of source code must retain the above copyright
diff --git a/src/arch/arm/utility.hh b/src/arch/arm/utility.hh
index 3ddfd12dd..5739ba3cd 100644
--- a/src/arch/arm/utility.hh
+++ b/src/arch/arm/utility.hh
@@ -1,4 +1,16 @@
 /*
+ * Copyright (c) 2010 ARM Limited
+ * All rights reserved
+ *
+ * The license below extends only to copyright in the software and shall
+ * not be construed as granting a license to any other intellectual
+ * property including but not limited to intellectual property relating
+ * to a hardware implementation of the functionality of the software
+ * licensed hereunder.  You may use the software subject to the license
+ * terms below provided that you ensure that this notice is replicated
+ * unmodified and in its entirety in all distributions of the software,
+ * modified or unmodified, in source code or in binary form.
+ *
  * Copyright (c) 2003-2005 The Regents of The University of Michigan
  * Copyright (c) 2007-2008 The Florida State University
  * All rights reserved.
@@ -70,7 +82,7 @@ namespace ArmISA {
             case COND_GT: return !(cpsr.n ^ cpsr.v || cpsr.z);
             case COND_LE: return  (cpsr.n ^ cpsr.v || cpsr.z);
             case COND_AL: return true;
-            case COND_NV: return false;
+            case COND_UC: return true;
             default:
                 panic("Unhandled predicate condition: %d\n", code);
         }