mirror of
https://github.com/PCSX2/pcsx2.git
synced 2026-07-11 09:44:17 +02:00
Common: reformat (#4720)
* common: format AlignedMalloc.cpp * common: format AppTrait.h * common: format Assertions.h * common: format CheckedStaticBox * common: format Console * common: format Dependencies.h * common: format EmbeddedImage * common: format EventSource * common: format Exceptions * common: format FastFormatString.cpp * common: format General.h * common: format InitInterface * common: format MathUtils.h * common: format MemsetFast/MemcpyFast * common: format Mutex.cpp * common: format PageFaultSource.h * common: format Path.h * common: format PathUtils.cpp * common: format Pcsx2Types.h * common: format Perf * common: format PersistentThread.h * common: format RwMutex * common: format SafeArray * common: format ScopedAlloc.h * common: format ScopedPtrMT.h * common: format Semaphore.cpp * common: format StringHelpers * common: format ThreadTools.cpp * common: format Threading.h * common: format ThreadingDialogs * common: format ThreadingInternal.h * common: format TraceLog.h * common: format VirtualMemory.cpp * common: format pxCheckBox * common: format pxEvents.h * common: format pxForwardDefs.h * common: format pxRadioPanel * common: format pxStaticText * common: format pxStreams * common: format pxTranslate.cpp * common: format pxWindowTextWriter.cpp * common: format wxAppWithHelpers * common: format wxBaseTools.h * common: format wxGuiTools * common: format wxHelpers.cpp * common: format Darwin directory * common: format Linux directory * common: format Windows directory * common: format LnxCpuDetect.cpp * common: format WinCpuDetect.cpp * common: format bmi.cpp * common: format cpudetect.cpp * common: format cpu_detect_internal.h * common: format fpu.cpp * common: format groups.cpp * common: format instructions.h * common: format internal.h * common: format jmp.cpp * common: format legacy.cpp * common: format legacy_instructions.h * common: format legacy_internal.h * common: format movs.cpp * common: format simd.cpp * common: format tools.h * common: format x86emitter.cpp * common: format x86types.h * common: format bmi.h * common: format dwshift.h * common: format group1.h group2.h group3.h * common: format incdec.h * common: format jmpcall.h * common: format movs.h * common: format simd_arithmetic.h * common: format simd_comparisons.h * common: format simd_helpers.h * common: format simd_moremovs.h * common: format simd_shufflepack.h * common: format simd_templated_helpers.h * common: format test.h
This commit is contained in:
+17
-16
@@ -21,33 +21,34 @@
|
||||
#include "common/Assertions.h"
|
||||
#include "common/ScopedAlloc.h"
|
||||
|
||||
void *__fastcall _aligned_malloc(size_t size, size_t align)
|
||||
void* __fastcall _aligned_malloc(size_t size, size_t align)
|
||||
{
|
||||
pxAssert(align < 0x10000);
|
||||
pxAssert(align < 0x10000);
|
||||
#if defined(__USE_ISOC11) && !defined(ASAN_WORKAROUND) // not supported yet on gcc 4.9
|
||||
return aligned_alloc(align, size);
|
||||
return aligned_alloc(align, size);
|
||||
#else
|
||||
void *result = 0;
|
||||
posix_memalign(&result, align, size);
|
||||
return result;
|
||||
void* result = 0;
|
||||
posix_memalign(&result, align, size);
|
||||
return result;
|
||||
#endif
|
||||
}
|
||||
|
||||
void *__fastcall pcsx2_aligned_realloc(void *handle, size_t new_size, size_t align, size_t old_size)
|
||||
void* __fastcall pcsx2_aligned_realloc(void* handle, size_t new_size, size_t align, size_t old_size)
|
||||
{
|
||||
pxAssert(align < 0x10000);
|
||||
pxAssert(align < 0x10000);
|
||||
|
||||
void *newbuf = _aligned_malloc(new_size, align);
|
||||
void* newbuf = _aligned_malloc(new_size, align);
|
||||
|
||||
if (newbuf != NULL && handle != NULL) {
|
||||
memcpy(newbuf, handle, std::min(old_size, new_size));
|
||||
_aligned_free(handle);
|
||||
}
|
||||
return newbuf;
|
||||
if (newbuf != NULL && handle != NULL)
|
||||
{
|
||||
memcpy(newbuf, handle, std::min(old_size, new_size));
|
||||
_aligned_free(handle);
|
||||
}
|
||||
return newbuf;
|
||||
}
|
||||
|
||||
__fi void _aligned_free(void *pmem)
|
||||
__fi void _aligned_free(void* pmem)
|
||||
{
|
||||
free(pmem);
|
||||
free(pmem);
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user