From 1a51bde7717d8f0458b682576029576225cf874f Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 6 Apr 2001 21:58:34 +0000 Subject: Update. 2001-04-06 David Mosberger * stdlib/tst-setcontext.c: Move st2[] to global scope. (f2): Verify that stack pointer is inside st2[]. * sysdeps/unix/sysv/linux/ia64/getcontext.S: It helps to save r12. * sysdeps/unix/sysv/linux/ia64/setcontext.S: It helps to restore r12. --- sysdeps/unix/sysv/linux/ia64/getcontext.S | 7 +++---- sysdeps/unix/sysv/linux/ia64/setcontext.S | 11 ++++++----- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'sysdeps') diff --git a/sysdeps/unix/sysv/linux/ia64/getcontext.S b/sysdeps/unix/sysv/linux/ia64/getcontext.S index 2669a2b85f..1a0ca915ab 100644 --- a/sysdeps/unix/sysv/linux/ia64/getcontext.S +++ b/sysdeps/unix/sysv/linux/ia64/getcontext.S @@ -61,12 +61,11 @@ ENTRY(__getcontext) mov.i rPFS = ar.pfs ;; .mem.offset 0,0; st8.spill [r2] = r5, 16 -.mem.offset 8,0; st8.spill [r3] = r6 - add r3 = (SC_FR+3*16-(SC_GR+6*8)), r3 +.mem.offset 8,0; st8.spill [r3] = r6, 48 + and rTMP = ~0x3, rRSC ;; st8.spill [r2] = r7, (SC_FR+2*16-(SC_GR+7*8)) - nop 0 - and rTMP = ~0x3, rRSC + st8.spill [r3] = sp, (SC_FR+3*16-(SC_GR+12*8)) ;; mov.m ar.rsc = rTMP // put RSE into enforced lazy mode mov.m rNAT = ar.unat diff --git a/sysdeps/unix/sysv/linux/ia64/setcontext.S b/sysdeps/unix/sysv/linux/ia64/setcontext.S index 0d6e9a0bce..3964ed397a 100644 --- a/sysdeps/unix/sysv/linux/ia64/setcontext.S +++ b/sysdeps/unix/sysv/linux/ia64/setcontext.S @@ -87,9 +87,12 @@ ENTRY(__setcontext) ld8.fill r5 = [r3], 16 mov b0 = rB0 ;; - ld8.fill r6 = [r2] + ld8.fill r6 = [r2], 48 ld8.fill r7 = [r3], (SC_FR+2*16-(SC_GR+7*8)) - adds r2 = (SC_FR+3*16-(SC_GR+6*8)), r2 + ;; + ld8.fill sp = [r2], (SC_FR+3*16-(SC_GR+12*8)) + mov.m ar.fpsr = rFPSR + mov.i ar.pfs = rPFS ;; ldf.fill f3 = [r2], 16 ldf.fill f2 = [r3], 48 @@ -132,10 +135,8 @@ ENTRY(__setcontext) mov pr = rPR, -1 ;; mov.m ar.rsc = rTMP // put RSE into enforced lazy mode - mov.m ar.fpsr = rFPSR - mov.i ar.pfs = rPFS ;; - loadrs // drop dirty partition is empty + loadrs // drop dirty partition ;; mov.m ar.bspstore = rBSP mov.m ar.unat = rUNAT -- cgit 1.4.1