--- GOO-3.3.4.s	2004-10-13 16:24:15.451845287 -0500
+++ GOO-3.4.2.s	2004-10-13 16:24:36.890792461 -0500
@@ -1,7 +1,7 @@
 .globl _ZN8OscilGen7prepareEv
 	.type	_ZN8OscilGen7prepareEv, @function
 _ZN8OscilGen7prepareEv:
-.LFB84:
+.LFB56:
 	pushl	%ebp
 .LCFI94:
 	movl	%esp, %ebp
@@ -16,46 +16,44 @@
 	movl	8(%ebp), %edx
 	movzbl	1361(%eax), %eax
 	cmpb	298(%edx), %al
-	jne	.L379
+	jne	.L344
 	movl	8(%ebp), %eax
 	movl	8(%ebp), %edx
 	movzbl	1360(%eax), %eax
 	cmpb	297(%edx), %al
-	jne	.L379
+	jne	.L344
 	movl	8(%ebp), %eax
 	movl	8(%ebp), %edx
 	movzbl	299(%edx), %edx
 	cmpl	%edx, 1376(%eax)
-	jne	.L379
+	jne	.L344
 	movl	8(%ebp), %eax
 	movl	8(%ebp), %edx
 	movzbl	300(%edx), %edx
 	cmpl	%edx, 1380(%eax)
-	jne	.L379
+	jne	.L344
 	movl	8(%ebp), %eax
 	movl	8(%ebp), %edx
 	movzbl	301(%edx), %edx
 	cmpl	%edx, 1384(%eax)
-	jne	.L379
+	jne	.L344
 	movl	8(%ebp), %eax
 	movl	8(%ebp), %edx
 	movzbl	302(%edx), %edx
 	cmpl	%edx, 1388(%eax)
-	jne	.L379
-	jmp	.L378
-.L379:
+	jne	.L344
+	jmp	.L343
+.L344:
 	movl	8(%ebp), %eax
 	movl	%eax, (%esp)
 	call	_ZN8OscilGen18changebasefunctionEv
-.L378:
+.L343:
 	movl	$0, -12(%ebp)
-.L380:
+.L345:
 	cmpl	$127, -12(%ebp)
-	jle	.L383
-	jmp	.L381
-.L383:
-	movl	8(%ebp), %ecx
-	movl	-12(%ebp), %edx
+	jg	.L346
+	movl	8(%ebp), %edx
+	movl	-12(%ebp), %ecx
 	movl	8(%ebp), %eax
 	addl	-12(%ebp), %eax
 	addl	$160, %eax
@@ -63,11 +61,11 @@
 	pushl	%eax
 	fildl	(%esp)
 	leal	4(%esp), %esp
-	fldl	.LC199
+	fldl	.LC193
 	fsubrp	%st, %st(1)
-	fldl	.LC199
+	fldl	.LC193
 	fdivrp	%st, %st(1)
-	fldl	.LC200
+	fldl	.LC194
 	fmulp	%st, %st(1)
 	movl	-12(%ebp), %eax
 	incl	%eax
@@ -75,17 +73,15 @@
 	fildl	(%esp)
 	leal	4(%esp), %esp
 	fdivrp	%st, %st(1)
-	fstps	844(%ecx,%edx,4)
+	fstps	844(%edx,%ecx,4)
 	leal	-12(%ebp), %eax
 	incl	(%eax)
-	jmp	.L380
-.L381:
+	jmp	.L345
+.L346:
 	movl	$0, -12(%ebp)
-.L384:
+.L348:
 	cmpl	$127, -12(%ebp)
-	jle	.L387
-	jmp	.L385
-.L387:
+	jg	.L349
 	movl	8(%ebp), %eax
 	addl	-12(%ebp), %eax
 	addl	$32, %eax
@@ -93,7 +89,7 @@
 	pushl	%eax
 	fildl	(%esp)
 	leal	4(%esp), %esp
-	fldl	.LC199
+	fldl	.LC193
 	fdivrp	%st, %st(1)
 	fld1
 	fsubrp	%st, %st(1)
@@ -105,83 +101,82 @@
 	movzbl	296(%eax), %eax
 	movl	%eax, -84(%ebp)
 	cmpl	$2, -84(%ebp)
-	je	.L390
+	je	.L353
 	cmpl	$2, -84(%ebp)
-	jg	.L395
+	jg	.L357
 	cmpl	$1, -84(%ebp)
