Skip to content
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

2241 update version file and add asm change #2242

Merged
merged 2 commits into from
Jan 23, 2024
Merged

2241 update version file and add asm change #2242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f00427
#2241: update version file
stmcgovern Jan 17, 2024
b471068
#2241: apply lib/context/src/context/asm hotfix changes
stmcgovern Jan 17, 2024
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
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.3.0
1.4.0
6 changes: 4 additions & 2 deletions lib/context/src/context/asm/jump_ppc64_sysv_elf_gas.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ jump_fcontext:
# endif
#endif
# reserve space on stack
subi %r1, %r1, 184
subi %r1, %r1, 192

#if _CALL_ELF != 2
std %r2, 0(%r1) # save TOC
Expand All @@ -123,6 +123,7 @@ jump_fcontext:
#if _CALL_ELF != 2
std %r3, 152(%r1) # save hidden
#endif
stfd %f31, 184(%r1) # save F31

# save CR
mfcr %r0
Expand Down Expand Up @@ -166,6 +167,7 @@ jump_fcontext:
#if _CALL_ELF != 2
ld %r3, 152(%r1) # restore hidden
#endif
lfd %f31, 184(%r1) # restore F31

# restore CR
ld %r0, 160(%r1)
Expand All @@ -180,7 +182,7 @@ jump_fcontext:
mtctr %r12

# adjust stack
addi %r1, %r1, 184
addi %r1, %r1, 192

#if _CALL_ELF == 2
# copy transfer_t into transfer_fn arg registers
Expand Down
4 changes: 2 additions & 2 deletions lib/context/src/context/asm/make_ppc64_sysv_elf_gas.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ make_fcontext:

# reserve space for context-data on context-stack
# including 64 byte of linkage + parameter area (R1 % 16 == 0)
subi %r3, %r3, 248
subi %r3, %r3, 256

# third arg of make_fcontext() == address of context-function
# entry point (ELFv2) or descriptor (ELFv1)
Expand All @@ -123,7 +123,7 @@ make_fcontext:

# set back-chain to zero
li %r0, 0
std %r0, 184(%r3)
std %r0, 192(%r3)

#if _CALL_ELF != 2
# zero in r3 indicates first jump to context-function
Expand Down
6 changes: 4 additions & 2 deletions lib/context/src/context/asm/ontop_ppc64_sysv_elf_gas.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ ontop_fcontext:
# endif
#endif
# reserve space on stack
subi %r1, %r1, 184
subi %r1, %r1, 192

#if _CALL_ELF != 2
std %r2, 0(%r1) # save TOC
Expand All @@ -123,6 +123,7 @@ ontop_fcontext:
#if _CALL_ELF != 2
std %r3, 152(%r1) # save hidden
#endif
stfd %f31, 184(%r1) # save F31

# save CR
mfcr %r0
Expand Down Expand Up @@ -165,6 +166,7 @@ ontop_fcontext:
#if _CALL_ELF != 2
ld %r3, 152(%r1) # restore hidden
#endif
lfd %f31, 184(%r1) # restore F31

# restore CR
ld %r0, 160(%r1)
Expand Down Expand Up @@ -203,7 +205,7 @@ return_to_ctx:
mtlr %r0

# adjust stack
addi %r1, %r1, 184
addi %r1, %r1, 192

# jump to context
bctr
Expand Down
Loading