vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/lib/ia64/longjmp.S: Fix the name of longjmp function.

Browse source 
* grub-core/lib/ia64/setjmp.S: Fix the name of setjmp function.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-03-02 15:31:17 +01:00
parent 396d4091e7
commit 7f8c105f61
4 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-03-02 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/lib/ia64/longjmp.S: Fix the name of longjmp function.
* grub-core/lib/ia64/setjmp.S: Fix the name of setjmp function.
2013-03-02 Vladimir Serbinenko <phcoder@gmail.com> 2013-03-02 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/script/execute.c (gettext_append): Remove nested functions. * grub-core/script/execute.c (gettext_append): Remove nested functions.

10
grub-core/lib/ia64/longjmp.S
View file

@ -40,10 +40,10 @@
/* __longjmp(__jmp_buf buf, int val) */ /* __longjmp(__jmp_buf buf, int val) */
.text .text
.global longjmp
.proc longjmp .proc EXT_C(grub_longjmp)
longjmp: FUNCTION(grub_longjmp)
alloc r8=ar.pfs,2,1,0,0 alloc r8=ar.pfs,2,1,0,0
mov r27=ar.rsc mov r27=ar.rsc
add r2=0x98,in0 // r2 <- &jmpbuf.orig_jmp_buf_addr add r2=0x98,in0 // r2 <- &jmpbuf.orig_jmp_buf_addr
@ -159,4 +159,4 @@ longjmp:
invala // virt. -> phys. regnum mapping may change invala // virt. -> phys. regnum mapping may change
mov pr=r24,-1 mov pr=r24,-1
br.ret.dptk.few rp br.ret.dptk.few rp
.endp longjmp .endp EXT_C(grub_longjmp)

8
grub-core/lib/ia64/setjmp.S
View file

@ -74,13 +74,13 @@ GRUB_MOD_LICENSE "GPLv2+"
/* The following two entry points are the traditional entry points: */ /* The following two entry points are the traditional entry points: */
.text .text
.global setjmp
.proc setjmp .proc EXT_C(grub_setjmp)
setjmp: FUNCTION(grub_setjmp)
alloc r8=ar.pfs,2,0,0,0 alloc r8=ar.pfs,2,0,0,0
mov in1=1 mov in1=1
br.cond.sptk.many __sigsetjmp br.cond.sptk.many __sigsetjmp
.endp setjmp .endp EXT_C(grub_setjmp)
/* __sigsetjmp(__jmp_buf buf, int savemask) */ /* __sigsetjmp(__jmp_buf buf, int savemask) */

2
include/grub/ia64/setjmp.h
View file

@ -24,5 +24,5 @@
/* the __jmp_buf element type should be __float80 per ABI... */ /* the __jmp_buf element type should be __float80 per ABI... */
typedef long grub_jmp_buf[_JBLEN] __attribute__ ((aligned (16))); /* guarantees 128-bit alignment! */ typedef long grub_jmp_buf[_JBLEN] __attribute__ ((aligned (16))); /* guarantees 128-bit alignment! */
int grub_setjmp (grub_jmp_buf env); int grub_setjmp (grub_jmp_buf env) __attribute__ ((returns_twice));
void grub_longjmp (grub_jmp_buf env, int val) __attribute__ ((noreturn)); void grub_longjmp (grub_jmp_buf env, int val) __attribute__ ((noreturn));