-	je	.L389
-	jmp	.L393
-.L395:
+	je	.L352
+	jmp	.L356
+.L357:
 	cmpl	$3, -84(%ebp)
-	je	.L391
+	je	.L354
 	cmpl	$4, -84(%ebp)
-	je	.L392
-	jmp	.L393
-.L389:
+	je	.L355
+	jmp	.L356
+.L352:
 	movl	8(%ebp), %esi
 	movl	-12(%ebp), %ebx
 	flds	-40(%ebp)
 	fstpl	-56(%ebp)
-	fldl	.LC202
+	fldl	.LC196
 	fstpl	(%esp)
 	call	log
 	fmull	-56(%ebp)
 	fstpl	(%esp)
 	call	exp
 	fstps	332(%esi,%ebx,4)
-	jmp	.L388
-.L390:
+	jmp	.L351
+.L353:
 	movl	8(%ebp), %esi
 	movl	-12(%ebp), %ebx
 	flds	-40(%ebp)
 	fstpl	-64(%ebp)
-	fldl	.LC203
+	fldl	.LC197
 	fstpl	(%esp)
 	call	log
 	fmull	-64(%ebp)
 	fstpl	(%esp)
 	call	exp
 	fstps	332(%esi,%ebx,4)
-	jmp	.L388
-.L391:
+	jmp	.L351
+.L354:
 	movl	8(%ebp), %esi
 	movl	-12(%ebp), %ebx
 	flds	-40(%ebp)
 	fstpl	-72(%ebp)
-	fldl	.LC204
+	fldl	.LC198
 	fstpl	(%esp)
 	call	log
 	fmull	-72(%ebp)
 	fstpl	(%esp)
 	call	exp
 	fstps	332(%esi,%ebx,4)
-	jmp	.L388
-.L392:
+	jmp	.L351
+.L355:
 	movl	8(%ebp), %esi
 	movl	-12(%ebp), %ebx
 	flds	-40(%ebp)
 	fstpl	-80(%ebp)
-	fldl	.LC205
+	fldl	.LC199
 	fstpl	(%esp)
 	call	log
 	fmull	-80(%ebp)
 	fstpl	(%esp)
 	call	exp
 	fstps	332(%esi,%ebx,4)
-	jmp	.L388
-.L393:
+	jmp	.L351
+.L356:
 	movl	8(%ebp), %edx
 	movl	-12(%ebp), %eax
-	flds	-40(%ebp)
 	fld1
-	fsubp	%st, %st(1)
+	fsubs	-40(%ebp)
 	fstps	332(%edx,%eax,4)
-.L388:
+.L351:
 	movl	8(%ebp), %eax
 	addl	-12(%ebp), %eax
 	addl	$32, %eax
 	cmpb	$63, 8(%eax)
-	ja	.L386
+	ja	.L350
 	movl	8(%ebp), %ebx
 	movl	-12(%ebp), %ecx
 	movl	8(%ebp), %edx
@@ -189,57 +184,51 @@
 	movl	332(%edx,%eax,4), %eax
 	xorl	$-2147483648, %eax
 	movl	%eax, 332(%ebx,%ecx,4)
-.L386:
+.L350:
 	leal	-12(%ebp), %eax
 	incl	(%eax)
-	jmp	.L384
-.L385:
+	jmp	.L348
+.L349:
 	movl	$0, -12(%ebp)
-.L397:
+.L359:
 	cmpl	$127, -12(%ebp)
-	jle	.L400
-	jmp	.L398
-.L400:
+	jg	.L360
 	movl	8(%ebp), %eax
 	addl	-12(%ebp), %eax
 	addl	$32, %eax
 	cmpb	$64, 8(%eax)
-	jne	.L399
+	jne	.L361
 	movl	8(%ebp), %ecx
 	movl	-12(%ebp), %edx
-	movl	$0x0, %eax
+	movl	$0x00000000, %eax
 	movl	%eax, 332(%ecx,%edx,4)
-.L399:
+.L361:
 	leal	-12(%ebp), %eax
 	incl	(%eax)
-	jmp	.L397
-.L398:
+	jmp	.L359
+.L360:
 	movl	$0, -12(%ebp)
-.L402:
+.L363:
 	movl	-12(%ebp), %eax
 	cmpl	OSCIL_SIZE, %eax
-	jl	.L405
-	jmp	.L403
-.L405:
+	jge	.L364
 	movl	8(%ebp), %edx
 	movl	-12(%ebp), %eax
 	leal	0(,%eax,4), %ecx
 	movl	1416(%edx), %edx
