FIXUP: Introduce new custom function to format TRIL code

eclipse-omr · Dec 15, 2023 · 187c1bd · 187c1bd
1 parent 55b7637
commit 187c1bd
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/fvtest/tril/test/FormatTest.cpp b/fvtest/tril/test/FormatTest.cpp
@@ -71,6 +71,23 @@ TEST(FormatTest, FormatInt) {
    //ASSERT_STREQ(buffer, ">>-4<<");
 }
 
+TEST(FormatTest, FormatIntWithPrefix) {
+   char buffer[1024] = { '\0' };
+
+   Tril::format(buffer, sizeof(buffer), ">>%hhd<<", (int8_t)42);
+   ASSERT_STREQ(buffer, ">>42<<");
+
+   Tril::format(buffer, sizeof(buffer), ">>%hd<<", (int16_t)-42);
+   ASSERT_STREQ(buffer, ">>-42<<");
+
+   Tril::format(buffer, sizeof(buffer), ">>%ld<<", (int32_t)42);
+   ASSERT_STREQ(buffer, ">>42<<");
+
+   Tril::format(buffer, sizeof(buffer), ">>%lld<<", (int64_t)-42);
+   ASSERT_STREQ(buffer, ">>-42<<");
+
+}
+
 TEST(FormatTest, FormatIntBad) {
    char buffer[1024] = { '\0' };
 

diff --git a/fvtest/tril/tril/format.hpp b/fvtest/tril/tril/format.hpp
@@ -392,7 +392,7 @@ inline void _format(char* dst, size_t size, const char *fmt, V value, Rest... re
          else
             {
             /*
-             * Ignore l, ll, h, hh and j prefixes
+             * Ignore l, ll, h, hh, j, I, I32 and I64 prefixes
              */
             if (*fmt == 'l')
                {
@@ -408,6 +408,13 @@ inline void _format(char* dst, size_t size, const char *fmt, V value, Rest... re
                }
             else if (*fmt == 'j')
                fmt++;
+            else if (*fmt == 'I')
+               {
+               fmt++;
+               if (  (*(fmt+0) == '3' && *(fmt+1) == '2')
+                  || (*(fmt+0) == '6' && *(fmt+1) == '4') )
+                  fmt+=2;
+               }
 
             size_t consumed = 0;
             switch (*fmt) {