diff options
| author | Josh Blum <josh@joshknows.com> | 2011-07-06 21:38:51 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-07-06 21:38:51 -0700 |
| commit | 92a3858d747d22bf7e03cd7b5987a2dcaaf60dd9 (patch) | |
| tree | 5cf06056e994cdab76ce9e56f5a2c7c9dfb20bd3 /host | |
| parent | b8d0dc0918c90c03b5e69593c8f79b5457aa5d7a (diff) | |
| parent | a3e1cb78b4c9791fbd3703d632cf22fa4005ee6c (diff) | |
| download | uhd-92a3858d747d22bf7e03cd7b5987a2dcaaf60dd9.tar.gz uhd-92a3858d747d22bf7e03cd7b5987a2dcaaf60dd9.tar.bz2 uhd-92a3858d747d22bf7e03cd7b5987a2dcaaf60dd9.zip | |
Merge branch 'master' into next
Conflicts:
host/lib/usrp/e100/e100_impl.cpp
Diffstat (limited to 'host')
| -rw-r--r-- | host/lib/convert/convert_with_sse2.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/convert/convert_with_sse2.cpp b/host/lib/convert/convert_with_sse2.cpp index 9772028dc..0cbb2c444 100644 --- a/host/lib/convert/convert_with_sse2.cpp +++ b/host/lib/convert/convert_with_sse2.cpp @@ -28,7 +28,7 @@ DECLARE_CONVERTER(convert_fc32_1_to_item32_1_nswap, PRIORITY_CUSTOM){ const __m128 scalar = _mm_set_ps1(float(scale_factor)); #define convert_fc32_1_to_item32_1_nswap_guts(_al_) \ - for (; i < (nsamps & ~0x3); i+=4){ \ + for (; i+4 < nsamps; i+=4){ \ /* load from input */ \ __m128 tmplo = _mm_load ## _al_ ## _ps(reinterpret_cast<const float *>(input+i+0)); \ __m128 tmphi = _mm_load ## _al_ ## _ps(reinterpret_cast<const float *>(input+i+2)); \ @@ -71,7 +71,7 @@ DECLARE_CONVERTER(convert_fc32_1_to_item32_1_bswap, PRIORITY_CUSTOM){ const __m128 scalar = _mm_set_ps1(float(scale_factor)); #define convert_fc32_1_to_item32_1_bswap_guts(_al_) \ - for (; i < (nsamps & ~0x3); i+=4){ \ + for (; i+4 < nsamps; i+=4){ \ /* load from input */ \ __m128 tmplo = _mm_load ## _al_ ## _ps(reinterpret_cast<const float *>(input+i+0)); \ __m128 tmphi = _mm_load ## _al_ ## _ps(reinterpret_cast<const float *>(input+i+2)); \ @@ -114,7 +114,7 @@ DECLARE_CONVERTER(convert_item32_1_to_fc32_1_nswap, PRIORITY_CUSTOM){ const __m128i zeroi = _mm_setzero_si128(); #define convert_item32_1_to_fc32_1_nswap_guts(_al_) \ - for (; i < (nsamps & ~0x3); i+=4){ \ + for (; i+4 < nsamps; i+=4){ \ /* load from input */ \ __m128i tmpi = _mm_loadu_si128(reinterpret_cast<const __m128i *>(input+i)); \ \ @@ -159,7 +159,7 @@ DECLARE_CONVERTER(convert_item32_1_to_fc32_1_bswap, PRIORITY_CUSTOM){ const __m128i zeroi = _mm_setzero_si128(); #define convert_item32_1_to_fc32_1_bswap_guts(_al_) \ - for (; i < (nsamps & ~0x3); i+=4){ \ + for (; i+4 < nsamps; i+=4){ \ /* load from input */ \ __m128i tmpi = _mm_loadu_si128(reinterpret_cast<const __m128i *>(input+i)); \ \ |