[gem5-dev] Change in gem5/gem5[develop]: misc,util: Remove explicit ';'s from M5OP_FOREACH.
Gabe Black has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/27237 ) Change subject: misc,util: Remove explicit ';'s from M5OP_FOREACH. .. misc,util: Remove explicit ';'s from M5OP_FOREACH. It may be the case that each item M5OP_FOREACH iterates over should end in a ',' and not a ';', for instance when putting each item into an array or initializing a structure. If the caller still wants a ';', they can add it into the definition of the M5OP macro. Change-Id: Idd6538b0aad27df39658c3f749c6ff5e4fe55e6d Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/27237 Reviewed-by: Bobby R. Bruce Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Tested-by: kokoro --- M include/gem5/asm/generic/m5ops.h M util/m5/src/aarch64/m5op.S M util/m5/src/arm/m5op.S M util/m5/src/sparc/m5op.S M util/m5/src/thumb/m5op.S 5 files changed, 30 insertions(+), 30 deletions(-) Approvals: Jason Lowe-Power: Looks good to me, but someone else must approve; Looks good to me, approved Bobby R. Bruce: Looks good to me, approved kokoro: Regressions pass diff --git a/include/gem5/asm/generic/m5ops.h b/include/gem5/asm/generic/m5ops.h index 4771085..fc56e59 100644 --- a/include/gem5/asm/generic/m5ops.h +++ b/include/gem5/asm/generic/m5ops.h @@ -81,31 +81,31 @@ #define M5OP_FOREACH\ -M5OP(m5_arm, M5OP_ARM); \ -M5OP(m5_quiesce, M5OP_QUIESCE); \ -M5OP(m5_quiesce_ns, M5OP_QUIESCE_NS); \ -M5OP(m5_quiesce_cycle, M5OP_QUIESCE_CYCLE); \ -M5OP(m5_quiesce_time, M5OP_QUIESCE_TIME); \ -M5OP(m5_rpns, M5OP_RPNS); \ -M5OP(m5_wake_cpu, M5OP_WAKE_CPU); \ -M5OP(m5_exit, M5OP_EXIT); \ -M5OP(m5_fail, M5OP_FAIL); \ -M5OP(m5_init_param, M5OP_INIT_PARAM); \ -M5OP(m5_load_symbol, M5OP_LOAD_SYMBOL); \ -M5OP(m5_reset_stats, M5OP_RESET_STATS); \ -M5OP(m5_dump_stats, M5OP_DUMP_STATS); \ -M5OP(m5_dump_reset_stats, M5OP_DUMP_RESET_STATS); \ -M5OP(m5_checkpoint, M5OP_CHECKPOINT); \ -M5OP(m5_write_file, M5OP_WRITE_FILE); \ -M5OP(m5_read_file, M5OP_READ_FILE); \ -M5OP(m5_debug_break, M5OP_DEBUG_BREAK); \ -M5OP(m5_switch_cpu, M5OP_SWITCH_CPU); \ -M5OP(m5_add_symbol, M5OP_ADD_SYMBOL); \ -M5OP(m5_panic, M5OP_PANIC); \ -M5OP(m5_work_begin, M5OP_WORK_BEGIN); \ -M5OP(m5_work_end, M5OP_WORK_END); \ -M5OP(m5_se_syscall, M5OP_SE_SYSCALL); \ -M5OP(m5_se_page_fault, M5OP_SE_PAGE_FAULT); \ -M5OP(m5_dist_toggle_sync, M5OP_DIST_TOGGLE_SYNC); +M5OP(m5_arm, M5OP_ARM) \ +M5OP(m5_quiesce, M5OP_QUIESCE) \ +M5OP(m5_quiesce_ns, M5OP_QUIESCE_NS)\ +M5OP(m5_quiesce_cycle, M5OP_QUIESCE_CYCLE) \ +M5OP(m5_quiesce_time, M5OP_QUIESCE_TIME)\ +M5OP(m5_rpns, M5OP_RPNS)\ +M5OP(m5_wake_cpu, M5OP_WAKE_CPU)\ +M5OP(m5_exit, M5OP_EXIT)\ +M5OP(m5_fail, M5OP_FAIL)\ +M5OP(m5_init_param, M5OP_INIT_PARAM)\ +M5OP(m5_load_symbol, M5OP_LOAD_SYMBOL) \ +M5OP(m5_reset_stats, M5OP_RESET_STATS) \ +M5OP(m5_dump_stats, M5OP_DUMP_STATS)\ +M5OP(m5_dump_reset_stats, M5OP_DUMP_RESET_STATS)\ +M5OP(m5_checkpoint, M5OP_CHECKPOINT)\ +M5OP(m5_write_file, M5OP_WRITE_FILE)\ +M5OP(m5_read_file, M5OP_READ_FILE) \ +M5OP(m5_debug_break, M5OP_DEBUG_BREAK) \ +M5OP(m5_switch_cpu, M5OP_SWITCH_CPU)\ +M5OP(m5_add_symbol, M5OP_ADD_SYMBOL)\ +M5OP(m5_panic, M5OP_PANIC) \ +M5OP(m5_work_begin, M5OP_WORK_BEGIN)\ +M5OP(m5_work_end, M5OP_WORK_END)\ +M5OP(m5_se_syscall, M5OP_SE_SYSCALL)\ +M5OP(m5_se_page_fault, M5OP_SE_PAGE_FAULT) \ +M5OP(m5_dist_toggle_sync, M5OP_DIST_TOGGLE_SYNC) #endif // __GEM5_ASM_GENERIC_M5OPS_H__ diff --git
[gem5-dev] Change in gem5/gem5[develop]: misc,util: Remove explicit '; 's from M5OP_FOREACH.
Gabe Black has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/27237 ) Change subject: misc,util: Remove explicit ';'s from M5OP_FOREACH. .. misc,util: Remove explicit ';'s from M5OP_FOREACH. It may be the case that each item M5OP_FOREACH iterates over should end in a ',' and not a ';', for instance when putting each item into an array or initializing a structure. If the caller still wants a ';', they can add it into the definition of the M5OP macro. Change-Id: Idd6538b0aad27df39658c3f749c6ff5e4fe55e6d --- M include/gem5/asm/generic/m5ops.h M util/m5/src/aarch64/m5op.S M util/m5/src/arm/m5op.S M util/m5/src/sparc/m5op.S M util/m5/src/thumb/m5op.S 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/include/gem5/asm/generic/m5ops.h b/include/gem5/asm/generic/m5ops.h index 4771085..fc56e59 100644 --- a/include/gem5/asm/generic/m5ops.h +++ b/include/gem5/asm/generic/m5ops.h @@ -81,31 +81,31 @@ #define M5OP_FOREACH\ -M5OP(m5_arm, M5OP_ARM); \ -M5OP(m5_quiesce, M5OP_QUIESCE); \ -M5OP(m5_quiesce_ns, M5OP_QUIESCE_NS); \ -M5OP(m5_quiesce_cycle, M5OP_QUIESCE_CYCLE); \ -M5OP(m5_quiesce_time, M5OP_QUIESCE_TIME); \ -M5OP(m5_rpns, M5OP_RPNS); \ -M5OP(m5_wake_cpu, M5OP_WAKE_CPU); \ -M5OP(m5_exit, M5OP_EXIT); \ -M5OP(m5_fail, M5OP_FAIL); \ -M5OP(m5_init_param, M5OP_INIT_PARAM); \ -M5OP(m5_load_symbol, M5OP_LOAD_SYMBOL); \ -M5OP(m5_reset_stats, M5OP_RESET_STATS); \ -M5OP(m5_dump_stats, M5OP_DUMP_STATS); \ -M5OP(m5_dump_reset_stats, M5OP_DUMP_RESET_STATS); \ -M5OP(m5_checkpoint, M5OP_CHECKPOINT); \ -M5OP(m5_write_file, M5OP_WRITE_FILE); \ -M5OP(m5_read_file, M5OP_READ_FILE); \ -M5OP(m5_debug_break, M5OP_DEBUG_BREAK); \ -M5OP(m5_switch_cpu, M5OP_SWITCH_CPU); \ -M5OP(m5_add_symbol, M5OP_ADD_SYMBOL); \ -M5OP(m5_panic, M5OP_PANIC); \ -M5OP(m5_work_begin, M5OP_WORK_BEGIN); \ -M5OP(m5_work_end, M5OP_WORK_END); \ -M5OP(m5_se_syscall, M5OP_SE_SYSCALL); \ -M5OP(m5_se_page_fault, M5OP_SE_PAGE_FAULT); \ -M5OP(m5_dist_toggle_sync, M5OP_DIST_TOGGLE_SYNC); +M5OP(m5_arm, M5OP_ARM) \ +M5OP(m5_quiesce, M5OP_QUIESCE) \ +M5OP(m5_quiesce_ns, M5OP_QUIESCE_NS)\ +M5OP(m5_quiesce_cycle, M5OP_QUIESCE_CYCLE) \ +M5OP(m5_quiesce_time, M5OP_QUIESCE_TIME)\ +M5OP(m5_rpns, M5OP_RPNS)\ +M5OP(m5_wake_cpu, M5OP_WAKE_CPU)\ +M5OP(m5_exit, M5OP_EXIT)\ +M5OP(m5_fail, M5OP_FAIL)\ +M5OP(m5_init_param, M5OP_INIT_PARAM)\ +M5OP(m5_load_symbol, M5OP_LOAD_SYMBOL) \ +M5OP(m5_reset_stats, M5OP_RESET_STATS) \ +M5OP(m5_dump_stats, M5OP_DUMP_STATS)\ +M5OP(m5_dump_reset_stats, M5OP_DUMP_RESET_STATS)\ +M5OP(m5_checkpoint, M5OP_CHECKPOINT)\ +M5OP(m5_write_file, M5OP_WRITE_FILE)\ +M5OP(m5_read_file, M5OP_READ_FILE) \ +M5OP(m5_debug_break, M5OP_DEBUG_BREAK) \ +M5OP(m5_switch_cpu, M5OP_SWITCH_CPU)\ +M5OP(m5_add_symbol, M5OP_ADD_SYMBOL)\ +M5OP(m5_panic, M5OP_PANIC) \ +M5OP(m5_work_begin, M5OP_WORK_BEGIN)\ +M5OP(m5_work_end, M5OP_WORK_END)\ +M5OP(m5_se_syscall, M5OP_SE_SYSCALL)\ +M5OP(m5_se_page_fault, M5OP_SE_PAGE_FAULT) \ +M5OP(m5_dist_toggle_sync, M5OP_DIST_TOGGLE_SYNC) #endif // __GEM5_ASM_GENERIC_M5OPS_H__ diff --git a/util/m5/src/aarch64/m5op.S b/util/m5/src/aarch64/m5op.S index 3e1d52a..af68e79 100644 --- a/util/m5/src/aarch64/m5op.S +++ b/util/m5/src/aarch64/m5op.S @@ -66,6 +66,6 @@ #endif .text -#define M5OP(name, func) m5op_func name, func +#define M5OP(name, func) m5op_func name, func; M5OP_FOREACH #undef M5OP diff --git a/util/m5/src/arm/m5op.S b/util/m5/src/arm/m5op.S
