Skip to content

Ppc64le bug fixes #74746

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 11 commits into from
Aug 29, 2022
Merged

Ppc64le bug fixes #74746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
997c94f
Avoid transformation from multiplication to left shift in case of 64 …
alhad-deshpande Jun 23, 2022
a348024
Fixed System.Collections.Concurrent.Tests timeout issue
alhad-deshpande Jul 28, 2022
479cc51
Merge branch 'dotnet:main' into ppc64le_bug_fixes
alhad-deshpande Jul 28, 2022
ee8d25e
Merge branch 'ppc64le_bug_fixes' of https://github.com/Sapana-Khemkar…
Sapana-Khemkar Aug 3, 2022
1a774f3
Merge branch 'dotnet:main' into ppc64le_bug_fixes
Sapana-Khemkar Aug 3, 2022
8fc6100
Merge branch 'dotnet:main' into ppc64le_bug_fixes
alhad-deshpande Aug 16, 2022
ae1bdde
[ppc64le] Fixed test case failures
alhad-deshpande Aug 17, 2022
46c5a68
[ppc64le] Incorporated code review comments
alhad-deshpande Aug 17, 2022
95d8be7
[ppc64le] Fixing conditional branching issue
vikasgupta8 Aug 29, 2022
a5b1c7c
[ppc64le] Fixed stack unwinding issue
alhad-deshpande Aug 29, 2022
f9a4be4
Merge branch 'dotnet:main' into ppc64le_bug_fixes
alhad-deshpande Aug 29, 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
4 changes: 2 additions & 2 deletions src/mono/mono/mini/exceptions-ppc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,9 +564,9 @@ mono_arch_unwind_frame (MonoJitTlsData *jit_tls,

unwind_info = mono_jinfo_get_unwind_info (ji, &unwind_info_len);

sframe = (MonoPPCStackFrame*)MONO_CONTEXT_GET_SP (ctx);
MONO_CONTEXT_SET_BP (new_ctx, sframe->sp);
if (!ji->is_trampoline && jinfo_get_method (ji)->save_lmf) {
sframe = (MonoPPCStackFrame*)MONO_CONTEXT_GET_SP (ctx);
MONO_CONTEXT_SET_BP (new_ctx, sframe->sp);
/* sframe->sp points just past the end of the LMF */
guint8 *lmf_addr = (guint8*)sframe->sp - sizeof (MonoLMF);
memcpy (&new_ctx->fregs [MONO_PPC_FIRST_SAVED_FREG], lmf_addr + G_STRUCT_OFFSET (MonoLMF, fregs), sizeof (double) * MONO_SAVED_FREGS);
Expand Down
4 changes: 2 additions & 2 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 @@ -1891,7 +1891,7 @@ typedef struct {
if (0 && ins->inst_true_bb->native_offset) { \
ppc_bc (code, (b0), (b1), (code - cfg->native_code + ins->inst_true_bb->native_offset) & 0xffff); \
} else { \
int br_disp = ins->inst_true_bb->max_offset - offset; \
int br_disp = ins->inst_true_bb->max_offset - cpos; \
if (!ppc_is_imm16 (br_disp + 8 * 1024) || !ppc_is_imm16 (br_disp - 8 * 1024)) { \
MonoOvfJump *ovfj = mono_mempool_alloc (cfg->mempool, sizeof (MonoOvfJump)); \
ovfj->data.bb = ins->inst_true_bb; \
Expand All @@ -1915,7 +1915,7 @@ if (0 && ins->inst_true_bb->native_offset) { \
*/
#define EMIT_COND_SYSTEM_EXCEPTION_FLAGS(b0,b1,exc_name) \
do { \
int br_disp = cfg->bb_exit->max_offset - offset; \
int br_disp = cfg->bb_exit->max_offset - cpos; \
if (!ppc_is_imm16 (br_disp + 1024) || ! ppc_is_imm16 (ppc_is_imm16 (br_disp - 1024))) { \
MonoOvfJump *ovfj = mono_mempool_alloc (cfg->mempool, sizeof (MonoOvfJump)); \
ovfj->data.exception = (exc_name); \
Expand Down