rtoss - Diff between revs 14 and 26

Subversion Repositories:
Rev:
Show entire file - Ignore whitespace
Rev 14 Rev 26
Line 1... Line 1...
1 /* 1 /*
2  * libmad - MPEG audio decoder library 2  * libmad - MPEG audio decoder library
3  * Copyright (C) 2000-2003 Underbit Technologies, Inc. -  
-   3  * Copyright (C) 2000-2004 Underbit Technologies, Inc.
4  * 4  *
5  * This program is free software; you can redistribute it and/or modify 5  * This program is free software; you can redistribute it and/or modify
6  * it under the terms of the GNU General Public License as published by 6  * it under the terms of the GNU General Public License as published by
7  * the Free Software Foundation; either version 2 of the License, or 7  * the Free Software Foundation; either version 2 of the License, or
8  * (at your option) any later version. 8  * (at your option) any later version.
Line 14... Line 14...
14  * 14  *
15  * You should have received a copy of the GNU General Public License 15  * You should have received a copy of the GNU General Public License
16  * along with this program; if not, write to the Free Software 16  * along with this program; if not, write to the Free Software
17  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 17  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
18  * 18  *
19  * $Id: fixed.h,v 1.36 2003/05/28 04:36:00 rob Exp $ -  
-   19  * $Id: fixed.h,v 1.38 2004/02/17 02:02:03 rob Exp $
20  */ 20  */
21 21
22 # ifndef LIBMAD_FIXED_H 22 # ifndef LIBMAD_FIXED_H
23 # define LIBMAD_FIXED_H 23 # define LIBMAD_FIXED_H
24 24
Line 206... Line 206...
206             : "=rm" (__result)  \ 206             : "=rm" (__result)  \
207             : "0" (__lo_), "r" (__hi_), "I" (MAD_F_SCALEBITS)  \ 207             : "0" (__lo_), "r" (__hi_), "I" (MAD_F_SCALEBITS)  \
208             : "cc");  \ 208             : "cc");  \
209        __result;  \ 209        __result;  \
210     }) 210     })
211 #    else -  
-   211 #   elif defined(OPT_INTEL)
-   212 /*
-   213  * Alternate Intel scaling that may or may not perform better.
-   214  */
-   215 #    define mad_f_scale64(hi, lo)  \
-   216     ({ mad_fixed_t __result;  \
-   217        asm ("shrl %3,%1\n\t"  \
-   218             "shll %4,%2\n\t"  \
-   219             "orl %2,%1"  \
-   220             : "=rm" (__result)  \
-   221             : "0" (lo), "r" (hi),  \
-   222               "I" (MAD_F_SCALEBITS), "I" (32 - MAD_F_SCALEBITS)  \
-   223             : "cc");  \
-   224        __result;  \
-   225     })
-   226 #   else
212 #    define mad_f_scale64(hi, lo)  \ 227 #    define mad_f_scale64(hi, lo)  \
213     ({ mad_fixed_t __result;  \ 228     ({ mad_fixed_t __result;  \
214        asm ("shrdl %3,%2,%1"  \ 229        asm ("shrdl %3,%2,%1"  \
215             : "=rm" (__result)  \ 230             : "=rm" (__result)  \
216             : "0" (lo), "r" (hi), "I" (MAD_F_SCALEBITS)  \ 231             : "0" (lo), "r" (hi), "I" (MAD_F_SCALEBITS)  \