Merge pull request #2800 from mhillenbrand/string_literal_endianness

Fix encoding/decoding of string literals for big-endian systems

SPIRV/SPVRemapper.cpp

@@ -297,15 +297,21 @@ namespace spv {
     std::string spirvbin_t::literalString(unsigned word) const
     {
         std::string literal;
+        const spirword_t * pos = spv.data() + word;
 
         literal.reserve(16);
 
-        const char* bytes = reinterpret_cast<const char*>(spv.data() + word);
+        do {
-
+            spirword_t word = *pos;
-        while (bytes && *bytes)
+            for (int i = 0; i < 4; i++) {
-            literal += *bytes++;
+                char c = word & 0xff;
-
+                if (c == '\0')
-        return literal;
+                    return literal;
+                literal += c;
+                word >>= 8;
+            }
+            pos++;
+        } while (true);
     }
 
     void spirvbin_t::applyMap()

SPIRV/disassemble.cpp

@@ -43,6 +43,7 @@
 #include <stack>
 #include <sstream>
 #include <cstring>
+#include <utility>
 
 #include "disassemble.h"
 #include "doc.h"
@@ -100,6 +101,7 @@ protected:
     void outputMask(OperandClass operandClass, unsigned mask);
     void disassembleImmediates(int numOperands);
     void disassembleIds(int numOperands);
+    std::pair<int, std::string> decodeString();
     int disassembleString();
     void disassembleInstruction(Id resultId, Id typeId, Op opCode, int numOperands);
 
@@ -290,31 +292,44 @@ void SpirvStream::disassembleIds(int numOperands)
     }
 }
 
-// return the number of operands consumed by the string
+// decode string from words at current position (non-consuming)
-int SpirvStream::disassembleString()
+std::pair<int, std::string> SpirvStream::decodeString()
 {
-    int startWord = word;
+    std::string res;
-
+    int wordPos = word;
-    out << " \"";
+    char c;
-
-    const char* wordString;
     bool done = false;
+
     do {
-        unsigned int content = stream[word];
+        unsigned int content = stream[wordPos];
-        wordString = (const char*)&content;
         for (int charCount = 0; charCount < 4; ++charCount) {
-            if (*wordString == 0) {
+            c = content & 0xff;
+            content >>= 8;
+            if (c == '\0') {
                 done = true;
                 break;
             }
-            out << *(wordString++);
+            res += c;
         }
-        ++word;
+        ++wordPos;
-    } while (! done);
+    } while(! done);
 
+    return std::make_pair(wordPos - word, res);
+}
+
+// return the number of operands consumed by the string
+int SpirvStream::disassembleString()
+{
+    out << " \"";
+
+    std::pair<int, std::string> decoderes = decodeString();
+
+    out << decoderes.second;
     out << "\"";
 
-    return word - startWord;
+    word += decoderes.first;
+
+    return decoderes.first;
 }
 
 void SpirvStream::disassembleInstruction(Id resultId, Id /*typeId*/, Op opCode, int numOperands)
@@ -331,7 +346,7 @@ void SpirvStream::disassembleInstruction(Id resultId, Id /*typeId*/, Op opCode,
             nextNestedControl = 0;
         }
     } else if (opCode == OpExtInstImport) {
-        idDescriptor[resultId] = (const char*)(&stream[word]);
+        idDescriptor[resultId] = decodeString().second;
     }
     else {
         if (resultId != 0 && idDescriptor[resultId].size() == 0) {
@@ -428,7 +443,7 @@ void SpirvStream::disassembleInstruction(Id resultId, Id /*typeId*/, Op opCode,
             --numOperands;
             // Get names for printing "(XXX)" for readability, *after* this id
             if (opCode == OpName)
-                idDescriptor[stream[word - 1]] = (const char*)(&stream[word]);
+                idDescriptor[stream[word - 1]] = decodeString().second;
             break;
         case OperandVariableIds:
             disassembleIds(numOperands);

SPIRV/spvIR.h

@@ -111,27 +111,23 @@ public:
 
     void addStringOperand(const char* str)
     {
-        unsigned int word;
+        unsigned int word = 0;
-        char* wordString = (char*)&word;
+        unsigned int shiftAmount = 0;
-        char* wordPtr = wordString;
-        int charCount = 0;
         char c;
+
         do {
             c = *(str++);
-            *(wordPtr++) = c;
+            word |= ((unsigned int)c) << shiftAmount;
-            ++charCount;
+            shiftAmount += 8;
-            if (charCount == 4) {
+            if (shiftAmount == 32) {
                 addImmediateOperand(word);
-                wordPtr = wordString;
+                word = 0;
-                charCount = 0;
+                shiftAmount = 0;
             }
         } while (c != 0);
 
         // deal with partial last word
-        if (charCount > 0) {
+        if (shiftAmount > 0) {
-            // pad with 0s
-            for (; charCount < 4; ++charCount)
-                *(wordPtr++) = 0;
             addImmediateOperand(word);
         }
     }