From a20c82f9336a65a7ea3764ac58b4f1acd15dc5d5 Mon Sep 17 00:00:00 2001
From: Alhad Deshpande <97085048+alhad-deshpande@users.noreply.github.com>
Date: Thu, 8 Sep 2022 21:08:23 +0530
Subject: [PATCH] [release/7.0][ppc64le] Fixed thunk address 8 byte alignment
 issue (#75258)

* [ppc64le] Bug fixes

* [ppc64le] Fixed thunk address 8 byte alignment issue
---
 src/mono/mono/mini/mini-ppc.c | 17 ++++++++++++++---
 src/mono/mono/mini/mini-ppc.h |  1 +
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/mono/mono/mini/mini-ppc.c b/src/mono/mono/mini/mini-ppc.c
index d1b8fc9790783..bc97b497af93a 100644
--- a/src/mono/mono/mini/mini-ppc.c
+++ b/src/mono/mono/mini/mini-ppc.c
@@ -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;
@@ -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);
@@ -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
 
diff --git a/src/mono/mono/mini/mini-ppc.h b/src/mono/mono/mini/mini-ppc.h
index 0b962aac233d2..e872c4b99c538 100644
--- a/src/mono/mono/mini/mini-ppc.h
+++ b/src/mono/mono/mini/mini-ppc.h
@@ -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) \