fix Issue 21914 - naked assembler functions get wrong offset to parameters

Author: WalterBright

src/dmd/backend/cgcod.d

@@ -832,8 +832,9 @@ Lagain:
     {
         version (FRAMEPTR)
         {
-            Para.size = ((farfunc ? 2 : 1) + needframe) * REGSIZE;
-            if (needframe)
+            bool frame = needframe || tyf & mTYnaked;
+            Para.size = ((farfunc ? 2 : 1) + frame) * REGSIZE;
+            if (frame)
                 EBPtoESP = -REGSIZE;
         }
         else

src/dmd/backend/cod3.d

@@ -752,6 +752,7 @@ void cgreg_dst_regs(reg_t* dst_integer_reg, reg_t* dst_float_reg)
 @trusted
 void cgreg_set_priorities(tym_t ty, const(reg_t)** pseq, const(reg_t)** pseqmsw)
 {
+    //printf("cgreg_set_priorities %x\n", ty);
     const sz = tysize(ty);
 
     if (tyxmmreg(ty))
@@ -5453,7 +5454,9 @@ void assignaddrc(code *c)
                 break;
 
             case FLpara:
-//printf("s = %s, Soffset = %d, Para.size = %d, BPoff = %d, EBPtoESP = %d\n", s.Sident.ptr, s.Soffset, Para.size, BPoff, EBPtoESP);
+                //printf("s = %s, Soffset = %d, Para.size = %d, BPoff = %d, EBPtoESP = %d, Vpointer = %d\n",
+                //s.Sident.ptr, cast(int)s.Soffset, cast(int)Para.size, cast(int)BPoff,
+                //cast(int)EBPtoESP, cast(int)c.IEV1.Vpointer);
                 soff = Para.size - BPoff;    // cancel out add of BPoff
                 goto L1;
 

test/runnable/iasm.d

@@ -4847,13 +4847,13 @@ L1:     pop     EAX;
 
 extern(C) void f16400(int, ...)
 {
-	asm {naked; ret;}
+        asm {naked; ret;}
 }
 
 void test16400()
 {
-	assert(*(cast(ubyte*) &f16400) == 0xc3); // fails
-	f16400(0); // corrupts the stack
+        assert(*(cast(ubyte*) &f16400) == 0xc3); // fails
+        f16400(0); // corrupts the stack
 }
 
 /****************************************************/
@@ -4883,13 +4883,35 @@ void test5922()
     asm
     {
         mov EDI, x;
-	mov y, EDI;
+        mov y, EDI;
     }
     assert(y == 10);
 }
 
 /****************************************************/
 
+// https://issues.dlang.org/show_bug.cgi?id=21914
+
+extern (C++) int insidx(int a, int b)
+{
+    asm
+    {
+        naked             ;
+        mov ECX,a-4+[ESP] ;
+        mov EAX,b-4+[ESP] ;
+        shl EAX,CL        ;
+        ret               ;
+    }
+}
+
+void test21914()
+{
+    int x = insidx(5, 7);
+    assert(x == (7 << 5));
+}
+
+/****************************************************/
+
 int main()
 {
     printf("Testing iasm.d\n");
@@ -4967,6 +4989,7 @@ int main()
     test16400();
     test16963();
     test5922();
+    test21914();
   }
     printf("Success\n");
     return 0;