Fennix/Kernel
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Kernel.git synced 2025-05-28 23:44:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename heap allocation function

Browse Source
This commit is contained in:
Alex 2023-03-25 12:02:01 +02:00
parent e3a544e79c
commit 7218575b48
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Core/Memory/Memory.cpp
View File

@ -309,7 +309,7 @@ NIF void InitializeMemoryManagement(BootInfo *Info)
} }
} }
void *HeapMalloc(size_t Size) void *malloc(size_t Size)
{ {
#ifdef DEBUG_ALLOCATIONS_SL #ifdef DEBUG_ALLOCATIONS_SL
SmartLockClass lock___COUNTER__(AllocatorLock, (KernelSymbolTable ? KernelSymbolTable->GetSymbolFromAddress((uintptr_t)__builtin_return_address(0)) : "Unknown")); SmartLockClass lock___COUNTER__(AllocatorLock, (KernelSymbolTable ? KernelSymbolTable->GetSymbolFromAddress((uintptr_t)__builtin_return_address(0)) : "Unknown"));
@ -362,7 +362,7 @@ void *HeapMalloc(size_t Size)
return ret; return ret;
} }
void *HeapCalloc(size_t n, size_t Size) void *calloc(size_t n, size_t Size)
{ {
#ifdef DEBUG_ALLOCATIONS_SL #ifdef DEBUG_ALLOCATIONS_SL
SmartLockClass lock___COUNTER__(AllocatorLock, (KernelSymbolTable ? KernelSymbolTable->GetSymbolFromAddress((uintptr_t)__builtin_return_address(0)) : "Unknown")); SmartLockClass lock___COUNTER__(AllocatorLock, (KernelSymbolTable ? KernelSymbolTable->GetSymbolFromAddress((uintptr_t)__builtin_return_address(0)) : "Unknown"));
@ -415,7 +415,7 @@ void *HeapCalloc(size_t n, size_t Size)
return ret; return ret;
} }
void *HeapRealloc(void *Address, size_t Size) void *realloc(void *Address, size_t Size)
{ {
#ifdef DEBUG_ALLOCATIONS_SL #ifdef DEBUG_ALLOCATIONS_SL
SmartLockClass lock___COUNTER__(AllocatorLock, (KernelSymbolTable ? KernelSymbolTable->GetSymbolFromAddress((uintptr_t)__builtin_return_address(0)) : "Unknown")); SmartLockClass lock___COUNTER__(AllocatorLock, (KernelSymbolTable ? KernelSymbolTable->GetSymbolFromAddress((uintptr_t)__builtin_return_address(0)) : "Unknown"));
@ -468,7 +468,7 @@ void *HeapRealloc(void *Address, size_t Size)
return ret; return ret;
} }
void HeapFree(void *Address) void free(void *Address)
{ {
#ifdef DEBUG_ALLOCATIONS_SL #ifdef DEBUG_ALLOCATIONS_SL
SmartLockClass lock___COUNTER__(AllocatorLock, (KernelSymbolTable ? KernelSymbolTable->GetSymbolFromAddress((uintptr_t)__builtin_return_address(0)) : "Unknown")); SmartLockClass lock___COUNTER__(AllocatorLock, (KernelSymbolTable ? KernelSymbolTable->GetSymbolFromAddress((uintptr_t)__builtin_return_address(0)) : "Unknown"));
@ -525,7 +525,7 @@ void *operator new(size_t Size)
#endif #endif
memdbg("new(%d)->[%s]", Size, KernelSymbolTable ? KernelSymbolTable->GetSymbolFromAddress((uintptr_t)__builtin_return_address(0)) : "Unknown"); memdbg("new(%d)->[%s]", Size, KernelSymbolTable ? KernelSymbolTable->GetSymbolFromAddress((uintptr_t)__builtin_return_address(0)) : "Unknown");
void *ret = HeapMalloc(Size); void *ret = malloc(Size);
#ifdef DEBUG #ifdef DEBUG
if (EnableExternalMemoryTracer) if (EnableExternalMemoryTracer)
{ {
@ -556,7 +556,7 @@ void *operator new[](size_t Size)
#endif #endif
memdbg("new[](%d)->[%s]", Size, KernelSymbolTable ? KernelSymbolTable->GetSymbolFromAddress((uintptr_t)__builtin_return_address(0)) : "Unknown"); memdbg("new[](%d)->[%s]", Size, KernelSymbolTable ? KernelSymbolTable->GetSymbolFromAddress((uintptr_t)__builtin_return_address(0)) : "Unknown");
void *ret = HeapMalloc(Size); void *ret = malloc(Size);
#ifdef DEBUG #ifdef DEBUG
if (EnableExternalMemoryTracer) if (EnableExternalMemoryTracer)
{ {
@ -588,7 +588,7 @@ void *operator new(unsigned long Size, std::align_val_t Alignment)
memdbg("new(%d, %d)->[%s]", Size, Alignment, KernelSymbolTable ? KernelSymbolTable->GetSymbolFromAddress((uintptr_t)__builtin_return_address(0)) : "Unknown"); memdbg("new(%d, %d)->[%s]", Size, Alignment, KernelSymbolTable ? KernelSymbolTable->GetSymbolFromAddress((uintptr_t)__builtin_return_address(0)) : "Unknown");
fixme("operator new with alignment(%#lx) is not implemented", Alignment); fixme("operator new with alignment(%#lx) is not implemented", Alignment);
void *ret = HeapMalloc(Size); void *ret = malloc(Size);
#ifdef DEBUG #ifdef DEBUG
if (EnableExternalMemoryTracer) if (EnableExternalMemoryTracer)
{ {
@ -619,7 +619,7 @@ void operator delete(void *Pointer)
#endif #endif
memdbg("delete(%#lx)->[%s]", Pointer, KernelSymbolTable ? KernelSymbolTable->GetSymbolFromAddress((uintptr_t)__builtin_return_address(0)) : "Unknown"); memdbg("delete(%#lx)->[%s]", Pointer, KernelSymbolTable ? KernelSymbolTable->GetSymbolFromAddress((uintptr_t)__builtin_return_address(0)) : "Unknown");
HeapFree(Pointer); free(Pointer);
#ifdef DEBUG #ifdef DEBUG
if (EnableExternalMemoryTracer) if (EnableExternalMemoryTracer)
{ {
@ -649,7 +649,7 @@ void operator delete[](void *Pointer)
#endif #endif
memdbg("delete[](%#lx)->[%s]", Pointer, KernelSymbolTable ? KernelSymbolTable->GetSymbolFromAddress((uintptr_t)__builtin_return_address(0)) : "Unknown"); memdbg("delete[](%#lx)->[%s]", Pointer, KernelSymbolTable ? KernelSymbolTable->GetSymbolFromAddress((uintptr_t)__builtin_return_address(0)) : "Unknown");
HeapFree(Pointer); free(Pointer);
#ifdef DEBUG #ifdef DEBUG
if (EnableExternalMemoryTracer) if (EnableExternalMemoryTracer)
{ {
@ -680,7 +680,7 @@ void operator delete(void *Pointer, long unsigned int Size)
#endif #endif
memdbg("delete(%#lx, %d)->[%s]", Pointer, Size, KernelSymbolTable ? KernelSymbolTable->GetSymbolFromAddress((uintptr_t)__builtin_return_address(0)) : "Unknown"); memdbg("delete(%#lx, %d)->[%s]", Pointer, Size, KernelSymbolTable ? KernelSymbolTable->GetSymbolFromAddress((uintptr_t)__builtin_return_address(0)) : "Unknown");
HeapFree(Pointer); free(Pointer);
#ifdef DEBUG #ifdef DEBUG
if (EnableExternalMemoryTracer) if (EnableExternalMemoryTracer)
{ {
@ -711,7 +711,7 @@ void operator delete[](void *Pointer, long unsigned int Size)
#endif #endif
memdbg("delete[](%#lx, %d)->[%s]", Pointer, Size, KernelSymbolTable ? KernelSymbolTable->GetSymbolFromAddress((uintptr_t)__builtin_return_address(0)) : "Unknown"); memdbg("delete[](%#lx, %d)->[%s]", Pointer, Size, KernelSymbolTable ? KernelSymbolTable->GetSymbolFromAddress((uintptr_t)__builtin_return_address(0)) : "Unknown");
HeapFree(Pointer); free(Pointer);
#ifdef DEBUG #ifdef DEBUG
if (EnableExternalMemoryTracer) if (EnableExternalMemoryTracer)
{ {

16
include/memory.hpp
View File

@ -676,14 +676,14 @@ extern Memory::PageTable4 *UserspaceKernelOnlyPageTable;
#endif // __cplusplus #endif // __cplusplus
EXTERNC void *HeapMalloc(size_t Size); EXTERNC void *malloc(size_t Size);
EXTERNC void *HeapCalloc(size_t n, size_t Size); EXTERNC void *calloc(size_t n, size_t Size);
EXTERNC void *HeapRealloc(void *Address, size_t Size); EXTERNC void *realloc(void *Address, size_t Size);
EXTERNC void HeapFree(void *Address); EXTERNC void free(void *Address);
#define kmalloc(Size) HeapMalloc(Size) #define kmalloc(Size) malloc(Size)
#define kcalloc(n, Size) HeapCalloc(n, Size) #define kcalloc(n, Size) calloc(n, Size)
#define krealloc(Address, Size) HeapRealloc(Address, Size) #define krealloc(Address, Size) realloc(Address, Size)
#define kfree(Address) HeapFree(Address) #define kfree(Address) free(Address)
#endif // !__FENNIX_KERNEL_INTERNAL_MEMORY_H__ #endif // !__FENNIX_KERNEL_INTERNAL_MEMORY_H__