Skip to content

[Ppc64le] Added memory patch thunking for function calls #73616

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
akoeplinger merged 8 commits into from
Aug 12, 2022
Merged

[Ppc64le] Added memory patch thunking for function calls #73616

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e703c1a
[ppc64le] Added memory patch thunking for function calls
alhad-deshpande Aug 5, 2022
eb2a57b
Incorporated code review comments and changes in OP_TAILCALL for memp…
alhad-deshpande Aug 7, 2022
b0d75b8
[ppc64le] Fixed test failures and code refactoring
alhad-deshpande Aug 9, 2022
fe08e0c
Merge branch 'dotnet:main' into ppc64le-mono-thunk
alhad-deshpande Aug 9, 2022
509e6d5
[ppc64le] Enabled g_assert for code sequence check and removed white …
alhad-deshpande Aug 9, 2022
95220c9
Merge branch 'ppc64le-mono-thunk' of https://github.com/Sapana-Khemka…
alhad-deshpande Aug 9, 2022
9c1aa13
[ppc64le] Fixed build issue in mini-ppc.h
alhad-deshpande Aug 9, 2022
a199280
[ppc64le] Incorporated code review comments
alhad-deshpande Aug 10, 2022
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
Prev Previous commit
Next Next commit
[ppc64le] Enabled g_assert for code sequence check and removed white … 
…spaces
  • Loading branch information
@alhad-deshpande
alhad-deshpande committed Aug 9, 2022
commit 509e6d577e241127c9948d06db5bf47ce1de1750
21 changes: 13 additions & 8 deletions src/mono/mono/mini/mini-ppc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,12 @@ mono_ppc_is_direct_call_sequence (guint32 *code)
if (ppc_opcode (code [-2]) == 24 && ppc_opcode (code [-3]) == 31) /* mr/nop */
return is_load_sequence (&code [-8]);
else
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
/* the memory patch thunk sequence for ppc64le is: lis/ori/sldi/oris/ori/ld/mtlr/blrl */
return is_load_sequence (&code [-7]);
#else
return is_load_sequence (&code [-6]);
#endif
}
return FALSE;
#else
Expand Down Expand Up @@ -2693,18 +2698,18 @@ static void
emit_thunk (guint8 *code, gconstpointer target)
{
#if defined(TARGET_POWERPC64) && G_BYTE_ORDER == G_LITTLE_ENDIAN
*(guint64*)code = (guint64)target;
code += sizeof (guint64);
*(guint64*)code = (guint64)target;
code += sizeof (guint64);
#else
guint8 *p = code;
guint8 *p = code;

/* 2 bytes on 32bit, 5 bytes on 64bit */
ppc_load_sequence (code, ppc_r0, target);
/* 2 bytes on 32bit, 5 bytes on 64bit */
ppc_load_sequence (code, ppc_r0, target);

ppc_mtctr (code, ppc_r0);
ppc_bcctr (code, PPC_BR_ALWAYS, 0);
ppc_mtctr (code, ppc_r0);
ppc_bcctr (code, PPC_BR_ALWAYS, 0);

mono_arch_flush_icache (p, code - p);
mono_arch_flush_icache (p, code - p);
#endif
}

Expand Down
2 changes: 1 addition & 1 deletion src/mono/mono/mini/tramp-ppc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ mono_arch_patch_callsite (guint8 *method_start, guint8 *code_ptr, guint8 *addr)
}

/* Sanity check */
//g_assert (mono_ppc_is_direct_call_sequence (code));
g_assert (mono_ppc_is_direct_call_sequence (code));

ppc_patch ((guint8*)code, addr);
}
Expand Down