Attachment 1451875 Details for Bug 1591701 – patch2

[patch] patch2

ppc64le_8d1fb71.patch (text/plain), 1.68 KB, created by Menanteau Guy on 2018-06-15 10:18:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Menanteau Guy

Created: 2018-06-15 10:18:29 UTC

Size: 1.68 KB

patch

obsolete

>From 8d1fb7131d1993bbe739cafce576dee05a892f91 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Marcin=20Ko=C5=9Bcielnicki?= <koriakin@0x04.net>
>Date: Sun, 10 Jul 2016 13:17:51 +0200
>Subject: [PATCH] ppc: ppc64 TOC fixes
>
>---
> src/vm_ppc.dasc | 6 ++++++
> 1 file changed, 6 insertions(+)
>
>diff --git a/src/vm_ppc.dasc b/src/vm_ppc.dasc
>index e91964717..da31c25f9 100644
>--- a/src/vm_ppc.dasc
>+++ b/src/vm_ppc.dasc
>@@ -792,6 +792,8 @@ static void build_subroutines(BuildCtx *ctx)
>   |   sub TMP0, TMP0, TMP1		// Compute -savestack(L, L->top).
>   |    lp TMP1, L->cframe
>   |     addi DISPATCH, DISPATCH, GG_G2DISP
>+  |  .toc lp TOCREG, TOC_OFS(CARG4)
>+  |  .tocenv lp ENVREG, ENV_OFS(CARG4)
>   |  .toc lp CARG4, 0(CARG4)
>   |  li TMP2, 0
>   |   stw TMP0, SAVE_NRES		// Neg. delta means cframe w/o frame.
>@@ -801,6 +803,7 @@ static void build_subroutines(BuildCtx *ctx)
>   |     stw L, DISPATCH_GL(cur_L)(DISPATCH)
>   |  mtctr CARG4
>   |  bctrl			// (lua_State *L, lua_CFunction func, void *ud)
>+  |  .toc lp TOCREG, SAVE_TOC
>   |.if PPE
>   |  mr BASE, CRET1
>   |  cmpwi CRET1, 0
>@@ -2409,6 +2412,8 @@ static void build_subroutines(BuildCtx *ctx)
>   |    addi TMP0, TMP1, 8*LUA_MINSTACK
>   |     lwz TMP2, L->maxstack
>   |   stw PC, SAVE_PC			// Redundant (but a defined value).
>+  |  .toc lp TOCREG, TOC_OFS(TMP3)
>+  |  .tocenv lp ENVREG, ENV_OFS(TMP3)
>   |  .toc lp TMP3, 0(TMP3)
>   |  cmplw TMP0, TMP2
>   |     stp BASE, L->base
>@@ -2419,6 +2424,7 @@ static void build_subroutines(BuildCtx *ctx)
>   |  bctrl				// (lua_State *L)
>   |  // Either throws an error, or recovers and returns -1, 0 or nresults+1.
>   |  lp BASE, L->base
>+  |  .toc lp TOCREG, SAVE_TOC
>   |  cmpwi CRET1, 0
>   |   slwi RD, CRET1, 3
>   |   la RA, -8(BASE)

Actions: View | Diff

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