From ecde3c9f3e46a78f653829f8b12241dc7fbe9fb2 Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Sat, 12 Jul 2003 12:31:13 +0000 Subject: - adding support for the Intel compiler icc - general multipass compilation make targets CVS patchset: 5149 CVS date: 2003/07/12 12:31:13 --- src/input/input_pvr.c | 6 ++- src/libffmpeg/diff_to_ffmpeg_cvs.txt | 61 +++++++++++++++++----- src/libffmpeg/libavcodec/i386/motion_est_mmx.c | 2 +- src/libffmpeg/libavcodec/libpostproc/postprocess.c | 14 ++--- src/libw32dll/wine/basetsd.h | 16 +++--- src/libw32dll/wine/poppack.h | 2 +- src/libw32dll/wine/pshpack1.h | 2 +- src/libw32dll/wine/pshpack2.h | 2 +- src/libw32dll/wine/pshpack4.h | 2 +- src/libw32dll/wine/windef.h | 2 +- src/libxineadec/nosefart/osd.h | 8 ++- src/video_out/alphablend.h | 2 +- src/video_out/libdha/AsmMacros.h | 2 +- src/video_out/video_out_xv.c | 8 ++- src/xine-engine/configfile.c | 3 +- src/xine-engine/metronom.c | 4 +- src/xine-utils/attributes.h | 2 +- src/xine-utils/xineutils.h | 20 +++---- 18 files changed, 105 insertions(+), 53 deletions(-) (limited to 'src') diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c index 02b18b034..b0ff55650 100644 --- a/src/input/input_pvr.c +++ b/src/input/input_pvr.c @@ -38,7 +38,7 @@ * usage: * xine pvr:/\!\! * - * $Id: input_pvr.c,v 1.28 2003/07/04 04:09:23 miguelfreitas Exp $ + * $Id: input_pvr.c,v 1.29 2003/07/12 12:31:14 mroi Exp $ */ /************************************************************************** @@ -104,6 +104,10 @@ #include #include #ifdef USE_V4L2 + #ifdef __ICC + /* __u64 will be undefined for icc, so we handle it here */ + #define __u64 unsigned long long + #endif #include "videodev2.h" #else #include diff --git a/src/libffmpeg/diff_to_ffmpeg_cvs.txt b/src/libffmpeg/diff_to_ffmpeg_cvs.txt index b3934e634..adbaf0d43 100644 --- a/src/libffmpeg/diff_to_ffmpeg_cvs.txt +++ b/src/libffmpeg/diff_to_ffmpeg_cvs.txt @@ -6,7 +6,7 @@ retrieving revision 1.87 diff -u -r1.87 common.h --- libavcodec/common.h 26 Mar 2003 10:39:34 -0000 1.87 +++ libavcodec/common.h 26 Mar 2003 13:49:18 -0000 -@@ -177,11 +177,19 @@ +@@ -178,11 +178,19 @@ # else @@ -38,7 +38,7 @@ retrieving revision 1.60 diff -u -r1.60 dsputil.h --- libavcodec/dsputil.h 15 Mar 2003 02:06:09 -0000 1.60 +++ libavcodec/dsputil.h 26 Mar 2003 13:49:18 -0000 -@@ -27,9 +27,14 @@ +@@ -29,9 +29,14 @@ #include "common.h" #include "avcodec.h" @@ -54,7 +54,7 @@ diff -u -r1.60 dsputil.h /* dct code */ typedef short DCTELEM; //typedef int DCTELEM; -@@ -257,21 +262,25 @@ +@@ -310,21 +315,25 @@ #undef emms_c @@ -497,13 +497,31 @@ diff -u -r1.83 postprocess.c #include "postprocess.h" #include "postprocess_internal.h" -@@ -151,37 +152,6 @@ - static inline void unusedVariableWarningFixer() - { - if(w05 + w20 + b00 + b01 + b02 + b08 + b80 == 0) b00=0; --} --#endif -- +@@ -104,13 +105,13 @@ + //#define NUM_BLOCKS_AT_ONCE 16 //not used yet + + #ifdef ARCH_X86 +-static uint64_t __attribute__((aligned(8))) w05= 0x0005000500050005LL; +-static uint64_t __attribute__((aligned(8))) w20= 0x0020002000200020LL; +-static uint64_t __attribute__((aligned(8))) b00= 0x0000000000000000LL; +-static uint64_t __attribute__((aligned(8))) b01= 0x0101010101010101LL; +-static uint64_t __attribute__((aligned(8))) b02= 0x0202020202020202LL; +-static uint64_t __attribute__((aligned(8))) b08= 0x0808080808080808LL; +-static uint64_t __attribute__((aligned(8))) b80= 0x8080808080808080LL; ++static const uint64_t __attribute__((aligned(8))) w05= 0x0005000500050005LL; ++static const uint64_t __attribute__((aligned(8))) w20= 0x0020002000200020LL; ++ uint64_t __attribute__((aligned(8))) b00= 0x0000000000000000LL; ++static const uint64_t __attribute__((aligned(8))) b01= 0x0101010101010101LL; ++static const uint64_t __attribute__((aligned(8))) b02= 0x0202020202020202LL; ++static const uint64_t __attribute__((aligned(8))) b08= 0x0808080808080808LL; ++static const uint64_t __attribute__((aligned(8))) b80= 0x8080808080808080LL; + #endif + + +@@ -159,37 +160,6 @@ + } + #endif + - -#ifdef ARCH_X86 -static inline void prefetchnta(void *p) @@ -532,9 +550,12 @@ diff -u -r1.83 postprocess.c - asm volatile( "prefetcht2 (%0)\n\t" - : : "r" (p) - ); - } - #endif +-} +-#endif +- + // The horizontal Functions exist only in C cuz the MMX code is faster with vertical filters and transposing + /** Index: libavcodec/mjpeg.c =================================================================== RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mjpeg.c,v @@ -655,3 +676,19 @@ diff -u -r1.29 h263.c } //printf("User Data: %s\n", buf); +Index: libavcodec/i386/motion_est_mmx.c +=================================================================== +RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/libavcodec/i386/motion_est_mmx.c,v +retrieving revision 1.8 +diff -u -r1.8 motion_est_mmx.c +--- libavcodec/i386/motion_est_mmx.c 26 Mar 2003 14:44:17 -0000 1.8 ++++ libavcodec/i386/motion_est_mmx.c 2 Jul 2003 14:31:19 -0000 +@@ -26,7 +26,7 @@ + 0x0002000200020002, + }; + +-static __attribute__ ((aligned(8))) uint64_t bone= 0x0101010101010101LL; ++static const __attribute__ ((aligned(8))) uint64_t bone= 0x0101010101010101LL; + + static inline void sad8_mmx(uint8_t *blk1, uint8_t *blk2, int stride, int h) + { diff --git a/src/libffmpeg/libavcodec/i386/motion_est_mmx.c b/src/libffmpeg/libavcodec/i386/motion_est_mmx.c index 5c4b32dcd..1bc5dfeb2 100644 --- a/src/libffmpeg/libavcodec/i386/motion_est_mmx.c +++ b/src/libffmpeg/libavcodec/i386/motion_est_mmx.c @@ -26,7 +26,7 @@ static const __attribute__ ((aligned(8))) uint64_t round_tab[3]={ 0x0002000200020002, }; -static __attribute__ ((aligned(8))) uint64_t bone= 0x0101010101010101LL; +static const __attribute__ ((aligned(8))) uint64_t bone= 0x0101010101010101LL; static inline void sad8_mmx(uint8_t *blk1, uint8_t *blk2, int stride, int h) { diff --git a/src/libffmpeg/libavcodec/libpostproc/postprocess.c b/src/libffmpeg/libavcodec/libpostproc/postprocess.c index 8473882bb..470c889d8 100644 --- a/src/libffmpeg/libavcodec/libpostproc/postprocess.c +++ b/src/libffmpeg/libavcodec/libpostproc/postprocess.c @@ -105,13 +105,13 @@ try to unroll inner for(x=0 ... loop to avoid these damn if(x ... checks //#define NUM_BLOCKS_AT_ONCE 16 //not used yet #ifdef ARCH_X86 -static uint64_t __attribute__((aligned(8))) w05= 0x0005000500050005LL; -static uint64_t __attribute__((aligned(8))) w20= 0x0020002000200020LL; -static uint64_t __attribute__((aligned(8))) b00= 0x0000000000000000LL; -static uint64_t __attribute__((aligned(8))) b01= 0x0101010101010101LL; -static uint64_t __attribute__((aligned(8))) b02= 0x0202020202020202LL; -static uint64_t __attribute__((aligned(8))) b08= 0x0808080808080808LL; -static uint64_t __attribute__((aligned(8))) b80= 0x8080808080808080LL; +static const uint64_t __attribute__((aligned(8))) w05= 0x0005000500050005LL; +static const uint64_t __attribute__((aligned(8))) w20= 0x0020002000200020LL; + uint64_t __attribute__((aligned(8))) b00= 0x0000000000000000LL; +static const uint64_t __attribute__((aligned(8))) b01= 0x0101010101010101LL; +static const uint64_t __attribute__((aligned(8))) b02= 0x0202020202020202LL; +static const uint64_t __attribute__((aligned(8))) b08= 0x0808080808080808LL; +static const uint64_t __attribute__((aligned(8))) b80= 0x8080808080808080LL; #endif diff --git a/src/libw32dll/wine/basetsd.h b/src/libw32dll/wine/basetsd.h index 7b5d3aba9..ac988d54b 100644 --- a/src/libw32dll/wine/basetsd.h +++ b/src/libw32dll/wine/basetsd.h @@ -28,16 +28,16 @@ extern "C" { /* Type model indepent typedefs */ +#ifndef __ICC typedef char __int8; -typedef unsigned char __uint8; - -typedef short __int16; -typedef unsigned short __uint16; - -typedef int __int32; -typedef unsigned int __uint32; +typedef short __int16; +typedef int __int32; +typedef long long __int64; +#endif -typedef long long __int64; +typedef unsigned char __uint8; +typedef unsigned short __uint16; +typedef unsigned int __uint32; typedef unsigned long long __uint64; #if defined(_WIN64) diff --git a/src/libw32dll/wine/poppack.h b/src/libw32dll/wine/poppack.h index 710479159..97c51987e 100644 --- a/src/libw32dll/wine/poppack.h +++ b/src/libw32dll/wine/poppack.h @@ -1,7 +1,7 @@ #ifdef __WINE_PSHPACK_H #undef __WINE_PSHPACK_H -#if defined(__GNUC__) || defined(__SUNPRO_C) +#if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__ICC) #pragma pack() #elif defined(__SUNPRO_CC) #warning "Assumes default alignment is 4" diff --git a/src/libw32dll/wine/pshpack1.h b/src/libw32dll/wine/pshpack1.h index e560250c2..659b2ed67 100644 --- a/src/libw32dll/wine/pshpack1.h +++ b/src/libw32dll/wine/pshpack1.h @@ -1,7 +1,7 @@ #ifndef __WINE_PSHPACK_H #define __WINE_PSHPACK_H 1 -#if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) +#if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__ICC) //#pragma pack(1) #elif !defined(RC_INVOKED) #error "1 as alignment isn't supported by the compiler" diff --git a/src/libw32dll/wine/pshpack2.h b/src/libw32dll/wine/pshpack2.h index 887b1e17b..a0830be0b 100644 --- a/src/libw32dll/wine/pshpack2.h +++ b/src/libw32dll/wine/pshpack2.h @@ -1,7 +1,7 @@ #ifndef __WINE_PSHPACK_H #define __WINE_PSHPACK_H 2 -#if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) +#if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__ICC) //#pragma pack(2) #elif !defined(RC_INVOKED) #error "2 as alignment isn't supported by the compiler" diff --git a/src/libw32dll/wine/pshpack4.h b/src/libw32dll/wine/pshpack4.h index 9fdaf70a7..3f85316b1 100644 --- a/src/libw32dll/wine/pshpack4.h +++ b/src/libw32dll/wine/pshpack4.h @@ -1,7 +1,7 @@ #ifndef __WINE_PSHPACK_H #define __WINE_PSHPACK_H 4 -#if defined(__GNUC__) || defined(__SUNPRO_CC) +#if defined(__GNUC__) || defined(__SUNPRO_CC) || defined(__ICC) //#pragma pack(4) #elif defined(__SUNPRO_C) //#pragma pack() diff --git a/src/libw32dll/wine/windef.h b/src/libw32dll/wine/windef.h index d0e4cefc5..e7f691a02 100644 --- a/src/libw32dll/wine/windef.h +++ b/src/libw32dll/wine/windef.h @@ -493,7 +493,7 @@ typedef LRESULT CALLBACK (*WNDPROC16)(HWND16,UINT16,WPARAM16,LPARAM); /* Macro for structure packing. */ -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__ICC) #ifndef _EGCS_ #define WINE_PACKED __attribute__((packed)) #define WINE_UNUSED __attribute__((unused)) diff --git a/src/libxineadec/nosefart/osd.h b/src/libxineadec/nosefart/osd.h index b021a3837..ee90aa972 100644 --- a/src/libxineadec/nosefart/osd.h +++ b/src/libxineadec/nosefart/osd.h @@ -20,14 +20,14 @@ ** osd.h ** ** O/S dependent routine defintions (must be customized) -** $Id: osd.h,v 1.1 2003/01/08 07:04:35 tmmm Exp $ +** $Id: osd.h,v 1.2 2003/07/12 12:31:14 mroi Exp $ */ #ifndef _OSD_H_ #define _OSD_H_ -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__ICC) #define __PACKED__ __attribute__ ((packed)) #define PATH_SEP '/' #ifdef __DJGPP__ @@ -79,6 +79,10 @@ extern void osd_shutdown(void); /* ** $Log: osd.h,v $ +** Revision 1.2 2003/07/12 12:31:14 mroi +** - adding support for the Intel compiler icc +** - general multipass compilation make targets +** ** Revision 1.1 2003/01/08 07:04:35 tmmm ** initial import of Nosefart sources ** diff --git a/src/video_out/alphablend.h b/src/video_out/alphablend.h index 71ecc73cd..05683924c 100644 --- a/src/video_out/alphablend.h +++ b/src/video_out/alphablend.h @@ -32,7 +32,7 @@ #undef PRAGMA_PACK_BEGIN #undef PRAGMA_PACK_END -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) +#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) || defined(__ICC) #define ATTRIBUTE_PACKED __attribute__ ((packed)) #define PRAGMA_PACK 0 #endif diff --git a/src/video_out/libdha/AsmMacros.h b/src/video_out/libdha/AsmMacros.h index 1549a6a7c..d1b136a7b 100644 --- a/src/video_out/libdha/AsmMacros.h +++ b/src/video_out/libdha/AsmMacros.h @@ -63,7 +63,7 @@ * Modified for readability by Nick Kurshev */ -#if defined(__GNUC__) +#if defined(__GNUC__) || defined(__ICC) #if defined(__alpha__) #include "sysdep/AsmMacros_alpha.h" #elif defined(__ia64__) diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c index b62e192c5..900d137fa 100644 --- a/src/video_out/video_out_xv.c +++ b/src/video_out/video_out_xv.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out_xv.c,v 1.169 2003/05/31 18:33:31 miguelfreitas Exp $ + * $Id: video_out_xv.c,v 1.170 2003/07/12 12:31:14 mroi Exp $ * * video_out_xv.c, X11 video extension interface for xine * @@ -42,6 +42,12 @@ #include #include +#if defined (__SVR4) && defined (__sun) +# include +#else +# include +#endif + #if defined(__FreeBSD__) #include #endif diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c index 3e67df3d3..0efc4d70c 100644 --- a/src/xine-engine/configfile.c +++ b/src/xine-engine/configfile.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: configfile.c,v 1.48 2003/07/10 14:14:40 mroi Exp $ + * $Id: configfile.c,v 1.49 2003/07/12 12:31:14 mroi Exp $ * * config object (was: file) management - implementation * @@ -27,6 +27,7 @@ #include "config.h" #endif +#include #include #include #include diff --git a/src/xine-engine/metronom.c b/src/xine-engine/metronom.c index 24c6fb999..d609645e0 100644 --- a/src/xine-engine/metronom.c +++ b/src/xine-engine/metronom.c @@ -17,14 +17,14 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: metronom.c,v 1.118 2003/05/15 20:23:18 miguelfreitas Exp $ + * $Id: metronom.c,v 1.119 2003/07/12 12:31:14 mroi Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include +#include #include #include #include diff --git a/src/xine-utils/attributes.h b/src/xine-utils/attributes.h index 2179823c8..c6bbe1b78 100644 --- a/src/xine-utils/attributes.h +++ b/src/xine-utils/attributes.h @@ -31,7 +31,7 @@ #endif /* disable GNU __attribute__ extension, when not compiling with GNU C */ -#if defined(__GNUC__) +#if defined(__GNUC__) || defined (__ICC) #ifndef ATTRIBUTE_PACKED #define ATTRIBUTE_PACKED 1 #endif diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h index dc05f2057..d80e00b07 100644 --- a/src/xine-utils/xineutils.h +++ b/src/xine-utils/xineutils.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xineutils.h,v 1.55 2003/07/12 03:10:15 miguelfreitas Exp $ + * $Id: xineutils.h,v 1.56 2003/07/12 12:31:13 mroi Exp $ * */ #ifndef XINEUTILS_H @@ -830,7 +830,7 @@ extern int v_b_table[256]; void xine_print_trace(void); -#ifdef DEBUG +#ifdef DEBUG # define XINE_ABORT() \ abort(); #else @@ -842,7 +842,7 @@ void xine_print_trace(void); * Provide assert like feature with better description of failure * Thanks to Mark Thomas */ -#if __GNUC__ +#ifdef __GNUC__ # define XINE_ASSERT(exp, desc, args...) \ do { \ if (!(exp)) { \ @@ -910,17 +910,17 @@ void xine_print_trace(void); printf( fmt, ##args ); \ }while(0) #else - #define lprintf(fmt, ...) \ + #define lprintf(...) \ do{ \ LONG_LOG_MODULE_STRING \ - printf( fmt, __VA_ARGS__ ); \ + printf( __VA_ARGS__ ); \ }while(0) #endif /* __GNUC__ */ #else #ifdef __GNUC__ #define lprintf(fmt, args...) ; #else - #define lprintf(fmt, ...) ; + #define lprintf(...) ; #endif /* __GNUC__ */ #endif /* LOG */ @@ -933,11 +933,11 @@ void xine_print_trace(void); } \ }while(0) #else - #define llprintf(cat, fmt, ...) \ + #define llprintf(cat, ...) \ do{ \ if(cat){ \ LONG_LOG_MODULE_STRING \ - printf( fmt, __VA_ARGS__ ); \ + printf( __VA_ARGS__ ); \ } \ }while(0) #endif /* __GNUC__ */ @@ -951,11 +951,11 @@ void xine_print_trace(void); } \ } while(0) #else - #define xprintf(xine, verbose, fmt, ...) \ + #define xprintf(xine, verbose, ...) \ do { \ if((xine)->verbosity >= verbose){ \ LOG_MODULE_STRING \ - printf(fmt, __VA_ARGS__); \ + printf(__VA_ARGS__); \ } \ } while(0) #endif /* __GNUC__ */ -- cgit v1.2.3