From 8fee59a9afe2b082b323b0f8f2a4dd87ce7ad484 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Wed, 3 Mar 2021 23:13:54 -0800 Subject: [PATCH] cpu: Delete the cpu/o3/isa_specific.hh header. This header has no contents and serves no purpose. Change-Id: I574a4bb248f09ab94c38eebe18a9285dae6604db Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/42221 Tested-by: kokoro Reviewed-by: Nathanael Premillieu Maintainer: Gabe Black --- src/cpu/o3/cpu.cc | 1 - src/cpu/o3/dyn_inst.hh | 1 - src/cpu/o3/fetch.cc | 2 +- src/cpu/o3/isa_specific.hh | 30 ------------------------------ src/cpu/o3/thread_context.hh | 2 +- 5 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 src/cpu/o3/isa_specific.hh diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc index 1bd7baaa5d..cfee8cd793 100644 --- a/src/cpu/o3/cpu.cc +++ b/src/cpu/o3/cpu.cc @@ -46,7 +46,6 @@ #include "cpu/activity.hh" #include "cpu/checker/cpu.hh" #include "cpu/checker/thread_context.hh" -#include "cpu/o3/isa_specific.hh" #include "cpu/o3/limits.hh" #include "cpu/o3/thread_context.hh" #include "cpu/simple_thread.hh" diff --git a/src/cpu/o3/dyn_inst.hh b/src/cpu/o3/dyn_inst.hh index cbcadf385c..24665a553e 100644 --- a/src/cpu/o3/dyn_inst.hh +++ b/src/cpu/o3/dyn_inst.hh @@ -58,7 +58,6 @@ #include "cpu/inst_seq.hh" #include "cpu/o3/cpu.hh" #include "cpu/o3/dyn_inst_ptr.hh" -#include "cpu/o3/isa_specific.hh" #include "cpu/o3/lsq_unit.hh" #include "cpu/op_class.hh" #include "cpu/reg_class.hh" diff --git a/src/cpu/o3/fetch.cc b/src/cpu/o3/fetch.cc index aa705a6135..571e98d10c 100644 --- a/src/cpu/o3/fetch.cc +++ b/src/cpu/o3/fetch.cc @@ -55,7 +55,7 @@ #include "cpu/exetrace.hh" #include "cpu/nop_static_inst.hh" #include "cpu/o3/cpu.hh" -#include "cpu/o3/isa_specific.hh" +#include "cpu/o3/dyn_inst.hh" #include "cpu/o3/limits.hh" #include "debug/Activity.hh" #include "debug/Drain.hh" diff --git a/src/cpu/o3/isa_specific.hh b/src/cpu/o3/isa_specific.hh deleted file mode 100644 index a5b571018d..0000000000 --- a/src/cpu/o3/isa_specific.hh +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2006 The Regents of The University of Michigan - * 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. - */ - -#include "cpu/base.hh" -#include "cpu/o3/dyn_inst.hh" diff --git a/src/cpu/o3/thread_context.hh b/src/cpu/o3/thread_context.hh index 48d7f52669..e946b88d11 100644 --- a/src/cpu/o3/thread_context.hh +++ b/src/cpu/o3/thread_context.hh @@ -43,7 +43,7 @@ #define __CPU_O3_THREAD_CONTEXT_HH__ #include "config/the_isa.hh" -#include "cpu/o3/isa_specific.hh" +#include "cpu/o3/cpu.hh" #include "cpu/thread_context.hh" namespace o3