[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.49, Thu Apr 1 11:11:28 2004 UTC revision 1.50, Mon Apr 5 20:36:36 2004 UTC
# Line 52  Line 52 
52  unsigned int xvid_debug = 0; /* xvid debug mask */  unsigned int xvid_debug = 0; /* xvid debug mask */
53  #endif  #endif
54    
55  #if defined(ARCH_IS_IA32)  #if defined(ARCH_IS_IA32) && defined(_MSC_VER)
 #if defined(_MSC_VER)  
56  #       include <windows.h>  #       include <windows.h>
57  #else  #elif defined(ARCH_IS_IA32) || defined(ARCH_IS_PPC)
58  #       include <signal.h>  #       include <signal.h>
59  #       include <setjmp.h>  #       include <setjmp.h>
60    
# Line 78  Line 77 
77   *   0 : SIGILL was *not* signalled   *   0 : SIGILL was *not* signalled
78   *   1 : SIGILL was signalled   *   1 : SIGILL was signalled
79   */   */
80    #if defined(ARCH_IS_IA32) && defined(_MSC_VER)
81  int  static int
82  sigill_check(void (*func)())  sigill_check(void (*func)())
83  {  {
 #if defined(_MSC_VER)  
84          _try {          _try {
85                  func();                  func();
86          }          } _except(EXCEPTION_EXECUTE_HANDLER) {
         _except(EXCEPTION_EXECUTE_HANDLER) {  
87    
88                  if (_exception_code() == STATUS_ILLEGAL_INSTRUCTION)                  if (_exception_code() == STATUS_ILLEGAL_INSTRUCTION)
89                          return 1;                          return(1);
90          }          }
91          return 0;          return(0);
92  #else  }
93    #elif defined(ARCH_IS_IA32) || defined(ARCH_IS_PPC)
94    static int
95    sigill_check(void (*func)())
96    {
97      void * old_handler;      void * old_handler;
98      int jmpret;      int jmpret;
99    
100        /* Set our SIGILL handler */
101      old_handler = signal(SIGILL, sigill_handler);      old_handler = signal(SIGILL, sigill_handler);
102      if (old_handler == SIG_ERR)  
103      {      /* Check for error */
104          return -1;      if (old_handler == SIG_ERR) {
105            return(-1);
106      }      }
107    
108        /* Save stack context, so if func triggers a SIGILL, we can still roll
109             * back to a valid CPU state */
110      jmpret = setjmp(mark);      jmpret = setjmp(mark);
111      if (jmpret == 0)  
112      {          /* If setjmp returned directly, then its returned value is 0, and we still
113             * have to test the passed func. Otherwise it means the stack context has
114             * been restored by a longjmp() call, which in our case happens only in the
115             * signal handler */
116        if (jmpret == 0) {
117          func();          func();
118      }      }
119    
120        /* Restore old signal handler */
121      signal(SIGILL, old_handler);      signal(SIGILL, old_handler);
122    
123      return jmpret;      return(jmpret);
 #endif  
124  }  }
125  #endif  #endif
126    
# Line 134  Line 142 
142  #endif  #endif
143    
144  #if defined(ARCH_IS_PPC)  #if defined(ARCH_IS_PPC)
145  #if defined(ARCH_IS_PPC_ALTIVEC)          if (!sigill_check(altivec_trigger))
146          cpu_flags |= XVID_CPU_ALTIVEC;          cpu_flags |= XVID_CPU_ALTIVEC;
147  #endif  #endif
 #endif  
148    
149          return cpu_flags;          return cpu_flags;
150  }  }
# Line 536  Line 543 
543  #endif  #endif
544    
545  #if defined(ARCH_IS_PPC)  #if defined(ARCH_IS_PPC)
546          if ((cpu_flags & XVID_CPU_ASM))          if ((cpu_flags & XVID_CPU_ALTIVEC)) {
547          {            /* sad operators */
548                  calc_cbp = calc_cbp_ppc;            sad16 = sad16_altivec_c;
549          }            sad16bi = sad16bi_altivec_c;
550              sad8 = sad8_altivec_c;
551              dev16 = dev16_altivec_c;
552    
553              sse8_16bit = sse8_16bit_altivec_c;
554    
555              /* mem transfer */
556              transfer_8to16copy = transfer_8to16copy_altivec_c;
557              transfer_16to8copy = transfer_16to8copy_altivec_c;
558              transfer_8to16sub = transfer_8to16sub_altivec_c;
559              transfer_8to16subro = transfer_8to16subro_altivec_c;
560              transfer_8to16sub2 = transfer_8to16sub2_altivec_c;
561              transfer_16to8add = transfer_16to8add_altivec_c;
562              transfer8x8_copy = transfer8x8_copy_altivec_c;
563    
564          if ((cpu_flags & XVID_CPU_ALTIVEC))            /* Inverse DCT */
565          {            idct = idct_altivec_c;
566                  calc_cbp = calc_cbp_altivec;  
567                  fdct = fdct_altivec;            /* Interpolation */
568                  idct = idct_altivec;            interpolate8x8_halfpel_h = interpolate8x8_halfpel_h_altivec_c;
569                  sadInit = sadInit_altivec;            interpolate8x8_halfpel_v = interpolate8x8_halfpel_v_altivec_c;
570                  sad16 = sad16_altivec;            interpolate8x8_halfpel_hv = interpolate8x8_halfpel_hv_altivec_c;
571                  sad8 = sad8_altivec;  
572                  dev16 = dev16_altivec;            interpolate8x8_avg2 = interpolate8x8_avg2_altivec_c;
573              interpolate8x8_avg4 = interpolate8x8_avg4_altivec_c;
574    
575              interpolate8x8_6tap_lowpass_h = interpolate8x8_6tap_lowpass_h_altivec_c;
576    
577              /* Colorspace conversion */
578              bgra_to_yv12 = bgra_to_yv12_altivec_c;
579              abgr_to_yv12 = abgr_to_yv12_altivec_c;
580              rgba_to_yv12 = rgba_to_yv12_altivec_c;
581              argb_to_yv12 = argb_to_yv12_altivec_c;
582    
583              yuyv_to_yv12 = yuyv_to_yv12_altivec_c;
584              uyvy_to_yv12 = uyvy_to_yv12_altivec_c;
585    
586              yv12_to_yuyv = yv12_to_yuyv_altivec_c;
587              yv12_to_uyvy = yv12_to_uyvy_altivec_c;
588    
589              /* Quantization */
590              quant_h263_intra = quant_h263_intra_altivec_c;
591              quant_h263_inter = quant_h263_inter_altivec_c;
592              dequant_h263_intra = dequant_h263_intra_altivec_c;
593              dequant_h263_inter = dequant_h263_inter_altivec_c;
594          }          }
595  #endif  #endif
596    
# Line 557  Line 598 
598      xvid_debug = init->debug;      xvid_debug = init->debug;
599  #endif  #endif
600    
601      return 0;      return(0);
602  }  }
603    
604    

Legend:
Removed from v.1.49  
changed lines
  Added in v.1.50

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