util: Break out the dispatch tables in the m5 util call types.

These dispatch tables will be useful in the java and lua wrappers as
well, since those should also support the alternative call methods.

Change-Id: Ib3be510c99b04960eb2efbc732aebe3165882bee
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/28178
Reviewed-by: Gabe Black <gabe.black@gmail.com>
Reviewed-by: Anthony Gutierrez <anthony.gutierrez@amd.com>
Maintainer: Gabe Black <gabe.black@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>

diff --git a/util/m5/src/call_type/addr.cc b/util/m5/src/call_type/addr.cc
index 9a5fee3f2d241c9b4a355dd33de84883fe61e990..5a70afebaa4a883f23248f9f6c347d5053ef5eea 100644 (file)
--- 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 (file)
index 0000000..50e2483
--- /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 97153f4fa50adc3a09268da18dc8d8431ad9308a..22c98b9c523b4e8ebe07257f0f0386c70339d7ac 100644 (file)
--- 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 (file)
index 0000000..aa1288e
--- /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 40a8e8d837cfe5f9cfdf98f5fe2b09382e3e822c..d820b2d34e799719862beab89251691b96f19cc3 100644 (file)
--- 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 (file)
index 0000000..4387b59
--- /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 fdac0540d58bd370f7596cb8a08c96cc19ef5155..7f984db4b51859b9f5a3837c65a7ff7d60cebaa9 100644 (file)
--- 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 <gem5/asm/generic/m5ops.h>
 #include <gem5/m5ops.h>
@@ -44,4 +44,4 @@ M5OP_FOREACH
 #undef M5OP
 };
 
-#endif // __DISPATCH_TABLE_HH__
+#endif // __DISPATCH_TABLE_H__