Attachment 1451878 Details for Bug 1591701 – patch5

[patch] patch5

ppc64le_1d40c34.patch (text/plain), 2.52 KB, created by Menanteau Guy on 2018-06-15 10:19:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Menanteau Guy

Created: 2018-06-15 10:19:55 UTC

Size: 2.52 KB

patch

obsolete

>From 1d40c34ec38fbe4ec9f5a6a4eaf82eac63558bb0 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Marcin=20Ko=C5=9Bcielnicki?= <koriakin@0x04.net>
>Date: Sat, 9 Jul 2016 03:00:14 +0200
>Subject: [PATCH] ppc: Fix unwind info for ppc64.
>
>---
> src/vm_ppc.dasc | 32 ++++++++++++++++++++++++++++++--
> 1 file changed, 30 insertions(+), 2 deletions(-)
>
>diff --git a/src/vm_ppc.dasc b/src/vm_ppc.dasc
>index f8775611d..e8e0dfdd6 100644
>--- a/src/vm_ppc.dasc
>+++ b/src/vm_ppc.dasc
>@@ -5209,7 +5209,11 @@ static void emit_asm_debug(BuildCtx *ctx)
> 	"\t.byte 0x1\n"
> 	"\t.string \"\"\n"
> 	"\t.uleb128 0x1\n"
>+#if LJ_ARCH_PPC32ON64
>+	"\t.sleb128 -8\n"
>+#else
> 	"\t.sleb128 -4\n"
>+#endif
> 	"\t.byte 65\n"
> 	"\t.byte 0xc\n\t.uleb128 1\n\t.uleb128 0\n"
> 	"\t.align 2\n"
>@@ -5222,14 +5226,24 @@ static void emit_asm_debug(BuildCtx *ctx)
> 	"\t.long .Lbegin\n"
> 	"\t.long %d\n"
> 	"\t.byte 0xe\n\t.uleb128 %d\n"
>+#if LJ_ARCH_PPC32ON64
>+	"\t.byte 0x11\n\t.uleb128 65\n\t.sleb128 -2\n"
>+	"\t.byte 0x11\n\t.uleb128 70\n\t.sleb128 -1\n",
>+#else
> 	"\t.byte 0x11\n\t.uleb128 65\n\t.sleb128 -1\n"
> 	"\t.byte 0x5\n\t.uleb128 70\n\t.uleb128 55\n",
>+#endif
> 	fcofs, CFRAME_SIZE);
>     for (i = 14; i <= 31; i++)
>       fprintf(ctx->fp,
> 	"\t.byte %d\n\t.uleb128 %d\n"
> 	"\t.byte %d\n\t.uleb128 %d\n",
>-	0x80+i, 37+(31-i), 0x80+32+i, 2+2*(31-i));
>+#if LJ_ARCH_PPC32ON64
>+	0x80+i, 19+(31-i), 0x80+32+i, 1+(31-i)
>+#else
>+	0x80+i, 37+(31-i), 0x80+32+i, 2+2*(31-i)
>+#endif
>+      );
>     fprintf(ctx->fp,
> 	"\t.align 2\n"
> 	".LEFDE0:\n\n");
>@@ -5261,7 +5275,11 @@ static void emit_asm_debug(BuildCtx *ctx)
> 	"\t.byte 0x1\n"
> 	"\t.string \"zPR\"\n"
> 	"\t.uleb128 0x1\n"
>+#if LJ_ARCH_PPC32ON64
>+	"\t.sleb128 -8\n"
>+#else
> 	"\t.sleb128 -4\n"
>+#endif
> 	"\t.byte 65\n"
> 	"\t.uleb128 6\n"			/* augmentation length */
> 	"\t.byte 0x1b\n"			/* pcrel|sdata4 */
>@@ -5279,14 +5297,24 @@ static void emit_asm_debug(BuildCtx *ctx)
> 	"\t.long %d\n"
> 	"\t.uleb128 0\n"			/* augmentation length */
> 	"\t.byte 0xe\n\t.uleb128 %d\n"
>+#if LJ_ARCH_PPC32ON64
>+	"\t.byte 0x11\n\t.uleb128 65\n\t.sleb128 -2\n"
>+	"\t.byte 0x11\n\t.uleb128 70\n\t.sleb128 -1\n",
>+#else
> 	"\t.byte 0x11\n\t.uleb128 65\n\t.sleb128 -1\n"
> 	"\t.byte 0x5\n\t.uleb128 70\n\t.uleb128 55\n",
>+#endif
> 	fcofs, CFRAME_SIZE);
>     for (i = 14; i <= 31; i++)
>       fprintf(ctx->fp,
> 	"\t.byte %d\n\t.uleb128 %d\n"
> 	"\t.byte %d\n\t.uleb128 %d\n",
>-	0x80+i, 37+(31-i), 0x80+32+i, 2+2*(31-i));
>+#if LJ_ARCH_PPC32ON64
>+	0x80+i, 19+(31-i), 0x80+32+i, 1+(31-i)
>+#else
>+	0x80+i, 37+(31-i), 0x80+32+i, 2+2*(31-i)
>+#endif
>+      );
>     fprintf(ctx->fp,
> 	"\t.align 2\n"
> 	".LEFDE2:\n\n");

Actions: View | Diff

Attachments on bug 1591701: 1451874 | 1451875 | 1451876 | 1451877 | 1451878 | 1451879 | 1451880 | 1451881 | 1451882 | 1579425