[cvs] / xvidcore / src / xvid.c Repository:
ViewVC logotype

Diff of /xvidcore/src/xvid.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.30, Tue Jul 16 11:15:15 2002 UTC revision 1.31, Thu Jul 18 13:47:46 2002 UTC
# Line 58  Line 58 
58  #include "utils/timer.h"  #include "utils/timer.h"
59  #include "bitstream/mbcoding.h"  #include "bitstream/mbcoding.h"
60    
61    #if defined(ARCH_X86) && defined(EXPERIMENTAL_SSE2_CODE)
62    
63    #ifdef WIN32
64    #include <windows.h>
65    #else
66    #include <signal.h>
67    #include <setjmp.h>
68    #endif
69    
70    
71    #ifndef WIN32
72    
73    static jmp_buf mark;
74    
75    static void
76    sigill_handler(int signal)
77    {
78       longjmp(mark, 1);
79    }
80    #endif
81    
82    
83    /*
84    calls the funcptr, and returns whether SIGILL (illegal instruction) was signalled
85    return values:
86    -1 : could not determine
87    0  : SIGILL was *not* signalled
88    1  : SIGILL was signalled
89    */
90    
91    int
92    sigill_check(void (*func)())
93    {
94    #ifdef WIN32
95            _try {
96                    func();
97            }
98            _except(EXCEPTION_EXECUTE_HANDLER) {
99    
100                    if (_exception_code() == STATUS_ILLEGAL_INSTRUCTION)
101                            return 1;
102            }
103            return 0;
104    #else
105        void * old_handler;
106        int jmpret;
107    
108    
109        old_handler = signal(SIGILL, sigill_handler);
110        if (old_handler == SIG_ERR)
111        {
112            return -1;
113        }
114    
115        jmpret = setjmp(mark);
116        if (jmpret == 0)
117        {
118            func();
119        }
120    
121        signal(SIGILL, old_handler);
122    
123        return jmpret;
124    #endif
125    }
126    #endif
127    
128  /*****************************************************************************  /*****************************************************************************
129   * XviD Init Entry point   * XviD Init Entry point
130   *   *
# Line 89  Line 156 
156          /* Inform the client the core build - unused because we're still alpha */          /* Inform the client the core build - unused because we're still alpha */
157          init_param->core_build = 1000;          init_param->core_build = 1000;
158    
         if ((init_param->cpu_flags & XVID_CPU_CHKONLY))  
         {  
                 init_param->cpu_flags = check_cpu_features();  
                 return XVID_ERR_OK;  
         }  
   
159          /* Do we have to force CPU features  ? */          /* Do we have to force CPU features  ? */
160          if ((init_param->cpu_flags & XVID_CPU_FORCE) > 0) {          if ((init_param->cpu_flags & XVID_CPU_FORCE)) {
161    
162                  cpu_flags = init_param->cpu_flags;                  cpu_flags = init_param->cpu_flags;
163    
164          } else {          } else {
165    
166                  cpu_flags = check_cpu_features();                  cpu_flags = check_cpu_features();
167    
168    #if defined(ARCH_X86) && defined(EXPERIMENTAL_SSE2_CODE)
169                    if ((cpu_flags & XVID_CPU_SSE) && sigill_check(sse_os_trigger))
170                            cpu_flags &= ~XVID_CPU_SSE;
171    
172                    if ((cpu_flags & XVID_CPU_SSE2) && sigill_check(sse2_os_trigger))
173                            cpu_flags &= ~XVID_CPU_SSE2;
174    #endif
175            }
176    
177            if ((init_param->cpu_flags & XVID_CPU_CHKONLY))
178            {
179                  init_param->cpu_flags = cpu_flags;                  init_param->cpu_flags = cpu_flags;
180                    return XVID_ERR_OK;
181          }          }
182    
183            init_param->cpu_flags = cpu_flags;
184    
185    
186          /* Initialize the function pointers */          /* Initialize the function pointers */
187          idct_int32_init();          idct_int32_init();
188          init_vlc_tables();          init_vlc_tables();

Legend:
Removed from v.1.30  
changed lines
  Added in v.1.31

No admin address has been configured
ViewVC Help
Powered by ViewVC 1.0.4