From 419b5bee0de2e67747d4e62d7481ff2828642748 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 18 Feb 2023 04:13:49 +0200 Subject: [PATCH] Replaced "__sync_synchronize" with "__sync" --- Core/Crash/UserHandler.cpp | 2 +- Core/Lock.cpp | 6 +++--- Core/Memory/Memory.cpp | 2 +- Execute/Elf/BaseLoad.cpp | 2 +- Tasking/Scheduler.cpp | 14 +++++++------- Tasking/Task.cpp | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Core/Crash/UserHandler.cpp b/Core/Crash/UserHandler.cpp index dedce6f..a101ce2 100644 --- a/Core/Crash/UserHandler.cpp +++ b/Core/Crash/UserHandler.cpp @@ -342,7 +342,7 @@ SafeFunction void UserModeExceptionHandler(CHArchTrapFrame *Frame) } TaskManager->GetCurrentThread()->Status = Tasking::TaskStatus::Terminated; - __sync_synchronize(); + __sync; error("End of report."); CPU::Interrupts(CPU::Enable); debug("Interrupts enabled back."); diff --git a/Core/Lock.cpp b/Core/Lock.cpp index c77acb4..0505ec2 100644 --- a/Core/Lock.cpp +++ b/Core/Lock.cpp @@ -58,14 +58,14 @@ Retry: CPUData *CoreData = GetCurrentCPU(); if (CoreData != nullptr) LockData.Core = CoreData->ID; - __sync_synchronize(); + __sync; return 0; } int LockClass::Unlock() { - __sync_synchronize(); + __sync; IsLocked.Store(false, MemoryOrder::Release); LockData.Count--; IsLocked = false; @@ -117,7 +117,7 @@ Retry: CPUData *CoreData = GetCurrentCPU(); if (CoreData != nullptr) LockData.Core = CoreData->ID; - __sync_synchronize(); + __sync; return 0; } diff --git a/Core/Memory/Memory.cpp b/Core/Memory/Memory.cpp index 3c5ccd2..4f77a3e 100644 --- a/Core/Memory/Memory.cpp +++ b/Core/Memory/Memory.cpp @@ -14,7 +14,7 @@ #ifdef DEBUG_ALLOCATIONS #define memdbg(m, ...) \ debug(m, ##__VA_ARGS__); \ - __sync_synchronize() + __sync #else #define memdbg(m, ...) #endif diff --git a/Execute/Elf/BaseLoad.cpp b/Execute/Elf/BaseLoad.cpp index 6f9d7e7..afded85 100644 --- a/Execute/Elf/BaseLoad.cpp +++ b/Execute/Elf/BaseLoad.cpp @@ -188,7 +188,7 @@ namespace Execute InterpreterTargetPath = new String(Path); /* We store in a String because Path may get changed while outside ELFLoad(). */ InterpreterMemoryImage = bl.MemoryImage; InterpreterNeededLibraries = bl.NeededLibraries; - __sync_synchronize(); + __sync; TCB *InterpreterIPCThread = TaskManager->CreateThread(TaskManager->GetCurrentProcess(), (IP)ELFInterpreterThreadWrapper); InterpreterIPCThread->Rename("ELF Interpreter IPC Thread"); InterpreterIPCThread->SetPriority(TaskPriority::Low); diff --git a/Tasking/Scheduler.cpp b/Tasking/Scheduler.cpp index 6652560..7b0e4e4 100644 --- a/Tasking/Scheduler.cpp +++ b/Tasking/Scheduler.cpp @@ -40,7 +40,7 @@ NewLock(SchedulerLock); #define schedbg(m, ...) \ debug(m, ##__VA_ARGS__); \ - __sync_synchronize() + __sync #else #define schedbg(m, ...) #endif @@ -49,7 +49,7 @@ NewLock(SchedulerLock); #ifdef DEBUG_GET_NEXT_AVAILABLE_PROCESS #define gnap_schedbg(m, ...) \ debug(m, ##__VA_ARGS__); \ - __sync_synchronize() + __sync #else #define gnap_schedbg(m, ...) #endif @@ -58,7 +58,7 @@ NewLock(SchedulerLock); #ifdef DEBUG_GET_NEXT_AVAILABLE_THREAD #define gnat_schedbg(m, ...) \ debug(m, ##__VA_ARGS__); \ - __sync_synchronize() + __sync #else #define gnat_schedbg(m, ...) #endif @@ -67,7 +67,7 @@ NewLock(SchedulerLock); #ifdef DEBUG_FIND_NEW_PROCESS #define fnp_schedbg(m, ...) \ debug(m, ##__VA_ARGS__); \ - __sync_synchronize() + __sync #else #define fnp_schedbg(m, ...) #endif @@ -76,7 +76,7 @@ NewLock(SchedulerLock); #ifdef DEBUG_SCHEDULER_SEARCH_PROCESS_THREAD #define sspt_schedbg(m, ...) \ debug(m, ##__VA_ARGS__); \ - __sync_synchronize() + __sync #else #define sspt_schedbg(m, ...) #endif @@ -85,7 +85,7 @@ NewLock(SchedulerLock); #ifdef DEBUG_WAKE_UP_THREADS #define wut_schedbg(m, ...) \ debug(m, ##__VA_ARGS__); \ - __sync_synchronize() + __sync #else #define wut_schedbg(m, ...) #endif @@ -637,7 +637,7 @@ namespace Tasking /* RealEnd->[Function Exit] */ RealEnd: this->SchedulerTicks.Store(CPU::Counter() - SchedTmpTicks); - __sync_synchronize(); /* TODO: Is this really needed? */ + __sync; /* TODO: Is this really needed? */ } SafeFunction __no_instrument_function void Task::OnInterruptReceived(CPU::x64::TrapFrame *Frame) { this->Schedule(Frame); } diff --git a/Tasking/Task.cpp b/Tasking/Task.cpp index 3342c75..a634ca0 100644 --- a/Tasking/Task.cpp +++ b/Tasking/Task.cpp @@ -22,7 +22,7 @@ #ifdef DEBUG_TASKING #define tskdbg(m, ...) \ debug(m, ##__VA_ARGS__); \ - __sync_synchronize() + __sync #else #define tskdbg(m, ...) #endif