Skip to content

Fix helloworld on x86 Linux #55095

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkotas merged 2 commits into from
Jul 9, 2021
Merged

Fix helloworld on x86 Linux #55095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1b6466
Fix helloworld work on .net x86 linux
t-mustafin Jul 2, 2021
626119f
Apply format patch
t-mustafin Jul 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/coreclr/jit/gentree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6423,6 +6423,9 @@ GenTreeCall* Compiler::gtNewCallNode(
GenTreeCall* node = new (this, GT_CALL) GenTreeCall(genActualType(type));

node->gtFlags |= (GTF_CALL | GTF_GLOB_REF);
#ifdef UNIX_X86_ABI
node->gtFlags |= GTF_CALL_POP_ARGS;
#endif // UNIX_X86_ABI
for (GenTreeCall::Use& use : GenTreeCall::UseList(args))
{
node->gtFlags |= (use.GetNode()->gtFlags & GTF_ALL_EFFECT);
Expand Down
9 changes: 7 additions & 2 deletions src/coreclr/jit/morph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ GenTree* Compiler::fgMorphIntoHelperCall(GenTree* tree, int helper, GenTreeCall:
call->gtCallMoreFlags = GTF_CALL_M_EMPTY;
call->gtInlineCandidateInfo = nullptr;
call->gtControlExpr = nullptr;
#ifdef UNIX_X86_ABI
call->gtFlags |= GTF_CALL_POP_ARGS;
#endif // UNIX_X86_ABI

#if DEBUG
// Helper calls are never candidates.
Expand Down Expand Up @@ -2894,9 +2897,10 @@ void Compiler::fgInitArgInfo(GenTreeCall* call)
}

#ifdef TARGET_X86
// Compute the maximum number of arguments that can be passed in registers.
// For X86 we handle the varargs and unmanaged calling conventions
// Compute the maximum number of arguments that can be passed in registers.
// For X86 we handle the varargs and unmanaged calling conventions

#ifndef UNIX_X86_ABI
if (call->gtFlags & GTF_CALL_POP_ARGS)
{
noway_assert(intArgRegNum < MAX_REG_ARG);
Expand All @@ -2907,6 +2911,7 @@ void Compiler::fgInitArgInfo(GenTreeCall* call)
if (callHasRetBuffArg)
maxRegArgs++;
}
#endif // UNIX_X86_ABI

if (call->IsUnmanaged())
{
Expand Down
11 changes: 11 additions & 0 deletions src/coreclr/vm/i386/jitinterfacex86.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,12 @@ void *JIT_TrialAlloc::GenBox(Flags flags)

// Do call to CopyValueClassUnchecked(object, data, pMT)

#ifdef UNIX_X86_ABI
#define STACK_ALIGN_PADDING 12
// Make pad to align esp
sl.X86EmitSubEsp(STACK_ALIGN_PADDING);
#endif // UNIX_X86_ABI

// Pass pMT (still in ECX)
sl.X86EmitPushReg(kECX);

Expand All @@ -507,6 +513,11 @@ void *JIT_TrialAlloc::GenBox(Flags flags)

// call CopyValueClass
sl.X86EmitCall(sl.NewExternalCodeLabel((LPVOID) CopyValueClassUnchecked), 12);
#ifdef UNIX_X86_ABI
// Make pad to align esp
sl.X86EmitAddEsp(STACK_ALIGN_PADDING);
#undef STACK_ALIGN_PADDING
#endif // UNIX_X86_ABI

// Restore the address of the newly allocated object and return it.
// mov eax,ebx
Expand Down