changeset f5ee56466b91 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=f5ee56466b91
description:
ISA: Back-out NoopMachInst as a StaticInstPtr change.
diffstat:
src/arch/alpha/SConscript | 1 -
src/arch/alpha/isa_traits.cc | 41 --------------------------------------
src/arch/alpha/isa_traits.hh | 3 +-
src/arch/arm/SConscript | 1 -
src/arch/arm/isa_traits.cc | 47 --------------------------------------------
src/arch/arm/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 +-
20 files changed, 21 insertions(+), 273 deletions(-)
diffs (truncated from 472 to 300 lines):
diff -r 0e38b529c387 -r f5ee56466b91 src/arch/alpha/SConscript
--- a/src/arch/alpha/SConscript Tue Jun 05 10:36:59 2012 -0400
+++ b/src/arch/alpha/SConscript Tue Jun 05 13:52:30 2012 -0400
@@ -40,7 +40,6 @@
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 0e38b529c387 -r f5ee56466b91 src/arch/alpha/isa_traits.cc
--- a/src/arch/alpha/isa_traits.cc Tue Jun 05 10:36:59 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 0e38b529c387 -r f5ee56466b91 src/arch/alpha/isa_traits.hh
--- a/src/arch/alpha/isa_traits.hh Tue Jun 05 10:36:59 2012 -0400
+++ b/src/arch/alpha/isa_traits.hh Tue Jun 05 13:52:30 2012 -0400
@@ -123,7 +123,8 @@
};
// 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 -r 0e38b529c387 -r f5ee56466b91 src/arch/arm/SConscript
--- a/src/arch/arm/SConscript Tue Jun 05 10:36:59 2012 -0400
+++ b/src/arch/arm/SConscript Tue Jun 05 13:52:30 2012 -0400
@@ -57,7 +57,6 @@
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 -r 0e38b529c387 -r f5ee56466b91 src/arch/arm/isa_traits.cc
--- a/src/arch/arm/isa_traits.cc Tue Jun 05 10:36:59 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 0e38b529c387 -r f5ee56466b91 src/arch/arm/isa_traits.hh
--- a/src/arch/arm/isa_traits.hh Tue Jun 05 10:36:59 2012 -0400
+++ b/src/arch/arm/isa_traits.hh Tue Jun 05 13:52:30 2012 -0400
@@ -95,7 +95,8 @@
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 -r 0e38b529c387 -r f5ee56466b91 src/arch/mips/SConscript
--- a/src/arch/mips/SConscript Tue Jun 05 10:36:59 2012 -0400
+++ b/src/arch/mips/SConscript Tue Jun 05 13:52:30 2012 -0400
@@ -40,7 +40,6 @@
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 0e38b529c387 -r f5ee56466b91 src/arch/mips/isa_traits.cc
--- a/src/arch/mips/isa_traits.cc Tue Jun 05 10:36:59 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 0e38b529c387 -r f5ee56466b91 src/arch/mips/isa_traits.hh
--- a/src/arch/mips/isa_traits.hh Tue Jun 05 10:36:59 2012 -0400
+++ b/src/arch/mips/isa_traits.hh Tue Jun 05 13:52:30 2012 -0400
@@ -143,7 +143,7 @@
};
// 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 -r 0e38b529c387 -r f5ee56466b91 src/arch/power/SConscript
--- a/src/arch/power/SConscript Tue Jun 05 10:36:59 2012 -0400
+++ b/src/arch/power/SConscript Tue Jun 05 13:52:30 2012 -0400
@@ -42,7 +42,6 @@
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 0e38b529c387 -r f5ee56466b91 src/arch/power/isa_traits.cc
--- a/src/arch/power/isa_traits.cc Tue Jun 05 10:36:59 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 0e38b529c387 -r f5ee56466b91 src/arch/power/isa_traits.hh
--- a/src/arch/power/isa_traits.hh Tue Jun 05 10:36:59 2012 -0400
+++ b/src/arch/power/isa_traits.hh Tue Jun 05 13:52:30 2012 -0400
@@ -66,7 +66,8 @@
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 -r 0e38b529c387 -r f5ee56466b91 src/arch/sparc/SConscript
--- a/src/arch/sparc/SConscript Tue Jun 05 10:36:59 2012 -0400
+++ b/src/arch/sparc/SConscript Tue Jun 05 13:52:30 2012 -0400
@@ -37,7 +37,6 @@
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 0e38b529c387 -r f5ee56466b91 src/arch/sparc/isa_traits.cc
--- a/src/arch/sparc/isa_traits.cc Tue Jun 05 10:36:59 2012 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
