mirror of
https://github.com/apache/nuttx.git
synced 2026-08-02 04:38:59 +00:00
c32b683085
Every compiler supported by NuttX provides the "long long" types,
so the CONFIG_HAVE_LONG_LONG indirection is no longer useful.
Remove the option from include/nuttx/compiler.h and treat
"long long" as unconditionally available across the OS.
In addition to deleting the guard itself, this commit unconditionally
enables the long-long flavored helpers that used to be gated behind
it:
- libs/libc/fixedmath: drop the soft-emulated b32/ub32 routines
in lib_fixedmath.c (-261 lines) and trim the matching
prototypes, Make.defs and CMakeLists.txt entries; keep only
the long-long backed implementations.
- include/sys/endian.h, include/strings.h, libs/libc/string
/lib_ffsll.c, lib_flsll.c: always expose the 64-bit byte-swap
and ffsll/flsll variants.
- libs/libm/libm/lib_llround{,f,l}.c: drop the empty stubs.
- libs/libc/stdlib (atoll, llabs, lldiv, strtoll/ull, rand48,
strtold), libs/libc/stream (libvsprintf, libvscanf,
libbsprintf, ultoa_invert), libs/libc/misc (crc64, crc64emac),
libs/libc/inttypes/strtoimax, libs/libc/lzf, libs/libc/libc.csv,
libs/libc/string (memset, vikmemcpy): remove the
#ifdef CONFIG_HAVE_LONG_LONG branches.
- include/{stddef.h,stdlib.h,fixedmath.h,sys/epoll.h,cxx/cstdlib,
nuttx/audio/audio.h,nuttx/crc64.h,nuttx/lib/math.h,
nuttx/lib/math32.h,nuttx/lib/stdbit.h}: same guard cleanup.
- drivers/note/note_driver.c, fs/spiffs/src/spiffs.h,
sched/irq/irq_procfs.c: drop their local guards as well.
- Documentation/applications/netutils/ntpclient/index.rst:
refresh the documentation snippet.
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
118 lines
3.1 KiB
C
118 lines
3.1 KiB
C
/****************************************************************************
|
|
* libs/libc/fixedmath/lib_ubsqrt.c
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed with
|
|
* this work for additional information regarding copyright ownership. The
|
|
* ASF licenses this file to you 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.
|
|
*
|
|
****************************************************************************/
|
|
|
|
/****************************************************************************
|
|
* Included Files
|
|
****************************************************************************/
|
|
|
|
#include <nuttx/config.h>
|
|
#include <fixedmath.h>
|
|
|
|
/****************************************************************************
|
|
* Public Functions
|
|
****************************************************************************/
|
|
|
|
/****************************************************************************
|
|
* Name: ub32sqrtub16
|
|
*
|
|
* Description:
|
|
* ub32sqrtub16 calculates square root for 'a'
|
|
*
|
|
****************************************************************************/
|
|
|
|
ub16_t ub32sqrtub16(ub32_t a)
|
|
{
|
|
uint64_t n = a;
|
|
uint64_t xk = n;
|
|
|
|
/* Direct conversion of ub32_t to uint64_t is same operation as multiplying
|
|
* 'a' by 2^32, therefore n = a * 2^32.
|
|
*/
|
|
|
|
if (xk == UINT64_MAX)
|
|
{
|
|
/* Avoid 'xk + n / xk' overflow on first iteration. */
|
|
|
|
xk = (uint64_t)1 << 63;
|
|
}
|
|
|
|
while (xk)
|
|
{
|
|
uint64_t xk1 = (xk + n / xk) >> 1;
|
|
|
|
if (xk1 >= xk)
|
|
{
|
|
break;
|
|
}
|
|
|
|
xk = xk1;
|
|
}
|
|
|
|
/* 'xk' now holds 'sqrt(n)' => 'sqrt(a * 2^32)' => 'sqrt(a) * 2^16', thus
|
|
* 'xk' holds square root of 'a' in ub16_t format.
|
|
*/
|
|
|
|
return (ub16_t)xk;
|
|
}
|
|
|
|
/****************************************************************************
|
|
* Name: ub16sqrtub8
|
|
*
|
|
* Description:
|
|
* ub16sqrtub8 calculates square root for 'a'
|
|
*
|
|
****************************************************************************/
|
|
|
|
ub8_t ub16sqrtub8(ub16_t a)
|
|
{
|
|
uint32_t n = a;
|
|
uint32_t xk = n;
|
|
|
|
/* Direct conversion of ub16_t to uint32_t is same operation as multiplying
|
|
* 'a' by 2^16, therefore n = a * 2^16.
|
|
*/
|
|
|
|
if (xk == UINT32_MAX)
|
|
{
|
|
/* Avoid 'xk + n / xk' overflow on first iteration. */
|
|
|
|
xk = (uint32_t)1 << 31;
|
|
}
|
|
|
|
while (xk)
|
|
{
|
|
uint32_t xk1 = (xk + n / xk) >> 1;
|
|
|
|
if (xk1 >= xk)
|
|
{
|
|
break;
|
|
}
|
|
|
|
xk = xk1;
|
|
}
|
|
|
|
/* 'xk' now holds 'sqrt(n)' => 'sqrt(a * 2^16)' => 'sqrt(a) * 2^8', thus
|
|
* 'xk' holds square root of 'a' in ub8_t format.
|
|
*/
|
|
|
|
return (ub8_t)xk;
|
|
}
|