ISA: Back-out NoopMachInst as a StaticInstPtr change.

3 files changed, 2 insertions, 42 deletions

diff --git a/src/arch/power/SConscript b/src/arch/power/SConscript
index 123c70693..a9d20b4bd 100644
--- a/src/arch/power/SConscript
+++ b/src/arch/power/SConscript
@@ -42,7 +42,6 @@ if env['TARGET_ISA'] == 'power':
     Source('insts/condition.cc')
     Source('insts/static_inst.cc')
     Source('interrupts.cc')
-    Source('isa_traits.cc')
     Source('linux/linux.cc')
     Source('linux/process.cc')
     Source('pagetable.cc')
diff --git a/src/arch/power/isa_traits.cc b/src/arch/power/isa_traits.cc
deleted file mode 100644
index de7792277..000000000
--- a/src/arch/power/isa_traits.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2012 Google
- * 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: Gabe Black
- */
-
-#include "arch/power/generated/decoder.hh"
-#include "arch/power/isa_traits.hh"
-
-namespace PowerISA
-{
-
-// This is ori 0, 0, 0
-const StaticInstPtr NoopStaticInst = new PowerISAInst::Or(0x60000000);
-
-}
diff --git a/src/arch/power/isa_traits.hh b/src/arch/power/isa_traits.hh
index d0279618f..3db4ab5aa 100644
--- a/src/arch/power/isa_traits.hh
+++ b/src/arch/power/isa_traits.hh
@@ -66,7 +66,8 @@ const int VMPageSize = (1 << LogVMPageSize);
 
 const int MachineBytes = 4;
 
-const extern StaticInstPtr NoopStaticInst;
+// This is ori 0, 0, 0
+const ExtMachInst NoopMachInst = 0x60000000;
 
 // Memory accesses can be unaligned
 const bool HasUnalignedMemAcc = true;