mirror of
https://github.com/ipxe/ipxe
synced 2025-12-21 04:20:17 +03:00
[umalloc] Formalise the user memory allocation API
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
* @{
|
||||
*/
|
||||
|
||||
#define ERRFILE_umalloc ( ERRFILE_ARCH | ERRFILE_CORE | 0x00000000 )
|
||||
#define ERRFILE_memtop_umalloc ( ERRFILE_ARCH | ERRFILE_CORE | 0x00000000 )
|
||||
#define ERRFILE_memmap ( ERRFILE_ARCH | ERRFILE_CORE | 0x00010000 )
|
||||
#define ERRFILE_pnpbios ( ERRFILE_ARCH | ERRFILE_CORE | 0x00020000 )
|
||||
#define ERRFILE_smbios ( ERRFILE_ARCH | ERRFILE_CORE | 0x00030000 )
|
||||
|
||||
12
src/arch/i386/include/bits/umalloc.h
Normal file
12
src/arch/i386/include/bits/umalloc.h
Normal file
@@ -0,0 +1,12 @@
|
||||
#ifndef _BITS_UMALLOC_H
|
||||
#define _BITS_UMALLOC_H
|
||||
|
||||
/** @file
|
||||
*
|
||||
* i386-specific user memory allocation API implementations
|
||||
*
|
||||
*/
|
||||
|
||||
#include <gpxe/memtop_umalloc.h>
|
||||
|
||||
#endif /* _BITS_UMALLOC_H */
|
||||
16
src/arch/i386/include/gpxe/memtop_umalloc.h
Normal file
16
src/arch/i386/include/gpxe/memtop_umalloc.h
Normal file
@@ -0,0 +1,16 @@
|
||||
#ifndef _GPXE_MEMTOP_UMALLOC_H
|
||||
#define _GPXE_MEMTOP_UMALLOC_H
|
||||
|
||||
/** @file
|
||||
*
|
||||
* External memory allocation
|
||||
*
|
||||
*/
|
||||
|
||||
#ifdef UMALLOC_MEMTOP
|
||||
#define UMALLOC_PREFIX_memtop
|
||||
#else
|
||||
#define UMALLOC_PREFIX_memtop __memtop_
|
||||
#endif
|
||||
|
||||
#endif /* _GPXE_MEMTOP_UMALLOC_H */
|
||||
@@ -36,9 +36,6 @@
|
||||
/** Equivalent of NOWHERE for user pointers */
|
||||
#define UNOWHERE ( ~UNULL )
|
||||
|
||||
/** Start of Etherboot text, as defined by the linker */
|
||||
extern char _text[];
|
||||
|
||||
/** An external memory block */
|
||||
struct external_memory {
|
||||
/** Size of this memory block (excluding this header) */
|
||||
@@ -135,7 +132,7 @@ static void ecollect_free ( void ) {
|
||||
* Calling realloc() with a new size of zero is a valid way to free a
|
||||
* memory block.
|
||||
*/
|
||||
userptr_t urealloc ( userptr_t ptr, size_t new_size ) {
|
||||
static userptr_t memtop_urealloc ( userptr_t ptr, size_t new_size ) {
|
||||
struct external_memory extmem;
|
||||
userptr_t new = ptr;
|
||||
size_t align;
|
||||
@@ -200,25 +197,4 @@ userptr_t urealloc ( userptr_t ptr, size_t new_size ) {
|
||||
return ( new_size ? new : UNOWHERE );
|
||||
}
|
||||
|
||||
/**
|
||||
* Allocate external memory
|
||||
*
|
||||
* @v size Requested size
|
||||
* @ret ptr Memory, or UNULL
|
||||
*
|
||||
* Memory is guaranteed to be aligned to a page boundary.
|
||||
*/
|
||||
userptr_t umalloc ( size_t size ) {
|
||||
return urealloc ( UNULL, size );
|
||||
}
|
||||
|
||||
/**
|
||||
* Free external memory
|
||||
*
|
||||
* @v ptr Memory allocated by umalloc(), or UNULL
|
||||
*
|
||||
* If @c ptr is UNULL, no action is taken.
|
||||
*/
|
||||
void ufree ( userptr_t ptr ) {
|
||||
urealloc ( ptr, 0 );
|
||||
}
|
||||
PROVIDE_UMALLOC ( memtop, urealloc, memtop_urealloc );
|
||||
Reference in New Issue
Block a user