From 3d4bcc97e4e0143f26c29b3f1faba608d7ae1378 Mon Sep 17 00:00:00 2001
From: Tim Haines <thaines.astro@gmail.com>
Date: Tue, 21 Nov 2023 15:18:40 -0600
Subject: [PATCH] Rename e_prefetchT1 -> e_prefetcht1

---
 common/h/mnemonics/x86_entryIDs.h          | 3 +--
 common/src/arch-x86.C                      | 4 ++--
 dataflowAPI/src/convertOpcodes.C           | 2 +-
 instructionAPI/src/InstructionCategories.C | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/common/h/mnemonics/x86_entryIDs.h b/common/h/mnemonics/x86_entryIDs.h
index ce16164385..1fb10a73ef 100644
--- a/common/h/mnemonics/x86_entryIDs.h
+++ b/common/h/mnemonics/x86_entryIDs.h
@@ -486,9 +486,8 @@ e_por,
 e_prefetch,
 e_prefetchnta,
 e_prefetcht0,
-e_prefetchT1,
-e_prefetchT2,
 e_prefetcht1,
+e_prefetchT2,
 e_prefetchw,
 e_prefetchwt1,
 e_psadbw,
diff --git a/common/src/arch-x86.C b/common/src/arch-x86.C
index cc1c43900b..5c4fc91523 100644
--- a/common/src/arch-x86.C
+++ b/common/src/arch-x86.C
@@ -1276,7 +1276,7 @@ COMMON_EXPORT dyn_hash_map<entryID, std::string> entryNames_IAPI = map_list_of
   (e_prefetch, "prefetch")
   (e_prefetchnta, "prefetchnta")
   (e_prefetcht0, "prefetcht0")
-  (e_prefetchT1, "prefetchT1")
+  (e_prefetcht1, "prefetchT1")
   (e_prefetchT2, "prefetchT2")
   (e_prefetch_w, "prefetchw")
   (e_prefetchw, "prefetchw")
@@ -3920,7 +3920,7 @@ static ia32_entry groupMap2[][2][8] = {
     {
       { e_prefetchnta, t_done, 0, true, { Mb, Zz, Zz }, 0, s1R | (fPREFETCHNT << FPOS), 0 },
       { e_prefetcht0,  t_done, 0, true, { Mb, Zz, Zz }, 0, s1R | (fPREFETCHT0 << FPOS), 0 },
-      { e_prefetchT1,  t_done, 0, true, { Mb, Zz, Zz }, 0, s1R | (fPREFETCHT1 << FPOS), 0 },
+      { e_prefetcht1,  t_done, 0, true, { Mb, Zz, Zz }, 0, s1R | (fPREFETCHT1 << FPOS), 0 },
       { e_prefetchT2,  t_done, 0, true, { Mb, Zz, Zz }, 0, s1R | (fPREFETCHT1 << FPOS), 0 },
       { e_No_Entry, t_ill, 0, true, { Zz, Zz, Zz }, 0, 0, 0 },
       { e_No_Entry, t_ill, 0, true, { Zz, Zz, Zz }, 0, 0, 0 },
diff --git a/dataflowAPI/src/convertOpcodes.C b/dataflowAPI/src/convertOpcodes.C
index c6bd4872f2..8a515ca7b2 100644
--- a/dataflowAPI/src/convertOpcodes.C
+++ b/dataflowAPI/src/convertOpcodes.C
@@ -164,7 +164,7 @@ X86InstructionKind RoseInsnX86Factory::convertKind(entryID opcode, prefixEntryID
             return x86_prefetchnta;
         case e_prefetcht0:
             return x86_prefetcht0;
-        case e_prefetchT1:
+        case e_prefetcht1:
             return x86_prefetcht1;
         case e_prefetchT2:
             return x86_prefetcht2;
diff --git a/instructionAPI/src/InstructionCategories.C b/instructionAPI/src/InstructionCategories.C
index 6df844ddf0..d38e568dad 100644
--- a/instructionAPI/src/InstructionCategories.C
+++ b/instructionAPI/src/InstructionCategories.C
@@ -100,7 +100,7 @@ namespace Dyninst
           case e_prefetch:
           case e_prefetchnta:
           case e_prefetcht0:
-          case e_prefetchT1:
+          case e_prefetcht1:
           case e_prefetchT2:
           case e_prefetch_w:
           case e_prefetchw: