From e29ec7d2edb0b37faa0b091798f95cabb1a89fd1 Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Wed, 2 Jun 2010 12:58:03 -0500
Subject: ARM: Move the inst2string function out of the isa_desc. Delete the
 now empty formats/util.isa.

---
 src/arch/arm/insts/static_inst.hh    | 14 +++++++++
 src/arch/arm/isa/formats/formats.isa |  3 --
 src/arch/arm/isa/formats/util.isa    | 58 ------------------------------------
 3 files changed, 14 insertions(+), 61 deletions(-)
 delete mode 100644 src/arch/arm/isa/formats/util.isa

(limited to 'src/arch')

diff --git a/src/arch/arm/insts/static_inst.hh b/src/arch/arm/insts/static_inst.hh
index 485d6997e..35dbe6d52 100644
--- a/src/arch/arm/insts/static_inst.hh
+++ b/src/arch/arm/insts/static_inst.hh
@@ -67,6 +67,20 @@ class ArmStaticInst : public StaticInst
     {
     }
 
+    inline static std::string
+    inst2string(MachInst machInst)
+    {
+        std::string str = "";
+        uint32_t mask = (1 << 31);
+
+        while (mask) {
+            str += ((machInst & mask) ? "1" : "0");
+            mask = mask >> 1;
+        }
+
+        return str;
+    }
+
     /// Print a register name for disassembly given the unique
     /// dependence tag number (FP or int).
     void printReg(std::ostream &os, int reg) const;
diff --git a/src/arch/arm/isa/formats/formats.isa b/src/arch/arm/isa/formats/formats.isa
index b55b82110..91e19aaa6 100644
--- a/src/arch/arm/isa/formats/formats.isa
+++ b/src/arch/arm/isa/formats/formats.isa
@@ -47,9 +47,6 @@
 //Include support for predicated instructions
 ##include "pred.isa"
 
-//Include utility functions
-##include "util.isa"
-
 //Include the float formats
 ##include "fp.isa"
 
diff --git a/src/arch/arm/isa/formats/util.isa b/src/arch/arm/isa/formats/util.isa
deleted file mode 100644
index f43137a04..000000000
--- a/src/arch/arm/isa/formats/util.isa
+++ /dev/null
@@ -1,58 +0,0 @@
-// -*- mode:c++ -*-
-
-// Copyright (c) 2007-2008 The Florida State University
-// All rights reserved.
-//
-// 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
-// notice, this list of conditions and the following disclaimer;
-// redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution;
-// neither the name of the copyright holders nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Authors: Stephen Hines
-
-let {{
-
-output header {{
-        std::string inst2string(MachInst machInst);
-}};
-
-output decoder {{
-
-    std::string inst2string(MachInst machInst)
-    {
-        std::string str = "";
-        uint32_t mask = 0x80000000;
-
-        for(int i=0; i < 32; i++) {
-            if ((machInst & mask) == 0) {
-                str += "0";
-            } else {
-                str += "1";
-            }
-
-            mask = mask >> 1;
-        }
-
-        return str;
-    }
-}};
-
-
-- 
cgit v1.2.3