From 080f708e7018f6c0529b6c875a44d84fc4d74419 Mon Sep 17 00:00:00 2001
From: Kunal Pathak <Kunal.Pathak@microsoft.com>
Date: Tue, 16 Aug 2022 07:19:13 -0700
Subject: [PATCH] fix formatting of arm/arm64 addresses (#73967)

---
 src/coreclr/jit/emitarm.cpp   | 4 ++--
 src/coreclr/jit/emitarm64.cpp | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/coreclr/jit/emitarm.cpp b/src/coreclr/jit/emitarm.cpp
index faca533e53946..fc45a76796786 100644
--- a/src/coreclr/jit/emitarm.cpp
+++ b/src/coreclr/jit/emitarm.cpp
@@ -6782,7 +6782,7 @@ void emitter::emitDispImm(int imm, bool addComma, bool alwaysHex /* =false */, b
     {
         if (isAddrOffset)
         {
-            printf("%02XH", imm);
+            printf("0x%02X", imm);
         }
         else
         {
@@ -6794,7 +6794,7 @@ void emitter::emitDispImm(int imm, bool addComma, bool alwaysHex /* =false */, b
         // val <= -1000
         if (isAddrOffset)
         {
-            printf("-%02XH", -imm);
+            printf("-0x%02X", -imm);
         }
         else
         {
diff --git a/src/coreclr/jit/emitarm64.cpp b/src/coreclr/jit/emitarm64.cpp
index 3fb57a30d71d1..499b0470ff298 100644
--- a/src/coreclr/jit/emitarm64.cpp
+++ b/src/coreclr/jit/emitarm64.cpp
@@ -11796,7 +11796,7 @@ void emitter::emitDispImm(ssize_t imm, bool addComma, bool alwaysHex /* =false *
     {
         alwaysHex = true;
     }
-    else if (strictArmAsm)
+    if (strictArmAsm)
     {
         printf("#");
     }
@@ -11827,7 +11827,7 @@ void emitter::emitDispImm(ssize_t imm, bool addComma, bool alwaysHex /* =false *
         {
             if (isAddrOffset)
             {
-                printf("%llXH", imm);
+                printf("0x%llX", imm);
             }
             else
             {
@@ -11836,7 +11836,7 @@ void emitter::emitDispImm(ssize_t imm, bool addComma, bool alwaysHex /* =false *
         }
         else
         {
-            printf("%02XH", (unsigned)imm);
+            printf("0x%02X", (unsigned)imm);
         }
     }