From 8e0b1d337876ae25ac01b01fb1b1e6f3ede6f90d Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Sat, 4 Apr 2020 06:53:00 -0700 Subject: [PATCH] util: Move the call type implementations into their own subdir. Change-Id: Ie94c2ef4783b6b5700beb0f0bbeb765ce9b03934 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/27551 Tested-by: kokoro Maintainer: Gabe Black Reviewed-by: Daniel Carvalho --- util/m5/src/SConscript | 4 +++- util/m5/src/{addr_call_type.cc => call_type/addr.cc} | 3 +-- util/m5/src/{inst_call_type.cc => call_type/inst.cc} | 0 util/m5/src/{semi_call_type.cc => call_type/semi.cc} | 0 4 files changed, 4 insertions(+), 3 deletions(-) rename util/m5/src/{addr_call_type.cc => call_type/addr.cc} (99%) rename util/m5/src/{inst_call_type.cc => call_type/inst.cc} (100%) rename util/m5/src/{semi_call_type.cc => call_type/semi.cc} (100%) diff --git a/util/m5/src/SConscript b/util/m5/src/SConscript index 176f4c262..ee725fd99 100644 --- a/util/m5/src/SConscript +++ b/util/m5/src/SConscript @@ -27,6 +27,8 @@ import os Import('*') +env.Append(CPPPATH=Dir('.')) + # Raw source files. args = 'args.cc' call_type = 'call_type.cc' @@ -65,7 +67,7 @@ for ct in call_types: ct_env = static_env.Clone() is_default = 'true' if ct.default else 'false' ct_env.Append(CXXFLAGS=[ '-DCALL_TYPE_IS_DEFAULT=%s' % is_default ]) - ct_support.extend(ct_env.StaticObject('%s_call_type.cc' % ct.name)) + ct_support.extend(ct_env.StaticObject('call_type/%s.cc' % ct.name)) m5_bin = static_env.Program('out/m5', ct_support + [ args, call_type, commands, m5, m5_mmap, libm5, usage ]) diff --git a/util/m5/src/addr_call_type.cc b/util/m5/src/call_type/addr.cc similarity index 99% rename from util/m5/src/addr_call_type.cc rename to util/m5/src/call_type/addr.cc index 963bb2e30..752d83125 100644 --- a/util/m5/src/addr_call_type.cc +++ b/util/m5/src/call_type/addr.cc @@ -27,9 +27,8 @@ #include -#include "m5_mmap.h" - #include "call_type.hh" +#include "m5_mmap.h" #include "usage.hh" extern "C" diff --git a/util/m5/src/inst_call_type.cc b/util/m5/src/call_type/inst.cc similarity index 100% rename from util/m5/src/inst_call_type.cc rename to util/m5/src/call_type/inst.cc diff --git a/util/m5/src/semi_call_type.cc b/util/m5/src/call_type/semi.cc similarity index 100% rename from util/m5/src/semi_call_type.cc rename to util/m5/src/call_type/semi.cc -- 2.30.2