mirrors/gnu-efi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnu-efi: fix lib/ia64/setjmp.S IA-64 build failure

Browse Source 
The build failed as:
  lib/ia64/setjmp.S:171: Error: Unknown opcode `ldf.nt1 f26=[r10],8'
  lib/ia64/setjmp.S:178: Error: Operand 1 of `ldf.fill.nt1' should be a floating-point register

The change syncs longjmp definition with
    edk2/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/Ipf/setjmp.s
pulling in:
- branch in the end of function
- registers used wrong instruction for float restore

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
This commit is contained in:
Sergei Trofimovich 2018-01-28 16:44:21 +00:00
parent d039cd620b
commit 0e6995a96b
1 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/ia64/setjmp.S
View File

@ -16,7 +16,7 @@ BASIS,
.globl setjmp .globl setjmp
.type setjmp, @function .type setjmp, @function
setjmp: setjmp:
alloc loc = ar.pfs, 1, 2, 1, 0 alloc loc0 = ar.pfs, 1, 2, 1, 0
;; ;;
mov r14 = ar.unat mov r14 = ar.unat
mov r15 = ar.bsp mov r15 = ar.bsp
@ -98,10 +98,10 @@ setjmp:
.globl longjmp .globl longjmp
.type longjmp, @function .type longjmp, @function
.regstk .regstk 2, 0, 0, 0
longjmp: longjmp:
add r10 = 0x10*20 + 8*14, in0 add r10 = 0x10*20 + 8*14, in0
movl r2 = ~(((1<<14) - 1) << 16) | 3) movl r2 = ~((((1<<14) - 1) << 16) | 3)
;; ;;
ld8.nt1 r14 = [r10], -8*2 ld8.nt1 r14 = [r10], -8*2
mov r15 = ar.bspstore mov r15 = ar.bspstore
@ -120,10 +120,6 @@ longjmp:
;; ;;
mov ar.rsc = r2 mov ar.rsc = r2
ld8.nt1 r23 = [r10], -8 ld8.nt1 r23 = [r10], -8
mov b5 = r25
;;
mov ar.rsc = r2
ld8.nt1 r23 = [r10], -8
mov b4 = r24 mov b4 = r24
;; ;;
ldf.fill.nt1 f3 = [in0], 0x10 ldf.fill.nt1 f3 = [in0], 0x10
@ -142,8 +138,8 @@ _skip_flushrs:
dep r2 = -1, r14, 3, 6 dep r2 = -1, r14, 3, 6
;; ;;
ldf.fill.nt1 f5 = [in0], 0x10 ldf.fill.nt1 f5 = [in0], 0x10
ld8.nt1 f21 = [r10], -8 ld8.nt1 r21 = [r10], -8
cmp p6 = r2, r15 cmp.ltu p6 = r2, r15
;; ;;
ld8.nt1 r20 = [r10], -0x10 ld8.nt1 r20 = [r10], -0x10
(p6) ld8.nta r31 = [r2] (p6) ld8.nta r31 = [r2]
@ -168,14 +164,14 @@ _skip_flushrs:
ld8.nt1 r19 = [r10], 0x10 ld8.nt1 r19 = [r10], 0x10
;; ;;
ldf.fill.nt1 f21 = [in0], 0x10 ldf.fill.nt1 f21 = [in0], 0x10
ldf.nt1 f26 = [r10], 8 ld8.nt1 r26 = [r10], 8
mov ar.pfs = r19 mov ar.pfs = r19
;; ;;
ldf.fill.nt1 f22 = [in0], 0x10 ldf.fill.nt1 f22 = [in0], 0x10
ld8.nt1 r27 = [r10], 8 ld8.nt1 r27 = [r10], 8
mov pr = r26, -1 mov pr = r26, -1
;; ;;
ldf.fill.nt1 r23 = [in0], 0x10 ldf.fill.nt1 f23 = [in0], 0x10
ld8.nt1 r28 = [r10], -17*8 - 0x10 ld8.nt1 r28 = [r10], -17*8 - 0x10
mov ar.lc = r27 mov ar.lc = r27
;; ;;
@ -198,3 +194,6 @@ _skip_flushrs:
mov ar.bspstore = r14 mov ar.bspstore = r14
mov ar.rnat = r31 mov ar.rnat = r31
;; ;;
invala
mov ar.rsc = r16
br.ret.sptk b0