ee07a45712
Remove overload for C array decay, and fix up the call sites that required it.
174 lines
5.6 KiB
C++
174 lines
5.6 KiB
C++
/*
|
|
* Portions of this file are copyright Rebirth contributors and licensed as
|
|
* described in COPYING.txt.
|
|
* Portions of this file are copyright Parallax Software and licensed
|
|
* according to the Parallax license below.
|
|
* See COPYING.txt for license details.
|
|
|
|
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
|
|
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
|
|
END-USERS, AND SUBJECT TO ALL OF THE TERMS AND CONDITIONS HEREIN, GRANTS A
|
|
ROYALTY-FREE, PERPETUAL LICENSE TO SUCH END-USERS FOR USE BY SUCH END-USERS
|
|
IN USING, DISPLAYING, AND CREATING DERIVATIVE WORKS THEREOF, SO LONG AS
|
|
SUCH USE, DISPLAY OR CREATION IS FOR NON-COMMERCIAL, ROYALTY OR REVENUE
|
|
FREE PURPOSES. IN NO EVENT SHALL THE END-USER USE THE COMPUTER CODE
|
|
CONTAINED HEREIN FOR REVENUE-BEARING PURPOSES. THE END-USER UNDERSTANDS
|
|
AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE.
|
|
COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <stdlib.h>
|
|
#include <type_traits>
|
|
|
|
#ifdef __cplusplus
|
|
#include <memory>
|
|
#include "dxxsconf.h"
|
|
#include "dsx-ns.h"
|
|
#include <utility>
|
|
|
|
#define MEM_K 1.5 // Dynamic array growth factor
|
|
|
|
#ifdef DEBUG_BIAS_MEMORY_ALLOCATIONS
|
|
#include <array>
|
|
#define DXX_DEBUG_BIAS_MEMORY_ALLOCATION (sizeof(std::array<double, 2>))
|
|
#else
|
|
#define DXX_DEBUG_BIAS_MEMORY_ALLOCATION (0)
|
|
#endif
|
|
|
|
namespace dcx {
|
|
|
|
#ifdef DEBUG_MEMORY_ALLOCATIONS
|
|
void mem_init(void);
|
|
|
|
void mem_display_blocks();
|
|
__attribute_alloc_size(1)
|
|
__attribute_malloc()
|
|
void *mem_malloc(size_t size, const char *var, const char *file, unsigned line);
|
|
void * mem_calloc( size_t nmemb, size_t size, const char * var, const char * filename, unsigned line) __attribute_alloc_size(1,2) __attribute_malloc();
|
|
__attribute_alloc_size(2)
|
|
void *mem_realloc(void *buffer, size_t size, const char *var, const char *file, unsigned line);
|
|
extern void mem_free( void * buffer );
|
|
|
|
/* DPH: Changed malloc, etc. to d_malloc. Overloading system calls is very evil and error prone */
|
|
|
|
// Checks to see if any blocks are overwritten
|
|
void mem_validate_heap();
|
|
|
|
#define mem_calloc(nmemb,size,var,file,line) ((mem_calloc)((size) ? (nmemb) : 0, (size), (var), (file), (line)))
|
|
|
|
#else
|
|
|
|
#ifdef DEBUG_BIAS_MEMORY_ALLOCATIONS
|
|
#define bias_malloc(SIZE) ({ \
|
|
auto p = malloc((SIZE) + DXX_DEBUG_BIAS_MEMORY_ALLOCATION); \
|
|
p ? p + DXX_DEBUG_BIAS_MEMORY_ALLOCATION : p; \
|
|
})
|
|
/* Bias calloc wastes a bit extra to keep the math simple */
|
|
#define bias_calloc(NMEMB,SIZE) ({ \
|
|
auto p = calloc((NMEMB), (SIZE) + DXX_DEBUG_BIAS_MEMORY_ALLOCATION); \
|
|
p ? p + DXX_DEBUG_BIAS_MEMORY_ALLOCATION : p; \
|
|
})
|
|
#define bias_realloc(PTR,SIZE) ({ \
|
|
auto p = realloc(reinterpret_cast<char *>(PTR) - DXX_DEBUG_BIAS_MEMORY_ALLOCATION, (SIZE) + DXX_DEBUG_BIAS_MEMORY_ALLOCATION); \
|
|
p ? p + DXX_DEBUG_BIAS_MEMORY_ALLOCATION : p; \
|
|
})
|
|
#define bias_free(PTR) free(reinterpret_cast<char *>(PTR) - DXX_DEBUG_BIAS_MEMORY_ALLOCATION)
|
|
#else
|
|
#define bias_malloc malloc
|
|
#define bias_calloc calloc
|
|
#define bias_realloc realloc
|
|
#define bias_free free
|
|
#endif
|
|
|
|
#define mem_malloc(size,var,file,line) ((void)var,(void)file,(void)line,bias_malloc((size)))
|
|
#define mem_calloc(nmemb,size,var,file,line) ((void)var,(void)file,(void)line,bias_calloc((nmemb),(size)))
|
|
#define mem_realloc(ptr,size,var,file,line) ((void)var,(void)file,(void)line,bias_realloc((ptr),(size)))
|
|
#define mem_free bias_free
|
|
|
|
static inline void mem_init(void)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
template <typename T>
|
|
T *MALLOC(T *&r, std::size_t count, const char *var, const char *file, unsigned line)
|
|
{
|
|
static_assert(std::is_pod<T>::value, "MALLOC cannot allocate non-POD");
|
|
return r = reinterpret_cast<T *>(mem_malloc(count * sizeof(T), var, file, line));
|
|
}
|
|
|
|
template <typename T>
|
|
T *CALLOC(T *&r, std::size_t count, const char *var, const char *file, unsigned line)
|
|
{
|
|
static_assert(std::is_pod<T>::value, "CALLOC cannot allocate non-POD");
|
|
return r = reinterpret_cast<T *>(mem_calloc(count, sizeof(T), var, file, line));
|
|
}
|
|
|
|
#define d_malloc(size) mem_malloc((size),"Unknown", __FILE__,__LINE__ )
|
|
#define d_realloc(ptr,size) mem_realloc((ptr),(size),"Unknown", __FILE__,__LINE__ )
|
|
template <typename T>
|
|
static inline void d_free(T *&ptr)
|
|
{
|
|
static_assert((std::is_same<T, void>::value || std::is_pod<T>::value), "d_free cannot free non-POD");
|
|
mem_free(std::exchange(ptr, nullptr));
|
|
}
|
|
|
|
template <typename T>
|
|
class RAIIdmem_deleter
|
|
{
|
|
public:
|
|
void operator()(T *v) const
|
|
{
|
|
d_free(v);
|
|
}
|
|
};
|
|
|
|
template <typename T>
|
|
class RAIIdmem_deleter<T[]> : public RAIIdmem_deleter<T>
|
|
{
|
|
public:
|
|
typedef T *pointer;
|
|
};
|
|
|
|
template <typename T>
|
|
class RAIIdmem : public std::unique_ptr<T, RAIIdmem_deleter<T>>
|
|
{
|
|
typedef std::unique_ptr<T, RAIIdmem_deleter<T>> base_ptr;
|
|
public:
|
|
static_assert(std::is_pod<typename base_ptr::element_type>::value, "RAIIdmem cannot manage non-POD");
|
|
DXX_INHERIT_CONSTRUCTORS(RAIIdmem, base_ptr);
|
|
};
|
|
|
|
/* Disallow C-style arrays of known bound. Use RAIIdmem<std::array<T, N>>
|
|
* for this case.
|
|
*/
|
|
template <typename T, std::size_t N>
|
|
class RAIIdmem<T[N]>
|
|
{
|
|
public:
|
|
RAIIdmem() = delete;
|
|
};
|
|
|
|
template <typename T>
|
|
RAIIdmem<T> &MALLOC(RAIIdmem<T> &r, std::size_t count, const char *var, const char *file, unsigned line)
|
|
{
|
|
typename RAIIdmem<T>::pointer p;
|
|
return r.reset(MALLOC<typename RAIIdmem<T>::element_type>(p, count, var, file, line)), r;
|
|
}
|
|
|
|
template <typename T>
|
|
void CALLOC(RAIIdmem<T> &r, std::size_t count, const char *var, const char *file, unsigned line)
|
|
{
|
|
typename RAIIdmem<T>::pointer p;
|
|
r.reset(CALLOC<typename RAIIdmem<T>::element_type>(p, count, var, file, line));
|
|
}
|
|
|
|
#define MALLOC( var, type, count ) (MALLOC<type>(var, (count),#var, __FILE__,__LINE__ ))
|
|
#define CALLOC( var, type, count ) (CALLOC<type>(var, (count),#var, __FILE__,__LINE__ ))
|
|
|
|
}
|
|
|
|
#endif
|