Hanhwi Jang has submitted this change and it was merged. (
https://gem5-review.googlesource.com/6481 )
Change subject: util: resolve m5op name mismatching in m5op headers.
......................................................................
util: resolve m5op name mismatching in m5op headers.
Two m5op, load_symbol and dist_toggle_sync are defined with
different name in C and asm version headers 'm5ops.h'
The m5ops are named to m5_load_symbol() and m5_dist_toggle_sync().
Change-Id: I9630d74f3fb95bc3dc5fa082778d8f6eaa49b3cb
Reviewed-on: https://gem5-review.googlesource.com/6481
Reviewed-by: Andreas Sandberg <andreas.sandb...@arm.com>
Maintainer: Andreas Sandberg <andreas.sandb...@arm.com>
---
M include/gem5/asm/generic/m5ops.h
M include/gem5/m5ops.h
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Andreas Sandberg: Looks good to me, approved; Looks good to me, approved
diff --git a/include/gem5/asm/generic/m5ops.h
b/include/gem5/asm/generic/m5ops.h
index 81569e0..2d7d074 100644
--- a/include/gem5/asm/generic/m5ops.h
+++ b/include/gem5/asm/generic/m5ops.h
@@ -128,7 +128,7 @@
M5OP(m5_panic, M5OP_PANIC, 0); \
M5OP(m5_work_begin, M5OP_WORK_BEGIN, 0); \
M5OP(m5_work_end, M5OP_WORK_END, 0); \
- M5OP(m5_dist_togglesync, M5OP_DIST_TOGGLE_SYNC, 0);
+ M5OP(m5_dist_toggle_sync, M5OP_DIST_TOGGLE_SYNC, 0);
#define M5OP_FOREACH_ANNOTATION \
M5_ANNOTATION(m5a_bsm, M5OP_AN_BSM); \
diff --git a/include/gem5/m5ops.h b/include/gem5/m5ops.h
index 5062ac2..72223d1 100644
--- a/include/gem5/m5ops.h
+++ b/include/gem5/m5ops.h
@@ -62,7 +62,7 @@
void m5_switch_cpu(void);
void m5_dist_toggle_sync(void);
void m5_add_symbol(uint64_t addr, char *symbol);
-void m5_loadsymbol();
+void m5_load_symbol();
void m5_panic(void);
void m5_work_begin(uint64_t workid, uint64_t threadid);
void m5_work_end(uint64_t workid, uint64_t threadid);
--
To view, visit https://gem5-review.googlesource.com/6481
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I9630d74f3fb95bc3dc5fa082778d8f6eaa49b3cb
Gerrit-Change-Number: 6481
Gerrit-PatchSet: 2
Gerrit-Owner: Hanhwi Jang <jang.han...@gmail.com>
Gerrit-Assignee: Andreas Sandberg <andreas.sandb...@arm.com>
Gerrit-Reviewer: Andreas Sandberg <andreas.sandb...@arm.com>
Gerrit-Reviewer: Hanhwi Jang <jang.han...@gmail.com>
Gerrit-CC: Jason Lowe-Power <ja...@lowepower.com>
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev
