--- cbp_ppc.s	2002/03/27 15:06:14	1.8
+++ cbp_ppc.s	2002/11/17 00:57:57	1.10
@@ -1,24 +1,55 @@
 #    Copyright (C) 2002 Guillaume Morin <guillaume@morinfr.org>, Alcôve
 #
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# *  This file is part of XviD, a free MPEG-4 video encoder/decoder
+# *
+# *  XviD is free software; you can redistribute it and/or modify it
+# *  under the terms of the GNU General Public License as published by
+# *  the Free Software Foundation; either version 2 of the License, or
+# *  (at your option) any later version.
+# *
+# *  This program is distributed in the hope that it will be useful,
+# *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+# *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# *  GNU General Public License for more details.
+# *
+# *  You should have received a copy of the GNU General Public License
+# *  along with this program; if not, write to the Free Software
+# *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+# *
+# *  Under section 8 of the GNU General Public License, the copyright
+# *  holders of XVID explicitly forbid distribution in the following
+# *  countries:
+# *
+# *    - Japan
+# *    - United States of America
+# *
+# *  Linking XviD statically or dynamically with other modules is making a
+# *  combined work based on XviD.  Thus, the terms and conditions of the
+# *  GNU General Public License cover the whole combination.
+# *
+# *  As a special exception, the copyright holders of XviD give you
+# *  permission to link XviD with independent modules that communicate with
+# *  XviD solely through the VFW1.1 and DShow interfaces, regardless of the
+# *  license terms of these independent modules, and to copy and distribute
+# *  the resulting combined work under terms of your choice, provided that
+# *  every copy of the combined work is accompanied by a complete copy of
+# *  the source code of XviD (the version of XviD used to produce the
+# *  combined work), being distributed under the terms of the GNU General
+# *  Public License plus this exception.  An independent module is a module
+# *  which is not derived from or based on XviD.
+# *
+# *  Note that people who make modified versions of XviD are not obligated
+# *  to grant this special exception for their modified versions; it is
+# *  their choice whether to do so.  The GNU General Public License gives
+# *  permission to release a modified version without this exception; this
+# *  exception also makes it possible to release a modified version which
+# *  carries forward this exception.
+# *
 #
-#
-#    $Id: cbp_ppc.s,v 1.8 2002/03/27 15:06:14 canard Exp $
+#    $Id: cbp_ppc.s,v 1.10 2002/11/17 00:57:57 edgomez Exp $
 #    $Source: /home/xvid/cvs/cvs-server-root/xvid/xvidcore/src/bitstream/ppc_asm/Attic/cbp_ppc.s,v $
-#    $Date: 2002/03/27 15:06:14 $
-#    $Author: canard $
+#    $Date: 2002/11/17 00:57:57 $
+#    $Author: edgomez $
 #
 #    This is my first PPC ASM attempt. So I might do nasty things.
 #    Please send any comments to <guillaume@morinfr.org>
@@ -59,41 +90,41 @@
 .global calc_cbp_ppc
 calc_cbp_ppc:
 	# r9 will contain coeffs addr
-	mr 9,3
+	mr %r9,%r3
 	# r8 is the loop counter (rows)
-	li 8,5
+	li %r8,5
 	# r3 contains the result, therefore we set it to 0
-	li 3,0
+	li %r3,0
 .loop:
 	# CTR is the loop2 counter
-	li 4,16
-	mtctr 4
+	li %r4,16
+	mtctr %r4
 	# r6 is coeff pointer for this line
-	mr 6,9
-	lis 7,.skip@ha
-	addi 7,7,.skip@l
-	lwz 7,0(7)
+	mr %r6,%r9
+	lis %r7,.skip@ha
+	addi %r7,%r7,.skip@l
+	lwz %r7,0(%r7)
 .loop2:
 	# coeffs is a matrix of 16 bits cells
-	lwz 4,0(6)
-	and 4,4,7
-	li 7,-1
+	lwz %r4,0(%r6)
+	and %r4,%r4,%r7
+	li %r7,-1
 
-	lwz 5,4(6)
+	lwz %r5,4(%r6)
 	# or. updates CR0
-	or. 4,5,4
+	or. %r4,%r5,%r4
 	# testing bit 2 (is zero) of CR0
 	bf 2,.cbp
-	addi 6,6,8
+	addi %r6,%r6,8
 	bdnz .loop2
 	b .newline
 .cbp:
-	li 4,1
-	slw 4,4,8
-	or 3,3,4
+	li %r4,1
+	slw %r4,%r4,%r8
+	or %r3,%r3,%r4
 .newline:
-	addi 9,9,128
+	addi %r9,%r9,128
 	# updates CR0, blabla
-	subic. 8,8,1
+	subic. %r8,%r8,1
 	bf 0,.loop
 	blr