diff --git a/Documentation/NuttXBinfmt.html b/Documentation/NuttXBinfmt.html index 653d1ea1984..d229492464e 100644 --- a/Documentation/NuttXBinfmt.html +++ b/Documentation/NuttXBinfmt.html @@ -8,7 +8,7 @@

NuttX Binary Loader

-

Last Updated: October 1, 2017

+

Last Updated: January 26, 2019

@@ -494,7 +494,6 @@ struct symtab_s 3.3.1 symtab_findbyname()
3.3.2 symtab_findorderedbyname()
3.3.3 symtab_findbyvalue()
- 3.3.4 symtab_findorderedbyvalue()

3.3.1 symtab_findbyname()

@@ -554,25 +553,6 @@ symtab_findbyvalue(FAR const struct symtab_s *symtab, NULL is returned if the entry is not found. -

3.3.4 symtab_findorderedbyvalue()

-

Function Prototype:

- -

Description:

- -

Returned Value:

- -
diff --git a/include/nuttx/symtab.h b/include/nuttx/symtab.h index d835a17b0db..b2cea913487 100644 --- a/include/nuttx/symtab.h +++ b/include/nuttx/symtab.h @@ -137,24 +137,6 @@ FAR const struct symtab_s * symtab_findbyvalue(FAR const struct symtab_s *symtab, FAR void *value, int nsyms); -/**************************************************************************** - * Name: symtab_findorderedbyvalue - * - * Description: - * Find the symbol in the symbol table whose value closest (but not greater - * than), the provided value. This version assumes that table is ordered - * with respect to symbol name. - * - * Returned Value: - * A reference to the symbol table entry if an entry with the matching - * name is found; NULL is returned if the entry is not found. - * - ****************************************************************************/ - -FAR const struct symtab_s * -symtab_findorderedbyvalue(FAR const struct symtab_s *symtab, - FAR void *value, int nsyms); - #undef EXTERN #if defined(__cplusplus) } diff --git a/libs/libc/symtab/Make.defs b/libs/libc/symtab/Make.defs index b5f83266d9d..5a7ddab07fd 100644 --- a/libs/libc/symtab/Make.defs +++ b/libs/libc/symtab/Make.defs @@ -36,7 +36,7 @@ # Symbol table source files CSRCS += symtab_findbyname.c symtab_findbyvalue.c -CSRCS += symtab_findorderedbyname.c symtab_findorderedbyvalue.c +CSRCS += symtab_findorderedbyname.c # Add the symtab directory to the build diff --git a/libs/libc/symtab/symtab_findorderedbyvalue.c b/libs/libc/symtab/symtab_findorderedbyvalue.c deleted file mode 100644 index f06439b4c2f..00000000000 --- a/libs/libc/symtab/symtab_findorderedbyvalue.c +++ /dev/null @@ -1,110 +0,0 @@ -/**************************************************************************** - * libs/libc/symtab/symtab_findorderedbyvalue.c - * - * Copyright (C) 2009, 2015 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include - -#include -#include -#include -#include - -#include - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -/**************************************************************************** - * Name: symtab_findorderedbyvalue - * - * Description: - * Find the symbol in the symbol table whose value closest (but not greater - * than), the provided value. This version assumes that table is ordered - * with respect to symbol name. - * - * Returned Value: - * A reference to the symbol table entry if an entry with the matching - * name is found; NULL is returned if the entry is not found. - * - ****************************************************************************/ - -FAR const struct symtab_s * -symtab_findorderedbyvalue(FAR const struct symtab_s *symtab, - FAR void *value, int nsyms) -{ - int low = 0; - int high = nsyms -1; - int mid; - - /* Loop until the range has been isolated to a single symbol table - * entry that may or may not match the search name. - */ - - DEBUGASSERT(symtab != NULL); - while (low < high) - { - /* Compare the name to the one in the middle. (or just below - * the middle in the case where one is even and one is odd). - */ - - mid = (low + high) >> 1; - if (value < symtab[mid].sym_value) - { - high = mid - 1; - } - else if (value > symtab[mid].sym_value) - { - low = mid + 1; - } - else /* if (value == symtab[mid].sym_value) */ - { - return &symtab[mid]; - } - } - - /* low == high... One final check. We might not have actually tested - * the final symtab[] name. - * - * Example: Only the last pass through loop, suppose low = 1, high = 2, - * mid = 1, and symtab[high].sym_name == name. Then we would get here with - * low = 2, high = 2, but symtab[2].sym_name was never tested. - */ - - return value == symtab[low].sym_value ? &symtab[low] : NULL; -}