Skip to content

Commit

Permalink
SH: makecontext/.Lexitcode: Always initialize the GOT register before…
Browse files Browse the repository at this point in the history
… use.

This is only relevant when returning from a context with »uc_link == NULL«,
which is not exercised in the testsuite.
  • Loading branch information
Thomas Schwinge committed Jun 23, 2012
1 parent 2a64972 commit a9def8c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
3 changes: 3 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
2012-06-23 Thomas Schwinge <thomas@codesourcery.com>

* sysdeps/unix/sysv/linux/sh/makecontext.S (.Lexitcode): Always
initialize the GOT register before use.

* sysdeps/unix/sysv/linux/sh/makecontext.S (__makecontext): Fix
calculation of ARGC > 4.

Expand Down
12 changes: 8 additions & 4 deletions sysdeps/unix/sysv/linux/sh/makecontext.S
Original file line number Diff line number Diff line change
Expand Up @@ -97,22 +97,26 @@ ENTRY(__makecontext)

.align 5
.Lexitcode:
tst r8, r8 /* ucb->uc_link == NULL? */
bt/s 2f
mov r8, r4 /* r4 <- ucb->uc_link */
#ifdef PIC
mova .Lgot, r0
mov.l .Lgot, r12
add r0, r12
#endif
tst r8, r8 /* ucb->uc_link == NULL? */
bt/s 2f
mov r8, r4 /* r4 <- ucb->uc_link */
mov.l .Lsetcontext, r1
#ifdef PIC
bsrf r1
.LPCS0:
nop
#else
mov.l .Lsetcontext, r1
jsr @r1
nop
#endif
/* If this returns (which can happen if the syscall fails) we'll exit
the program with the return error value (-1). */

2:
mov.l .Lexit, r1
#ifdef PIC
Expand Down

0 comments on commit a9def8c

Please sign in to comment.