From 4ca72b95551f15c87ff3dc8e68fc797f14c034b7 Mon Sep 17 00:00:00 2001
From: Galen Williamson <galen@vector35.com>
Date: Thu, 23 May 2024 16:36:38 -0400
Subject: [PATCH] more fixes:

* fixes the infinite recursion stack overflow when lifting mfmsr
* allocates unique register ID for MSR and adds GetRegisterName hook to handle it
* adds underscore prefix to intrinsic names
---
 vle_ext.cpp | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/vle_ext.cpp b/vle_ext.cpp
index f1de74b..e30bd8a 100644
--- a/vle_ext.cpp
+++ b/vle_ext.cpp
@@ -13,7 +13,9 @@ using namespace BinaryNinja;
 using namespace std;
 
 #define CTR_REG 3
-#define PPC_REG_MSR 152
+// #define PPC_REG_MSR 152
+#define PPC_REG_MSR 344  // ppc_reg::PPC_REG_ENDING
+
 
 #define CR0_UNSIGNED_FLAG 2
 #define CR0_SIGNED_FLAG 1
@@ -216,6 +218,12 @@ class ppcVleArchitectureExtension : public ArchitectureHook
 		return result;
 	}
 
+	virtual string GetRegisterName(uint32_t regId) override
+	{
+        if (regId == PPC_REG_MSR)
+            return "MSR";
+        return ArchitectureHook::GetRegisterName(regId);
+    }
 
 	virtual std::vector<uint32_t> GetGlobalRegisters() override
 	{
@@ -257,11 +265,11 @@ class ppcVleArchitectureExtension : public ArchitectureHook
     virtual std::string GetIntrinsicName (uint32_t intrinsic) override {
          switch (intrinsic)  {
             case CNTLWZ_INTRINSIC:
-                return "CountLeadingZeros";
+                return "_CountLeadingZeros";
             case E_STMVGPRW_INTRINSIC:
-                return "Store (R0, R3:R12)";
+                return "_Store (R0, R3:R12)";
             case E_LDMVGPRW_INTRINSIC:
-                return "Load (R0, R3:R12)";
+                return "_Load (R0, R3:R12)";
             default:
                 return "";
             }
@@ -270,7 +278,8 @@ class ppcVleArchitectureExtension : public ArchitectureHook
     virtual std::vector<uint32_t> GetAllIntrinsics() override {
         return vector<uint32_t> {
             CNTLWZ_INTRINSIC,
-            E_STMVGPRW_INTRINSIC
+            E_STMVGPRW_INTRINSIC,
+            E_LDMVGPRW_INTRINSIC
         };
     }
 
@@ -4142,11 +4151,11 @@ class ppcVleArchitectureExtension : public ArchitectureHook
                     il.AddInstruction(
                         il.SetRegister(
                             4,
+                            this->get_r_reg(instr->fields[0].value),
                             il.Register(
                                 4,
-                                this->get_r_reg(instr->fields[0].value)
-                            ),
-                            PPC_REG_MSR
+                                PPC_REG_MSR
+                            )
                         )
                     );
                     return true;