Skip to content

Segmentation fault while running test-suite and iter.lua Test case f… #194

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
wants to merge 2 commits into from
Closed

Segmentation fault while running test-suite and iter.lua Test case f… #194

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d46e99
Segmentation fault while running test-suite and iter.lua Test case f…
Jan 31, 2023
a94adaf
Added code to support PPC64LE
vikasgupta8 Oct 5, 2023
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
45 changes: 42 additions & 3 deletions src/vm_ppc.dasc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -977,16 +977,28 @@ static void build_subroutines(BuildCtx *ctx)
|.if FFI
| cmplwi TMP0, 1
|.endif
|.if P64
|// PC value corrected to avoid segfault
Copy link
Contributor

@zhuizhuhaomeng zhuizhuhaomeng Apr 18, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this part be merged into [email protected]:LuaJIT/LuaJIT.git

Copy link

@vikasgupta8 vikasgupta8 May 3, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change was already included in moonjit.

https://github.com/moonjit/moonjit/blob/a2a39ea7184f3c8cab9474c6e41f6541265fb362/src/vm_ppc.dasc#L981

| lwz PC, FRAME_CONTPC(RB) // Restore PC from [cont|PC].
| addi BASEP4, BASE, 4
| addi TMP2, RD, WORD_HI-8
| lwz TMP1, LFUNC:TMP1->pc
|.else
| lwz PC, -16(RB) // Restore PC from [cont|PC].
| subi TMP2, RD, 8
|.endif
| stwx TISNIL, RA, TMP2 // Ensure one valid arg.
|.if P64
| ld TMP3, 0(DISPATCH)
|.endif
|.if FFI
| ble >1
|.endif
|.if P64
| add TMP0, TMP0, TMP3
|.else
| lwz TMP1, LFUNC:TMP1->pc
|.endif
| lwz KBASE, PC2PROTO(k)(TMP1)
| // BASE = base, RA = resultptr, RB = meta base
| mtctr TMP0
Expand Down Expand Up @@ -1715,6 +1727,25 @@ static void build_subroutines(BuildCtx *ctx)
|
|//-- Base library: iterators -------------------------------------------
|
|.if P64
|.ffunc next
| cmplwi NARGS8:RC, 8
| lwz TAB:CARG1, WORD_LO(BASE)
| blt ->fff_fallback
|.if ENDIAN_LE
| add TMP1, BASE, NARGS8:RC
| stw TISNIL, WORD_HI(TMP1) // Set missing 2nd arg to nil.
|.else
| stwx TISNIL, BASE, NARGS8:RC // Set missing 2nd arg to nil.
|.endif
| lwz PC, FRAME_PC(BASE)
| stp BASE, L->base // Add frame since C call can throw.
| stp BASE, L->top // Dummy frame length is ok.
| la CARG2, 8(BASE)
| la CARG3, -8(BASE)
| stw PC, SAVE_PC
| bl extern lj_tab_next // (GCtab *t, cTValue *key,TValue *o)
|.else
|.ffunc_1 next
| stwx TISNIL, BASE, NARGS8:RC // Set missing 2nd arg to nil.
| checktab CARG3
Expand All @@ -1723,16 +1754,17 @@ static void build_subroutines(BuildCtx *ctx)
| la CARG2, 8(BASE)
| la CARG3, -8(BASE)
| bl extern lj_tab_next // (GCtab *t, cTValue *key, TValue *o)
|.endif
| // Returns 1=found, 0=end, -1=error.
| cmpwi CRET1, 0
| la RA, -8(BASE)
| li RD, (2+1)*8
| bgt ->fff_res // Found key/value.
| bgt ->fff_res // Found key/value.
| li CARG3, LJ_TNIL
| beq ->fff_restv // End of traversal: return nil.
| beq ->fff_restv // End of traversal: return nil.
| lwz CFUNC:RB, FRAME_FUNC(BASE)
| li NARGS8:RC, 2*8
| b ->fff_fallback // Invalid key.
| b ->fff_fallback // Invalid key.
|
|.ffunc_1 pairs
| checktab CARG3
Expand Down Expand Up @@ -5667,10 +5699,17 @@ static void build_ins(BuildCtx *ctx, BCOp op, int defop)
| crand 4*cr0+eq, 4*cr0+eq, 4*cr7+eq
| add TMP3, PC, TMP0
| bne cr0, >5
|.if P64
| lus TMP1, 0xfffe
| ori TMP1, TMP1, 0x7fff
| stw ZERO, WORD_LO-8(RA) // Initialize control var.
| stw TMP1, WORD_HI-8(RA)
|.else
| lus TMP1, (LJ_KEYINDEX >> 16)
| ori TMP1, TMP1, (LJ_KEYINDEX & 0xffff)
| stw ZERO, -4(RA) // Initialize control var.
| stw TMP1, -8(RA)
|.endif
| addis PC, TMP3, -(BCBIAS_J*4 >> 16)
|1:
| ins_next
Expand Down