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

Update debugging code

Browse Source
This commit is contained in:
Alex 2023-03-14 01:41:47 +02:00
parent ed1ea5e6b6
commit f54b46149d
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
2 changed files with 80 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
Core/Memory/Memory.cpp
View File

@ -288,14 +288,17 @@ void *HeapMalloc(size_t Size)
#ifdef DEBUG #ifdef DEBUG
if (EnableExternalMemoryTracer) if (EnableExternalMemoryTracer)
{ {
mExtTrkLock.TimeoutLock(__FUNCTION__, 100000); char LockTmpStr[64];
strcpy_unsafe(LockTmpStr, __FUNCTION__);
strcat_unsafe(LockTmpStr, "_memTrk");
mExtTrkLock.TimeoutLock(LockTmpStr, 10000);
sprintf(mExtTrkLog, "malloc( %ld )=%p-%p~%p\n\r", Size, ret, (void *)((uintptr_t)ret + Size), __builtin_return_address(0)); sprintf(mExtTrkLog, "malloc( %ld )=%p-%p~%p\n\r", Size, ret, (void *)((uintptr_t)ret + Size), __builtin_return_address(0));
UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3); UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3);
for (short i = 0; i < MEM_TRK_MAX_SIZE; i++) for (short i = 0; i < MEM_TRK_MAX_SIZE; i++)
{ {
mTrkUART.Write(mExtTrkLog[i]);
if (mExtTrkLog[i] == '\r') if (mExtTrkLog[i] == '\r')
break; break;
mTrkUART.Write(mExtTrkLog[i]);
} }
mExtTrkLock.Unlock(); mExtTrkLock.Unlock();
} }
@ -338,14 +341,17 @@ void *HeapCalloc(size_t n, size_t Size)
#ifdef DEBUG #ifdef DEBUG
if (EnableExternalMemoryTracer) if (EnableExternalMemoryTracer)
{ {
mExtTrkLock.TimeoutLock(__FUNCTION__, 100000); char LockTmpStr[64];
strcpy_unsafe(LockTmpStr, __FUNCTION__);
strcat_unsafe(LockTmpStr, "_memTrk");
mExtTrkLock.TimeoutLock(LockTmpStr, 10000);
sprintf(mExtTrkLog, "calloc( %ld %ld )=%p-%p~%p\n\r", n, Size, ret, (void *)((uintptr_t)ret + (n * Size)), __builtin_return_address(0)); sprintf(mExtTrkLog, "calloc( %ld %ld )=%p-%p~%p\n\r", n, Size, ret, (void *)((uintptr_t)ret + (n * Size)), __builtin_return_address(0));
UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3); UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3);
for (short i = 0; i < MEM_TRK_MAX_SIZE; i++) for (short i = 0; i < MEM_TRK_MAX_SIZE; i++)
{ {
mTrkUART.Write(mExtTrkLog[i]);
if (mExtTrkLog[i] == '\r') if (mExtTrkLog[i] == '\r')
break; break;
mTrkUART.Write(mExtTrkLog[i]);
} }
mExtTrkLock.Unlock(); mExtTrkLock.Unlock();
} }
@ -388,14 +394,17 @@ void *HeapRealloc(void *Address, size_t Size)
#ifdef DEBUG #ifdef DEBUG
if (EnableExternalMemoryTracer) if (EnableExternalMemoryTracer)
{ {
mExtTrkLock.TimeoutLock(__FUNCTION__, 100000); char LockTmpStr[64];
strcpy_unsafe(LockTmpStr, __FUNCTION__);
strcat_unsafe(LockTmpStr, "_memTrk");
mExtTrkLock.TimeoutLock(LockTmpStr, 10000);
sprintf(mExtTrkLog, "realloc( %p %ld )=%p-%p~%p\n\r", Address, Size, ret, (void *)((uintptr_t)ret + Size), __builtin_return_address(0)); sprintf(mExtTrkLog, "realloc( %p %ld )=%p-%p~%p\n\r", Address, Size, ret, (void *)((uintptr_t)ret + Size), __builtin_return_address(0));
UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3); UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3);
for (short i = 0; i < MEM_TRK_MAX_SIZE; i++) for (short i = 0; i < MEM_TRK_MAX_SIZE; i++)
{ {
mTrkUART.Write(mExtTrkLog[i]);
if (mExtTrkLog[i] == '\r') if (mExtTrkLog[i] == '\r')
break; break;
mTrkUART.Write(mExtTrkLog[i]);
} }
mExtTrkLock.Unlock(); mExtTrkLock.Unlock();
} }
@ -413,14 +422,17 @@ void HeapFree(void *Address)
#ifdef DEBUG #ifdef DEBUG
if (EnableExternalMemoryTracer) if (EnableExternalMemoryTracer)
{ {
mExtTrkLock.TimeoutLock(__FUNCTION__, 100000); char LockTmpStr[64];
strcpy_unsafe(LockTmpStr, __FUNCTION__);
strcat_unsafe(LockTmpStr, "_memTrk");
mExtTrkLock.TimeoutLock(LockTmpStr, 10000);
sprintf(mExtTrkLog, "free( %p )~%p\n\r", Address, __builtin_return_address(0)); sprintf(mExtTrkLog, "free( %p )~%p\n\r", Address, __builtin_return_address(0));
UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3); UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3);
for (short i = 0; i < MEM_TRK_MAX_SIZE; i++) for (short i = 0; i < MEM_TRK_MAX_SIZE; i++)
{ {
mTrkUART.Write(mExtTrkLog[i]);
if (mExtTrkLog[i] == '\r') if (mExtTrkLog[i] == '\r')
break; break;
mTrkUART.Write(mExtTrkLog[i]);
} }
mExtTrkLock.Unlock(); mExtTrkLock.Unlock();
} }
@ -459,14 +471,17 @@ void *operator new(size_t Size)
#ifdef DEBUG #ifdef DEBUG
if (EnableExternalMemoryTracer) if (EnableExternalMemoryTracer)
{ {
mExtTrkLock.TimeoutLock(__FUNCTION__, 100000); char LockTmpStr[64];
strcpy_unsafe(LockTmpStr, __FUNCTION__);
strcat_unsafe(LockTmpStr, "_memTrk");
mExtTrkLock.TimeoutLock(LockTmpStr, 10000);
sprintf(mExtTrkLog, "new( %ld )~%p\n\r", Size, __builtin_return_address(0)); sprintf(mExtTrkLog, "new( %ld )~%p\n\r", Size, __builtin_return_address(0));
UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3); UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3);
for (short i = 0; i < MEM_TRK_MAX_SIZE; i++) for (short i = 0; i < MEM_TRK_MAX_SIZE; i++)
{ {
mTrkUART.Write(mExtTrkLog[i]);
if (mExtTrkLog[i] == '\r') if (mExtTrkLog[i] == '\r')
break; break;
mTrkUART.Write(mExtTrkLog[i]);
} }
mExtTrkLock.Unlock(); mExtTrkLock.Unlock();
} }
@ -485,14 +500,17 @@ void *operator new[](size_t Size)
#ifdef DEBUG #ifdef DEBUG
if (EnableExternalMemoryTracer) if (EnableExternalMemoryTracer)
{ {
mExtTrkLock.TimeoutLock(__FUNCTION__, 100000); char LockTmpStr[64];
strcpy_unsafe(LockTmpStr, __FUNCTION__);
strcat_unsafe(LockTmpStr, "_memTrk");
mExtTrkLock.TimeoutLock(LockTmpStr, 10000);
sprintf(mExtTrkLog, "new[]( %ld )~%p\n\r", Size, __builtin_return_address(0)); sprintf(mExtTrkLog, "new[]( %ld )~%p\n\r", Size, __builtin_return_address(0));
UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3); UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3);
for (short i = 0; i < MEM_TRK_MAX_SIZE; i++) for (short i = 0; i < MEM_TRK_MAX_SIZE; i++)
{ {
mTrkUART.Write(mExtTrkLog[i]);
if (mExtTrkLog[i] == '\r') if (mExtTrkLog[i] == '\r')
break; break;
mTrkUART.Write(mExtTrkLog[i]);
} }
mExtTrkLock.Unlock(); mExtTrkLock.Unlock();
} }
@ -512,14 +530,17 @@ void *operator new(unsigned long Size, std::align_val_t Alignment)
#ifdef DEBUG #ifdef DEBUG
if (EnableExternalMemoryTracer) if (EnableExternalMemoryTracer)
{ {
mExtTrkLock.TimeoutLock(__FUNCTION__, 100000); char LockTmpStr[64];
strcpy_unsafe(LockTmpStr, __FUNCTION__);
strcat_unsafe(LockTmpStr, "_memTrk");
mExtTrkLock.TimeoutLock(LockTmpStr, 10000);
sprintf(mExtTrkLog, "new( %ld %#lx )~%p\n\r", Size, (uintptr_t)Alignment, __builtin_return_address(0)); sprintf(mExtTrkLog, "new( %ld %#lx )~%p\n\r", Size, (uintptr_t)Alignment, __builtin_return_address(0));
UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3); UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3);
for (short i = 0; i < MEM_TRK_MAX_SIZE; i++) for (short i = 0; i < MEM_TRK_MAX_SIZE; i++)
{ {
mTrkUART.Write(mExtTrkLog[i]);
if (mExtTrkLog[i] == '\r') if (mExtTrkLog[i] == '\r')
break; break;
mTrkUART.Write(mExtTrkLog[i]);
} }
mExtTrkLock.Unlock(); mExtTrkLock.Unlock();
} }
@ -538,14 +559,17 @@ void operator delete(void *Pointer)
#ifdef DEBUG #ifdef DEBUG
if (EnableExternalMemoryTracer) if (EnableExternalMemoryTracer)
{ {
mExtTrkLock.TimeoutLock(__FUNCTION__, 100000); char LockTmpStr[64];
strcpy_unsafe(LockTmpStr, __FUNCTION__);
strcat_unsafe(LockTmpStr, "_memTrk");
mExtTrkLock.TimeoutLock(LockTmpStr, 10000);
sprintf(mExtTrkLog, "delete( %p )~%p\n\r", Pointer, __builtin_return_address(0)); sprintf(mExtTrkLog, "delete( %p )~%p\n\r", Pointer, __builtin_return_address(0));
UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3); UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3);
for (short i = 0; i < MEM_TRK_MAX_SIZE; i++) for (short i = 0; i < MEM_TRK_MAX_SIZE; i++)
{ {
mTrkUART.Write(mExtTrkLog[i]);
if (mExtTrkLog[i] == '\r') if (mExtTrkLog[i] == '\r')
break; break;
mTrkUART.Write(mExtTrkLog[i]);
} }
mExtTrkLock.Unlock(); mExtTrkLock.Unlock();
} }
@ -564,14 +588,17 @@ void operator delete[](void *Pointer)
#ifdef DEBUG #ifdef DEBUG
if (EnableExternalMemoryTracer) if (EnableExternalMemoryTracer)
{ {
mExtTrkLock.TimeoutLock(__FUNCTION__, 100000); char LockTmpStr[64];
strcpy_unsafe(LockTmpStr, __FUNCTION__);
strcat_unsafe(LockTmpStr, "_memTrk");
mExtTrkLock.TimeoutLock(LockTmpStr, 10000);
sprintf(mExtTrkLog, "delete[]( %p )~%p\n\r", Pointer, __builtin_return_address(0)); sprintf(mExtTrkLog, "delete[]( %p )~%p\n\r", Pointer, __builtin_return_address(0));
UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3); UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3);
for (short i = 0; i < MEM_TRK_MAX_SIZE; i++) for (short i = 0; i < MEM_TRK_MAX_SIZE; i++)
{ {
mTrkUART.Write(mExtTrkLog[i]);
if (mExtTrkLog[i] == '\r') if (mExtTrkLog[i] == '\r')
break; break;
mTrkUART.Write(mExtTrkLog[i]);
} }
mExtTrkLock.Unlock(); mExtTrkLock.Unlock();
} }
@ -590,14 +617,17 @@ void operator delete(void *Pointer, long unsigned int Size)
#ifdef DEBUG #ifdef DEBUG
if (EnableExternalMemoryTracer) if (EnableExternalMemoryTracer)
{ {
mExtTrkLock.TimeoutLock(__FUNCTION__, 100000); char LockTmpStr[64];
strcpy_unsafe(LockTmpStr, __FUNCTION__);
strcat_unsafe(LockTmpStr, "_memTrk");
mExtTrkLock.TimeoutLock(LockTmpStr, 10000);
sprintf(mExtTrkLog, "delete( %p %ld )~%p\n\r", Pointer, Size, __builtin_return_address(0)); sprintf(mExtTrkLog, "delete( %p %ld )~%p\n\r", Pointer, Size, __builtin_return_address(0));
UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3); UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3);
for (short i = 0; i < MEM_TRK_MAX_SIZE; i++) for (short i = 0; i < MEM_TRK_MAX_SIZE; i++)
{ {
mTrkUART.Write(mExtTrkLog[i]);
if (mExtTrkLog[i] == '\r') if (mExtTrkLog[i] == '\r')
break; break;
mTrkUART.Write(mExtTrkLog[i]);
} }
mExtTrkLock.Unlock(); mExtTrkLock.Unlock();
} }
@ -617,14 +647,17 @@ void operator delete[](void *Pointer, long unsigned int Size)
#ifdef DEBUG #ifdef DEBUG
if (EnableExternalMemoryTracer) if (EnableExternalMemoryTracer)
{ {
mExtTrkLock.TimeoutLock(__FUNCTION__, 100000); char LockTmpStr[64];
strcpy_unsafe(LockTmpStr, __FUNCTION__);
strcat_unsafe(LockTmpStr, "_memTrk");
mExtTrkLock.TimeoutLock(LockTmpStr, 10000);
sprintf(mExtTrkLog, "delete[]( %p %ld )~%p\n\r", Pointer, Size, __builtin_return_address(0)); sprintf(mExtTrkLog, "delete[]( %p %ld )~%p\n\r", Pointer, Size, __builtin_return_address(0));
UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3); UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3);
for (short i = 0; i < MEM_TRK_MAX_SIZE; i++) for (short i = 0; i < MEM_TRK_MAX_SIZE; i++)
{ {
mTrkUART.Write(mExtTrkLog[i]);
if (mExtTrkLog[i] == '\r') if (mExtTrkLog[i] == '\r')
break; break;
mTrkUART.Write(mExtTrkLog[i]);
} }
mExtTrkLock.Unlock(); mExtTrkLock.Unlock();
} }

