Commit b17a70c7 authored by rtoy's avatar rtoy
Browse files

os_sigcontext_fpu_modes should return a 32-bit int, not a long since 

x86-vm.lisp declares os_sigcontext_fpu_modes to return a 32-bit int.
parent 2087c900

lisp/Darwin-os.c

+4 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * Frobbed for OpenBSD by Pierre R. Mai, 2001.

 * Frobbed for Darwin by Pierre R. Mai, 2003.

 *

 * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/Darwin-os.c,v 1.22 2008/12/07 02:33:55 agoncharov Exp $

 * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/Darwin-os.c,v 1.23 2008/12/10 02:39:13 rtoy Exp $

 *

 */
@@ -251,11 +251,11 @@ os_sigcontext_fpu_reg(ucontext_t *scp, int index) 
    return NULL;

}



unsigned long

unsigned int

os_sigcontext_fpu_modes(ucontext_t *scp)

{

    unsigned long modes;

    unsigned long mxcsr;

    unsigned int modes;

    unsigned int mxcsr;

    unsigned short cw, sw;



    /*

lisp/FreeBSD-os.c

+3 −3
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
 * Much hacked by Paul Werkowski

 * GENCGC support by Douglas Crosher, 1996, 1997.

 *

 * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/FreeBSD-os.c,v 1.26 2008/12/07 05:15:44 agoncharov Exp $

 * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/FreeBSD-os.c,v 1.27 2008/12/10 02:39:13 rtoy Exp $

 *

 */
@@ -111,10 +111,10 @@ os_sigcontext_fpu_reg(ucontext_t *scp, int index) 
    return reg;

}



unsigned long

unsigned int

os_sigcontext_fpu_modes(ucontext_t *scp)

{

    unsigned long modes;

    unsigned int modes;

    

    union savefpu *sv = (union savefpu *) scp->uc_mcontext.mc_fpstate;

    int fpformat = scp->uc_mcontext.mc_fpformat;

lisp/Linux-os.c

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 * GENCGC support by Douglas Crosher, 1996, 1997.

 * Alpha support by Julian Dolby, 1999.

 *

 * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/Linux-os.c,v 1.40 2008/12/07 02:33:55 agoncharov Exp $

 * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/Linux-os.c,v 1.41 2008/12/10 02:39:13 rtoy Exp $

 *

 */
@@ -111,10 +111,10 @@ os_sigcontext_fpu_reg(ucontext_t *scp, int offset) 
    }

}



unsigned long

unsigned int

os_sigcontext_fpu_modes(ucontext_t *scp)

{

    unsigned long modes;

    unsigned int modes;

    unsigned short cw, sw;



    if (scp->uc_mcontext.fpregs == NULL) {

lisp/os.h

+2 −2
Original line number Diff line number Diff line 
/*

 * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/os.h,v 1.22 2008/12/07 02:33:55 agoncharov Exp $

 * $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/os.h,v 1.23 2008/12/10 02:39:13 rtoy Rel $

 *

 * Common interface for os-dependent functions.

 *
@@ -113,6 +113,6 @@ extern int os_control_stack_overflow(void *, os_context_t *); 
unsigned long *os_sigcontext_reg(ucontext_t *, int);

unsigned long *os_sigcontext_pc(ucontext_t *);

unsigned char *os_sigcontext_fpu_reg(ucontext_t *, int);

unsigned long os_sigcontext_fpu_modes(ucontext_t *);

unsigned int os_sigcontext_fpu_modes(ucontext_t *);



#endif /* _OS_H_ */