1 files changed, 7 insertions, 53 deletions
diff --git a/src/pkg/big/arith.go b/src/pkg/big/arith.go
index 81ce23a3a..4f18ed37b 100644
--- a/src/pkg/big/arith.go
+++ b/src/pkg/big/arith.go
@@ -267,58 +267,12 @@ func divWW_g(x1, x0, y Word) (q, r Word) {
 }
 
 
-// ----------------------------------------------------------------------------
-// Elementary operations on vectors
-
-// All higher-level functions use these elementary vector operations.
-// The function pointers f are initialized with default implementations
-// f_g, written in Go for portability. The corresponding assembly routines
-// f_s should be installed if they exist.
-var (
-	// addVV sets z and returns c such that z+c = x+y.
-	addVV func(z, x, y *Word, n int) (c Word) = addVV_g
-
-	// subVV sets z and returns c such that z-c = x-y.
-	subVV func(z, x, y *Word, n int) (c Word) = subVV_g
-
-	// addVW sets z and returns c such that z+c = x-y.
-	addVW func(z, x *Word, y Word, n int) (c Word) = addVW_g
-
-	// subVW sets z and returns c such that z-c = x-y.
-	subVW func(z, x *Word, y Word, n int) (c Word) = subVW_g
-
-	// mulAddVWW sets z and returns c such that z+c = x*y + r.
-	mulAddVWW func(z, x *Word, y, r Word, n int) (c Word) = mulAddVWW_g
-
-	// addMulVVW sets z and returns c such that z+c = z + x*y.
-	addMulVVW func(z, x *Word, y Word, n int) (c Word) = addMulVVW_g
-
-	// divWVW sets z and returns r such that z-r = (xn<<(n*_W) + x) / y.
-	divWVW func(z *Word, xn Word, x *Word, y Word, n int) (r Word) = divWVW_g
-)
-
-
-func init() {
-	// Uncomment to use generic routines.
-	//return;
-
-	// Install assembly routines.
-	addVV = addVV_s
-	subVV = subVV_s
-	addVW = addVW_s
-	subVW = subVW_s
-	mulAddVWW = mulAddVWW_s
-	addMulVVW = addMulVVW_s
-	divWVW = divWVW_s
-}
-
-
 func (p *Word) at(i int) *Word {
 	return (*Word)(unsafe.Pointer(uintptr(unsafe.Pointer(p)) + uintptr(i)*_S))
 }
 
 
-func addVV_s(z, x, y *Word, n int) (c Word)
+func addVV(z, x, y *Word, n int) (c Word)
 func addVV_g(z, x, y *Word, n int) (c Word) {
 	for i := 0; i < n; i++ {
 		c, *z.at(i) = addWW_g(*x.at(i), *y.at(i), c)
@@ -327,7 +281,7 @@ func addVV_g(z, x, y *Word, n int) (c Word) {
 }
 
 
-func subVV_s(z, x, y *Word, n int) (c Word)
+func subVV(z, x, y *Word, n int) (c Word)
 func subVV_g(z, x, y *Word, n int) (c Word) {
 	for i := 0; i < n; i++ {
 		c, *z.at(i) = subWW_g(*x.at(i), *y.at(i), c)
@@ -336,7 +290,7 @@ func subVV_g(z, x, y *Word, n int) (c Word) {
 }
 
 
-func addVW_s(z, x *Word, y Word, n int) (c Word)
+func addVW(z, x *Word, y Word, n int) (c Word)
 func addVW_g(z, x *Word, y Word, n int) (c Word) {
 	c = y
 	for i := 0; i < n; i++ {
@@ -346,7 +300,7 @@ func addVW_g(z, x *Word, y Word, n int) (c Word) {
 }
 
 
-func subVW_s(z, x *Word, y Word, n int) (c Word)
+func subVW(z, x *Word, y Word, n int) (c Word)
 func subVW_g(z, x *Word, y Word, n int) (c Word) {
 	c = y
 	for i := 0; i < n; i++ {
@@ -356,7 +310,7 @@ func subVW_g(z, x *Word, y Word, n int) (c Word) {
 }
 
 
-func mulAddVWW_s(z, x *Word, y, r Word, n int) (c Word)
+func mulAddVWW(z, x *Word, y, r Word, n int) (c Word)
 func mulAddVWW_g(z, x *Word, y, r Word, n int) (c Word) {
 	c = r
 	for i := 0; i < n; i++ {
@@ -366,7 +320,7 @@ func mulAddVWW_g(z, x *Word, y, r Word, n int) (c Word) {
 }
 
 
-func addMulVVW_s(z, x *Word, y Word, n int) (c Word)
+func addMulVVW(z, x *Word, y Word, n int) (c Word)
 func addMulVVW_g(z, x *Word, y Word, n int) (c Word) {
 	for i := 0; i < n; i++ {
 		z1, z0 := mulAddWWW_g(*x.at(i), y, *z.at(i))
@@ -377,7 +331,7 @@ func addMulVVW_g(z, x *Word, y Word, n int) (c Word) {
 }
 
 
-func divWVW_s(z *Word, xn Word, x *Word, y Word, n int) (r Word)
+func divWVW(z *Word, xn Word, x *Word, y Word, n int) (r Word)
 func divWVW_g(z *Word, xn Word, x *Word, y Word, n int) (r Word) {
 	r = xn
 	for i := n - 1; i >= 0; i-- {