35
Library/Convert.cpp
View File

@ -642,14 +642,17 @@ EXTERNC __no_stack_protector void *__memcpy_chk(void *dest, const void *src, siz
#ifdef DEBUG #ifdef DEBUG
if (EnableExternalMemoryTracer) if (EnableExternalMemoryTracer)
{ {
mExtTrkLock.TimeoutLock(__FUNCTION__, 100000); char LockTmpStr[64];
strcpy_unsafe(LockTmpStr, __FUNCTION__);
strcat_unsafe(LockTmpStr, "_memTrk");
mExtTrkLock.TimeoutLock(LockTmpStr, 10000);
sprintf(mExtTrkLog, "memcpy( %p %p %ld %ld )=%p-%p>%p-%p~%p\n\r", dest, src, len, slen, src, (void *)((uintptr_t)src + len), dest, (void *)((uintptr_t)dest + len), __builtin_return_address(0)); sprintf(mExtTrkLog, "memcpy( %p %p %ld %ld )=%p-%p>%p-%p~%p\n\r", dest, src, len, slen, src, (void *)((uintptr_t)src + len), dest, (void *)((uintptr_t)dest + len), __builtin_return_address(0));
UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3); UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3);
for (short i = 0; i < MEM_TRK_MAX_SIZE; i++) for (short i = 0; i < MEM_TRK_MAX_SIZE; i++)
{ {
mTrkUART.Write(mExtTrkLog[i]);
if (mExtTrkLog[i] == '\r') if (mExtTrkLog[i] == '\r')
break; break;
mTrkUART.Write(mExtTrkLog[i]);
} }
mExtTrkLock.Unlock(); mExtTrkLock.Unlock();
} }
@ -710,14 +713,17 @@ EXTERNC __no_stack_protector void *__memset_chk(void *dest, int val, size_t len,
#ifdef DEBUG #ifdef DEBUG
if (EnableExternalMemoryTracer) if (EnableExternalMemoryTracer)
{ {
mExtTrkLock.TimeoutLock(__FUNCTION__, 100000); char LockTmpStr[64];
strcpy_unsafe(LockTmpStr, __FUNCTION__);
strcat_unsafe(LockTmpStr, "_memTrk");
mExtTrkLock.TimeoutLock(LockTmpStr, 10000);
sprintf(mExtTrkLog, "memset( %p %d %ld %ld )=%#x>%p-%p~%p\n\r", dest, val, len, slen, val, dest, (void *)((uintptr_t)dest + len), __builtin_return_address(0)); sprintf(mExtTrkLog, "memset( %p %d %ld %ld )=%#x>%p-%p~%p\n\r", dest, val, len, slen, val, dest, (void *)((uintptr_t)dest + len), __builtin_return_address(0));
UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3); UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3);
for (short i = 0; i < MEM_TRK_MAX_SIZE; i++) for (short i = 0; i < MEM_TRK_MAX_SIZE; i++)
{ {
mTrkUART.Write(mExtTrkLog[i]);
if (mExtTrkLog[i] == '\r') if (mExtTrkLog[i] == '\r')
break; break;
mTrkUART.Write(mExtTrkLog[i]);
} }
mExtTrkLock.Unlock(); mExtTrkLock.Unlock();
} }
@ -784,14 +790,17 @@ EXTERNC __no_stack_protector void *__memmove_chk(void *dest, const void *src, si
#ifdef DEBUG #ifdef DEBUG
if (EnableExternalMemoryTracer) if (EnableExternalMemoryTracer)
{ {
mExtTrkLock.TimeoutLock(__FUNCTION__, 100000); char LockTmpStr[64];
strcpy_unsafe(LockTmpStr, __FUNCTION__);
strcat_unsafe(LockTmpStr, "_memTrk");
mExtTrkLock.TimeoutLock(LockTmpStr, 10000);
sprintf(mExtTrkLog, "memmove( %p %p %ld %ld )=%p-%p>%p-%p~%p\n\r", dest, src, len, slen, dest, (void *)((uintptr_t)dest + len), src, (void *)((uintptr_t)src + len), __builtin_return_address(0)); sprintf(mExtTrkLog, "memmove( %p %p %ld %ld )=%p-%p>%p-%p~%p\n\r", dest, src, len, slen, dest, (void *)((uintptr_t)dest + len), src, (void *)((uintptr_t)src + len), __builtin_return_address(0));
UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3); UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3);
for (short i = 0; i < MEM_TRK_MAX_SIZE; i++) for (short i = 0; i < MEM_TRK_MAX_SIZE; i++)
{ {
mTrkUART.Write(mExtTrkLog[i]);
if (mExtTrkLog[i] == '\r') if (mExtTrkLog[i] == '\r')
break; break;
mTrkUART.Write(mExtTrkLog[i]);
} }
mExtTrkLock.Unlock(); mExtTrkLock.Unlock();
} }
@ -889,14 +898,17 @@ EXTERNC __no_stack_protector void *memcpy(void *dest, const void *src, size_t le
#ifdef DEBUG #ifdef DEBUG
if (EnableExternalMemoryTracer) if (EnableExternalMemoryTracer)
{ {
mExtTrkLock.TimeoutLock(__FUNCTION__, 100000); char LockTmpStr[64];
strcpy_unsafe(LockTmpStr, __FUNCTION__);
strcat_unsafe(LockTmpStr, "_memTrk");
mExtTrkLock.TimeoutLock(LockTmpStr, 10000);
sprintf(mExtTrkLog, "!memcpy( %p %p %ld )=%p-%p>%p-%p~%p\n\r", dest, src, len, dest, (void *)((uintptr_t)dest + len), src, (void *)((uintptr_t)src + len), __builtin_return_address(0)); sprintf(mExtTrkLog, "!memcpy( %p %p %ld )=%p-%p>%p-%p~%p\n\r", dest, src, len, dest, (void *)((uintptr_t)dest + len), src, (void *)((uintptr_t)src + len), __builtin_return_address(0));
UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3); UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3);
for (short i = 0; i < MEM_TRK_MAX_SIZE; i++) for (short i = 0; i < MEM_TRK_MAX_SIZE; i++)
{ {
mTrkUART.Write(mExtTrkLog[i]);
if (mExtTrkLog[i] == '\r') if (mExtTrkLog[i] == '\r')
break; break;
mTrkUART.Write(mExtTrkLog[i]);
} }
mExtTrkLock.Unlock(); mExtTrkLock.Unlock();
} }
@ -911,14 +923,17 @@ EXTERNC __no_stack_protector void *memset(void *dest, int val, size_t len)
#ifdef DEBUG #ifdef DEBUG
if (EnableExternalMemoryTracer) if (EnableExternalMemoryTracer)
{ {
mExtTrkLock.TimeoutLock(__FUNCTION__, 100000); char LockTmpStr[64];
strcpy_unsafe(LockTmpStr, __FUNCTION__);
strcat_unsafe(LockTmpStr, "_memTrk");
mExtTrkLock.TimeoutLock(LockTmpStr, 10000);
sprintf(mExtTrkLog, "!memset( %p %d %ld )=%p-%p~%p\n\r", dest, val, len, dest, (void *)((uintptr_t)dest + len), __builtin_return_address(0)); sprintf(mExtTrkLog, "!memset( %p %d %ld )=%p-%p~%p\n\r", dest, val, len, dest, (void *)((uintptr_t)dest + len), __builtin_return_address(0));
UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3); UniversalAsynchronousReceiverTransmitter::UART mTrkUART = UniversalAsynchronousReceiverTransmitter::UART(UniversalAsynchronousReceiverTransmitter::COM3);
for (short i = 0; i < MEM_TRK_MAX_SIZE; i++) for (short i = 0; i < MEM_TRK_MAX_SIZE; i++)
{ {
mTrkUART.Write(mExtTrkLog[i]);
if (mExtTrkLog[i] == '\r') if (mExtTrkLog[i] == '\r')
break; break;
mTrkUART.Write(mExtTrkLog[i]);
} }
mExtTrkLock.Unlock(); mExtTrkLock.Unlock();
} }