Skip to content

Commit

Permalink
libc:add parse_memory_range to parse memory string
Browse files Browse the repository at this point in the history
Signed-off-by: anjiahao <[email protected]>
  • Loading branch information
anjiahao1 authored and xiaoxiang781216 committed Dec 10, 2023
1 parent 69e413c commit 542a555
Show file tree
Hide file tree
Showing 6 changed files with 161 additions and 11 deletions.
11 changes: 11 additions & 0 deletions boards/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4584,3 +4584,14 @@ config BOARD_USBDEV_SERIALSTR
default n
---help---
Use board unique serial number to iSerialNumber in the device descriptor.

config BOARD_MEMORY_RANGE
string "Board memory range"
default ""
---help---
Memory range of board. format: <start>,<end>,<flags>,....
start: start address of memory range
end: end address of memory range
flags: Readable 0x1, writable 0x2, executable 0x4
example:0x1000,0x2000,0x1,0x2000,0x3000,0x3,0x3000,0x4000,0x7

10 changes: 1 addition & 9 deletions include/nuttx/binfmt/binfmt.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

#include <nuttx/sched.h>
#include <nuttx/streams.h>
#include <nuttx/memoryregion.h>

/****************************************************************************
* Pre-processor Definitions
Expand Down Expand Up @@ -111,15 +112,6 @@ struct binary_s
CODE int (*unload)(FAR struct binary_s *bin);
};

/* This describes binfmt coredump filed */

struct memory_region_s
{
uintptr_t start; /* Start address of this region */
uintptr_t end; /* End address of this region */
uint32_t flags; /* Figure 5-3: Segment Flag Bits: PF_[X|W|R] */
};

/* This describes one binary format handler */

struct binfmt_s
Expand Down
66 changes: 66 additions & 0 deletions include/nuttx/memoryregion.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
/****************************************************************************
* include/nuttx/memoryregion.h
*
* 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.
*
****************************************************************************/

#ifndef __INCLUDE_MEMORYREGION_H
#define __INCLUDE_MEMORYREGION_H

/****************************************************************************
* Included Files
****************************************************************************/

#include <stddef.h>

/****************************************************************************
* Public Types
****************************************************************************/

/* This describes binfmt coredump filed */

struct memory_region_s
{
uintptr_t start; /* Start address of this region */
uintptr_t end; /* End address of this region */
uint32_t flags; /* Figure 5-3: Segment Flag Bits: PF_[X|W|R] */
};

/****************************************************************************
* Public Function
****************************************************************************/

/****************************************************************************
* Name: parse_memory_region
*
* Input Parameters:
* format - The format string to parse. <start>,<end>,<flags>,...
* start - The start address of the memory region
* end - The end address of the memory region
* flags - Readable 0x1, writable 0x2, executable 0x4
* region - The memory region to populate
* num - The number of memory regions to parse
*
* example: 0x1000,0x2000,0x1,0x2000,0x3000,0x3,0x3000,0x4000,0x7
*
****************************************************************************/

ssize_t parse_memory_region(FAR const char *format,
FAR struct memory_region_s *region,
size_t num);

#endif /* __INCLUDE_MEMORYREGION_H */
3 changes: 2 additions & 1 deletion libs/libc/misc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ list(
lib_getfullpath.c
lib_openat.c
lib_mkdirat.c
lib_utimensat.c)
lib_utimensat.c
lib_memoryregion.c)

# Support for platforms that do not have long long types

Expand Down
2 changes: 1 addition & 1 deletion libs/libc/misc/Make.defs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ CSRCS += lib_mknod.c lib_umask.c lib_utsname.c lib_getrandom.c
CSRCS += lib_xorshift128.c lib_tea_encrypt.c lib_tea_decrypt.c
CSRCS += lib_cxx_initialize.c lib_impure.c lib_memfd.c lib_mutex.c
CSRCS += lib_fchmodat.c lib_fstatat.c lib_getfullpath.c lib_openat.c
CSRCS += lib_mkdirat.c lib_utimensat.c lib_mallopt.c
CSRCS += lib_mkdirat.c lib_utimensat.c lib_mallopt.c lib_memoryregion.c

# Support for platforms that do not have long long types

Expand Down
80 changes: 80 additions & 0 deletions libs/libc/misc/lib_memoryregion.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
/****************************************************************************
* libs/libc/misc/lib_memoryregion.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/memoryregion.h>
#include <stdlib.h>
#include <errno.h>

/****************************************************************************
* Public Functions
****************************************************************************/

/****************************************************************************
* Name: parse_memory_region
*
* Input Parameters:
* format - The format string to parse. <start>,<end>,<flags>,...
* start - The start address of the memory region
* end - The end address of the memory region
* flags - Readable 0x1, writable 0x2, executable 0x4
* region - The memory region to populate
* num - The number of memory regions to parse
*
* example: 0x1000,0x2000,0x1,0x2000,0x3000,0x3,0x3000,0x4000,0x7
*
****************************************************************************/

ssize_t parse_memory_region(FAR const char *format,
FAR struct memory_region_s *region,
size_t num)
{
FAR char *endptr;
size_t i = 0;

if (format == NULL || region == NULL || num == 0)
{
return -EINVAL;
}

while (*format != '\0' && i < num * 3)
{
if (i % 3 == 0)
{
region[i / 3].start = strtoul(format, &endptr, 0);
}
else if (i % 3 == 1)
{
region[i / 3].end = strtoul(format, &endptr, 0);
}
else if (i % 3 == 2)
{
region[i / 3].flags = strtoul(format, &endptr, 0);
}

format = endptr + 1;
i++;
}

return i / 3;
}

0 comments on commit 542a555

Please sign in to comment.