[Mplayer-cvslog] CVS: main/mp3lib decode_i586.s,1.1.1.1,1.2 decode_MMX.s,1.5,1.6 tabinit_MMX.s,1.1,1.2 dct64_MMX.s,1.3,1.4 dct64_3dnow.s,1.5,1.6 dct64_sse.s,1.1,1.2 dct64_k7.s,1.7,1.8

Atmosfear atmos4 at mplayer.dev.hu
Tue Aug 7 17:37:48 CEST 2001


Update of /cvsroot/mplayer/main/mp3lib
In directory mplayer:/var/tmp.root/cvs-serv6496

Modified Files:
	decode_i586.s decode_MMX.s tabinit_MMX.s dct64_MMX.s 
	dct64_3dnow.s dct64_sse.s dct64_k7.s 
Log Message:
Remove ELF specific stuff from asm (aout/pe(win32) compat)


Index: decode_i586.s
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/decode_i586.s,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- decode_i586.s	24 Feb 2001 20:31:11 -0000	1.1.1.1
+++ decode_i586.s	7 Aug 2001 15:37:45 -0000	1.2
@@ -24,19 +24,24 @@
 / $Id$
 /
 .bss
-        .comm   buffs,4352,4
+/ third .comm parm only supported on ELF, removed for aout/pe(win32)
+/ compatibility - atmos
+//        .comm   buffs,4352,4
+        .comm   buffs,4352
 .data
-        .align 4
+        .balign 4
 bo:
         .long 1
-.section .rodata
-        .align 8
+/ gas 2.11.2 on OpenBSD does not know .section pseudoop, think its
+/ ok to have this simply commeted out - atmos
+//.section .rodata
+        .balign 8
 .LC0:
         .long 0x0,0x40dfffc0
-        .align 8
+        .balign 8
 .LC1:
         .long 0x0,0xc0e00000
-        .align 8
+        .balign 8
 .text
 .globl synth_1to1_pent
 synth_1to1_pent:

Index: decode_MMX.s
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/decode_MMX.s,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- decode_MMX.s	6 Jul 2001 12:08:32 -0000	1.5
+++ decode_MMX.s	7 Aug 2001 15:37:45 -0000	1.6
@@ -8,7 +8,7 @@
 #
 
 .data
-.align 8
+.balign 16
 null_one: .long 0x0000ffff, 0x0000ffff
 one_null: .long 0xffff0000, 0xffff0000
 .globl costab_mmx
@@ -93,7 +93,7 @@
 	pushl %ecx
 	leal decwins(%ebx,%ebx,1), %edx
 	shrl $1, %ecx
-.align 16
+.balign 16
 .L3: 
         movq  (%edx),%mm0
         movq  64(%edx),%mm4
@@ -171,7 +171,7 @@
 .next_loop:
         subl $64,%esi                    
         movl $7,%ecx
-.align 16
+.balign 16
 .L4: 
         movq  (%edx),%mm0
         movq  64(%edx),%mm4

Index: tabinit_MMX.s
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/tabinit_MMX.s,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tabinit_MMX.s	29 Jun 2001 17:53:53 -0000	1.1
+++ tabinit_MMX.s	7 Aug 2001 15:37:45 -0000	1.2
@@ -2,12 +2,15 @@
 # See ChangeLog of mpg123-0.59s-pre.1 for detail
 # Applied to mplayer by Nick Kurshev <nickols_k at mail.ru>
 .bss
-	.align 8
-    	.comm	decwin,2176,32
-	.align 8
-	.comm	decwins,2176,32
+	.balign 8
+/ .com third parm only supported on ELF - atmos	
+//    	.comm	decwin,2176,32
+    	.comm	decwin,2176
+	.balign 8
+//	.comm	decwins,2176,32
+	.comm	decwins,2176
 .data
-	.align 8
+	.balign 8
 intwinbase_MMX:
 	.value      0,    -1,    -1,    -1,    -1,    -1,    -1,    -2
 	.value     -2,    -2,    -2,    -3,    -3,    -4,    -4,    -5
@@ -46,7 +49,7 @@
 intwindiv:
 	.long 0x47800000			# 65536.0
 .text
-	.align 32
+	.balign 32
 .globl make_decode_tables_MMX
 make_decode_tables_MMX:
 	pushl %edi

Index: dct64_MMX.s
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/dct64_MMX.s,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dct64_MMX.s	5 Jul 2001 09:44:18 -0000	1.3
+++ dct64_MMX.s	7 Aug 2001 15:37:45 -0000	1.4
@@ -5,7 +5,7 @@
 
 .text
 
-	.align 16
+	.balign 16
 
 .globl dct64_MMX
 dct64_MMX:

Index: dct64_3dnow.s
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/dct64_3dnow.s,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dct64_3dnow.s	6 Jul 2001 10:59:14 -0000	1.5
+++ dct64_3dnow.s	7 Aug 2001 15:37:45 -0000	1.6
@@ -8,13 +8,13 @@
 #
 
 .data
-	.align 8
+	.balign 8
 x_plus_minus_3dnow: .long 0x00000000, 0x80000000
 plus_1f: .float 1.0
 
 .text
 
-	.align 16
+	.balign 16
 
 .globl dct64_MMX_3dnow
 dct64_MMX_3dnow:

Index: dct64_sse.s
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/dct64_sse.s,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dct64_sse.s	27 Jul 2001 17:25:19 -0000	1.1
+++ dct64_sse.s	7 Aug 2001 15:37:45 -0000	1.2
@@ -6,13 +6,13 @@
 #
 
 //.data
-//	.align 8
+//	.balign 8
 //x_plus_minus_3dnow: .long 0x00000000, 0x80000000
 //plus_1f: .float 1.0
 
 .text
 
-	.align 16
+	.balign 16
 
 	.global dct64_MMX_sse
 

Index: dct64_k7.s
===================================================================
RCS file: /cvsroot/mplayer/main/mp3lib/dct64_k7.s,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dct64_k7.s	6 Jul 2001 10:59:14 -0000	1.7
+++ dct64_k7.s	7 Aug 2001 15:37:45 -0000	1.8
@@ -8,13 +8,13 @@
 #
 
 .data
-	.align 8
+	.balign 8
 x_plus_minus_3dnow: .long 0x00000000, 0x80000000
 plus_1f: .float 1.0
 
 .text
 
-	.align 16
+	.balign 16
 
 .globl dct64_MMX_3dnowex
 dct64_MMX_3dnowex:




More information about the MPlayer-cvslog mailing list