i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel/arm/thread: convert TRACE to new syntax

Browse Source 
Change-Id: Iaf2876b92c130196a671f274e5fc36f6cccf1d0e
Reviewed-on: https://review.haiku-os.org/c/haiku/+/5445
Reviewed-by: Adrien Destugues <[email protected]>
This commit is contained in:
David Karoly
2022-07-11 19:34:03 +00:00
committed by waddlesplash
parent eedb92aace
commit 764c0853e8
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/arch/arm/arch_thread.cpp
+11 -11
View File
@@ -34,9 +34,9 @@
//#define TRACE_ARCH_THREAD //#define TRACE_ARCH_THREAD
#ifdef TRACE_ARCH_THREAD #ifdef TRACE_ARCH_THREAD
# define TRACE(x) dprintf x # define TRACE(x...) dprintf(x)
#else #else
# define TRACE(x) ; # define TRACE(x...) ;
#endif #endif
// Valid initial arch_thread state. We just memcpy() it when initializing // Valid initial arch_thread state. We just memcpy() it when initializing
@@ -97,8 +97,8 @@ arch_thread_init_kthread_stack(Thread* thread, void* _stack, void* _stackTop,
{ {
addr_t* stackTop = (addr_t*)_stackTop; addr_t* stackTop = (addr_t*)_stackTop;
TRACE(("arch_thread_init_kthread_stack(%s): stack top %p, function %p, data: " TRACE("arch_thread_init_kthread_stack(%s): stack top %p, function %p, data: "
"%p\n", thread->name, stackTop, function, data)); "%p\n", thread->name, stackTop, function, data);
// push the function address -- that's the return address used after the // push the function address -- that's the return address used after the
// context switch (lr/r14 register) // context switch (lr/r14 register)
@@ -175,16 +175,16 @@ arch_thread_context_switch(Thread *from, Thread *to)
((ARMVMTranslationMap *)newTranslationMap)->PagingStructures()->pgdir_phys; ((ARMVMTranslationMap *)newTranslationMap)->PagingStructures()->pgdir_phys;
if (oldPageDirectoryAddress != newPageDirectoryAddress) { if (oldPageDirectoryAddress != newPageDirectoryAddress) {
TRACE(("arch_thread_context_switch: swap pgdir: " TRACE("arch_thread_context_switch: swap pgdir: "
"0x%08" B_PRIxPHYSADDR " -> 0x%08" B_PRIxPHYSADDR "\n", "0x%08" B_PRIxPHYSADDR " -> 0x%08" B_PRIxPHYSADDR "\n",
oldPageDirectoryAddress, newPageDirectoryAddress)); oldPageDirectoryAddress, newPageDirectoryAddress);
arm_swap_pgdir(newPageDirectoryAddress); arm_swap_pgdir(newPageDirectoryAddress);
} }
TRACE(("arch_thread_context_switch: %p(%s/%p) -> %p(%s/%p)\n", TRACE("arch_thread_context_switch: %p(%s/%p) -> %p(%s/%p)\n",
from, from->name, from->arch_info.sp, to, to->name, to->arch_info.sp)); from, from->name, from->arch_info.sp, to, to->name, to->arch_info.sp);
arm_context_switch(&from->arch_info, &to->arch_info); arm_context_switch(&from->arch_info, &to->arch_info);
TRACE(("arch_thread_context_switch %p %p\n", to, from)); TRACE("arch_thread_context_switch %p %p\n", to, from);
} }
@@ -205,8 +205,8 @@ arch_thread_enter_userspace(Thread *thread, addr_t entry,
addr_t stackTop = thread->user_stack_base + thread->user_stack_size; addr_t stackTop = thread->user_stack_base + thread->user_stack_size;
TRACE(("arch_thread_enter_userspace: entry 0x%" B_PRIxADDR ", args %p %p, " TRACE("arch_thread_enter_userspace: entry 0x%" B_PRIxADDR ", args %p %p, "
"ustack_top 0x%" B_PRIxADDR "\n", entry, args1, args2, stackTop)); "ustack_top 0x%" B_PRIxADDR "\n", entry, args1, args2, stackTop);
//stackTop = arch_randomize_stack_pointer(stackTop - sizeof(args)); //stackTop = arch_randomize_stack_pointer(stackTop - sizeof(args));