mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-09-10 03:01:56 -04:00
Aurora DVD support (#43)
* Aurora DVD support * Remove commented code * Restore STUB_LOG
This commit is contained in:
@@ -240,7 +240,7 @@ inline void* operator new[](size_t, JKRHeapToken, void* where) {
|
||||
#define JKR_NEW new (JKRHeapToken::Dummy)
|
||||
#define JKR_NEW_ARGS(...) new (JKRHeapToken::Dummy, __VA_ARGS__ )
|
||||
#define JKR_DELETE(expr) jkrDelete(expr)
|
||||
#define JKR_DELETE_ARRAY(expr) delete[] (expr)
|
||||
#define JKR_DELETE_ARRAY(expr) jkrDeleteArray(expr)
|
||||
#define JKR_HEAP_TOKEN , JKRHeapToken::Dummy
|
||||
#define JKR_HEAP_TOKEN_PARAM , JKRHeapToken
|
||||
#else
|
||||
@@ -261,7 +261,7 @@ void* operator new[](size_t size JKR_HEAP_TOKEN_PARAM, int alignment);
|
||||
void* operator new[](size_t size JKR_HEAP_TOKEN_PARAM, JKRHeap* heap, int alignment);
|
||||
|
||||
void operator delete(void* ptr JKR_HEAP_TOKEN_PARAM);
|
||||
void operator delete[](void* ptr);
|
||||
void operator delete[](void* ptr JKR_HEAP_TOKEN_PARAM);
|
||||
|
||||
#if TARGET_PC
|
||||
template<typename T>
|
||||
@@ -281,6 +281,10 @@ inline void jkrDelete(void* ptr) {
|
||||
|
||||
operator delete(ptr, JKRHeapToken::Dummy);
|
||||
}
|
||||
|
||||
static void jkrDeleteArray(void* ptr) {
|
||||
operator delete[](ptr, JKRHeapToken::Dummy);
|
||||
}
|
||||
#endif
|
||||
|
||||
void JKRDefaultMemoryErrorRoutine(void* heap, u32 size, int alignment);
|
||||
|
||||
@@ -38,7 +38,7 @@ void J2DScreen::clean() {
|
||||
mFontRes = NULL;
|
||||
|
||||
if (mNameTable != NULL) {
|
||||
JKR_DELETE_ARRAY(mNameTable->getResNameTable());
|
||||
JKR_DELETE_ARRAY(const_cast<ResNTAB*>(mNameTable->getResNameTable()));
|
||||
JKR_DELETE(mNameTable);
|
||||
mNameTable = NULL;
|
||||
}
|
||||
|
||||
@@ -3,7 +3,8 @@
|
||||
#include "JSystem/JGadget/binary.h"
|
||||
#include "JSystem/JGadget/define.h"
|
||||
#include "global.h"
|
||||
#include <stdint.h>
|
||||
#include <cstdint>
|
||||
#include <cstdlib>
|
||||
|
||||
#include "global.h"
|
||||
|
||||
|
||||
@@ -593,14 +593,6 @@ void* operator new[](size_t size) {
|
||||
return JKRHeap::alloc(size, 4, NULL);
|
||||
}
|
||||
#else
|
||||
void* operator new[](size_t size) {
|
||||
return fallback_alloc(size, 0, false);
|
||||
}
|
||||
|
||||
void* operator new[](std::size_t size, const std::nothrow_t&) noexcept {
|
||||
return fallback_alloc(size, 0, false);
|
||||
}
|
||||
|
||||
void* operator new[](size_t size JKR_HEAP_TOKEN_PARAM) {
|
||||
void* mem = JKRHeap::alloc(size, alignof(max_align_t), NULL);
|
||||
if (mem == NULL) {
|
||||
@@ -654,7 +646,7 @@ void operator delete[](void* ptr) {
|
||||
JKRHeap::free(ptr, NULL);
|
||||
}
|
||||
#else
|
||||
void operator delete[](void* ptr) {
|
||||
void operator delete[](void* ptr JKR_HEAP_TOKEN_PARAM) {
|
||||
if (ptr == NULL)
|
||||
return;
|
||||
JKRHeap* heap = JKRHeap::findFromRoot(ptr);
|
||||
|
||||
Reference in New Issue
Block a user