sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-12 14:32:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

[memmap] Rename addr/last fields to min/max for clarity

Browse Source 
Use the terminology "min" and "max" for addresses covered by a memory
region descriptor, since this is sufficiently intuitive to generally
not require further explanation.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2025-05-23 16:55:42 +01:00
parent cd38ed4fab
commit 036e43334a
12 changed files with 69 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/include/ipxe/memmap.h
View File

@@ -46,15 +46,10 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
/** A memory region descriptor */
struct memmap_region {
/** The address being described */
uint64_t addr;
/** Last address with the same description
*
* Note that this is the last address with the same
* description as the address being described, not the first
* address with a different description.
*/
uint64_t last;
/** Minimum address in region */
uint64_t min;
/** Maximum address in region */
uint64_t max;
/** Region flags */
unsigned int flags;
/** Region name (for debug messages) */
@@ -69,14 +64,14 @@ struct memmap_region {
/**
* Initialise memory region descriptor
*
* @v addr Address within region
* @v min Minimum address
* @v region Region descriptor to fill in
*/
static inline __attribute__ (( always_inline )) void
memmap_init ( uint64_t addr, struct memmap_region *region ) {
memmap_init ( uint64_t min, struct memmap_region *region ) {
region->addr = addr;
region->last = ~( ( uint64_t ) 0 );
region->min = min;
region->max = ~( ( uint64_t ) 0 );
region->flags = 0;
region->name = NULL;
}
@@ -103,7 +98,7 @@ static inline __attribute__ (( always_inline )) uint64_t
memmap_size ( const struct memmap_region *region ) {
/* Calculate size, assuming overflow is known to be impossible */
return ( ( region->last + 1 ) - region->addr );
return ( region->max - region->min + 1 );
}
/** An in-use memory region */
@@ -132,11 +127,11 @@ struct used_region {
/**
* Describe memory region from system memory map
*
* @v addr Address within region
* @v min Minimum address
* @v hide Hide in-use regions from the memory map
* @v region Region descriptor to fill in
*/
void memmap_describe ( uint64_t addr, int hide, struct memmap_region *region );
void memmap_describe ( uint64_t min, int hide, struct memmap_region *region );
/**
* Synchronise in-use regions with the externally visible system memory map
@@ -173,11 +168,11 @@ memmap_use ( struct used_region *used, physaddr_t start, size_t size ) {
* @v hide Hide in-use regions from the memory map
*/
#define for_each_memmap_from( region, start, hide ) \
for ( (region)->addr = (start), (region)->last = 0 ; \
( ( ( (region)->last + 1 ) != 0 ) && \
( memmap_describe ( (region)->addr, (hide), \
for ( (region)->min = (start), (region)->max = 0 ; \
( ( ( (region)->max + 1 ) != 0 ) && \
( memmap_describe ( (region)->min, (hide), \
(region) ), 1 ) ) ; \
(region)->addr = ( (region)->last + 1 ) )
(region)->min = ( (region)->max + 1 ) )
/**
* Iterate over memory regions
@@ -204,8 +199,8 @@ static inline void memmap_dump ( const struct memmap_region *region ) {
( ( flags & MEMMAP_FL_RESERVED ) ? "R" : "-" ),
( ( flags & MEMMAP_FL_USED ) ? "U" : "-" ),
( ( flags & MEMMAP_FL_INACCESSIBLE ) ? "X" : "-" ),
( ( unsigned long long ) region->addr ),
( ( unsigned long long ) region->last ),
( ( unsigned long long ) region->min ),
( ( unsigned long long ) region->max ),
( name ? " " : "" ), ( name ? name : "" ) );
}

6
src/include/ipxe/null_memmap.h
View File

@@ -20,16 +20,16 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
/**
* Describe memory region from system memory map
*
* @v addr Address within region
* @v min Minimum address
* @v hide Hide in-use regions from the memory map
* @v region Region descriptor to fill in
*/
static inline __attribute__ (( always_inline )) void
MEMMAP_INLINE ( null, memmap_describe ) ( uint64_t addr, int hide __unused,
MEMMAP_INLINE ( null, memmap_describe ) ( uint64_t min, int hide __unused,
struct memmap_region *region ) {
/* Initialise region as empty */
memmap_init ( addr, region );
memmap_init ( min, region );
}
/**