From ac858434c63fa143515476602237a1fcafb8a742 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Thu, 26 Mar 2020 16:27:47 -0700 Subject: [PATCH] sim,misc: Rename M5OP_ANNOTATE to M5OP_RESERVED1. The M5OP_ANNOTATE constant is unused and treated as a reserved op in gem5. Rename it to make it official and consistent. Change-Id: Id5fe6a3aa402a2e0cd187503abff9b09e81b3724 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/27235 Maintainer: Gabe Black Tested-by: kokoro Reviewed-by: Bobby R. Bruce --- include/gem5/asm/generic/m5ops.h | 2 +- src/sim/pseudo_inst.hh | 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 38eaeb175..4771085d1 100644 --- a/include/gem5/asm/generic/m5ops.h +++ b/include/gem5/asm/generic/m5ops.h @@ -66,7 +66,7 @@ #define M5OP_ADD_SYMBOL 0x53 #define M5OP_PANIC 0x54 -#define M5OP_ANNOTATE 0x55 // deprecated annotate function +#define M5OP_RESERVED1 0x55 // Reserved for user, used to be annotate #define M5OP_RESERVED2 0x56 // Reserved for user #define M5OP_RESERVED3 0x57 // Reserved for user #define M5OP_RESERVED4 0x58 // Reserved for user diff --git a/src/sim/pseudo_inst.hh b/src/sim/pseudo_inst.hh index be9e5bb63..6a63812dc 100644 --- a/src/sim/pseudo_inst.hh +++ b/src/sim/pseudo_inst.hh @@ -234,7 +234,7 @@ pseudoInst(ThreadContext *tc, uint8_t func, uint64_t &result) invokeSimcall(tc, workend); return true; - case M5OP_ANNOTATE: + case M5OP_RESERVED1: case M5OP_RESERVED2: case M5OP_RESERVED3: case M5OP_RESERVED4: -- 2.30.2