mirror of
https://github.com/apache/nuttx.git
synced 2026-06-04 06:42:32 +08:00
math: Optimize the implementation of log2ceil and log2floor
and move common math funtions to math32.h: div_round_up div_round_closest is_power_of_2 roundup_pow_of_two rounddown_pow_of_two Signed-off-by: lipengfei28 <lipengfei28@xiaomi.com>
This commit is contained in:
committed by
Alin Jerpelea
parent
4fd78583f7
commit
ca39dc2e74
@@ -86,10 +86,6 @@ list(
|
||||
lib_err.c
|
||||
lib_instrument.c)
|
||||
|
||||
# Add generic integer math functions
|
||||
|
||||
list(APPEND SRCS lib_log2ceil.c lib_log2floor.c)
|
||||
|
||||
# Keyboard driver encoder/decoder
|
||||
|
||||
if(CONFIG_LIBC_KBDCODEC)
|
||||
|
||||
@@ -43,10 +43,6 @@ CSRCS += lib_crc64.c lib_crc32.c lib_crc16.c lib_crc16ccitt.c lib_crc8.c
|
||||
CSRCS += lib_crc8ccitt.c lib_crc8table.c lib_glob.c lib_execinfo.c
|
||||
CSRCS += lib_ftok.c lib_err.c lib_instrument.c
|
||||
|
||||
# Add generic integer math functions
|
||||
|
||||
CSRCS += lib_log2ceil.c lib_log2floor.c
|
||||
|
||||
# Keyboard driver encoder/decoder
|
||||
|
||||
ifeq ($(CONFIG_LIBC_KBDCODEC),y)
|
||||
|
||||
@@ -1,55 +0,0 @@
|
||||
/****************************************************************************
|
||||
* libs/libc/misc/lib_log2ceil.c
|
||||
*
|
||||
* 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/lib/math32.h>
|
||||
|
||||
/****************************************************************************
|
||||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Name: log2ceil
|
||||
*
|
||||
* Description:
|
||||
* Calculate the up-rounded power-of-two for input.
|
||||
*
|
||||
* Input Parameters:
|
||||
* x - Argument to calculate the power-of-two from.
|
||||
*
|
||||
* Returned Value:
|
||||
* Power-of-two for argument, rounded up.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
uintptr_t log2ceil(uintptr_t x)
|
||||
{
|
||||
uintptr_t pot = 0;
|
||||
|
||||
for (x = x - 1; x; x >>= 1)
|
||||
{
|
||||
pot++;
|
||||
}
|
||||
|
||||
return pot;
|
||||
}
|
||||
@@ -1,55 +0,0 @@
|
||||
/****************************************************************************
|
||||
* libs/libc/misc/lib_log2floor.c
|
||||
*
|
||||
* 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/lib/math32.h>
|
||||
|
||||
/****************************************************************************
|
||||
* Public Functions
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Name: log2floor
|
||||
*
|
||||
* Description:
|
||||
* Calculate the down-rounded (truncated) power-of-two for input.
|
||||
*
|
||||
* Input Parameters:
|
||||
* x - Argument to calculate the power-of-two from.
|
||||
*
|
||||
* Returned Value:
|
||||
* Power-of-two for argument, rounded (truncated) down.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
uintptr_t log2floor(uintptr_t x)
|
||||
{
|
||||
uintptr_t pot = 0;
|
||||
|
||||
for (; x > 1; x >>= 1)
|
||||
{
|
||||
pot++;
|
||||
}
|
||||
|
||||
return pot;
|
||||
}
|
||||
Reference in New Issue
Block a user