Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/27238 )
Change subject: util: Use a dispatch table to call ops in the m5 utility.
......................................................................
util: Use a dispatch table to call ops in the m5 utility.
This way different implementations can be substituted in depending on
how the low level ops should actually be triggered (inst, addr,
semihosting, (etc?)).
Change-Id: I7c6eab7d87cc973d0bc9c1889037a0f89ce057e8
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/27238
Maintainer: Gabe Black <gabebl...@google.com>
Tested-by: kokoro <noreply+kok...@google.com>
Reviewed-by: Bobby R. Bruce <bbr...@ucdavis.edu>
---
A util/m5/src/dispatch_table.h
M util/m5/src/m5.c
2 files changed, 83 insertions(+), 28 deletions(-)
Approvals:
Bobby R. Bruce: Looks good to me, approved
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/util/m5/src/dispatch_table.h b/util/m5/src/dispatch_table.h
new file mode 100644
index 0000000..c9f1906
--- /dev/null
+++ b/util/m5/src/dispatch_table.h
@@ -0,0 +1,47 @@
+/*
+ * 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 __DISPATCH_TABLE_H__
+#define __DISPATCH_TABLE_H__
+
+#include <gem5/asm/generic/m5ops.h>
+#include <gem5/m5ops.h>
+
+/*
+ * This structure holds function pointers, one for each m5 operation,
which can
+ * be filled with different implementations. Conceptually they're like
virtual
+ * functions. They can then be passed to a consumer which knows which
function
+ * it wants, but not exactly how/where it's implemented.
+ */
+typedef struct DispatchTable
+{
+#define M5OP(name, func) __typeof__(&name) name;
+M5OP_FOREACH
+#undef M5OP
+} DispatchTable;
+
+#endif // __DISPATCH_TABLE_H__
diff --git a/util/m5/src/m5.c b/util/m5/src/m5.c
index 6e3efac..9fe8221 100644
--- a/util/m5/src/m5.c
+++ b/util/m5/src/m5.c
@@ -49,13 +49,21 @@
#include <sys/types.h>
#include <unistd.h>
+#include <gem5/asm/generic/m5ops.h>
#include <gem5/m5ops.h>
+#include "dispatch_table.h"
#include "m5_mmap.h"
char *progname;
char *command = "unspecified";
void usage();
+DispatchTable default_dispatch = {
+#define M5OP(name, func) .name = &name,
+M5OP_FOREACH
+#undef M5OP
+};
+
void
parse_int_args(int argc, char *argv[], uint64_t ints[], int len)
{
@@ -98,7 +106,7 @@
}
int
-read_file(int dest_fid)
+read_file(DispatchTable *dt, int dest_fid)
{
uint8_t buf[256*1024];
int offset = 0;
@@ -109,7 +117,7 @@
// Linux does demand paging.
memset(buf, 0, sizeof(buf));
- while ((len = m5_read_file(buf, sizeof(buf), offset)) > 0) {
+ while ((len = (*dt->m5_read_file)(buf, sizeof(buf), offset)) > 0) {
uint8_t *base = buf;
offset += len;
do {
@@ -132,7 +140,7 @@
}
void
-write_file(const char *filename, const char *host_filename)
+write_file(DispatchTable *dt, const char *filename, const char
*host_filename)
{
fprintf(stderr, "opening %s\n", filename);
int src_fid = open(filename, O_RDONLY);
@@ -150,7 +158,7 @@
memset(buf, 0, sizeof(buf));
while ((len = read(src_fid, buf, sizeof(buf))) > 0) {
- bytes += m5_write_file(buf, len, offset, host_filename);
+ bytes += (*dt->m5_write_file)(buf, len, offset, host_filename);
offset += len;
}
fprintf(stderr, "written %d bytes\n", bytes);
@@ -159,62 +167,62 @@
}
void
-do_exit(int argc, char *argv[])
+do_exit(DispatchTable *dt, int argc, char *argv[])
{
if (argc > 1)
usage();
uint64_t ints[1];
parse_int_args(argc, argv, ints, 1);
- m5_exit(ints[0]);
+ (*dt->m5_exit)(ints[0]);
}
void
-do_fail(int argc, char *argv[])
+do_fail(DispatchTable *dt, int argc, char *argv[])
{
if (argc < 1 || argc > 2)
usage();
uint64_t ints[2] = {0,0};
parse_int_args(argc, argv, ints, argc);
- m5_fail(ints[1], ints[0]);
+ (*dt->m5_fail)(ints[1], ints[0]);
}
void
-do_reset_stats(int argc, char *argv[])
+do_reset_stats(DispatchTable *dt, int argc, char *argv[])
{
uint64_t ints[2];
parse_int_args(argc, argv, ints, 2);
- m5_reset_stats(ints[0], ints[1]);
+ (*dt->m5_reset_stats)(ints[0], ints[1]);
}
void
-do_dump_stats(int argc, char *argv[])
+do_dump_stats(DispatchTable *dt, int argc, char *argv[])
{
uint64_t ints[2];
parse_int_args(argc, argv, ints, 2);
- m5_dump_stats(ints[0], ints[1]);
+ (*dt->m5_dump_stats)(ints[0], ints[1]);
}
void
-do_dump_reset_stats(int argc, char *argv[])
+do_dump_reset_stats(DispatchTable *dt, int argc, char *argv[])
{
uint64_t ints[2];
parse_int_args(argc, argv, ints, 2);
- m5_dump_reset_stats(ints[0], ints[1]);
+ (*dt->m5_dump_reset_stats)(ints[0], ints[1]);
}
void
-do_read_file(int argc, char *argv[])
+do_read_file(DispatchTable *dt, int argc, char *argv[])
{
if (argc > 0)
usage();
- read_file(STDOUT_FILENO);
+ read_file(dt, STDOUT_FILENO);
}
void
-do_write_file(int argc, char *argv[])
+do_write_file(DispatchTable *dt, int argc, char *argv[])
{
if (argc != 1 && argc != 2)
usage();
@@ -222,54 +230,54 @@
const char *filename = argv[0];
const char *host_filename = (argc == 2) ? argv[1] : argv[0];
- write_file(filename, host_filename);
+ write_file(dt, filename, host_filename);
}
void
-do_checkpoint(int argc, char *argv[])
+do_checkpoint(DispatchTable *dt, int argc, char *argv[])
{
uint64_t ints[2];
parse_int_args(argc, argv, ints, 2);
- m5_checkpoint(ints[0], ints[1]);
+ (*dt->m5_checkpoint)(ints[0], ints[1]);
}
void
-do_addsymbol(int argc, char *argv[])
+do_addsymbol(DispatchTable *dt, int argc, char *argv[])
{
if (argc != 2)
usage();
uint64_t addr = strtoul(argv[0], NULL, 0);
char *symbol = argv[1];
- m5_add_symbol(addr, symbol);
+ (*dt->m5_add_symbol)(addr, symbol);
}
void
-do_loadsymbol(int argc, char *argv[])
+do_loadsymbol(DispatchTable *dt, int argc, char *argv[])
{
if (argc > 0)
usage();
- m5_load_symbol();
+ (*dt->m5_load_symbol)();
}
void
-do_initparam(int argc, char *argv[])
+do_initparam(DispatchTable *dt, int argc, char *argv[])
{
if (argc > 1)
usage();
uint64_t key_str[2];
pack_str_into_regs(argc == 0 ? "" : argv[0], key_str, 2);
- uint64_t val = m5_init_param(key_str[0], key_str[1]);
+ uint64_t val = (*dt->m5_init_param)(key_str[0], key_str[1]);
printf("%"PRIu64, val);
}
struct MainFunc
{
char *name;
- void (*func)(int argc, char *argv[]);
+ void (*func)(DispatchTable *dt, int argc, char *argv[]);
char *usage;
};
@@ -347,7 +355,7 @@
if (strcmp(command, mainfuncs[i].name) != 0)
continue;
- mainfuncs[i].func(argc, argv);
+ mainfuncs[i].func(&default_dispatch, argc, argv);
exit(0);
}
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/27238
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I7c6eab7d87cc973d0bc9c1889037a0f89ce057e8
Gerrit-Change-Number: 27238
Gerrit-PatchSet: 11
Gerrit-Owner: Gabe Black <gabebl...@google.com>
Gerrit-Reviewer: Bobby R. Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Earl Ou <shunhsin...@google.com>
Gerrit-Reviewer: Gabe Black <gabebl...@google.com>
Gerrit-Reviewer: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: Yu-hsin Wang <yuhsi...@google.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
