From 008b17d8161ef1d880347bfbbe49336a1446e56e Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Mon, 4 Jun 2012 10:57:23 -0700 Subject: [PATCH] ISA: Turn the ExtMachInst NoopMachinst into the StaticInstPtr NoopStaticInst. This eliminates a use of the ExtMachInst type outside of the ISAs. --- src/arch/alpha/SConscript | 1 + src/arch/alpha/isa_traits.cc | 41 ++++++++++++++++++++++++++++++++++++ src/arch/alpha/isa_traits.hh | 3 +-- src/arch/mips/SConscript | 1 + src/arch/mips/isa_traits.cc | 39 ++++++++++++++++++++++++++++++++++ src/arch/mips/isa_traits.hh | 2 +- src/arch/power/SConscript | 1 + src/arch/power/isa_traits.cc | 40 +++++++++++++++++++++++++++++++++++ src/arch/power/isa_traits.hh | 3 +-- src/arch/sparc/SConscript | 1 + src/arch/sparc/isa_traits.cc | 40 +++++++++++++++++++++++++++++++++++ src/arch/sparc/isa_traits.hh | 2 +- src/arch/x86/SConscript | 1 + src/arch/x86/isa_traits.cc | 39 ++++++++++++++++++++++++++++++++++ src/arch/x86/isa_traits.hh | 13 ++---------- src/arch/x86/x86_traits.hh | 13 ++++++++++++ src/cpu/o3/fetch_impl.hh | 3 +-- 17 files changed, 224 insertions(+), 19 deletions(-) create mode 100644 src/arch/alpha/isa_traits.cc create mode 100644 src/arch/mips/isa_traits.cc create mode 100644 src/arch/power/isa_traits.cc create mode 100644 src/arch/sparc/isa_traits.cc create mode 100644 src/arch/x86/isa_traits.cc diff --git a/src/arch/alpha/SConscript b/src/arch/alpha/SConscript index 421040bb5..aa7ac63c1 100644 --- a/src/arch/alpha/SConscript +++ b/src/arch/alpha/SConscript @@ -40,6 +40,7 @@ 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 new file mode 100644 index 000000000..769c6ceee --- /dev/null +++ b/src/arch/alpha/isa_traits.cc @@ -0,0 +1,41 @@ +/* + * 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 5738ccdb1..eff219a60 100644 --- a/src/arch/alpha/isa_traits.hh +++ b/src/arch/alpha/isa_traits.hh @@ -123,8 +123,7 @@ enum { }; // return a no-op instruction... used for instruction fetch faults -// Alpha UNOP (ldq_u r31,0(r0)) -const ExtMachInst NoopMachInst = 0x2ffe0000; +const extern StaticInstPtr NoopStaticInst; // Memory accesses cannot be unaligned const bool HasUnalignedMemAcc = false; diff --git a/src/arch/mips/SConscript b/src/arch/mips/SConscript index 15b4ffc51..ee6fb03f0 100644 --- a/src/arch/mips/SConscript +++ b/src/arch/mips/SConscript @@ -40,6 +40,7 @@ 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 new file mode 100644 index 000000000..7cdb6f082 --- /dev/null +++ b/src/arch/mips/isa_traits.cc @@ -0,0 +1,39 @@ +/* + * 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 f2a748da9..5884a969b 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 ExtMachInst NoopMachInst = 0x00000000; +const extern StaticInstPtr NoopStaticInst; const int LogVMPageSize = 13; // 8K bytes const int VMPageSize = (1 << LogVMPageSize); diff --git a/src/arch/power/SConscript b/src/arch/power/SConscript index a9d20b4bd..123c70693 100644 --- a/src/arch/power/SConscript +++ b/src/arch/power/SConscript @@ -42,6 +42,7 @@ 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 new file mode 100644 index 000000000..de7792277 --- /dev/null +++ b/src/arch/power/isa_traits.cc @@ -0,0 +1,40 @@ +/* + * 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 3db4ab5aa..d0279618f 100644 --- a/src/arch/power/isa_traits.hh +++ b/src/arch/power/isa_traits.hh @@ -66,8 +66,7 @@ const int VMPageSize = (1 << LogVMPageSize); const int MachineBytes = 4; -// This is ori 0, 0, 0 -const ExtMachInst NoopMachInst = 0x60000000; +const extern StaticInstPtr NoopStaticInst; // Memory accesses can be unaligned const bool HasUnalignedMemAcc = true; diff --git a/src/arch/sparc/SConscript b/src/arch/sparc/SConscript index 5e2146750..f48b6dd39 100644 --- a/src/arch/sparc/SConscript +++ b/src/arch/sparc/SConscript @@ -37,6 +37,7 @@ 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 new file mode 100644 index 000000000..eee188692 --- /dev/null +++ b/src/arch/sparc/isa_traits.cc @@ -0,0 +1,40 @@ +/* + * 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 9b02a4d80..4da49758c 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) -const MachInst NoopMachInst = 0x01000000; +extern const StaticInstPtr NoopStaticInst; // 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 92b30ced1..eb87afd94 100644 --- a/src/arch/x86/SConscript +++ b/src/arch/x86/SConscript @@ -57,6 +57,7 @@ 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 new file mode 100644 index 000000000..e2c803f1f --- /dev/null +++ b/src/arch/x86/isa_traits.cc @@ -0,0 +1,39 @@ +/* + * 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 383e56eee..338ea4f4d 100644 --- a/src/arch/x86/isa_traits.hh +++ b/src/arch/x86/isa_traits.hh @@ -43,6 +43,7 @@ #include "arch/x86/types.hh" #include "arch/x86/x86_traits.hh" #include "base/types.hh" +#include "cpu/static_inst_fwd.hh" namespace LittleEndianGuest {} @@ -71,17 +72,7 @@ namespace X86ISA // Memory accesses can be unaligned const bool HasUnalignedMemAcc = true; - 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). - }; + extern const StaticInstPtr NoopStaticInst; } #endif // __ARCH_X86_ISATRAITS_HH__ diff --git a/src/arch/x86/x86_traits.hh b/src/arch/x86/x86_traits.hh index 6157cb30b..a94d806ef 100644 --- a/src/arch/x86/x86_traits.hh +++ b/src/arch/x86/x86_traits.hh @@ -40,6 +40,7 @@ #include +#include "arch/x86/types.hh" #include "base/types.hh" namespace X86ISA @@ -104,6 +105,18 @@ 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 b6eb25c08..40fe5ae01 100644 --- a/src/cpu/o3/fetch_impl.hh +++ b/src/cpu/o3/fetch_impl.hh @@ -661,8 +661,7 @@ DefaultFetch::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, - decoder[tid]->decode(TheISA::NoopMachInst, fetchPC.instAddr()), + DynInstPtr instruction = buildInst(tid, TheISA::NoopStaticInst, NULL, fetchPC, fetchPC, false); instruction->setPredTarg(fetchPC); -- 2.30.2