diff --git a/util/m5/src/call_type/addr.cc b/util/m5/src/call_type/addr.cc index 9a5fee3f2d..5a70afebaa 100644 --- a/util/m5/src/call_type/addr.cc +++ b/util/m5/src/call_type/addr.cc @@ -29,26 +29,13 @@ #include "args.hh" #include "call_type.hh" -#include "dispatch_table.hh" +#include "call_type/addr_dt.hh" #include "m5_mmap.h" #include "usage.hh" -extern "C" -{ -#define M5OP(name, func) __typeof__(name) M5OP_MERGE_TOKENS(name, _addr); -M5OP_FOREACH -#undef M5OP -} - namespace { -DispatchTable addr_dispatch = { -#define M5OP(name, func) .name = &::M5OP_MERGE_TOKENS(name, _addr), -M5OP_FOREACH -#undef M5OP -}; - #if defined(M5OP_ADDR) const bool DefaultAddrDefined = true; constexpr uint64_t DefaultAddress = M5OP_ADDR; diff --git a/util/m5/src/call_type/addr_dt.hh b/util/m5/src/call_type/addr_dt.hh new file mode 100644 index 0000000000..50e2483f29 --- /dev/null +++ b/util/m5/src/call_type/addr_dt.hh @@ -0,0 +1,51 @@ +/* + * Copyright 2020 Google Inc. + * + * 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. + */ + +#ifndef __CALL_TYPE_ADDR_DT_HH__ +#define __CALL_TYPE_ADDR_DT_HH__ + +#include "dispatch_table.hh" + +extern "C" +{ +#define M5OP(name, func) __typeof__(::name) M5OP_MERGE_TOKENS(name, _addr); +M5OP_FOREACH +#undef M5OP +} + +namespace +{ + +DispatchTable addr_dispatch = { +#define M5OP(name, func) .name = &::M5OP_MERGE_TOKENS(name, _addr), +M5OP_FOREACH +#undef M5OP +}; + +} // anonymous namespace + +#endif // __CALL_TYPE_ADDR_DT_HH__ diff --git a/util/m5/src/call_type/inst.cc b/util/m5/src/call_type/inst.cc index 97153f4fa5..22c98b9c52 100644 --- a/util/m5/src/call_type/inst.cc +++ b/util/m5/src/call_type/inst.cc @@ -29,17 +29,11 @@ #include "args.hh" #include "call_type.hh" -#include "dispatch_table.hh" +#include "call_type/inst_dt.hh" namespace { -DispatchTable inst_dispatch = { -#define M5OP(name, func) .name = &::name, -M5OP_FOREACH -#undef M5OP -}; - class InstCallType : public CallType { public: diff --git a/util/m5/src/call_type/inst_dt.hh b/util/m5/src/call_type/inst_dt.hh new file mode 100644 index 0000000000..aa1288eea6 --- /dev/null +++ b/util/m5/src/call_type/inst_dt.hh @@ -0,0 +1,44 @@ +/* + * Copyright 2020 Google Inc. + * + * 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. + */ + +#ifndef __CALL_TYPE_INST_DT_HH__ +#define __CALL_TYPE_INST_DT_HH__ + +#include "dispatch_table.hh" + +namespace +{ + +DispatchTable inst_dispatch = { +#define M5OP(name, func) .name = &::name, +M5OP_FOREACH +#undef M5OP +}; + +} // anonymous namespace + +#endif // __CALL_TYPE_INST_DT_HH__ diff --git a/util/m5/src/call_type/semi.cc b/util/m5/src/call_type/semi.cc index 40a8e8d837..d820b2d34e 100644 --- a/util/m5/src/call_type/semi.cc +++ b/util/m5/src/call_type/semi.cc @@ -29,24 +29,11 @@ #include "args.hh" #include "call_type.hh" -#include "dispatch_table.hh" - -extern "C" -{ -#define M5OP(name, func) __typeof__(name) M5OP_MERGE_TOKENS(name, _semi); -M5OP_FOREACH -#undef M5OP -} +#include "call_type/semi_dt.hh" namespace { -DispatchTable semi_dispatch = { -#define M5OP(name, func) .name = &::M5OP_MERGE_TOKENS(name, _semi), -M5OP_FOREACH -#undef M5OP -}; - class SemiCallType : public CallType { public: diff --git a/util/m5/src/call_type/semi_dt.hh b/util/m5/src/call_type/semi_dt.hh new file mode 100644 index 0000000000..4387b59b51 --- /dev/null +++ b/util/m5/src/call_type/semi_dt.hh @@ -0,0 +1,51 @@ +/* + * Copyright 2020 Google Inc. + * + * 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. + */ + +#ifndef __CALL_TYPE_SEMI_DT_HH__ +#define __CALL_TYPE_SEMI_DT_HH__ + +#include "dispatch_table.hh" + +extern "C" +{ +#define M5OP(name, func) __typeof__(::name) M5OP_MERGE_TOKENS(name, _semi); +M5OP_FOREACH +#undef M5OP +} + +namespace +{ + +static DispatchTable semi_dispatch = { +#define M5OP(name, func) .name = &::M5OP_MERGE_TOKENS(name, _semi), +M5OP_FOREACH +#undef M5OP +}; + +} // anonymous namespace + +#endif // __CALL_TYPE_SEMI_DT_HH__ diff --git a/util/m5/src/dispatch_table.hh b/util/m5/src/dispatch_table.hh index fdac0540d5..7f984db4b5 100644 --- a/util/m5/src/dispatch_table.hh +++ b/util/m5/src/dispatch_table.hh @@ -25,8 +25,8 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __DISPATCH_TABLE_HH__ -#define __DISPATCH_TABLE_HH__ +#ifndef __DISPATCH_TABLE_H__ +#define __DISPATCH_TABLE_H__ #include #include @@ -44,4 +44,4 @@ M5OP_FOREACH #undef M5OP }; -#endif // __DISPATCH_TABLE_HH__ +#endif // __DISPATCH_TABLE_H__