gvsafronov/rapidjson
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1760 from escherstair/fix_ce6_support

Browse Source 
fix _BitScanReverse() usage for CE6
This commit is contained in:
Milo Yip 2020-08-07 10:12:21 +08:00 committed by GitHub
commit ce81bc9edf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/rapidjson/internal/clzll.h
View File

@ -17,7 +17,7 @@
#include "../rapidjson.h"
#if defined(_MSC_VER)
#if defined(_MSC_VER) && !defined(UNDER_CE)
#include <intrin.h>
#if defined(_WIN64)
#pragma intrinsic(_BitScanReverse64)
@ -34,7 +34,7 @@ inline uint32_t clzll(uint64_t x) {
// infinite loop in the software implementation.
RAPIDJSON_ASSERT(x != 0);
#if defined(_MSC_VER)
#if defined(_MSC_VER) && !defined(UNDER_CE)
unsigned long r = 0;
#if defined(_WIN64)
_BitScanReverse64(&r, x);
@ -53,7 +53,7 @@ inline uint32_t clzll(uint64_t x) {
return static_cast<uint32_t>(__builtin_clzll(x));
#else
// naive version
uint32_t r;
uint32_t r = 0;
while (!(x & (static_cast<uint64_t>(1) << 63))) {
x <<= 1;
++r;

1
test/unittest/CMakeLists.txt
View File

@ -3,6 +3,7 @@ include(CheckCXXCompilerFlag)
set(UNITTEST_SOURCES
allocatorstest.cpp
bigintegertest.cpp
clzlltest.cpp
cursorstreamwrappertest.cpp
documenttest.cpp
dtoatest.cpp

34
test/unittest/clzlltest.cpp Normal file
View File

@ -0,0 +1,34 @@
// Tencent is pleased to support the open source community by making RapidJSON available.
//
// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
//
// Licensed under the MIT License (the "License"); you may not use this file except
// in compliance with the License. You may obtain a copy of the License at
//
// http://opensource.org/licenses/MIT
//
// Unless required by applicable law or agreed to in writing, software distributed
// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
// CONDITIONS OF ANY KIND, either express or implied. See the License for the
// specific language governing permissions and limitations under the License.
#include "unittest.h"
#include "rapidjson/internal/clzll.h"
#ifdef __GNUC__
RAPIDJSON_DIAG_PUSH
#endif
using namespace rapidjson::internal;
TEST(clzll, normal) {
EXPECT_EQ(clzll(1), 63U);
EXPECT_EQ(clzll(2), 62U);
EXPECT_EQ(clzll(12), 60U);
EXPECT_EQ(clzll(0x0000000080000001UL), 32U);
EXPECT_EQ(clzll(0x8000000000000001UL), 0U);
}
#ifdef __GNUC__
RAPIDJSON_DIAG_POP
#endif