July 2001 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/DOCS/Hungarian MPlayer-FAQ,1.22,1.23
by Winner of tha face compo 04 Jul '01

04 Jul '01

Update of /cvsroot/mplayer/main/DOCS/Hungarian In directory mplayerhq:/var/tmp.root/cvs-serv20731/DOCS/Hungarian Modified Files: MPlayer-FAQ Log Message: ICCCCMSFNSFN Index: MPlayer-FAQ =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/Hungarian/MPlayer-FAQ,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- MPlayer-FAQ 2 Jul 2001 18:41:48 -0000 1.22 +++ MPlayer-FAQ 4 Jul 2001 20:18:24 -0000 1.23 @@ -213,15 +213,7 @@ Q: Gondjaim vannak a kedvenc ablakkezelõm esetén a teljesképernyõs xv/xmga/.. móddal.. -A: Igen, ez egy bug. De nem(csak) a miénk. Eddig nem találtunk olyan - fullscreen módszert, ami minden ablakkezelõvel mûködik. - Volt néhány próbálkozás, de valamivel mindig bugzott. Valószínûleg a - megoldás egy új opció lesz, például -fsmode , a kívánt módszerek közti - választásara. - Sajnos a legtöbb elterjedt ablakkezelõ nem kompatibilis a szabványokkal, - vagy Motif-fal, így a teljesképernyõs mód bekapcsolására irányuló - szabványos módszerek nem mûködnek velük. A nem szabványos módszerek pedig - a szabványos ablakkezelõkkel nem mûködnek. +A: Használd az -fsmode opciót. Bõvebben: lásd example.conf vagy a manpage-t. Q: Dehát aviplay-jel mûködik ! A: És? _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main/DOCS mplayer.1,1.60,1.61
by Winner of tha face compo 04 Jul '01

04 Jul '01

Update of /cvsroot/mplayer/main/DOCS In directory mplayerhq:/var/tmp.root/cvs-serv13690/DOCS Modified Files: mplayer.1 Log Message: -fsmode (again...) Index: mplayer.1 =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/mplayer.1,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- mplayer.1 4 Jul 2001 16:32:38 -0000 1.60 +++ mplayer.1 4 Jul 2001 16:56:31 -0000 1.61 @@ -285,9 +285,9 @@ This option workarounds some problems when using specific windowmanagers and fullscreen mode. If you experience fullscreen problems, try changing this value between 0 and 7. - -fsmode 0 ICCCWM patch (patched) (default) - -fsmode 1 ICCCWM patch - -fsmode 2 nothing in particular + -fsmode 0 new method (since 0.18pre3) + -fsmode 1 ICCCWM patch (for KDE2/icewm) + -fsmode 2 old method (0.17a) .IP .SH "ALPHA/BETA CODE" .TP _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main/DOCS mplayer.1,1.59,1.60
by Winner of tha face compo 04 Jul '01

04 Jul '01

