diff options
| author | Carol Eidt <carol.eidt@microsoft.com> | 2018-03-15 08:21:25 -0700 |
|---|---|---|
| committer | Carol Eidt <carol.eidt@microsoft.com> | 2018-04-17 16:15:14 -0700 |
| commit | 32480530dbcd0936e4292bdd50e5a94002f8dba2 (patch) | |
| tree | 333c33b54dce6addf25ec10419e7eb8ed742e05f /src/vm/amd64/calldescrworkeramd64.S | |
| parent | 963e5a9f08ed7c664036ef9b7050374b66f71d64 (diff) | |
| download | coreclr-32480530dbcd0936e4292bdd50e5a94002f8dba2.tar.gz coreclr-32480530dbcd0936e4292bdd50e5a94002f8dba2.tar.bz2 coreclr-32480530dbcd0936e4292bdd50e5a94002f8dba2.zip | |
Unix/x64 ABI cleanup
Eliminate `FEATURE_UNIX_AMD64_STRUCT_PASSING` and replace it with `UNIX_AMD64_ABI` when used alone. Both are currently defined; it is highly unlikely the latter will work alone; and it significantly clutters up the code, especially the JIT.
Also, fix the altjit support (now `UNIX_AMD64_ABI_ITF`) to *not* call `ClassifyEightBytes` if the struct is too large. Otherwise it asserts.
Diffstat (limited to 'src/vm/amd64/calldescrworkeramd64.S')
| -rw-r--r-- | src/vm/amd64/calldescrworkeramd64.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vm/amd64/calldescrworkeramd64.S b/src/vm/amd64/calldescrworkeramd64.S index 05dd8ac8ef..e91d41dd0e 100644 --- a/src/vm/amd64/calldescrworkeramd64.S +++ b/src/vm/amd64/calldescrworkeramd64.S @@ -108,7 +108,7 @@ LOCAL_LABEL(NoFloatArguments): cmp ecx, 8 je LOCAL_LABEL(ReturnsDouble) -#if defined(UNIX_AMD64_ABI) && defined(FEATURE_UNIX_AMD64_STRUCT_PASSING) +#if defined(UNIX_AMD64_ABI) // Struct with two integer eightbytes cmp ecx, 16 jne LOCAL_LABEL(NotTwoIntegerEightbytes) @@ -138,7 +138,7 @@ LOCAL_LABEL(NotFirstIntegerSecondSSEEightbyte): jne LOCAL_LABEL(Epilog) // unexpected movsd real8 ptr [rbx+CallDescrData__returnValue], xmm0 movsd real8 ptr [rbx+CallDescrData__returnValue + 8], xmm1 -#endif // UNIX_AMD64_ABI && FEATURE_UNIX_AMD64_STRUCT_PASSING +#endif // UNIX_AMD64_ABI jmp LOCAL_LABEL(Epilog) |