Skip to content

[ppc64le] Bug fixes - Backport #77202

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

Closed
alhad-deshpande wants to merge 5 commits into from
Closed

[ppc64le] Bug fixes - Backport #77202

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
44b121d
[ppc64le] Bug fixes
alhad-deshpande Aug 30, 2022
71f2ac8
[ppc64le] Fixed thunk address 8 byte alignment issue
alhad-deshpande Sep 8, 2022
9a612ae
Merge branch 'dotnet:release/7.0' into release/7.0
alhad-deshpande Sep 8, 2022
a4d8616
Merge branch 'dotnet:release/7.0' into release/7.0
alhad-deshpande Oct 19, 2022
daf76ab
[ppc64le] Bug fixes
alhad-deshpande Oct 19, 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] Fixed thunk address 8 byte alignment issue
  • Loading branch information
@alhad-deshpande
alhad-deshpande committed Sep 8, 2022
commit 71f2ac881f42d0efd48e03d03da0d86fc2b6cc16
17 changes: 14 additions & 3 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 @@ -2732,6 +2732,9 @@ handle_thunk (MonoCompile *cfg, guchar *code, const guchar *target)
if (!cfg->arch.thunks) {
cfg->arch.thunks = cfg->thunks;
cfg->arch.thunks_size = cfg->thunk_area;
#ifdef THUNK_ADDR_ALIGNMENT
cfg->arch.thunks = ALIGN_TO(cfg->arch.thunks, THUNK_ADDR_ALIGNMENT);
#endif
}
thunks = cfg->arch.thunks;
thunks_size = cfg->arch.thunks_size;
Expand Down Expand Up @@ -3907,11 +3910,11 @@ mono_arch_output_basic_block (MonoCompile *cfg, MonoBasicBlock *bb)
if (cfg->compile_aot && ins->sreg1 == ppc_r12) {
/* The trampolines clobber this */
ppc_mr (code, ppc_r29, ins->sreg1);
ppc_ldptr (code, ppc_r0, ins->inst_offset, ppc_r29);
ppc_ldptr (code, ppc_r12, ins->inst_offset, ppc_r29);
} else {
ppc_ldptr (code, ppc_r0, ins->inst_offset, ins->sreg1);
ppc_ldptr (code, ppc_r12, ins->inst_offset, ins->sreg1);
}
ppc_mtlr (code, ppc_r0);
ppc_mtlr (code, ppc_r12);
ppc_blrl (code);
/* FIXME: this should be handled somewhere else in the new jit */
code = emit_move_return_value (cfg, ins, code);
Expand Down Expand Up @@ -5556,6 +5559,14 @@ mono_arch_emit_exceptions (MonoCompile *cfg)
}

set_code_cursor (cfg, code);

#ifdef THUNK_ADDR_ALIGNMENT
/* We need to align thunks_offset to 8 byte boundary, hence allocating first 8 bytes
for padding purpose */
if (cfg->thunk_area != 0) {
cfg->thunk_area += THUNK_ADDR_ALIGNMENT;
}
#endif
}
#endif

Expand Down
1 change: 1 addition & 0 deletions src/mono/mono/mini/mini-ppc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#ifdef TARGET_POWERPC64
#if !defined(PPC_USES_FUNCTION_DESCRIPTOR)
#define THUNK_SIZE 8
#define THUNK_ADDR_ALIGNMENT 8
#define GET_MEMORY_SLOT_THUNK_ADDRESS(c) \
((guint64)(((c)) [0] & 0x0000ffff) << 48) \
+ ((guint64)(((c)) [1] & 0x0000ffff) << 32) \
Expand Down