changeset cdfe09f9bdee in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=cdfe09f9bdee
description:
ISA: Turn the ExtMachInst NoopMachinst into the StaticInstPtr
NoopStaticInst.
This eliminates a use of the ExtMachInst type outside of the ISAs.
diffstat:
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(-)
diffs (truncated from 397 to 300 lines):
diff -r 9a22621c741c -r cdfe09f9bdee src/arch/alpha/SConscript
--- a/src/arch/alpha/SConscript Mon Jun 04 10:43:11 2012 -0700
+++ b/src/arch/alpha/SConscript Mon Jun 04 10:57:23 2012 -0700
@@ -40,6 +40,7 @@
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 -r 9a22621c741c -r cdfe09f9bdee src/arch/alpha/isa_traits.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/arch/alpha/isa_traits.cc Mon Jun 04 10:57:23 2012 -0700
@@ -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 -r 9a22621c741c -r cdfe09f9bdee src/arch/alpha/isa_traits.hh
--- a/src/arch/alpha/isa_traits.hh Mon Jun 04 10:43:11 2012 -0700
+++ b/src/arch/alpha/isa_traits.hh Mon Jun 04 10:57:23 2012 -0700
@@ -123,8 +123,7 @@
};
// 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 -r 9a22621c741c -r cdfe09f9bdee src/arch/mips/SConscript
--- a/src/arch/mips/SConscript Mon Jun 04 10:43:11 2012 -0700
+++ b/src/arch/mips/SConscript Mon Jun 04 10:57:23 2012 -0700
@@ -40,6 +40,7 @@
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 -r 9a22621c741c -r cdfe09f9bdee src/arch/mips/isa_traits.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/arch/mips/isa_traits.cc Mon Jun 04 10:57:23 2012 -0700
@@ -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 -r 9a22621c741c -r cdfe09f9bdee src/arch/mips/isa_traits.hh
--- a/src/arch/mips/isa_traits.hh Mon Jun 04 10:43:11 2012 -0700
+++ b/src/arch/mips/isa_traits.hh Mon Jun 04 10:57:23 2012 -0700
@@ -143,7 +143,7 @@
};
// 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 -r 9a22621c741c -r cdfe09f9bdee src/arch/power/SConscript
--- a/src/arch/power/SConscript Mon Jun 04 10:43:11 2012 -0700
+++ b/src/arch/power/SConscript Mon Jun 04 10:57:23 2012 -0700
@@ -42,6 +42,7 @@
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 -r 9a22621c741c -r cdfe09f9bdee src/arch/power/isa_traits.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/arch/power/isa_traits.cc Mon Jun 04 10:57:23 2012 -0700
@@ -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 -r 9a22621c741c -r cdfe09f9bdee src/arch/power/isa_traits.hh
--- a/src/arch/power/isa_traits.hh Mon Jun 04 10:43:11 2012 -0700
+++ b/src/arch/power/isa_traits.hh Mon Jun 04 10:57:23 2012 -0700
@@ -66,8 +66,7 @@
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 -r 9a22621c741c -r cdfe09f9bdee src/arch/sparc/SConscript
--- a/src/arch/sparc/SConscript Mon Jun 04 10:43:11 2012 -0700
+++ b/src/arch/sparc/SConscript Mon Jun 04 10:57:23 2012 -0700
@@ -37,6 +37,7 @@
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 -r 9a22621c741c -r cdfe09f9bdee src/arch/sparc/isa_traits.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/arch/sparc/isa_traits.cc Mon Jun 04 10:57:23 2012 -0700
@@ -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 -r 9a22621c741c -r cdfe09f9bdee src/arch/sparc/isa_traits.hh
--- a/src/arch/sparc/isa_traits.hh Mon Jun 04 10:43:11 2012 -0700
+++ b/src/arch/sparc/isa_traits.hh Mon Jun 04 10:57:23 2012 -0700
@@ -50,7 +50,7 @@
#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 -r 9a22621c741c -r cdfe09f9bdee src/arch/x86/SConscript
--- a/src/arch/x86/SConscript Mon Jun 04 10:43:11 2012 -0700
+++ b/src/arch/x86/SConscript Mon Jun 04 10:57:23 2012 -0700
@@ -57,6 +57,7 @@
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 -r 9a22621c741c -r cdfe09f9bdee src/arch/x86/isa_traits.cc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/arch/x86/isa_traits.cc Mon Jun 04 10:57:23 2012 -0700
@@ -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.
+ *
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
