fix Issue 24130 - ImportC: Windows headers use inline asm with differ…

compiler/src/dmd/cli.d

@@ -610,7 +610,7 @@ dmd -cov -unittest myprog.d
         Option("nothrow",
             "assume no Exceptions will be thrown",
             `Turns off generation of exception stack unwinding code, enables
-	    more efficient code for RAII objects.`,
+            more efficient code for RAII objects.`,
         ),
         Option("O",
             "optimize",

compiler/src/dmd/cparse.d

@@ -626,7 +626,7 @@ final class CParser(AST) : Parser!AST
 
                 default:
                     // ImportC extensions: parse as a D asm block.
-                    s = parseAsm();
+                    s = parseAsm(compileEnv.masm);
                     break;
             }
             break;

compiler/src/dmd/dmodule.d

@@ -780,7 +780,9 @@ extern (C++) final class Module : Package
         {
             filetype = FileType.c;
 
+            global.compileEnv.masm = target.os == Target.OS.Windows && !target.omfobj; // Microsoft inline assembler format
             scope p = new CParser!AST(this, buf, cast(bool) docfile, global.errorSink, target.c, &defines, &global.compileEnv);
+            global.compileEnv.masm = false;
             p.nextToken();
             checkCompiledImport();
             members = p.parseModule();

compiler/src/dmd/frontend.h

@@ -3403,6 +3403,7 @@ struct CompileEnv final
     bool ddocOutput;
     bool shortenedMethods;
     bool obsolete;
+    bool masm;
     CompileEnv() :
         versionNumber(),
         date(),
@@ -3412,10 +3413,11 @@ struct CompileEnv final
         previewIn(),
         ddocOutput(),
         shortenedMethods(true),
-        obsolete()
+        obsolete(),
+        masm()
     {
     }
-    CompileEnv(uint32_t versionNumber, _d_dynamicArray< const char > date = {}, _d_dynamicArray< const char > time = {}, _d_dynamicArray< const char > vendor = {}, _d_dynamicArray< const char > timestamp = {}, bool previewIn = false, bool ddocOutput = false, bool shortenedMethods = true, bool obsolete = false) :
+    CompileEnv(uint32_t versionNumber, _d_dynamicArray< const char > date = {}, _d_dynamicArray< const char > time = {}, _d_dynamicArray< const char > vendor = {}, _d_dynamicArray< const char > timestamp = {}, bool previewIn = false, bool ddocOutput = false, bool shortenedMethods = true, bool obsolete = false, bool masm = false) :
         versionNumber(versionNumber),
         date(date),
         time(time),
@@ -3424,7 +3426,8 @@ struct CompileEnv final
         previewIn(previewIn),
         ddocOutput(ddocOutput),
         shortenedMethods(shortenedMethods),
-        obsolete(obsolete)
+        obsolete(obsolete),
+        masm(masm)
         {}
 };
 
@@ -4237,6 +4240,7 @@ class AsmStatement : public Statement
 {
 public:
     Token* tokens;
+    bool caseSensitive;
     AsmStatement* syntaxCopy() override;
     void accept(Visitor* v) override;
 };

compiler/src/dmd/glue.d

@@ -565,10 +565,10 @@ private void genObjFile(Module m, bool multiobj)
 
         outdata(m.cov);
 
-	size_t sz = m.covb[0].sizeof;
-	size_t n = (m.numlines + sz * 8) / (sz * 8);
-	uint* p =  cast(uint*)Mem.check(calloc(n, sz));
-	m.covb = p[0 .. n];
+        size_t sz = m.covb[0].sizeof;
+        size_t n = (m.numlines + sz * 8) / (sz * 8);
+        uint* p =  cast(uint*)Mem.check(calloc(n, sz));
+        m.covb = p[0 .. n];
     }
 
     for (int i = 0; i < m.members.length; i++)

compiler/src/dmd/iasm.d

@@ -64,6 +64,7 @@ extern(C++) Statement asmSemantic(AsmStatement s, Scope *sc)
             return statementSemantic(se, sc);
         }
         auto ias = new InlineAsmStatement(s.loc, s.tokens);
+        ias.caseSensitive = s.caseSensitive;
         return inlineAsmSemantic(ias, sc);
     }
     else version (IN_GCC)

compiler/src/dmd/iasmdmd.d

@@ -344,14 +344,15 @@ immutable:
     ubyte val;
     opflag_t ty;
 
-    bool isSIL_DIL_BPL_SPL() const @safe
+    bool isSIL_DIL_BPL_SPL() const @trusted
     {
+        bool caseSensitive = asmstate.statement.caseSensitive;
         // Be careful as these have the same val's as AH CH DH BH
         return ty == _r8 &&
-            ((val == _SIL && regstr == "SIL") ||
-             (val == _DIL && regstr == "DIL") ||
-             (val == _BPL && regstr == "BPL") ||
-             (val == _SPL && regstr == "SPL"));
+            ((val == _SIL && stringEq(regstr, "SIL", caseSensitive)) ||
+             (val == _DIL && stringEq(regstr, "DIL", caseSensitive)) ||
+             (val == _BPL && stringEq(regstr, "BPL", caseSensitive)) ||
+             (val == _SPL && stringEq(regstr, "SPL", caseSensitive)));
     }
 }
 
@@ -2161,9 +2162,9 @@ private @safe pure bool asm_isNonZeroInt(const ref OPND o)
 /*******************************
  */
 
-private @safe pure bool asm_is_fpreg(const(char)[] szReg)
+private @trusted bool asm_is_fpreg(const(char)[] szReg)
 {
-    return szReg == "ST";
+    return stringEq(szReg, "ST", asmstate.statement.caseSensitive);
 }
 
 /*******************************
@@ -3395,9 +3396,10 @@ immutable(REG)* asm_reg_lookup(const(char)[] s)
 {
     //dbg_printf("asm_reg_lookup('%s')\n",s);
 
+    bool caseSensitive = asmstate.statement.caseSensitive;
     for (int i = 0; i < regtab.length; i++)
     {
-        if (s == regtab[i].regstr)
+        if (stringEq(s, regtab[i].regstr, caseSensitive))
         {
             return &regtab[i];
         }
@@ -3406,7 +3408,7 @@ immutable(REG)* asm_reg_lookup(const(char)[] s)
     {
         for (int i = 0; i < regtab64.length; i++)
         {
-            if (s == regtab64[i].regstr)
+            if (stringEq(s, regtab64[i].regstr, caseSensitive))
             {
                 return &regtab64[i];
             }
@@ -4648,3 +4650,44 @@ unittest
         assert( isOneOf(_8, _anysize));
     }
 }
+
+/**********************************
+ * Case insensitive string compare
+ * Returns: true if equal
+ */
+
+bool stringEq(const(char)[] s1, const(char)[] s2, bool caseSensitive)
+{
+    if (caseSensitive)
+        return s1 == s2;
+
+    if (s1.length != s2.length)
+        return false;
+    foreach (i, c; s1)
+    {
+        char c1 = c;
+        if ('A' <= c1 && c1 <= 'Z')
+            c1 |= 0x20;
+        char c2 = s2[i];
+        if ('A' <= c2 && c2 <= 'Z')
+            c2 |= 0x20;
+
+        if (c1 != c2)
+            return false;
+    }
+    return true;
+}
+
+unittest
+{
+    assert(!stringEq("ABZ", "ABZX", true));
+
+    assert( stringEq("ABZ", "ABZ", true));
+    assert(!stringEq("aBz", "ABZ", true));
+    assert(!stringEq("ABZ", "ABz", true));
+
+    assert( stringEq("aBZ", "ABZ", false));
+    assert( stringEq("aBz", "AbZ", false));
+    assert( stringEq("ABZ", "ABz", false));
+    assert(!stringEq("3BZ", "ABz", false));
+}

compiler/src/dmd/lexer.d

@@ -52,6 +52,7 @@ struct CompileEnv
     bool ddocOutput;         /// collect embedded documentation comments
     bool shortenedMethods = true;   /// allow => in normal function declarations
     bool obsolete;           /// warn on use of legacy code
+    bool masm;               /// use MASM inline asm syntax
 }
 
 /***********************************************************

compiler/src/dmd/parse.d

@@ -6601,7 +6601,7 @@ class Parser(AST, Lexer = dmd.lexer.Lexer) : Lexer
             }
 
         case TOK.asm_:
-            s = parseAsm();
+            s = parseAsm(false);
             break;
 
         case TOK.import_:
@@ -6972,10 +6972,12 @@ class Parser(AST, Lexer = dmd.lexer.Lexer) : Lexer
      *   AsmInstruction ;
      *   AsmInstruction ; AsmInstruction
      *
+     * Params:
+     *   endOfLine = true if EOL means end of asm statement
      * Returns:
      *   inline assembler block as a Statement
      */
-    AST.Statement parseAsm()
+    AST.Statement parseAsm(bool endOfLine)
     {
         // Parse the asm block into a sequence of AsmStatements,
         // each AsmStatement is one instruction.
@@ -6998,6 +7000,8 @@ class Parser(AST, Lexer = dmd.lexer.Lexer) : Lexer
         size_t nestlevel = 0;
         while (1)
         {
+            if (endOfLine)
+                nextDefineLine();
             switch (token.value)
             {
             case TOK.identifier:
@@ -7032,14 +7036,20 @@ class Parser(AST, Lexer = dmd.lexer.Lexer) : Lexer
                 }
                 break;
 
+            case TOK.endOfLine:
+                nextDefineLine();
+                goto case;
+
             case TOK.semicolon:
                 if (nestlevel != 0)
                     error("mismatched number of curly brackets");
 
                 if (toklist || label)
                 {
                     // Create AsmStatement from list of tokens we've saved
-                    AST.Statement s = new AST.AsmStatement(token.loc, toklist);
+                    AST.AsmStatement as = new AST.AsmStatement(token.loc, toklist);
+                    as.caseSensitive = !endOfLine;
+                    AST.Statement s = as;
                     toklist = null;
                     ptoklist = &toklist;
                     if (label)
@@ -7083,6 +7093,8 @@ class Parser(AST, Lexer = dmd.lexer.Lexer) : Lexer
             break;
         }
         nextToken();
+        if (token.value == TOK.endOfLine)
+            nextToken();
         auto s = new AST.CompoundAsmStatement(loc, statements, stc);
         return s;
     }

compiler/src/dmd/statement.d

@@ -1958,6 +1958,7 @@ extern (C++) final class LabelDsymbol : Dsymbol
 extern (C++) class AsmStatement : Statement
 {
     Token* tokens;
+    bool caseSensitive;  // for register names
 
     extern (D) this(const ref Loc loc, Token* tokens) @safe
     {

compiler/src/dmd/statement.h

@@ -712,6 +712,7 @@ class AsmStatement : public Statement
 {
 public:
     Token *tokens;
+    bool caseSensitive;  // for register names
 
     AsmStatement *syntaxCopy() override;
     void accept(Visitor *v) override { v->visit(this); }

compiler/test/compilable/test24130.c

@@ -0,0 +1,18 @@
+/*
+ * DISABLED: freebsd32 freebsd64 linux32 linux64 osx32 osx64 win64 dragonflybsd openbsd
+ */
+
+// https://issues.dlang.org/show_bug.cgi?id=24130
+
+void test(int ShiftCount, int Value)
+{
+#ifdef _MSC_VER
+__asm    {
+        mov     ecx, ShiftCount
+        mov     eax, dword ptr [Value]
+        mov     edx, dword ptr [Value+4]
+        shrd    eax, edx, cl
+        shr     edx, cl
+    }
+#endif
+}