From f4ac3673d50d89decebade7fbbb6ff8bac752756 Mon Sep 17 00:00:00 2001 From: Hanhwi Jang Date: Fri, 8 Dec 2017 14:34:59 +0900 Subject: [PATCH] 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 Maintainer: Andreas Sandberg --- include/gem5/asm/generic/m5ops.h | 2 +- include/gem5/m5ops.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/gem5/asm/generic/m5ops.h b/include/gem5/asm/generic/m5ops.h index 81569e025..2d7d0741d 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 5062ac24b..72223d140 100644 --- a/include/gem5/m5ops.h +++ b/include/gem5/m5ops.h @@ -62,7 +62,7 @@ void m5_debug_break(void); 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); -- 2.30.2