-	movl	$0x0, %eax
-	movl	%eax, (%edx,%ecx)
+	movl	$0x00000000, %eax
+	movl	%eax, (%ecx,%edx)
 	leal	-12(%ebp), %eax
 	incl	(%eax)
-	jmp	.L402
-.L403:
+	jmp	.L363
+.L364:
 	movl	8(%ebp), %eax
 	cmpb	$0, 297(%eax)
-	jne	.L406
+	jne	.L366
 	movl	$0, -12(%ebp)
-.L407:
+.L367:
 	cmpl	$127, -12(%ebp)
-	jle	.L410
-	jmp	.L411
-.L410:
+	jg	.L370
 	movl	8(%ebp), %edx
 	movl	-12(%ebp), %eax
 	sall	$2, %eax
@@ -264,7 +253,7 @@
 	call	sin
 	fldl	-96(%ebp)
 	fmulp	%st, %st(1)
-	fldl	.LC207
+	fldl	.LC202
 	fdivrp	%st, %st(1)
 	fstps	(%ebx)
 	movl	8(%ebp), %ecx
@@ -290,58 +279,53 @@
 	call	cos
 	fldl	-104(%ebp)
 	fmulp	%st, %st(1)
-	fldl	.LC207
+	fldl	.LC202
 	fdivrp	%st, %st(1)
 	fstps	(%ebx)
 	leal	-12(%ebp), %eax
 	incl	(%eax)
-	jmp	.L407
-.L406:
+	jmp	.L367
+.L366:
 	movl	$0, -16(%ebp)
-.L412:
+.L371:
 	cmpl	$127, -16(%ebp)
-	jle	.L415
-	jmp	.L411
-.L415:
+	jg	.L370
 	movl	8(%ebp), %eax
 	addl	-16(%ebp), %eax
 	addl	$32, %eax
 	cmpb	$64, 8(%eax)
-	jne	.L416
-	jmp	.L414
-.L416:
+	jne	.L374
+	jmp	.L373
+.L374:
 	movl	$1, -12(%ebp)
-.L417:
+.L375:
 	movl	OSCIL_SIZE, %edx
 	movl	%edx, %eax
 	sarl	$31, %eax
 	shrl	$31, %eax
-	leal	(%eax,%edx), %eax
+	leal	(%edx,%eax), %eax
 	sarl	%eax
-	cmpl	%eax, -12(%ebp)
-	jl	.L420
-	jmp	.L414
-.L420:
-	movl	-16(%ebp), %edx
-	incl	%edx
-	movl	-12(%ebp), %eax
-	imull	%edx, %eax
+	cmpl	-12(%ebp), %eax
+	jle	.L373
+	movl	-16(%ebp), %eax
+	incl	%eax
+	imull	-12(%ebp), %eax
 	movl	%eax, -20(%ebp)
 	movl	OSCIL_SIZE, %edx
 	movl	%edx, %eax
 	sarl	$31, %eax
 	shrl	$31, %eax
-	leal	(%eax,%edx), %eax
+	leal	(%edx,%eax), %eax
 	sarl	%eax
-	cmpl	%eax, -20(%ebp)
-	jle	.L421
-	jmp	.L414
-.L421:
+	cmpl	-20(%ebp), %eax
+	jge	.L378
+	jmp	.L373
+.L378:
 	movl	8(%ebp), %ecx
 	movl	-12(%ebp), %eax
 	leal	0(,%eax,4), %edx
 	movl	1412(%ecx), %eax
-	movl	(%eax,%edx), %eax
+	movl	(%edx,%eax), %eax
 	movl	%eax, -24(%ebp)
 	movl	8(%ebp), %ecx
 	movl	-12(%ebp), %edx
@@ -349,7 +333,7 @@
 	subl	%edx, %eax
 	leal	0(,%eax,4), %edx
 	movl	1412(%ecx), %eax
-	movl	(%eax,%edx), %eax
+	movl	(%edx,%eax), %eax
 	movl	%eax, -28(%ebp)
 	movl	8(%ebp), %edx
 	movl	-16(%ebp), %eax
@@ -377,32 +361,32 @@
 	fstps	-36(%ebp)
 	movl	8(%ebp), %edx
 	movl	-20(%ebp), %eax
-	leal	0(,%eax,4), %ebx
-	movl	1416(%edx), %esi
+	leal	0(,%eax,4), %ecx
+	movl	1416(%edx), %ebx
 	movl	8(%ebp), %edx
 	movl	-20(%ebp), %eax
