Further simplify power6 wordcopy by removing switch statements.

This fix replaces switch statements that contain individual
[fwd|bwd]_align_merge (<constant>) calls with a single [fwd|bwd]_align_merge
(align) call.

diff --git a/ChangeLog b/ChangeLog
index cdd29819f31184b4fa71431a35e15613db221f5c..e31c4dbe248330b9fb8f2eae79fd4f9aee1280f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-04-18  Will Schmidt  <will_schmidt@vnet.ibm.com>
+
+       * sysdeps/powerpc/powerpc64/power6/wordcopy.c
+       (_wordcopy_fwd_dest_aligned): Replace switch with a parameterized
+       fwd_align_merge macro call.
+       (_wordcopy_bwd_dest_aligned): Replace switch with a parameterized
+       bwd_align_merge macro call.
+       * sysdeps/powerpc/powerpc32/power6/wordcopy.c: Likewise.
+
 2012-04-18  Will Schmidt  <will_schmidt@vnet.ibm.com>
 
        * sysdeps/powerpc/powerpc64/power6/wordcopy.c: Add fwd_align_merge and

diff --git a/sysdeps/powerpc/powerpc32/power6/wordcopy.c b/sysdeps/powerpc/powerpc32/power6/wordcopy.c
index d0df56f22c98e096ae0dc1ef9c23b2ceb82d2076..698b82f4fbda94458061e566b47b253c126c52af 100644 (file)
--- a/sysdeps/powerpc/powerpc32/power6/wordcopy.c
+++ b/sysdeps/powerpc/powerpc32/power6/wordcopy.c
@@ -115,18 +115,7 @@ _wordcopy_fwd_dest_aligned (dstp, srcp, len)
     len -= 1;
   }
 
-  switch (align)
-    {
-    case 1:
-      fwd_align_merge (1);
-      break;
-    case 2:
-      fwd_align_merge (2);
-      break;
-    case 3:
-      fwd_align_merge (3);
-      break;
-    }
+  fwd_align_merge (align);
 
 }
 
@@ -224,16 +213,5 @@ _wordcopy_bwd_dest_aligned (dstp, srcp, len)
     len -= 1;
   }
 
-  switch (align)
-    {
-    case 1:
-      bwd_align_merge (1);
-      break;
-    case 2:
-      bwd_align_merge (2);
-      break;
-    case 3:
-      bwd_align_merge (3);
-      break;
-    }
+  bwd_align_merge (align);
 }

diff --git a/sysdeps/powerpc/powerpc64/power6/wordcopy.c b/sysdeps/powerpc/powerpc64/power6/wordcopy.c
index b18b97faab542cbad1ffae91d48debfa81b12c33..4c72404e3d834479d3d51cb8653ccbf6b684d2af 100644 (file)
--- a/sysdeps/powerpc/powerpc64/power6/wordcopy.c
+++ b/sysdeps/powerpc/powerpc64/power6/wordcopy.c
@@ -115,30 +115,7 @@ _wordcopy_fwd_dest_aligned (dstp, srcp, len)
     len -= 1;
   }
 
-  switch (align)
-    {
-    case 1:
-      fwd_align_merge (1);
-      break;
-    case 2:
-      fwd_align_merge (2);
-      break;
-    case 3:
-      fwd_align_merge (3);
-      break;
-    case 4:
-      fwd_align_merge (4);
-      break;
-    case 5:
-      fwd_align_merge (5);
-      break;
-    case 6:
-      fwd_align_merge (6);
-      break;
-    case 7:
-      fwd_align_merge (7);
-      break;
-    }
+  fwd_align_merge (align);
 
 }
 
@@ -236,28 +213,5 @@ _wordcopy_bwd_dest_aligned (dstp, srcp, len)
     len -= 1;
   }
 
-  switch (align)
-    {
-    case 1:
-      bwd_align_merge (1);
-      break;
-    case 2:
-      bwd_align_merge (2);
-      break;
-    case 3:
-      bwd_align_merge (3);
-      break;
-    case 4:
-      bwd_align_merge (4);
-      break;
-    case 5:
-      bwd_align_merge (5);
-      break;
-    case 6:
-      bwd_align_merge (6);
-      break;
-    case 7:
-      bwd_align_merge (7);
-      break;
-    }
+  bwd_align_merge (align);
 }