From d8431003bb12f02c98b2cd91625aba8a98e494dd Mon Sep 17 00:00:00 2001
From: "fbarchard@google.com"
 <fbarchard@google.com@16f28f9a-4ce2-e073-06de-1de4eb20be90>
Date: Tue, 26 Mar 2013 18:04:02 +0000
Subject: [PATCH] movbe remove - not useful so far. BUG=none TEST=none Review
 URL: https://webrtc-codereview.appspot.com/1255004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@623 16f28f9a-4ce2-e073-06de-1de4eb20be90
---
 README.chromium              | 2 +-
 include/libyuv/cpu_id.h      | 1 -
 include/libyuv/version.h     | 2 +-
 source/cpu_id.cc             | 4 ----
 unit_test/cpu_test.cc        | 2 --
 unit_test/scale_argb_test.cc | 1 -
 util/cpuid.c                 | 2 --
 7 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/README.chromium b/README.chromium
index 66046f5c7..aac3f6621 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 622
+Version: 623
 License: BSD
 License File: LICENSE
 
diff --git a/include/libyuv/cpu_id.h b/include/libyuv/cpu_id.h
index ac9d23731..5f4d8fb8a 100644
--- a/include/libyuv/cpu_id.h
+++ b/include/libyuv/cpu_id.h
@@ -34,7 +34,6 @@ static const int kCpuHasSSE41 = 0x80;
 static const int kCpuHasSSE42 = 0x100;
 static const int kCpuHasAVX = 0x200;
 static const int kCpuHasAVX2 = 0x400;
-static const int kCpuHasMOVBE = 0x800;  // For test purposes.
 
 // These flags are only valid on MIPS processors.
 static const int kCpuHasMIPS = 0x1000;
diff --git a/include/libyuv/version.h b/include/libyuv/version.h
index 2b2e4ce91..f8280d61b 100644
--- a/include/libyuv/version.h
+++ b/include/libyuv/version.h
@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 622
+#define LIBYUV_VERSION 623
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT
diff --git a/source/cpu_id.cc b/source/cpu_id.cc
index 6400518ab..4ee9fd69d 100644
--- a/source/cpu_id.cc
+++ b/source/cpu_id.cc
@@ -162,7 +162,6 @@ int InitCpuFlags(void) {
               ((cpu_info[2] & 0x00000200) ? kCpuHasSSSE3 : 0) |
               ((cpu_info[2] & 0x00080000) ? kCpuHasSSE41 : 0) |
               ((cpu_info[2] & 0x00100000) ? kCpuHasSSE42 : 0) |
-              ((cpu_info[2] & 0x00400000) ? kCpuHasMOVBE : 0) |
               (((cpu_info[2] & 0x18000000) == 0x18000000) ? kCpuHasAVX : 0) |
               kCpuHasX86;
 #ifdef HAS_XGETBV
@@ -190,9 +189,6 @@ int InitCpuFlags(void) {
   if (TestEnv("LIBYUV_DISABLE_SSE42")) {
     cpu_info_ &= ~kCpuHasSSE42;
   }
-  if (TestEnv("LIBYUV_DISABLE_MOVBE")) {
-    cpu_info_ &= ~kCpuHasMOVBE;
-  }
   if (TestEnv("LIBYUV_DISABLE_AVX")) {
     cpu_info_ &= ~kCpuHasAVX;
   }
diff --git a/unit_test/cpu_test.cc b/unit_test/cpu_test.cc
index a4e40f62f..8dbe245ed 100644
--- a/unit_test/cpu_test.cc
+++ b/unit_test/cpu_test.cc
@@ -35,8 +35,6 @@ TEST_F(libyuvTest, TestCpuHas) {
   printf("Has SSE4.1 %x\n", has_sse41);
   int has_sse42 = TestCpuFlag(kCpuHasSSE42);
   printf("Has SSE4.2 %x\n", has_sse42);
-  int has_movbe = TestCpuFlag(kCpuHasMOVBE);
-  printf("Has MOVBE %x\n", has_movbe);
   int has_avx = TestCpuFlag(kCpuHasAVX);
   printf("Has AVX %x\n", has_avx);
   int has_avx2 = TestCpuFlag(kCpuHasAVX2);
diff --git a/unit_test/scale_argb_test.cc b/unit_test/scale_argb_test.cc
index f88ffdb89..8783f2a6f 100644
--- a/unit_test/scale_argb_test.cc
+++ b/unit_test/scale_argb_test.cc
@@ -413,7 +413,6 @@ TEST_F(libyuvTest, ARGBScaleTo853x480_Bilinear) {
   EXPECT_LE(max_diff, 1);
 }
 
-
 TEST_F(libyuvTest, ARGBScaleFrom640x360_None) {
   int src_width = 640;
   int src_height = 360;
diff --git a/util/cpuid.c b/util/cpuid.c
index be40a17e8..6f2a1fdac 100644
--- a/util/cpuid.c
+++ b/util/cpuid.c
@@ -25,7 +25,6 @@ int main(int argc, const char* argv[]) {
   int has_mips = TestCpuFlag(kCpuHasMIPS);
   int has_mips_dsp = TestCpuFlag(kCpuHasMIPS_DSP);
   int has_mips_dspr2 = TestCpuFlag(kCpuHasMIPS_DSPR2);
-  int has_movbe = TestCpuFlag(kCpuHasMOVBE);
   int has_neon = TestCpuFlag(kCpuHasNEON);
   int has_sse2 = TestCpuFlag(kCpuHasSSE2);
   int has_sse41 = TestCpuFlag(kCpuHasSSE41);
@@ -74,7 +73,6 @@ int main(int argc, const char* argv[]) {
   printf("Has MIPS %x\n", has_mips);
   printf("Has MIPS DSP %x\n", has_mips_dsp);
   printf("Has MIPS DSPR2 %x\n", has_mips_dspr2);
-  printf("Has MOVBE %x\n", has_movbe);
   printf("Has NEON %x\n", has_neon);
   printf("Has SSE2 %x\n", has_sse2);
   printf("Has SSE4.1 %x\n", has_sse41);