From 450dcb56ecbf6f729401e753f0a27e4170177ddd Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Fri, 20 Sep 2013 17:36:02 -0700 Subject: Improve float to integral conversion. Change-Id: I1597083cb2c04084ce825fe2e3c753fde8309cd8 --- runtime/entrypoints/entrypoint_utils.h | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'runtime/entrypoints/entrypoint_utils.h') diff --git a/runtime/entrypoints/entrypoint_utils.h b/runtime/entrypoints/entrypoint_utils.h index 8b58cb332c..fff7b71e4b 100644 --- a/runtime/entrypoints/entrypoint_utils.h +++ b/runtime/entrypoints/entrypoint_utils.h @@ -16,7 +16,8 @@ #ifndef ART_RUNTIME_ENTRYPOINTS_ENTRYPOINT_UTILS_H_ #define ART_RUNTIME_ENTRYPOINTS_ENTRYPOINT_UTILS_H_ -#include "object_utils.h" + +#include "base/macros.h" #include "class_linker.h" #include "common_throws.h" #include "dex_file.h" @@ -27,6 +28,7 @@ #include "mirror/array.h" #include "mirror/class-inl.h" #include "mirror/throwable.h" +#include "object_utils.h" #include "thread.h" @@ -416,6 +418,23 @@ static inline void* GetJniDlsymLookupStub() { return reinterpret_cast(art_jni_dlsym_lookup_stub); } +template +static inline INT_TYPE art_float_to_integral(FLOAT_TYPE f) { + const INT_TYPE kMaxInt = static_cast(std::numeric_limits::max()); + const INT_TYPE kMinInt = static_cast(std::numeric_limits::min()); + const FLOAT_TYPE kMaxIntAsFloat = static_cast(kMaxInt); + const FLOAT_TYPE kMinIntAsFloat = static_cast(kMinInt); + if (LIKELY(f > kMinIntAsFloat)) { + if (LIKELY(f < kMaxIntAsFloat)) { + return static_cast(f); + } else { + return kMaxInt; + } + } else { + return (f != f) ? 0 : kMinInt; // f != f implies NaN + } +} + } // namespace art #endif // ART_RUNTIME_ENTRYPOINTS_ENTRYPOINT_UTILS_H_ -- cgit v1.2.3-59-g8ed1b