generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 90b01576: Merge "Fixed int fast types for LP64"

Browse Source 
* commit '90b0157679a984f1829a72f8c642d17030aa7644':
  Fixed int fast types for LP64
This commit is contained in:
Calin Juravle 2014-02-21 17:25:25 +00:00 committed by Android Git Automerger
commit 587399d23a
3 changed files with 55 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libc/include/stdint.h
View File

@ -69,29 +69,35 @@ typedef __intptr_t intptr_t;
typedef __uintptr_t uintptr_t; typedef __uintptr_t uintptr_t;
typedef int8_t int_least8_t; typedef int8_t int_least8_t;
typedef int8_t int_fast8_t;
typedef uint8_t uint_least8_t; typedef uint8_t uint_least8_t;
typedef uint8_t uint_fast8_t;
typedef int16_t int_least16_t; typedef int16_t int_least16_t;
typedef int32_t int_fast16_t;
typedef uint16_t uint_least16_t; typedef uint16_t uint_least16_t;
typedef uint32_t uint_fast16_t;
typedef int32_t int_least32_t; typedef int32_t int_least32_t;
typedef int32_t int_fast32_t;
typedef uint32_t uint_least32_t; typedef uint32_t uint_least32_t;
typedef uint32_t uint_fast32_t;
typedef int64_t int_least64_t; typedef int64_t int_least64_t;
typedef int64_t int_fast64_t;
typedef uint64_t uint_least64_t; typedef uint64_t uint_least64_t;
typedef int8_t int_fast8_t;
typedef uint8_t uint_fast8_t;
typedef int64_t int_fast64_t;
typedef uint64_t uint_fast64_t; typedef uint64_t uint_fast64_t;
#ifdef __LP64__
typedef int64_t int_fast16_t;
typedef uint64_t uint_fast16_t;
typedef int64_t int_fast32_t;
typedef uint64_t uint_fast32_t;
#else
typedef int32_t int_fast16_t;
typedef uint32_t uint_fast16_t;
typedef int32_t int_fast32_t;
typedef uint32_t uint_fast32_t;
#endif
typedef uint64_t uintmax_t; typedef uint64_t uintmax_t;
typedef int64_t intmax_t; typedef int64_t intmax_t;

1
tests/Android.mk
View File

@ -59,6 +59,7 @@ libBionicStandardTests_src_files := \
stack_protector_test.cpp \ stack_protector_test.cpp \
stack_unwinding_test.cpp \ stack_unwinding_test.cpp \
stack_unwinding_test_impl.c \ stack_unwinding_test_impl.c \
stdint_test.cpp \
stdio_test.cpp \ stdio_test.cpp \
stdlib_test.cpp \ stdlib_test.cpp \
string_test.cpp \ string_test.cpp \

37
tests/stdint_test.cpp Normal file
View File

@ -0,0 +1,37 @@
/*
* Copyright (C) 2014 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* 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 <gtest/gtest.h>
#include <stdint.h>
TEST(stdint_types, type_sizes) {
ASSERT_EQ(1U, sizeof(int_fast8_t));
ASSERT_EQ(8U, sizeof(int_fast64_t));
ASSERT_EQ(1U, sizeof(uint_fast8_t));
ASSERT_EQ(8U, sizeof(uint_fast64_t));
#if defined(__LP64__)
ASSERT_EQ(8U, sizeof(int_fast16_t));
ASSERT_EQ(8U, sizeof(int_fast32_t));
ASSERT_EQ(8U, sizeof(uint_fast16_t));
ASSERT_EQ(8U, sizeof(uint_fast32_t));
#else
ASSERT_EQ(4U, sizeof(int_fast16_t));
ASSERT_EQ(4U, sizeof(int_fast32_t));
ASSERT_EQ(4U, sizeof(uint_fast16_t));
ASSERT_EQ(4U, sizeof(uint_fast32_t));
#endif
}