Allow bitwise or expressions and numeric literals in spirv_asm blocks (#3157)

* Add -spirv-core-grammar option to load alternate spirv defs

Also embed a version to use by default

* Use perfect hash for spv op lookup

* Neaten perfect hash embedding

* Refactor spirv grammar lookup in preperation for more kinds of lookups

* Load spirv capability list from spec

* Add all SPIR-V enums to lookup table

* regenerate vs projects

* appease msvc

* Use string slices for spir-v core grammar lookups

* wiggle

* comment

* Add OpInfo for spv ops

* regenerate vs projects

* Embed op names

* Add min/max operand counts and enum categories to spirv info

* neaten

* Operand kinds for spirv ops

* Store and embed all information relating to spirv enums and qualifiers

* Use SPIR-V spec to position instructions in spirv_asm blocks

* Neaten spir-v info embedding

* Neaten perfect hash embedding

* Add assignment syntax to spirv_asm snippets

* Better errors for spirv_asm parser

* Add warning for too many operands in spirv asm

* squash warnings

* neaten

* test wiggle

* Lookup enums for spirv

* Put OpCapability and OpExtension in the correct place for spirv_asm blocks

* Tests for OpCapability and OpExtension

* ci wiggle

* Add expected failure

* Allow raising immediate values to constant ids where necessary in spirv_asm blocks

* Allow bitwise or expressions and numeric literals in spirv_asm blocks

* test numeric literals

* Fix memory issues.

* fix.

---------

Co-authored-by: Yong He <yonghe@outlook.com>

1 files changed, 14 insertions, 7 deletions

diff --git a/source/core/slang-string-util.cpp b/source/core/slang-string-util.cpp
index ac8a176ad..fb062de76 100644
--- a/source/core/slang-string-util.cpp
+++ b/source/core/slang-string-util.cpp
@@ -593,22 +593,29 @@ ComPtr<ISlangBlob> StringUtil::createStringBlob(const String& string)
         cur++;
     }
 
+    int radix = 10;
+    auto getDigit = CharUtil::getDecimalDigitValue;
+    if (cur+1 < end && *cur == '0' && (*(cur+1) == 'x' || *(cur+1) == 'X'))
+    {
+        radix = 16;
+        getDigit = CharUtil::getHexDigitValue;
+        cur += 2;
+    }
+
     // We need at least one digit
     if (cur >= end || !CharUtil::isDigit(*cur))
     {
         return SLANG_FAIL;
     }
     
-    Int value = *cur++ - '0';
-    // Do the remaining digits
+    Int value = 0;
+    // Do the digits
     for (; cur < end; ++cur)
     {
-        const char c = *cur;
-        if (!CharUtil::isDigit(c))
-        {
+        const auto d = getDigit(*cur);
+        if (d == -1)
             return SLANG_FAIL;
-        }
-        value = value * 10 + (c - '0');
+        value = value * radix + d;
     }
 
     value = negate ? -value : value;