Fix wrong patch from jep-388 backport

Vladimir Kempik · Vladimir Kempik · commit 6d0379585aef · 2022-02-08T13:36:10.000+03:00
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
@@ -1492,7 +1492,7 @@ void MacroAssembler::movptr(Register r, uintptr_t imm64) {
 #ifndef PRODUCT
   {
     char buffer[64];
-    snprintf(buffer, sizeof(buffer), PTR64_FORMAT, imm64);
+    snprintf(buffer, sizeof(buffer), "0x%"PRIX64, (uint64_t)imm64);
     block_comment(buffer);
   }
 #endif
@@ -1555,7 +1555,7 @@ void MacroAssembler::mov_immediate64(Register dst, uint64_t imm64)
 #ifndef PRODUCT
   {
     char buffer[64];
-    snprintf(buffer, sizeof(buffer), PTR64_FORMAT, imm64);
+    snprintf(buffer, sizeof(buffer), "0x%"PRIX64, imm64);
     block_comment(buffer);
   }
 #endif
@@ -1668,7 +1668,7 @@ void MacroAssembler::mov_immediate32(Register dst, uint32_t imm32)
 #ifndef PRODUCT
     {
       char buffer[64];
-      snprintf(buffer, sizeof(buffer), PTR32_FORMAT, imm32);
+      snprintf(buffer, sizeof(buffer), "0x%"PRIX32, imm32);
       block_comment(buffer);
     }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -1492,7 +1492,7 @@ void MacroAssembler::movptr(Register r, uintptr_t imm64) {`
`1492`	`1492`	`#ifndef PRODUCT`
`1493`	`1493`	`{`
`1494`	`1494`	`char buffer[64];`
`1495`		`- snprintf(buffer, sizeof(buffer), PTR64_FORMAT, imm64);`
	`1495`	`+ snprintf(buffer, sizeof(buffer), "0x%"PRIX64, (uint64_t)imm64);`
`1496`	`1496`	`block_comment(buffer);`
`1497`	`1497`	`}`
`1498`	`1498`	`#endif`
`@@ -1555,7 +1555,7 @@ void MacroAssembler::mov_immediate64(Register dst, uint64_t imm64)`
`1555`	`1555`	`#ifndef PRODUCT`
`1556`	`1556`	`{`
`1557`	`1557`	`char buffer[64];`
`1558`		`- snprintf(buffer, sizeof(buffer), PTR64_FORMAT, imm64);`
	`1558`	`+ snprintf(buffer, sizeof(buffer), "0x%"PRIX64, imm64);`
`1559`	`1559`	`block_comment(buffer);`
`1560`	`1560`	`}`
`1561`	`1561`	`#endif`
`@@ -1668,7 +1668,7 @@ void MacroAssembler::mov_immediate32(Register dst, uint32_t imm32)`
`1668`	`1668`	`#ifndef PRODUCT`
`1669`	`1669`	`{`
`1670`	`1670`	`char buffer[64];`
`1671`		`- snprintf(buffer, sizeof(buffer), PTR32_FORMAT, imm32);`
	`1671`	`+ snprintf(buffer, sizeof(buffer), "0x%"PRIX32, imm32);`
`1672`	`1672`	`block_comment(buffer);`
`1673`	`1673`	`}`
`1674`	`1674`	`#endif`