-	leal	0(,%eax,4), %ecx
-	movl	1416(%edx), %eax
+	sall	$2, %eax
+	movl	1416(%edx), %edx
 	flds	-24(%ebp)
 	fmuls	-32(%ebp)
 	flds	-28(%ebp)
 	fmuls	-36(%ebp)
 	fsubrp	%st, %st(1)
-	flds	(%eax,%ecx)
+	flds	(%eax,%edx)
 	faddp	%st, %st(1)
-	fstps	(%esi,%ebx)
+	fstps	(%ecx,%ebx)
 	movl	8(%ebp), %ecx
 	movl	-20(%ebp), %edx
 	movl	OSCIL_SIZE, %eax
 	subl	%edx, %eax
-	leal	0(,%eax,4), %esi
-	movl	1416(%ecx), %ebx
+	leal	0(,%eax,4), %ebx
+	movl	1416(%ecx), %esi
 	movl	8(%ebp), %ecx
 	movl	-20(%ebp), %edx
 	movl	OSCIL_SIZE, %eax
 	subl	%edx, %eax
-	leal	0(,%eax,4), %edx
-	movl	1416(%ecx), %eax
+	sall	$2, %eax
+	movl	1416(%ecx), %edx
 	flds	-24(%ebp)
 	fmuls	-36(%ebp)
 	flds	-28(%ebp)
@@ -413,37 +397,37 @@
 	fstps	(%ebx,%esi)
 	leal	-12(%ebp), %eax
 	incl	(%eax)
-	jmp	.L417
-.L414:
+	jmp	.L375
+.L373:
 	leal	-16(%ebp), %eax
 	incl	(%eax)
-	jmp	.L412
-.L411:
+	jmp	.L371
+.L370:
 	movl	8(%ebp), %eax
 	cmpl	$0, 320(%eax)
-	je	.L422
+	je	.L379
 	movl	8(%ebp), %eax
 	movl	%eax, (%esp)
 	call	_ZN8OscilGen14shiftharmonicsEv
-.L422:
+.L379:
 	movl	8(%ebp), %eax
 	cmpb	$0, 309(%eax)
-	jne	.L423
+	jne	.L380
 	movl	8(%ebp), %eax
 	movl	%eax, (%esp)
 	call	_ZN8OscilGen9waveshapeEv
 	movl	8(%ebp), %eax
 	movl	%eax, (%esp)
 	call	_ZN8OscilGen11oscilfilterEv
-	jmp	.L424
-.L423:
+	jmp	.L381
+.L380:
 	movl	8(%ebp), %eax
 	movl	%eax, (%esp)
 	call	_ZN8OscilGen11oscilfilterEv
 	movl	8(%ebp), %eax
 	movl	%eax, (%esp)
 	call	_ZN8OscilGen9waveshapeEv
-.L424:
+.L381:
 	movl	8(%ebp), %eax
 	movl	%eax, (%esp)
 	call	_ZN8OscilGen10modulationEv
@@ -452,14 +436,14 @@
 	call	_ZN8OscilGen14spectrumadjustEv
 	movl	8(%ebp), %eax
 	cmpl	$0, 320(%eax)
-	jne	.L425
+	jne	.L382
 	movl	8(%ebp), %eax
 	movl	%eax, (%esp)
 	call	_ZN8OscilGen14shiftharmonicsEv
-.L425:
+.L382:
 	movl	8(%ebp), %eax
 	movl	1416(%eax), %edx
-	movl	$0x0, %eax
+	movl	$0x00000000, %eax
 	movl	%eax, (%edx)
 	movl	8(%ebp), %edx
 	movl	8(%ebp), %eax
@@ -479,27 +463,27 @@
 	popl	%esi
 	popl	%ebp
 	ret
-.LFE84:
+.LFE56:
 	.size	_ZN8OscilGen7prepareEv, .-_ZN8OscilGen7prepareEv
 	.section	.rodata
 	.align 8
-.LC211:
+.LC206:
 	.long	0
 	.long	1080033280
 	.align 8
-.LC212:
+.LC207:
 	.long	0
 	.long	1076101120
 	.align 8
-.LC213:
+.LC208:
 	.long	0
 	.long	1077805056
 	.align 8
-.LC214:
+.LC210:
 	.long	0
 	.long	1079590912
 	.align 8
-.LC215:
+.LC211:
 	.long	-1598689907
 	.long	1051772663
 	.text