ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oleaut32: Fix ARM floating point register allocations. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2017-12-08 15:08:57 +01:00
parent 46aedd2ba4
commit b67dc2f4da
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/oleaut32/typelib.c
View File

@ -6867,7 +6867,8 @@ DispCallFunc(
} regs; } regs;
int rcount; /* 32-bit register index count */ int rcount; /* 32-bit register index count */
#ifndef __SOFTFP__ #ifndef __SOFTFP__
int scount = 0; /* single-precision float register index count (will be incremented twice for doubles, plus alignment) */ int scount = 0; /* single-precision float register index count */
int dcount = 0; /* double-precision float register index count */
#endif #endif
TRACE("(%p, %ld, %d, %d, %d, %p, %p, %p (vt=%d))\n", TRACE("(%p, %ld, %d, %d, %d, %p, %p, %p (vt=%d))\n",
@ -6921,15 +6922,13 @@ DispCallFunc(
case VT_R8: /* these must be 8-byte aligned, and put in 'd' regs or stack, as they are double-floats */ case VT_R8: /* these must be 8-byte aligned, and put in 'd' regs or stack, as they are double-floats */
case VT_DATE: case VT_DATE:
#ifndef __SOFTFP__ #ifndef __SOFTFP__
if (scount < 15) dcount = max( (scount + 1) / 2, dcount );
if (dcount < 8)
{ {
scount += (scount % 2); /* align scount to next whole double */ regs.sd.d[dcount++] = V_R8(arg);
regs.sd.d[scount/2] = V_R8(arg);
scount += 2;
} }
else else
{ {
scount = 16; /* Make sure we flag that all 's' regs are full */
argspos += (argspos % 2); /* align argspos to 8-bytes */ argspos += (argspos % 2); /* align argspos to 8-bytes */
memcpy( &args[argspos], &V_R8(arg), sizeof(V_R8(arg)) ); memcpy( &args[argspos], &V_R8(arg), sizeof(V_R8(arg)) );
argspos += sizeof(V_R8(arg)) / sizeof(DWORD); argspos += sizeof(V_R8(arg)) / sizeof(DWORD);
@ -6981,6 +6980,7 @@ DispCallFunc(
break; break;
case VT_R4: /* these must be 4-byte aligned, and put in 's' regs or stack, as they are single-floats */ case VT_R4: /* these must be 4-byte aligned, and put in 's' regs or stack, as they are single-floats */
#ifndef __SOFTFP__ #ifndef __SOFTFP__
if (!(scount % 2)) scount = max( scount, dcount * 2 );
if (scount < 16) if (scount < 16)
regs.sd.s[scount++] = V_R4(arg); regs.sd.s[scount++] = V_R4(arg);
else else