Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/27235 )
Change subject: sim,misc: Rename M5OP_ANNOTATE to M5OP_RESERVED1.
......................................................................
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 <gabebl...@google.com>
Tested-by: kokoro <noreply+kok...@google.com>
Reviewed-by: Bobby R. Bruce <bbr...@ucdavis.edu>
---
M include/gem5/asm/generic/m5ops.h
M src/sim/pseudo_inst.hh
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Bobby R. Bruce: Looks good to me, approved
Gabe Black: 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 38eaeb1..4771085 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 be9e5bb..6a63812 100644
--- a/src/sim/pseudo_inst.hh
+++ b/src/sim/pseudo_inst.hh
@@ -234,7 +234,7 @@
invokeSimcall<ABI>(tc, workend);
return true;
- case M5OP_ANNOTATE:
+ case M5OP_RESERVED1:
case M5OP_RESERVED2:
case M5OP_RESERVED3:
case M5OP_RESERVED4:
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/27235
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: Id5fe6a3aa402a2e0cd187503abff9b09e81b3724
Gerrit-Change-Number: 27235
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
