Changeset 96577 in vbox

Timestamp:

Sep 2, 2022 11:47:43 AM (2 years ago)

Author:

vboxsync

Message:

iprt/bldprog-strtab-template.cpp.h: Sparc build fix. bugref:9726

File:

• trunk/include/iprt/bldprog-strtab-template.cpp.h (modified) (7 diffs)

trunk/include/iprt/bldprog-strtab-template.cpp.h

@@ -85 +85 @@
 
 #ifdef BLDPROG_STRTAB_WITH_COMPRESSION
-# include <iprt/asm.h>
 # include <map>
 # include <iprt/sanitized/string>
@@ -186 +185 @@
 
 
+#ifdef BLDPROG_STRTAB_WITH_COMPRESSION
+
+/**
+ * Same as ASMBitTest.
+ *
+ * We cannot safely use ASMBitTest here because it must be inline, as this code
+ * is used to build RuntimeBldProg. */
+DECLINLINE(bool) BldProgBitIsSet(uint64_t const *pbmBitmap, size_t iBit)
+{
+    return RT_BOOL(pbmBitmap[iBit / 64] & RT_BIT_64(iBit % 64));
+}
+
+
+/**
+ * Same as ASMBitSet.
+ *
+ * We cannot safely use ASMBitSet here because it must be inline, as this code
+ * is used to build RuntimeBldProg.
+ */
+DECLINLINE(void) BldProgBitSet(uint64_t *pbmBitmap, size_t iBit)
+{
+    pbmBitmap[iBit / 64] |= RT_BIT_64(iBit % 64);
+}
+
+#endif
+
+
 /**
  * Initializes the strint table compiler.
@@ -211 +237 @@
     pThis->cMaxPendingStrings = cMaxStrings;
     memset(pThis->bmUsedChars, 0, sizeof(pThis->bmUsedChars));
-    ASMBitSet(pThis->bmUsedChars, 0);    /* Some parts of the code still thinks zero is a terminator, so don't use it for now. */
+    BldProgBitSet(pThis->bmUsedChars, 0);    /* Some parts of the code still thinks zero is a terminator, so don't use it for now. */
 # ifndef BLDPROG_STRTAB_PURE_ASCII
-    ASMBitSet(pThis->bmUsedChars, 0xff); /* Reserve escape byte for codepoints above 127. */
+    BldProgBitSet(pThis->bmUsedChars, 0xff); /* Reserve escape byte for codepoints above 127. */
 # endif
 #endif
@@ -321 +347 @@
     char ch;
     while ((ch = *psz++) != '\0')
-        ASMBitSet(pThis->bmUsedChars, (uint8_t)ch);
+        BldProgBitSet(pThis->bmUsedChars, (uint8_t)ch);
 
     /*
@@ -797 +823 @@
         char        szTmp[2] = { (char)i, '\0' };
         const char *psz      = szTmp;
-        if (   ASMBitTest(pThis->bmUsedChars, (int32_t)i)
+        if (   BldProgBitIsSet(pThis->bmUsedChars, i)
             || iDict >= SortedDict.m_cEntries)
         {
@@ -1165 +1191 @@
     for (unsigned i = 0; i < RT_ELEMENTS(pThis->aCompDict); i++)
     {
-        if (ASMBitTest(pThis->bmUsedChars, (int32_t)i)
+        if (BldProgBitIsSet(pThis->bmUsedChars, i)
             ? pThis->aCompDict[i].cchString != 1 : pThis->aCompDict[i].cchString < 1)
             abort();
@@ -1187 +1213 @@
 #ifdef BLDPROG_STRTAB_WITH_COMPRESSION
     for (unsigned i = 0; i < 0x100; i++)
-        if (!ASMBitTest(pThis->bmUsedChars, (int32_t)i)) /* Encode table references using '\xYY'. */
+        if (!BldProgBitIsSet(pThis->bmUsedChars, i)) /* Encode table references using '\xYY'. */
             abCharCat[i] = 2;
 #endif