Update of /cvsroot/mplayer/main/DOCS In directory mplayerhq:/var/tmp.root/cvs-serv13049/DOCS Modified Files: mplayer.1 Log Message: -fsmode Index: mplayer.1 =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/mplayer.1,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- mplayer.1 29 Jun 2001 22:46:21 -0000 1.59 +++ mplayer.1 4 Jul 2001 16:32:38 -0000 1.60 @@ -53,6 +53,7 @@ .RB [ \-config\ file ] .RB [ \-display\ name ] .RB [ \-unicode ] +.RB [ \-fsmode\ mode ] .I - or file .PP .SH DESCRIPTION @@ -278,7 +279,15 @@ Contrary: -nounicode .TP .B \-lircconf\ configfile -specifies a configfile for LIRC (see http://www.lirc.org) if you don't like the default ~/.lircrc +specifies a configfile for LIRC (see http://www.lirc.org) if you don't like the default ~/.lircrc +.TP +.B \-fsmode\ mode +This option workarounds some problems when using specific windowmanagers and +fullscreen mode. If you experience fullscreen problems, try changing this +value between 0 and 7. + -fsmode 0 ICCCWM patch (patched) (default) + -fsmode 1 ICCCWM patch + -fsmode 2 nothing in particular .IP .SH "ALPHA/BETA CODE" .TP _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main configure,1.97,1.98
by J�rgen Keil 04 Jul '01

04 Jul '01

Update of /cvsroot/mplayer/main In directory mplayerhq:/var/tmp.root/cvs-serv1144 Modified Files: configure Log Message: rework autodetection of assembler used by gcc, the correct assembler is detected now, in case the user has specified a certain version of the compiler with the "-cc=..." option. Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.97 retrieving revision 1.98 diff -u -r1.97 -r1.98 --- configure 3 Jul 2001 23:04:36 -0000 1.97 +++ configure 4 Jul 2001 10:45:20 -0000 1.98 @@ -6,6 +6,9 @@ # # Changes in reversed order: # +# 2001/07/04 by Juergen Keil +# - autodetect the assembler binary used by the GCC C compiler +# # 2001/07/03 by Nick Kurshev # - added universal way of configuring SUBDIRS # - moved configurable stuff of depended SUBDIRS to SUBDIRS @@ -19,9 +22,14 @@ # 2001/06/04 by Nick Kurshev # - added hard checking of gcc and soft of assembler # -# 2001/05/40 by LGB +# 2001/05/30 by LGB # - added --prefix support # +# 2001/05/?? by Juergen Keil +# - autodetect OSS & Sun style audio +# - cpu feature detection for non-linux x86 systems +# - converted from bash to bourne shell script +# # 2001/05/22 by Nick Kurshev # - added definition of CPU clone # @@ -207,10 +215,7 @@ # --- Check for C compiler: _cc=gcc -_as=`gcc -print-prog-name=as` -if [ x"_$as" = x ]; then - _as=as -fi +_as=auto _x11=auto _x11libdir= @@ -308,6 +313,15 @@ echo "YOU'VE SELECTED '--disable-gcc-checking'. PLEASE DON'T SEND US ANY BUGREPORTS!" fi # --- + +# now that we know what compiler should be used for compilation, try to find +# out which assembler is used by the $_cc compiler +if [ "$_as" = auto ]; then + _as=`$_cc -print-prog-name=as` + if [ "_$as" = "" ]; then + _as=as + fi +fi if [ -r /proc/cpuinfo ]; then _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main/mp3lib dct64_MMX.s,1.1,1.2 dct64_3dnow.s,1.2,1.3 dct64_k7.s,1.4,1.5 decode_MMX.s,1.2,1.3
by Nick Kurshev 04 Jul '01

04 Jul '01

Update of /cvsroot/mplayer/main/mp3lib In directory mplayerhq:/var/tmp.root/cvs-serv31885/main/mp3lib Modified Files: dct64_MMX.s dct64_3dnow.s dct64_k7.s decode_MMX.s Log Message: Finished 3dnow optimization (in scalar mode) and minor improvements Index: dct64_MMX.s =================================================================== RCS file: /cvsroot/mplayer/main/mp3lib/dct64_MMX.s,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dct64_MMX.s 29 Jun 2001 17:53:53 -0000 1.1 +++ dct64_MMX.s 4 Jul 2001 09:47:56 -0000 1.2 @@ -1,41 +1,7 @@ # This code was taken from http://www.mpg123.org # See ChangeLog of mpg123-0.59s-pre.1 for detail # Applied to mplayer by Nick Kurshev <nickols_k(a)mail.ru> - -.data - .align 4 -costab: - .long 1056974725 - .long 1057056395 - .long 1057223771 - .long 1057485416 - .long 1057855544 - .long 1058356026 - .long 1059019886 - .long 1059897405 - .long 1061067246 - .long 1062657950 - .long 1064892987 - .long 1066774581 - .long 1069414683 - .long 1073984175 - .long 1079645762 - .long 1092815430 - .long 1057005197 - .long 1057342072 - .long 1058087743 - .long 1059427869 - .long 1061799040 - .long 1065862217 - .long 1071413542 - .long 1084439708 - .long 1057128951 - .long 1058664893 - .long 1063675095 - .long 1076102863 - .long 1057655764 - .long 1067924853 - .long 1060439283 +# .text @@ -57,7 +23,7 @@ movl 276(%esp),%edi flds 4(%eax) - movl $costab,%ebx + movl $costab_mmx,%ebx fadds 120(%eax) orl %ecx,%ecx fstps 4(%edx) Index: dct64_3dnow.s =================================================================== RCS file: /cvsroot/mplayer/main/mp3lib/dct64_3dnow.s,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dct64_3dnow.s 29 Jun 2001 17:53:53 -0000 1.2 +++ dct64_3dnow.s 4 Jul 2001 09:47:56 -0000 1.3 @@ -3,45 +3,10 @@ # Applied to mplayer by Nick Kurshev <nickols_k(a)mail.ru> # Partial 3dnow! optimization by Nick Kurshev # -# TODO: finish 3dnow! optimization at least in scalar mode +# TODO: optimize scalar 3dnow! code +# Warning: Phases 7 & 8 are not tested # -.data - .align 8 -plus_minus_3dnow: .long 0x00000000, 0x80000000 -costab: - .long 1056974725 - .long 1057056395 - .long 1057223771 - .long 1057485416 - .long 1057855544 - .long 1058356026 - .long 1059019886 - .long 1059897405 - .long 1061067246 - .long 1062657950 - .long 1064892987 - .long 1066774581 - .long 1069414683 - .long 1073984175 - .long 1079645762 - .long 1092815430 - .long 1057005197 - .long 1057342072 - .long 1058087743 - .long 1059427869 - .long 1061799040 - .long 1065862217 - .long 1071413542 - .long 1084439708 - .long 1057128951 - .long 1058664893 - .long 1063675095 - .long 1076102863 - .long 1057655764 - .long 1067924853 - .long 1060439283 - .text .align 16 @@ -53,14 +18,13 @@ pushl %edi subl $256,%esp movl 280(%esp),%eax - leal 128(%esp),%edx movl 272(%esp),%esi movl 276(%esp),%edi - movl $costab,%ebx + movl $costab_mmx,%ebx orl %ecx,%ecx movl %esp,%ecx - femms + /* Phase 1*/ movq (%eax), %mm0 movq 8(%eax), %mm4 @@ -535,395 +499,419 @@ movd %mm7, 120(%ecx) /* Phase 6. This is the end of easy road. */ - movl $1, %eax - movd %eax, %mm7 - pi2fd %mm7, %mm7 - movq 32(%ecx), %mm0 - punpckldq 120(%ebx), %mm7 /* 1.0 | 120(%ebx) */ - movq %mm0, %mm1 - movq plus_minus_3dnow, %mm6 - /* n.b.: pfpnacc */ - pxor %mm6, %mm1 - pfacc %mm1, %mm0 - /**/ - pfmul %mm7, %mm0 - movq %mm0, 32(%edx) - femms +/* Code below is coded in scalar mode. Should be optimized */ + + movd 32(%ecx), %mm0 + pfadd 36(%ecx), %mm0 + movd %mm0, 32(%edx) + + movd 32(%ecx), %mm0 + pfsub 36(%ecx), %mm0 + pfmul 120(%ebx),%mm0 + movd %mm0, 36(%edx) + + movd 44(%ecx), %mm0 + pfsub 40(%ecx), %mm0 + pfmul 120(%ebx),%mm0 + + movd %mm0, 44(%edx) + pfadd 40(%ecx), %mm0 + pfadd 44(%ecx), %mm0 + movd %mm0, 40(%edx) + + movd 48(%ecx), %mm3 + pfsub 52(%ecx), %mm3 + pfmul 120(%ebx), %mm3 + + movd 60(%ecx), %mm2 + pfsub 56(%ecx), %mm2 + pfmul 120(%ebx), %mm2 + movq %mm2, %mm1 + + pfadd 56(%ecx), %mm1 + pfadd 60(%ecx), %mm1 + movq %mm1, %mm0 + + pfadd 48(%ecx), %mm0 + pfadd 52(%ecx), %mm0 + movd %mm0, 48(%edx) + pfadd %mm3, %mm1 + movd %mm1, 56(%edx) + movd %mm2, 60(%edx) + pfadd %mm3, %mm2 + movd %mm2, 52(%edx) - flds 44(%ecx) - fsubs 40(%ecx) - fmuls 120(%ebx) - - fsts 44(%edx) - fadds 40(%ecx) /* pfacc 40(ecx), 56(%ecx) */ - fadds 44(%ecx) - fstps 40(%edx) - - flds 48(%ecx) - fsubs 52(%ecx) - fmuls 120(%ebx) - - flds 60(%ecx) - fsubs 56(%ecx) - fmuls 120(%ebx) - - fld %st(0) - fadds 56(%ecx) - fadds 60(%ecx) - - fld %st(0) - fadds 48(%ecx) - fadds 52(%ecx) - fstps 48(%edx) - fadd %st(2) - fstps 56(%edx) - fsts 60(%edx) - faddp %st(1) - fstps 52(%edx) /*---*/ - flds 64(%ecx) - fadds 68(%ecx) - fstps 64(%edx) - - flds 64(%ecx) - fsubs 68(%ecx) - fmuls 120(%ebx) - fstps 68(%edx) - - flds 76(%ecx) - fsubs 72(%ecx) - fmuls 120(%ebx) - fsts 76(%edx) - fadds 72(%ecx) - fadds 76(%ecx) - fstps 72(%edx) - - flds 92(%ecx) - fsubs 88(%ecx) - fmuls 120(%ebx) - fsts 92(%edx) - fadds 92(%ecx) - fadds 88(%ecx) - - fld %st(0) - fadds 80(%ecx) - fadds 84(%ecx) - fstps 80(%edx) - - flds 80(%ecx) - fsubs 84(%ecx) - fmuls 120(%ebx) - fadd %st(0), %st(1) - fadds 92(%edx) - fstps 84(%edx) - fstps 88(%edx) - - flds 96(%ecx) - fadds 100(%ecx) - fstps 96(%edx) - - flds 96(%ecx) - fsubs 100(%ecx) - fmuls 120(%ebx) - fstps 100(%edx) - - flds 108(%ecx) - fsubs 104(%ecx) - fmuls 120(%ebx) - fsts 108(%edx) - fadds 104(%ecx) - fadds 108(%ecx) - fstps 104(%edx) - - flds 124(%ecx) - fsubs 120(%ecx) - fmuls 120(%ebx) - fsts 124(%edx) - fadds 120(%ecx) - fadds 124(%ecx) - - fld %st(0) - fadds 112(%ecx) - fadds 116(%ecx) - fstps 112(%edx) - - flds 112(%ecx) - fsubs 116(%ecx) - fmuls 120(%ebx) - fadd %st(0),%st(1) - fadds 124(%edx) - fstps 116(%edx) - fstps 120(%edx) + movd 64(%ecx), %mm0 + pfadd 68(%ecx), %mm0 + movd %mm0, 64(%edx) + + movd 64(%ecx), %mm0 + pfsub 68(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + movd %mm0, 68(%edx) + + movd 76(%ecx), %mm0 + pfsub 72(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + movd %mm0, 76(%edx) + pfadd 72(%ecx), %mm0 + pfadd 76(%ecx), %mm0 + movd %mm0, 72(%edx) + + movd 92(%ecx), %mm0 + pfsub 88(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + movd %mm0, 92(%edx) + pfadd 92(%ecx), %mm0 + pfadd 88(%ecx), %mm0 + movq %mm0, %mm1 + + pfadd 80(%ecx), %mm0 + pfadd 84(%ecx), %mm0 + movd %mm0, 80(%edx) + + movd 80(%ecx), %mm0 + pfsub 84(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + pfadd %mm0, %mm1 + pfadd 92(%edx), %mm0 + movd %mm0, 84(%edx) + movd %mm1, 88(%edx) + + movd 96(%ecx), %mm0 + pfadd 100(%ecx), %mm0 + movd %mm0, 96(%edx) + + movd 96(%ecx), %mm0 + pfsub 100(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + movd %mm0, 100(%edx) + + movd 108(%ecx), %mm0 + pfsub 104(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + movd %mm0, 108(%edx) + pfadd 104(%ecx), %mm0 + pfadd 108(%ecx), %mm0 + movd %mm0, 104(%edx) + + movd 124(%ecx), %mm0 + pfsub 120(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + movd %mm0, 124(%edx) + pfadd 120(%ecx), %mm0 + pfadd 124(%ecx), %mm0 + movq %mm0, %mm1 + + pfadd 112(%ecx), %mm0 + pfadd 116(%ecx), %mm0 + movd %mm0, 112(%edx) + + movd 112(%ecx), %mm0 + pfsub 116(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + pfadd %mm0,%mm1 + pfadd 124(%edx), %mm0 + movd %mm0, 116(%edx) + movd %mm1, 120(%edx) + jnz .L01 /* Phase 7*/ +/* Code below is coded in scalar mode. Should be optimized */ - flds (%ecx) - fadds 4(%ecx) - fstps 1024(%esi) - - flds (%ecx) - fsubs 4(%ecx) - fmuls 120(%ebx) - fsts (%esi) - fstps (%edi) - - flds 12(%ecx) - fsubs 8(%ecx) - fmuls 120(%ebx) - fsts 512(%edi) - fadds 12(%ecx) - fadds 8(%ecx) - fstps 512(%esi) - - flds 16(%ecx) - fsubs 20(%ecx) - fmuls 120(%ebx) - - flds 28(%ecx) - fsubs 24(%ecx) - fmuls 120(%ebx) - fsts 768(%edi) - fld %st(0) - fadds 24(%ecx) - fadds 28(%ecx) - fld %st(0) - fadds 16(%ecx) - fadds 20(%ecx) - fstps 768(%esi) - fadd %st(2) - fstps 256(%esi) - faddp %st(1) - fstps 256(%edi) + movd (%ecx), %mm0 + pfadd 4(%ecx), %mm0 + movd %mm0, 1024(%esi) + + movd (%ecx), %mm0 + pfsub 4(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + movd %mm0, (%esi) + movd %mm0, (%edi) + + movd 12(%ecx), %mm0 + pfsub 8(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + movd %mm0, 512(%edi) + pfadd 12(%ecx), %mm0 + pfadd 8(%ecx), %mm0 + movd %mm0, 512(%esi) + + movd 16(%ecx), %mm0 + pfsub 20(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + movq %mm0, %mm3 + + movd 28(%ecx), %mm0 + pfsub 24(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + movd %mm0, 768(%edi) + movq %mm0, %mm2 + + pfadd 24(%ecx), %mm0 + pfadd 28(%ecx), %mm0 + movq %mm0, %mm1 + + pfadd 16(%ecx), %mm0 + pfadd 20(%ecx), %mm0 + movd %mm0, 768(%esi) + pfadd %mm3, %mm1 + movd %mm1, 256(%esi) + pfadd %mm3, %mm2 + movd %mm2, 256(%edi) /* Phase 8*/ - flds 32(%edx) - fadds 48(%edx) - fstps 896(%esi) - - flds 48(%edx) - fadds 40(%edx) - fstps 640(%esi) - - flds 40(%edx) - fadds 56(%edx) - fstps 384(%esi) - - flds 56(%edx) - fadds 36(%edx) - fstps 128(%esi) - - flds 36(%edx) - fadds 52(%edx) - fstps 128(%edi) - - flds 52(%edx) - fadds 44(%edx) - fstps 384(%edi) - - flds 60(%edx) - fsts 896(%edi) - fadds 44(%edx) - fstps 640(%edi) - - flds 96(%edx) - fadds 112(%edx) - fld %st(0) - fadds 64(%edx) - fstps 960(%esi) - fadds 80(%edx) - fstps 832(%esi) - - flds 112(%edx) - fadds 104(%edx) - fld %st(0) - fadds 80(%edx) - fstps 704(%esi) - fadds 72(%edx) - fstps 576(%esi) - - flds 104(%edx) - fadds 120(%edx) - fld %st(0) - fadds 72(%edx) - fstps 448(%esi) - fadds 88(%edx) - fstps 320(%esi) - - flds 120(%edx) - fadds 100(%edx) - fld %st(0) - fadds 88(%edx) - fstps 192(%esi) - fadds 68(%edx) - fstps 64(%esi) - - flds 100(%edx) - fadds 116(%edx) - fld %st(0) - fadds 68(%edx) - fstps 64(%edi) - fadds 84(%edx) - fstps 192(%edi) - - flds 116(%edx) - fadds 108(%edx) - fld %st(0) - fadds 84(%edx) - fstps 320(%edi) - fadds 76(%edx) - fstps 448(%edi) - - flds 108(%edx) - fadds 124(%edx) - fld %st(0) - fadds 76(%edx) - fstps 576(%edi) - fadds 92(%edx) - fstps 704(%edi) - - flds 124(%edx) - fsts 960(%edi) - fadds 92(%edx) - fstps 832(%edi) + movq 32(%edx), %mm0 + movq 48(%edx), %mm1 + pfadd 48(%edx), %mm0 + pfadd 40(%edx), %mm1 + movd %mm0, 896(%esi) + movd %mm1, 640(%esi) + psrlq $32, %mm0 + psrlq $32, %mm1 + movd %mm0, 128(%edi) + movd %mm1, 384(%edi) + + movd 40(%edx), %mm0 + pfadd 56(%edx), %mm0 + movd %mm0, 384(%esi) + + movd 56(%edx), %mm0 + pfadd 36(%edx), %mm0 + movd %mm0, 128(%esi) + + movd 60(%edx), %mm0 + movd %mm0, 896(%edi) + pfadd 44(%edx), %mm0 + movd %mm0, 640(%edi) + + movq 96(%edx), %mm0 + movq 112(%edx), %mm2 + movq 104(%edx), %mm4 + pfadd 112(%edx), %mm0 + pfadd 104(%edx), %mm2 + pfadd 120(%edx), %mm4 + movq %mm0, %mm1 + movq %mm2, %mm3 + movq %mm4, %mm5 + pfadd 64(%edx), %mm0 + pfadd 80(%edx), %mm2 + pfadd 72(%edx), %mm4 + movd %mm0, 960(%esi) + movd %mm2, 704(%esi) + movd %mm4, 448(%esi) + psrlq $32, %mm0 + psrlq $32, %mm2 + psrlq $32, %mm4 + movd %mm0, 64(%edi) + movd %mm2, 320(%edi) + movd %mm4, 576(%edi) + pfadd 80(%edx), %mm1 + pfadd 72(%edx), %mm3 + pfadd 88(%edx), %mm5 + movd %mm1, 832(%esi) + movd %mm3, 576(%esi) + movd %mm5, 320(%esi) + psrlq $32, %mm1 + psrlq $32, %mm3 + psrlq $32, %mm5 + movd %mm1, 192(%edi) + movd %mm3, 448(%edi) + movd %mm5, 704(%edi) + + movd 120(%edx), %mm0 + pfadd 100(%edx), %mm0 + movq %mm0, %mm1 + pfadd 88(%edx), %mm0 + movd %mm0, 192(%esi) + pfadd 68(%edx), %mm1 + movd %mm1, 64(%esi) + + movd 124(%edx), %mm0 + movd %mm0, 960(%edi) + pfadd 92(%edx), %mm0 + movd %mm0, 832(%edi) + jmp .L_bye .L01: /* Phase 9*/ - - flds (%ecx) - fadds 4(%ecx) - fistp 512(%esi) - - flds (%ecx) - fsubs 4(%ecx) - fmuls 120(%ebx) - - fistp (%esi) - - - flds 12(%ecx) - fsubs 8(%ecx) - fmuls 120(%ebx) - fist 256(%edi) - fadds 12(%ecx) - fadds 8(%ecx) - fistp 256(%esi) - - flds 16(%ecx) - fsubs 20(%ecx) - fmuls 120(%ebx) - - flds 28(%ecx) - fsubs 24(%ecx) - fmuls 120(%ebx) - fist 384(%edi) - fld %st(0) - fadds 24(%ecx) - fadds 28(%ecx) - fld %st(0) - fadds 16(%ecx) - fadds 20(%ecx) - fistp 384(%esi) - fadd %st(2) - fistp 128(%esi) - faddp %st(1) - fistp 128(%edi) + movd (%ecx), %mm0 + pfadd 4(%ecx), %mm0 + pf2id %mm0, %mm0 + movd %mm0, %eax + movw %ax, 512(%esi) + + movd (%ecx), %mm0 + pfsub 4(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + pf2id %mm0, %mm0 + movd %mm0, %eax + movw %ax, (%esi) + + movd 12(%ecx), %mm0 + pfsub 8(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + pf2id %mm0, %mm7 + movd %mm7, %eax + movw %ax, 256(%edi) + pfadd 12(%ecx), %mm0 + pfadd 8(%ecx), %mm0 + pf2id %mm0, %mm0 + movd %mm0, %eax + movw %ax, 256(%esi) + + movd 16(%ecx), %mm0 + pfsub 20(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + movq %mm0, %mm3 + + movd 28(%ecx), %mm0 + pfsub 24(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + pf2id %mm0, %mm7 + movd %mm7, %eax + movw %ax, 384(%edi) + movq %mm0, %mm2 + + pfadd 24(%ecx), %mm0 + pfadd 28(%ecx), %mm0 + movq %mm0, %mm1 + pfadd 16(%ecx), %mm0 + pfadd 20(%ecx), %mm0 + pf2id %mm0, %mm0 + movd %mm0, %eax + movw %ax, 384(%esi) + pfadd %mm3, %mm1 + pf2id %mm1, %mm1 + movd %mm1, %eax + movw %ax, 128(%esi) + pfadd %mm3, %mm2 + pf2id %mm2, %mm2 + movd %mm2, %eax + movw %ax, 128(%edi) + /* Phase 10*/ - flds 32(%edx) - fadds 48(%edx) - fistp 448(%esi) - - flds 48(%edx) - fadds 40(%edx) - fistp 320(%esi) - - flds 40(%edx) - fadds 56(%edx) - fistp 192(%esi) - - flds 56(%edx) - fadds 36(%edx) - fistp 64(%esi) - - flds 36(%edx) - fadds 52(%edx) - fistp 64(%edi) - - flds 52(%edx) - fadds 44(%edx) - fistp 192(%edi) - - flds 60(%edx) - fist 448(%edi) - fadds 44(%edx) - fistp 320(%edi) - - flds 96(%edx) - fadds 112(%edx) - fld %st(0) - fadds 64(%edx) - fistp 480(%esi) - fadds 80(%edx) - fistp 416(%esi) - - flds 112(%edx) - fadds 104(%edx) - fld %st(0) - fadds 80(%edx) - fistp 352(%esi) - fadds 72(%edx) - fistp 288(%esi) - - flds 104(%edx) - fadds 120(%edx) - fld %st(0) - fadds 72(%edx) - fistp 224(%esi) - fadds 88(%edx) - fistp 160(%esi) - - flds 120(%edx) - fadds 100(%edx) - fld %st(0) - fadds 88(%edx) - fistp 96(%esi) - fadds 68(%edx) - fistp 32(%esi) - - flds 100(%edx) - fadds 116(%edx) - fld %st(0) - fadds 68(%edx) - fistp 32(%edi) - fadds 84(%edx) - fistp 96(%edi) - - flds 116(%edx) - fadds 108(%edx) - fld %st(0) - fadds 84(%edx) - fistp 160(%edi) - fadds 76(%edx) - fistp 224(%edi) - - flds 108(%edx) - fadds 124(%edx) - fld %st(0) - fadds 76(%edx) - fistp 288(%edi) - fadds 92(%edx) - fistp 352(%edi) - - flds 124(%edx) - fist 480(%edi) - fadds 92(%edx) - fistp 416(%edi) + movq 32(%edx), %mm0 + movq 48(%edx), %mm1 + pfadd 48(%edx), %mm0 + pfadd 40(%edx), %mm1 + pf2id %mm0, %mm0 + pf2id %mm1, %mm1 + movd %mm0, %eax + movd %mm1, %ecx + movw %ax, 448(%esi) + movw %cx, 320(%esi) + psrlq $32, %mm0 + psrlq $32, %mm1 + movd %mm0, %eax + movd %mm1, %ecx + movw %ax, 64(%edi) + movw %cx, 192(%edi) + + movd 40(%edx), %mm0 + pfadd 56(%edx), %mm0 + pf2id %mm0, %mm0 + movd %mm0, %eax + movw %ax, 192(%esi) + + movd 56(%edx), %mm0 + pfadd 36(%edx), %mm0 + pf2id %mm0, %mm0 + movd %mm0, %eax + movw %ax, 64(%esi) + + movd 60(%edx), %mm0 + pf2id %mm0, %mm7 + movd %mm7, %eax + movw %ax, 448(%edi) + pfadd 44(%edx), %mm0 + pf2id %mm0, %mm0 + movd %mm0, %eax + movw %ax, 320(%edi) + + movq 96(%edx), %mm0 + movq 112(%edx), %mm2 + movq 104(%edx), %mm4 + pfadd 112(%edx), %mm0 + pfadd 104(%edx), %mm2 + pfadd 120(%edx), %mm4 + movq %mm0, %mm1 + movq %mm2, %mm3 + movq %mm4, %mm5 + pfadd 64(%edx), %mm0 + pfadd 80(%edx), %mm2 + pfadd 72(%edx), %mm4 + pf2id %mm0, %mm7 + pf2id %mm2, %mm6 + pf2id %mm4, %mm4 + movd %mm7, %eax + movd %mm6, %ecx + movd %mm4, %ebx + movw %ax, 480(%esi) + movw %cx, 352(%esi) + movw %bx, 224(%esi) + psrlq $32, %mm7 + psrlq $32, %mm6 + psrlq $32, %mm4 + movd %mm7, %eax + movd %mm6, %ecx + movd %mm4, %ebx + movw %ax, 32(%edi) + movw %cx, 160(%edi) + movw %bx, 288(%edi) + pfadd 80(%edx), %mm1 + pfadd 72(%edx), %mm3 + pfadd 88(%edx), %mm5 + pf2id %mm1, %mm1 + pf2id %mm3, %mm3 + pf2id %mm5, %mm5 + movd %mm1, %eax + movd %mm3, %ecx + movd %mm5, %ebx + movw %ax, 416(%esi) + movw %cx, 288(%esi) + movw %bx, 160(%esi) + psrlq $32, %mm1 + psrlq $32, %mm3 + psrlq $32, %mm5 + movd %mm1, %eax + movd %mm3, %ecx + movd %mm5, %ebx + movw %ax, 96(%edi) + movw %cx, 224(%edi) + movw %bx, 352(%edi) + + movd 120(%edx), %mm0 + pfadd 100(%edx), %mm0 + movq %mm0, %mm1 + pfadd 88(%edx), %mm0 + pf2id %mm0, %mm0 + movd %mm0, %eax + movw %ax, 96(%esi) + pfadd 68(%edx), %mm1 + pf2id %mm1, %mm1 + movd %mm1, %eax + movw %ax, 32(%esi) + + movq 124(%edx), %mm0 + pf2id %mm0, %mm1 + movd %mm1, %eax + movw %ax, 480(%edi) + pfadd 92(%edx), %mm0 + pf2id %mm0, %mm0 + movd %mm0, %eax + movw %ax, 416(%edi) + movsw + .L_bye: addl $256,%esp + femms popl %edi popl %esi popl %ebx Index: dct64_k7.s =================================================================== RCS file: /cvsroot/mplayer/main/mp3lib/dct64_k7.s,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dct64_k7.s 29 Jun 2001 17:53:53 -0000 1.4 +++ dct64_k7.s 4 Jul 2001 09:47:56 -0000 1.5 @@ -3,45 +3,10 @@ # Applied to mplayer by Nick Kurshev <nickols_k(a)mail.ru> # Partial 3dnowex-DSP! optimization by Nick Kurshev # -# TODO: finish 3dnow! optimization at least in scalar mode +# TODO: optimize scalar 3dnow! code +# Warning: Phases 7 & 8 are not tested # -.data - .align 8 -plus_minus_3dnow: .long 0x00000000, 0x80000000 -costab: - .long 1056974725 - .long 1057056395 - .long 1057223771 - .long 1057485416 - .long 1057855544 - .long 1058356026 - .long 1059019886 - .long 1059897405 - .long 1061067246 - .long 1062657950 - .long 1064892987 - .long 1066774581 - .long 1069414683 - .long 1073984175 - .long 1079645762 - .long 1092815430 - .long 1057005197 - .long 1057342072 - .long 1058087743 - .long 1059427869 - .long 1061799040 - .long 1065862217 - .long 1071413542 - .long 1084439708 - .long 1057128951 - .long 1058664893 - .long 1063675095 - .long 1076102863 - .long 1057655764 - .long 1067924853 - .long 1060439283 - .text .align 16 @@ -57,10 +22,10 @@ leal 128(%esp),%edx movl 272(%esp),%esi movl 276(%esp),%edi - movl $costab,%ebx + movl $costab_mmx,%ebx orl %ecx,%ecx movl %esp,%ecx - femms + /* Phase 1*/ movq (%eax), %mm0 movq 8(%eax), %mm4 @@ -407,395 +372,419 @@ movq %mm7, 120(%ecx) /* Phase 6. This is the end of easy road. */ - movl $1, %eax - movd %eax, %mm7 - pi2fd %mm7, %mm7 - movq 32(%ecx), %mm0 - punpckldq 120(%ebx), %mm7 /* 1.0 | 120(%ebx) */ - movq %mm0, %mm1 - movq plus_minus_3dnow, %mm6 - /* n.b.: pfpnacc */ - pxor %mm6, %mm1 - pfacc %mm1, %mm0 - /**/ - pfmul %mm7, %mm0 - movq %mm0, 32(%edx) - femms +/* Code below is coded in scalar mode. Should be optimized */ + + movd 32(%ecx), %mm0 + pfadd 36(%ecx), %mm0 + movd %mm0, 32(%edx) + + movd 32(%ecx), %mm0 + pfsub 36(%ecx), %mm0 + pfmul 120(%ebx),%mm0 + movd %mm0, 36(%edx) + + movd 44(%ecx), %mm0 + pfsub 40(%ecx), %mm0 + pfmul 120(%ebx),%mm0 + + movd %mm0, 44(%edx) + pfadd 40(%ecx), %mm0 + pfadd 44(%ecx), %mm0 + movd %mm0, 40(%edx) + + movd 48(%ecx), %mm3 + pfsub 52(%ecx), %mm3 + pfmul 120(%ebx), %mm3 + + movd 60(%ecx), %mm2 + pfsub 56(%ecx), %mm2 + pfmul 120(%ebx), %mm2 + movq %mm2, %mm1 + + pfadd 56(%ecx), %mm1 + pfadd 60(%ecx), %mm1 + movq %mm1, %mm0 + + pfadd 48(%ecx), %mm0 + pfadd 52(%ecx), %mm0 + movd %mm0, 48(%edx) + pfadd %mm3, %mm1 + movd %mm1, 56(%edx) + movd %mm2, 60(%edx) + pfadd %mm3, %mm2 + movd %mm2, 52(%edx) - flds 44(%ecx) - fsubs 40(%ecx) - fmuls 120(%ebx) - - fsts 44(%edx) - fadds 40(%ecx) /* pfacc 40(ecx), 56(%ecx) */ - fadds 44(%ecx) - fstps 40(%edx) - - flds 48(%ecx) - fsubs 52(%ecx) - fmuls 120(%ebx) - - flds 60(%ecx) - fsubs 56(%ecx) - fmuls 120(%ebx) - - fld %st(0) - fadds 56(%ecx) - fadds 60(%ecx) - - fld %st(0) - fadds 48(%ecx) - fadds 52(%ecx) - fstps 48(%edx) - fadd %st(2) - fstps 56(%edx) - fsts 60(%edx) - faddp %st(1) - fstps 52(%edx) /*---*/ - flds 64(%ecx) - fadds 68(%ecx) - fstps 64(%edx) - - flds 64(%ecx) - fsubs 68(%ecx) - fmuls 120(%ebx) - fstps 68(%edx) - - flds 76(%ecx) - fsubs 72(%ecx) - fmuls 120(%ebx) - fsts 76(%edx) - fadds 72(%ecx) - fadds 76(%ecx) - fstps 72(%edx) - - flds 92(%ecx) - fsubs 88(%ecx) - fmuls 120(%ebx) - fsts 92(%edx) - fadds 92(%ecx) - fadds 88(%ecx) - - fld %st(0) - fadds 80(%ecx) - fadds 84(%ecx) - fstps 80(%edx) - - flds 80(%ecx) - fsubs 84(%ecx) - fmuls 120(%ebx) - fadd %st(0), %st(1) - fadds 92(%edx) - fstps 84(%edx) - fstps 88(%edx) - - flds 96(%ecx) - fadds 100(%ecx) - fstps 96(%edx) - - flds 96(%ecx) - fsubs 100(%ecx) - fmuls 120(%ebx) - fstps 100(%edx) - - flds 108(%ecx) - fsubs 104(%ecx) - fmuls 120(%ebx) - fsts 108(%edx) - fadds 104(%ecx) - fadds 108(%ecx) - fstps 104(%edx) - - flds 124(%ecx) - fsubs 120(%ecx) - fmuls 120(%ebx) - fsts 124(%edx) - fadds 120(%ecx) - fadds 124(%ecx) - - fld %st(0) - fadds 112(%ecx) - fadds 116(%ecx) - fstps 112(%edx) - - flds 112(%ecx) - fsubs 116(%ecx) - fmuls 120(%ebx) - fadd %st(0),%st(1) - fadds 124(%edx) - fstps 116(%edx) - fstps 120(%edx) + movd 64(%ecx), %mm0 + pfadd 68(%ecx), %mm0 + movd %mm0, 64(%edx) + + movd 64(%ecx), %mm0 + pfsub 68(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + movd %mm0, 68(%edx) + + movd 76(%ecx), %mm0 + pfsub 72(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + movd %mm0, 76(%edx) + pfadd 72(%ecx), %mm0 + pfadd 76(%ecx), %mm0 + movd %mm0, 72(%edx) + + movd 92(%ecx), %mm0 + pfsub 88(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + movd %mm0, 92(%edx) + pfadd 92(%ecx), %mm0 + pfadd 88(%ecx), %mm0 + movq %mm0, %mm1 + + pfadd 80(%ecx), %mm0 + pfadd 84(%ecx), %mm0 + movd %mm0, 80(%edx) + + movd 80(%ecx), %mm0 + pfsub 84(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + pfadd %mm0, %mm1 + pfadd 92(%edx), %mm0 + movd %mm0, 84(%edx) + movd %mm1, 88(%edx) + + movd 96(%ecx), %mm0 + pfadd 100(%ecx), %mm0 + movd %mm0, 96(%edx) + + movd 96(%ecx), %mm0 + pfsub 100(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + movd %mm0, 100(%edx) + + movd 108(%ecx), %mm0 + pfsub 104(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + movd %mm0, 108(%edx) + pfadd 104(%ecx), %mm0 + pfadd 108(%ecx), %mm0 + movd %mm0, 104(%edx) + + movd 124(%ecx), %mm0 + pfsub 120(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + movd %mm0, 124(%edx) + pfadd 120(%ecx), %mm0 + pfadd 124(%ecx), %mm0 + movq %mm0, %mm1 + + pfadd 112(%ecx), %mm0 + pfadd 116(%ecx), %mm0 + movd %mm0, 112(%edx) + + movd 112(%ecx), %mm0 + pfsub 116(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + pfadd %mm0,%mm1 + pfadd 124(%edx), %mm0 + movd %mm0, 116(%edx) + movd %mm1, 120(%edx) + jnz .L01 /* Phase 7*/ +/* Code below is coded in scalar mode. Should be optimized */ - flds (%ecx) - fadds 4(%ecx) - fstps 1024(%esi) - - flds (%ecx) - fsubs 4(%ecx) - fmuls 120(%ebx) - fsts (%esi) - fstps (%edi) - - flds 12(%ecx) - fsubs 8(%ecx) - fmuls 120(%ebx) - fsts 512(%edi) - fadds 12(%ecx) - fadds 8(%ecx) - fstps 512(%esi) - - flds 16(%ecx) - fsubs 20(%ecx) - fmuls 120(%ebx) - - flds 28(%ecx) - fsubs 24(%ecx) - fmuls 120(%ebx) - fsts 768(%edi) - fld %st(0) - fadds 24(%ecx) - fadds 28(%ecx) - fld %st(0) - fadds 16(%ecx) - fadds 20(%ecx) - fstps 768(%esi) - fadd %st(2) - fstps 256(%esi) - faddp %st(1) - fstps 256(%edi) + movd (%ecx), %mm0 + pfadd 4(%ecx), %mm0 + movd %mm0, 1024(%esi) + + movd (%ecx), %mm0 + pfsub 4(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + movd %mm0, (%esi) + movd %mm0, (%edi) + + movd 12(%ecx), %mm0 + pfsub 8(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + movd %mm0, 512(%edi) + pfadd 12(%ecx), %mm0 + pfadd 8(%ecx), %mm0 + movd %mm0, 512(%esi) + + movd 16(%ecx), %mm0 + pfsub 20(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + movq %mm0, %mm3 + + movd 28(%ecx), %mm0 + pfsub 24(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + movd %mm0, 768(%edi) + movq %mm0, %mm2 + + pfadd 24(%ecx), %mm0 + pfadd 28(%ecx), %mm0 + movq %mm0, %mm1 + + pfadd 16(%ecx), %mm0 + pfadd 20(%ecx), %mm0 + movd %mm0, 768(%esi) + pfadd %mm3, %mm1 + movd %mm1, 256(%esi) + pfadd %mm3, %mm2 + movd %mm2, 256(%edi) /* Phase 8*/ - flds 32(%edx) - fadds 48(%edx) - fstps 896(%esi) - - flds 48(%edx) - fadds 40(%edx) - fstps 640(%esi) - - flds 40(%edx) - fadds 56(%edx) - fstps 384(%esi) - - flds 56(%edx) - fadds 36(%edx) - fstps 128(%esi) - - flds 36(%edx) - fadds 52(%edx) - fstps 128(%edi) - - flds 52(%edx) - fadds 44(%edx) - fstps 384(%edi) - - flds 60(%edx) - fsts 896(%edi) - fadds 44(%edx) - fstps 640(%edi) - - flds 96(%edx) - fadds 112(%edx) - fld %st(0) - fadds 64(%edx) - fstps 960(%esi) - fadds 80(%edx) - fstps 832(%esi) - - flds 112(%edx) - fadds 104(%edx) - fld %st(0) - fadds 80(%edx) - fstps 704(%esi) - fadds 72(%edx) - fstps 576(%esi) - - flds 104(%edx) - fadds 120(%edx) - fld %st(0) - fadds 72(%edx) - fstps 448(%esi) - fadds 88(%edx) - fstps 320(%esi) - - flds 120(%edx) - fadds 100(%edx) - fld %st(0) - fadds 88(%edx) - fstps 192(%esi) - fadds 68(%edx) - fstps 64(%esi) - - flds 100(%edx) - fadds 116(%edx) - fld %st(0) - fadds 68(%edx) - fstps 64(%edi) - fadds 84(%edx) - fstps 192(%edi) - - flds 116(%edx) - fadds 108(%edx) - fld %st(0) - fadds 84(%edx) - fstps 320(%edi) - fadds 76(%edx) - fstps 448(%edi) - - flds 108(%edx) - fadds 124(%edx) - fld %st(0) - fadds 76(%edx) - fstps 576(%edi) - fadds 92(%edx) - fstps 704(%edi) - - flds 124(%edx) - fsts 960(%edi) - fadds 92(%edx) - fstps 832(%edi) + movq 32(%edx), %mm0 + movq 48(%edx), %mm1 + pfadd 48(%edx), %mm0 + pfadd 40(%edx), %mm1 + movd %mm0, 896(%esi) + movd %mm1, 640(%esi) + psrlq $32, %mm0 + psrlq $32, %mm1 + movd %mm0, 128(%edi) + movd %mm1, 384(%edi) + + movd 40(%edx), %mm0 + pfadd 56(%edx), %mm0 + movd %mm0, 384(%esi) + + movd 56(%edx), %mm0 + pfadd 36(%edx), %mm0 + movd %mm0, 128(%esi) + + movd 60(%edx), %mm0 + movd %mm0, 896(%edi) + pfadd 44(%edx), %mm0 + movd %mm0, 640(%edi) + + movq 96(%edx), %mm0 + movq 112(%edx), %mm2 + movq 104(%edx), %mm4 + pfadd 112(%edx), %mm0 + pfadd 104(%edx), %mm2 + pfadd 120(%edx), %mm4 + movq %mm0, %mm1 + movq %mm2, %mm3 + movq %mm4, %mm5 + pfadd 64(%edx), %mm0 + pfadd 80(%edx), %mm2 + pfadd 72(%edx), %mm4 + movd %mm0, 960(%esi) + movd %mm2, 704(%esi) + movd %mm4, 448(%esi) + psrlq $32, %mm0 + psrlq $32, %mm2 + psrlq $32, %mm4 + movd %mm0, 64(%edi) + movd %mm2, 320(%edi) + movd %mm4, 576(%edi) + pfadd 80(%edx), %mm1 + pfadd 72(%edx), %mm3 + pfadd 88(%edx), %mm5 + movd %mm1, 832(%esi) + movd %mm3, 576(%esi) + movd %mm5, 320(%esi) + psrlq $32, %mm1 + psrlq $32, %mm3 + psrlq $32, %mm5 + movd %mm1, 192(%edi) + movd %mm3, 448(%edi) + movd %mm5, 704(%edi) + + movd 120(%edx), %mm0 + pfadd 100(%edx), %mm0 + movq %mm0, %mm1 + pfadd 88(%edx), %mm0 + movd %mm0, 192(%esi) + pfadd 68(%edx), %mm1 + movd %mm1, 64(%esi) + + movd 124(%edx), %mm0 + movd %mm0, 960(%edi) + pfadd 92(%edx), %mm0 + movd %mm0, 832(%edi) + jmp .L_bye .L01: /* Phase 9*/ - - flds (%ecx) - fadds 4(%ecx) - fistp 512(%esi) - - flds (%ecx) - fsubs 4(%ecx) - fmuls 120(%ebx) - - fistp (%esi) - - - flds 12(%ecx) - fsubs 8(%ecx) - fmuls 120(%ebx) - fist 256(%edi) - fadds 12(%ecx) - fadds 8(%ecx) - fistp 256(%esi) - - flds 16(%ecx) - fsubs 20(%ecx) - fmuls 120(%ebx) - - flds 28(%ecx) - fsubs 24(%ecx) - fmuls 120(%ebx) - fist 384(%edi) - fld %st(0) - fadds 24(%ecx) - fadds 28(%ecx) - fld %st(0) - fadds 16(%ecx) - fadds 20(%ecx) - fistp 384(%esi) - fadd %st(2) - fistp 128(%esi) - faddp %st(1) - fistp 128(%edi) + movd (%ecx), %mm0 + pfadd 4(%ecx), %mm0 + pf2id %mm0, %mm0 + movd %mm0, %eax + movw %ax, 512(%esi) + + movd (%ecx), %mm0 + pfsub 4(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + pf2id %mm0, %mm0 + movd %mm0, %eax + movw %ax, (%esi) + + movd 12(%ecx), %mm0 + pfsub 8(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + pf2id %mm0, %mm7 + movd %mm7, %eax + movw %ax, 256(%edi) + pfadd 12(%ecx), %mm0 + pfadd 8(%ecx), %mm0 + pf2id %mm0, %mm0 + movd %mm0, %eax + movw %ax, 256(%esi) + + movd 16(%ecx), %mm0 + pfsub 20(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + movq %mm0, %mm3 + + movd 28(%ecx), %mm0 + pfsub 24(%ecx), %mm0 + pfmul 120(%ebx), %mm0 + pf2id %mm0, %mm7 + movd %mm7, %eax + movw %ax, 384(%edi) + movq %mm0, %mm2 + + pfadd 24(%ecx), %mm0 + pfadd 28(%ecx), %mm0 + movq %mm0, %mm1 + pfadd 16(%ecx), %mm0 + pfadd 20(%ecx), %mm0 + pf2id %mm0, %mm0 + movd %mm0, %eax + movw %ax, 384(%esi) + pfadd %mm3, %mm1 + pf2id %mm1, %mm1 + movd %mm1, %eax + movw %ax, 128(%esi) + pfadd %mm3, %mm2 + pf2id %mm2, %mm2 + movd %mm2, %eax + movw %ax, 128(%edi) + /* Phase 10*/ - flds 32(%edx) - fadds 48(%edx) - fistp 448(%esi) - - flds 48(%edx) - fadds 40(%edx) - fistp 320(%esi) - - flds 40(%edx) - fadds 56(%edx) - fistp 192(%esi) - - flds 56(%edx) - fadds 36(%edx) - fistp 64(%esi) - - flds 36(%edx) - fadds 52(%edx) - fistp 64(%edi) - - flds 52(%edx) - fadds 44(%edx) - fistp 192(%edi) - - flds 60(%edx) - fist 448(%edi) - fadds 44(%edx) - fistp 320(%edi) - - flds 96(%edx) - fadds 112(%edx) - fld %st(0) - fadds 64(%edx) - fistp 480(%esi) - fadds 80(%edx) - fistp 416(%esi) - - flds 112(%edx) - fadds 104(%edx) - fld %st(0) - fadds 80(%edx) - fistp 352(%esi) - fadds 72(%edx) - fistp 288(%esi) - - flds 104(%edx) - fadds 120(%edx) - fld %st(0) - fadds 72(%edx) - fistp 224(%esi) - fadds 88(%edx) - fistp 160(%esi) - - flds 120(%edx) - fadds 100(%edx) - fld %st(0) - fadds 88(%edx) - fistp 96(%esi) - fadds 68(%edx) - fistp 32(%esi) - - flds 100(%edx) - fadds 116(%edx) - fld %st(0) - fadds 68(%edx) - fistp 32(%edi) - fadds 84(%edx) - fistp 96(%edi) - - flds 116(%edx) - fadds 108(%edx) - fld %st(0) - fadds 84(%edx) - fistp 160(%edi) - fadds 76(%edx) - fistp 224(%edi) - - flds 108(%edx) - fadds 124(%edx) - fld %st(0) - fadds 76(%edx) - fistp 288(%edi) - fadds 92(%edx) - fistp 352(%edi) - - flds 124(%edx) - fist 480(%edi) - fadds 92(%edx) - fistp 416(%edi) + movq 32(%edx), %mm0 + movq 48(%edx), %mm1 + pfadd 48(%edx), %mm0 + pfadd 40(%edx), %mm1 + pf2id %mm0, %mm0 + pf2id %mm1, %mm1 + movd %mm0, %eax + movd %mm1, %ecx + movw %ax, 448(%esi) + movw %cx, 320(%esi) + psrlq $32, %mm0 + psrlq $32, %mm1 + movd %mm0, %eax + movd %mm1, %ecx + movw %ax, 64(%edi) + movw %cx, 192(%edi) + + movd 40(%edx), %mm0 + pfadd 56(%edx), %mm0 + pf2id %mm0, %mm0 + movd %mm0, %eax + movw %ax, 192(%esi) + + movd 56(%edx), %mm0 + pfadd 36(%edx), %mm0 + pf2id %mm0, %mm0 + movd %mm0, %eax + movw %ax, 64(%esi) + + movd 60(%edx), %mm0 + pf2id %mm0, %mm7 + movd %mm7, %eax + movw %ax, 448(%edi) + pfadd 44(%edx), %mm0 + pf2id %mm0, %mm0 + movd %mm0, %eax + movw %ax, 320(%edi) + + movq 96(%edx), %mm0 + movq 112(%edx), %mm2 + movq 104(%edx), %mm4 + pfadd 112(%edx), %mm0 + pfadd 104(%edx), %mm2 + pfadd 120(%edx), %mm4 + movq %mm0, %mm1 + movq %mm2, %mm3 + movq %mm4, %mm5 + pfadd 64(%edx), %mm0 + pfadd 80(%edx), %mm2 + pfadd 72(%edx), %mm4 + pf2id %mm0, %mm7 + pf2id %mm2, %mm6 + pf2id %mm4, %mm4 + movd %mm7, %eax + movd %mm6, %ecx + movd %mm4, %ebx + movw %ax, 480(%esi) + movw %cx, 352(%esi) + movw %bx, 224(%esi) + psrlq $32, %mm7 + psrlq $32, %mm6 + psrlq $32, %mm4 + movd %mm7, %eax + movd %mm6, %ecx + movd %mm4, %ebx + movw %ax, 32(%edi) + movw %cx, 160(%edi) + movw %bx, 288(%edi) + pfadd 80(%edx), %mm1 + pfadd 72(%edx), %mm3 + pfadd 88(%edx), %mm5 + pf2id %mm1, %mm1 + pf2id %mm3, %mm3 + pf2id %mm5, %mm5 + movd %mm1, %eax + movd %mm3, %ecx + movd %mm5, %ebx + movw %ax, 416(%esi) + movw %cx, 288(%esi) + movw %bx, 160(%esi) + psrlq $32, %mm1 + psrlq $32, %mm3 + psrlq $32, %mm5 + movd %mm1, %eax + movd %mm3, %ecx + movd %mm5, %ebx + movw %ax, 96(%edi) + movw %cx, 224(%edi) + movw %bx, 352(%edi) + + movd 120(%edx), %mm0 + pfadd 100(%edx), %mm0 + movq %mm0, %mm1 + pfadd 88(%edx), %mm0 + pf2id %mm0, %mm0 + movd %mm0, %eax + movw %ax, 96(%esi) + pfadd 68(%edx), %mm1 + pf2id %mm1, %mm1 + movd %mm1, %eax + movw %ax, 32(%esi) + + movq 124(%edx), %mm0 + pf2id %mm0, %mm1 + movd %mm1, %eax + movw %ax, 480(%edi) + pfadd 92(%edx), %mm0 + pf2id %mm0, %mm0 + movd %mm0, %eax + movw %ax, 416(%edi) + movsw + .L_bye: addl $256,%esp + femms popl %edi popl %esi popl %ebx Index: decode_MMX.s =================================================================== RCS file: /cvsroot/mplayer/main/mp3lib/decode_MMX.s,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- decode_MMX.s 3 Jul 2001 09:25:16 -0000 1.2 +++ decode_MMX.s 4 Jul 2001 09:47:56 -0000 1.3 @@ -11,6 +11,39 @@ .align 8 null_one: .long 0x0000ffff, 0x0000ffff one_null: .long 0xffff0000, 0xffff0000 +.globl costab_mmx +costab_mmx: + .long 1056974725 + .long 1057056395 + .long 1057223771 + .long 1057485416 + .long 1057855544 + .long 1058356026 + .long 1059019886 + .long 1059897405 + .long 1061067246 + .long 1062657950 + .long 1064892987 + .long 1066774581 + .long 1069414683 + .long 1073984175 + .long 1079645762 + .long 1092815430 + .long 1057005197 + .long 1057342072 + .long 1058087743 + .long 1059427869 + .long 1061799040 + .long 1065862217 + .long 1071413542 + .long 1084439708 + .long 1057128951 + .long 1058664893 + .long 1063675095 + .long 1076102863 + .long 1057655764 + .long 1067924853 + .long 1060439283 .text _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main/mp3lib Makefile,1.10,1.11
by Nick Kurshev 04 Jul '01

04 Jul '01

Update of /cvsroot/mplayer/main/mp3lib In directory mplayerhq:/var/tmp.root/cvs-serv26730/main/mp3lib Modified Files: Makefile Log Message: Minor cleanups Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/mp3lib/Makefile,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Makefile 3 Jul 2001 07:50:52 -0000 1.10 +++ Makefile 4 Jul 2001 07:00:15 -0000 1.11 @@ -1,13 +1,13 @@ include ../config.mak -SRCS = sr1.c d_cpu.s -OBJS = sr1.o d_cpu.o +SRCS = sr1.c +OBJS = sr1.o # OBJS = $(SRCS:.c,.s=.o) CFLAGS = $(OPTFLAGS) $(EXTRA_INC) ifeq ($(TARGET_ARCH_X86),yes) -SRCS += decode_i586.s -OBJS += decode_i586.o +SRCS += d_cpu.s decode_i586.s +OBJS += d_cpu.o decode_i586.o ifeq ($(TARGET_MMX),yes) SRCS += decode_MMX.s dct64_MMX.s tabinit_MMX.s OBJS += decode_MMX.o dct64_MMX.o tabinit_MMX.o _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main/libvo video_out.c,1.18,1.19
by Arpi of Ize 03 Jul '01

03 Jul '01

Update of /cvsroot/mplayer/main/libvo In directory mplayerhq:/var/tmp.root/cvs-serv16953 Modified Files: video_out.c Log Message: added vo_fsmode Index: video_out.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/video_out.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- video_out.c 26 Jun 2001 23:34:03 -0000 1.18 +++ video_out.c 3 Jul 2001 23:46:24 -0000 1.19 @@ -41,6 +41,7 @@ int vo_dheight=0; int vo_dbpp=0; int vo_doublebuffering = 0; +int vo_fsmode = 0; char *vo_subdevice = NULL; _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main/libvo video_out.h,1.8,1.9 vo_dga.c,1.27,1.28
by Arpi of Ize 03 Jul '01

03 Jul '01

Update of /cvsroot/mplayer/main/libvo In directory mplayerhq:/var/tmp.root/cvs-serv16903 Modified Files: video_out.h vo_dga.c Log Message: extern vo_doublebuffering cleanup Index: video_out.h =================================================================== RCS file: /cvsroot/mplayer/main/libvo/video_out.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- video_out.h 21 Jun 2001 22:34:25 -0000 1.8 +++ video_out.h 3 Jul 2001 23:45:49 -0000 1.9 @@ -104,5 +104,8 @@ extern int vo_dheight; extern int vo_dbpp; +extern int vo_doublebuffering; +extern int vo_fsmode; + extern char *vo_subdevice; Index: vo_dga.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_dga.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- vo_dga.c 22 Jun 2001 19:51:25 -0000 1.27 +++ vo_dga.c 3 Jul 2001 23:45:49 -0000 1.28 @@ -23,6 +23,9 @@ * - works only on x86 architectures * * $Log$ + * Revision 1.28 2001/07/03 23:45:49 arpi + * extern vo_doublebuffering cleanup + * * Revision 1.27 2001/06/22 19:51:25 atmosfear * Fixed pointer->integer cast warning. * @@ -291,8 +294,6 @@ extern int verbose; -extern int vo_dbpp; -extern int vo_doublebuffering; static int vo_dga_src_format; static int vo_dga_width; // bytes per line in framebuffer _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main cfg-mplayer.h,1.64,1.65
by Arpi of Ize 03 Jul '01

03 Jul '01

Update of /cvsroot/mplayer/main In directory mplayerhq:/var/tmp.root/cvs-serv16816 Modified Files: cfg-mplayer.h Log Message: -fsmode Index: cfg-mplayer.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- cfg-mplayer.h 2 Jul 2001 19:25:34 -0000 1.64 +++ cfg-mplayer.h 3 Jul 2001 23:44:19 -0000 1.65 @@ -28,6 +28,7 @@ #endif extern int vo_doublebuffering; +extern int vo_fsmode; extern int vo_dbpp; extern int osd_level; extern int sub_unicode; @@ -165,6 +166,7 @@ {"noflip", &flip, CONF_TYPE_FLAG, 0, -1, 0}, {"bpp", &vo_dbpp, CONF_TYPE_INT, CONF_RANGE, 0, 32}, + {"fsmode", &vo_fsmode, CONF_TYPE_INT, CONF_RANGE, 0, 7}, {"double", &vo_doublebuffering, CONF_TYPE_FLAG, 0, 0, 1}, {"nodouble", &vo_doublebuffering, CONF_TYPE_FLAG, 0, 1, 0}, #ifdef HAVE_LIRC _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0

CVS: main/libvo x11_common.c,1.24,1.25
by Arpi of Ize 03 Jul '01

03 Jul '01

Update of /cvsroot/mplayer/main/libvo In directory mplayerhq:/var/tmp.root/cvs-serv16196 Modified Files: x11_common.c Log Message: switch fullscreen method with -fsmode Index: x11_common.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- x11_common.c 27 Jun 2001 08:50:03 -0000 1.24 +++ x11_common.c 3 Jul 2001 23:23:55 -0000 1.25 @@ -182,8 +182,17 @@ static MotifWmHints vo_MotifWmHints; static Atom vo_MotifHints = None; +// Note: always d==0 ! void vo_x11_decoration( Display * vo_Display,Window w,int d ) { + + if(vo_fsmode&1){ + XSetWindowAttributes attr; + attr.override_redirect = True; + XChangeWindowAttributes(vo_Display, w, CWOverrideRedirect, &attr); +// XMapWindow(vo_Display], w); + } + vo_MotifHints=XInternAtom( vo_Display,"_MOTIF_WM_HINTS",0 ); if ( vo_MotifHints != None ) { @@ -191,9 +200,9 @@ vo_MotifWmHints.flags=MWM_HINTS_FUNCTIONS | MWM_HINTS_DECORATIONS; vo_MotifWmHints.functions=MWM_FUNC_MOVE | MWM_FUNC_CLOSE | MWM_FUNC_MINIMIZE | MWM_FUNC_MAXIMIZE; if ( d ) d=MWM_DECOR_ALL; - vo_MotifWmHints.decorations=d | MWM_DECOR_MENU; + vo_MotifWmHints.decorations=d|((vo_fsmode&2)?0:MWM_DECOR_MENU); XChangeProperty( vo_Display,w,vo_MotifHints,vo_MotifHints,32, - PropModeReplace,(unsigned char *)&vo_MotifWmHints,5 ); + PropModeReplace,(unsigned char *)&vo_MotifWmHints,(vo_fsmode&4)?4:5 ); } } _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog(a)lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog

1 0