summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/arch/alpha/SConscript1
-rw-r--r--src/arch/alpha/isa_traits.cc41
-rw-r--r--src/arch/alpha/isa_traits.hh3
-rw-r--r--src/arch/arm/SConscript1
-rw-r--r--src/arch/arm/isa_traits.cc47
-rw-r--r--src/arch/arm/isa_traits.hh3
-rw-r--r--src/arch/mips/SConscript1
-rw-r--r--src/arch/mips/isa_traits.cc39
-rw-r--r--src/arch/mips/isa_traits.hh2
-rw-r--r--src/arch/power/SConscript1
-rw-r--r--src/arch/power/isa_traits.cc40
-rw-r--r--src/arch/power/isa_traits.hh3
-rw-r--r--src/arch/sparc/SConscript1
-rw-r--r--src/arch/sparc/isa_traits.cc40
-rw-r--r--src/arch/sparc/isa_traits.hh2
-rw-r--r--src/arch/x86/SConscript1
-rw-r--r--src/arch/x86/isa_traits.cc39
-rw-r--r--src/arch/x86/isa_traits.hh13
-rw-r--r--src/arch/x86/x86_traits.hh13
-rw-r--r--src/cpu/o3/fetch_impl.hh3
20 files changed, 21 insertions, 273 deletions
diff --git a/src/arch/alpha/SConscript b/src/arch/alpha/SConscript
index aa7ac63c1..421040bb5 100644
--- a/src/arch/alpha/SConscript
+++ b/src/arch/alpha/SConscript
@@ -40,7 +40,6 @@ if env['TARGET_ISA'] == 'alpha':
Source('interrupts.cc')
Source('ipr.cc')
Source('isa.cc')
- Source('isa_traits.cc')
Source('kernel_stats.cc')
Source('linux/linux.cc')
Source('linux/process.cc')
diff --git a/src/arch/alpha/isa_traits.cc b/src/arch/alpha/isa_traits.cc
deleted file mode 100644
index 769c6ceee..000000000
--- a/src/arch/alpha/isa_traits.cc
+++ /dev/null
@@ -1,41 +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/alpha/generated/decoder.hh"
-#include "arch/alpha/isa_traits.hh"
-
-namespace AlphaISA
-{
-
-// Alpha UNOP (ldq_u r31,0(r0))
-const StaticInstPtr NoopStaticInst =
- AlphaISAInst::makeNop(new AlphaISAInst::Ldq_u(0x2ffe0000));
-
-}
diff --git a/src/arch/alpha/isa_traits.hh b/src/arch/alpha/isa_traits.hh
index eff219a60..5738ccdb1 100644
--- a/src/arch/alpha/isa_traits.hh
+++ b/src/arch/alpha/isa_traits.hh
@@ -123,7 +123,8 @@ enum {
};
// return a no-op instruction... used for instruction fetch faults
-const extern StaticInstPtr NoopStaticInst;
+// Alpha UNOP (ldq_u r31,0(r0))
+const ExtMachInst NoopMachInst = 0x2ffe0000;
// Memory accesses cannot be unaligned
const bool HasUnalignedMemAcc = false;
diff --git a/src/arch/arm/SConscript b/src/arch/arm/SConscript
index 08a3c7048..44b6286a0 100644
--- a/src/arch/arm/SConscript
+++ b/src/arch/arm/SConscript
@@ -57,7 +57,6 @@ if env['TARGET_ISA'] == 'arm':
Source('insts/vfp.cc')
Source('interrupts.cc')
Source('isa.cc')
- Source('isa_traits.cc')
Source('linux/linux.cc')
Source('linux/process.cc')
Source('linux/system.cc')
diff --git a/src/arch/arm/isa_traits.cc b/src/arch/arm/isa_traits.cc
deleted file mode 100644
index 7a663751c..000000000
--- a/src/arch/arm/isa_traits.cc
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2012 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
- * 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: Ali Saidi
- */
-#include "arch/arm/generated/decoder.hh"
-#include "arch/arm/isa_traits.hh"
-
-namespace ArmISA
-{
-// no-op that is predicated true
-const StaticInstPtr NoopStaticInst = new ArmISAInst::NopInst(0x01E320F000ULL);
-}
-
diff --git a/src/arch/arm/isa_traits.hh b/src/arch/arm/isa_traits.hh
index 067111b59..43b3674d4 100644
--- a/src/arch/arm/isa_traits.hh
+++ b/src/arch/arm/isa_traits.hh
@@ -95,7 +95,8 @@ namespace ArmISA
const Addr PAddrImplMask = (ULL(1) << PABits) - 1;
- const extern StaticInstPtr NoopStaticInst;
+ // return a no-op instruction... used for instruction fetch faults
+ const ExtMachInst NoopMachInst = 0x01E320F000ULL;
const int LogVMPageSize = 12; // 4K bytes
const int VMPageSize = (1 << LogVMPageSize);
diff --git a/src/arch/mips/SConscript b/src/arch/mips/SConscript
index ee6fb03f0..15b4ffc51 100644
--- a/src/arch/mips/SConscript
+++ b/src/arch/mips/SConscript
@@ -40,7 +40,6 @@ if env['TARGET_ISA'] == 'mips':
Source('idle_event.cc')
Source('interrupts.cc')
Source('isa.cc')
- Source('isa_traits.cc')
Source('linux/linux.cc')
Source('linux/process.cc')
Source('linux/system.cc')
diff --git a/src/arch/mips/isa_traits.cc b/src/arch/mips/isa_traits.cc
deleted file mode 100644
index 7cdb6f082..000000000
--- a/src/arch/mips/isa_traits.cc
+++ /dev/null
@@ -1,39 +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/mips/generated/decoder.hh"
-#include "arch/mips/isa_traits.hh"
-
-namespace MipsISA
-{
-
-const StaticInstPtr NoopStaticInst = new MipsISAInst::Nop("", 0x00000000);
-
-}
diff --git a/src/arch/mips/isa_traits.hh b/src/arch/mips/isa_traits.hh
index 5884a969b..f2a748da9 100644
--- a/src/arch/mips/isa_traits.hh
+++ b/src/arch/mips/isa_traits.hh
@@ -143,7 +143,7 @@ enum mode_type
};
// return a no-op instruction... used for instruction fetch faults
-const extern StaticInstPtr NoopStaticInst;
+const ExtMachInst NoopMachInst = 0x00000000;
const int LogVMPageSize = 13; // 8K bytes
const int VMPageSize = (1 << LogVMPageSize);
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;
diff --git a/src/arch/sparc/SConscript b/src/arch/sparc/SConscript
index f48b6dd39..5e2146750 100644
--- a/src/arch/sparc/SConscript
+++ b/src/arch/sparc/SConscript
@@ -37,7 +37,6 @@ if env['TARGET_ISA'] == 'sparc':
Source('faults.cc')
Source('interrupts.cc')
Source('isa.cc')
- Source('isa_traits.cc')
Source('linux/linux.cc')
Source('linux/process.cc')
Source('linux/syscalls.cc')
diff --git a/src/arch/sparc/isa_traits.cc b/src/arch/sparc/isa_traits.cc
deleted file mode 100644
index eee188692..000000000
--- a/src/arch/sparc/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/sparc/generated/decoder.hh"
-#include "arch/sparc/isa_traits.hh"
-
-namespace SparcISA
-{
-
-const StaticInstPtr NoopStaticInst =
- new SparcISAInst::Nop("nop", 0x01000000, No_OpClass);
-
-}
diff --git a/src/arch/sparc/isa_traits.hh b/src/arch/sparc/isa_traits.hh
index 4da49758c..9b02a4d80 100644
--- a/src/arch/sparc/isa_traits.hh
+++ b/src/arch/sparc/isa_traits.hh
@@ -50,7 +50,7 @@ using namespace BigEndianGuest;
#define ISA_HAS_DELAY_SLOT 1
// SPARC NOP (sethi %(hi(0), g0)
-extern const StaticInstPtr NoopStaticInst;
+const MachInst NoopMachInst = 0x01000000;
// 8K. This value is implmentation specific; and should probably
// be somewhere else.
diff --git a/src/arch/x86/SConscript b/src/arch/x86/SConscript
index eb87afd94..92b30ced1 100644
--- a/src/arch/x86/SConscript
+++ b/src/arch/x86/SConscript
@@ -57,7 +57,6 @@ if env['TARGET_ISA'] == 'x86':
Source('insts/static_inst.cc')
Source('interrupts.cc')
Source('isa.cc')
- Source('isa_traits.cc')
Source('linux/linux.cc')
Source('linux/process.cc')
Source('linux/syscalls.cc')
diff --git a/src/arch/x86/isa_traits.cc b/src/arch/x86/isa_traits.cc
deleted file mode 100644
index e2c803f1f..000000000
--- a/src/arch/x86/isa_traits.cc
+++ /dev/null
@@ -1,39 +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/x86/generated/decoder.hh"
-#include "arch/x86/x86_traits.hh"
-
-namespace X86ISA
-{
-
-const StaticInstPtr NoopStaticInst = new X86ISAInst::NOP(NoopMachInst);
-
-}
diff --git a/src/arch/x86/isa_traits.hh b/src/arch/x86/isa_traits.hh
index 338ea4f4d..383e56eee 100644
--- a/src/arch/x86/isa_traits.hh
+++ b/src/arch/x86/isa_traits.hh
@@ -43,7 +43,6 @@
#include "arch/x86/types.hh"
#include "arch/x86/x86_traits.hh"
#include "base/types.hh"
-#include "cpu/static_inst_fwd.hh"
namespace LittleEndianGuest {}
@@ -72,7 +71,17 @@ namespace X86ISA
// Memory accesses can be unaligned
const bool HasUnalignedMemAcc = true;
- extern const StaticInstPtr NoopStaticInst;
+ const ExtMachInst NoopMachInst = {
+ 0x0, // No legacy prefixes.
+ 0x0, // No rex prefix.
+ { 1, 0x0, 0x0, 0x90 }, // One opcode byte, 0x90.
+ 0x0, 0x0, // No modrm or sib.
+ 0, 0, // No immediate or displacement.
+ 8, 8, 8, // All sizes are 8.
+ 0, // Displacement size is 0.
+ SixtyFourBitMode // Behave as if we're in 64 bit
+ // mode (this doesn't actually matter).
+ };
}
#endif // __ARCH_X86_ISATRAITS_HH__
diff --git a/src/arch/x86/x86_traits.hh b/src/arch/x86/x86_traits.hh
index a94d806ef..6157cb30b 100644
--- a/src/arch/x86/x86_traits.hh
+++ b/src/arch/x86/x86_traits.hh
@@ -40,7 +40,6 @@
#include <cassert>
-#include "arch/x86/types.hh"
#include "base/types.hh"
namespace X86ISA
@@ -105,18 +104,6 @@ namespace X86ISA
assert(addr < PhysAddrAPICRangeSize);
return PhysAddrPrefixInterrupts | (id * PhysAddrAPICRangeSize) | addr;
}
-
- const ExtMachInst NoopMachInst = {
- 0x0, // No legacy prefixes.
- 0x0, // No rex prefix.
- { 1, 0x0, 0x0, 0x90 }, // One opcode byte, 0x90.
- 0x0, 0x0, // No modrm or sib.
- 0, 0, // No immediate or displacement.
- 8, 8, 8, // All sizes are 8.
- 0, // Displacement size is 0.
- SixtyFourBitMode // Behave as if we're in 64 bit
- // mode (this doesn't actually matter).
- };
}
#endif //__ARCH_X86_X86TRAITS_HH__
diff --git a/src/cpu/o3/fetch_impl.hh b/src/cpu/o3/fetch_impl.hh
index 40fe5ae01..b6eb25c08 100644
--- a/src/cpu/o3/fetch_impl.hh
+++ b/src/cpu/o3/fetch_impl.hh
@@ -661,7 +661,8 @@ DefaultFetch<Impl>::finishTranslation(Fault fault, RequestPtr mem_req)
DPRINTF(Fetch, "[tid:%i]: Translation faulted, building noop.\n", tid);
// We will use a nop in ordier to carry the fault.
- DynInstPtr instruction = buildInst(tid, TheISA::NoopStaticInst,
+ DynInstPtr instruction = buildInst(tid,
+ decoder[tid]->decode(TheISA::NoopMachInst, fetchPC.instAddr()),
NULL, fetchPC, fetchPC, false);
instruction->setPredTarg(fetchPC);