forked from 0ad/0ad
janwas
c0ed950657
this snowballed into a massive search+destroy of the hodgepodge of mostly equivalent types we had in use (int, uint, unsigned, unsigned int, i32, u32, ulong, uintN). it is more efficient to use 64-bit types in 64-bit mode, so the preferred default is size_t (for anything remotely resembling a size or index). tile coordinates are ssize_t to allow more efficient conversion to/from floating point. flags are int because we almost never need more than 15 distinct bits, bit test/set is not slower and int is fastest to type. finally, some data that is pretty much directly passed to OpenGL is now typed accordingly. after several hours, the code now requires fewer casts and less guesswork. other changes: - unit and player IDs now have an "invalid id" constant in the respective class to avoid casting and -1 - fix some endian/64-bit bugs in the map (un)packing. added a convenience function to write/read a size_t. - ia32: change CPUID interface to allow passing in ecx (required for cache topology detection, which I need at work). remove some unneeded functions from asm, replace with intrinsics where possible. This was SVN commit r5942.
46 lines
1.3 KiB
C++
46 lines
1.3 KiB
C++
#include "precompiled.h"
|
|
#include "ScriptableComplex.h"
|
|
#include "ScriptableComplex.inl"
|
|
|
|
#include "lib/allocators/bucket.h"
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// suballocator for CJSComplex.m_Properties elements
|
|
// (must come after property defs, which are currently in the header)
|
|
//-----------------------------------------------------------------------------
|
|
|
|
static Bucket bucket;
|
|
// HACK: it needs to be created/destroyed; since there is no
|
|
// global init/shutdown call here, we keep a refcnt. this assumes that
|
|
// going to 0 <==> shutdown! if that proves wrong, bucket_alloc will warn.
|
|
static size_t suballoc_refs; // initialized in suballoc_attach
|
|
|
|
void jscomplexproperty_suballoc_attach()
|
|
{
|
|
ONCE(\
|
|
size_t el_size = std::max(sizeof(CJSValComplexProperty), sizeof(CJSComplexProperty<int, true>));\
|
|
(void)bucket_create(&bucket, el_size);\
|
|
suballoc_refs = 0;\
|
|
);
|
|
suballoc_refs++;
|
|
}
|
|
|
|
void jscomplexproperty_suballoc_detach()
|
|
{
|
|
suballoc_refs--;
|
|
if(suballoc_refs == 0)
|
|
bucket_destroy(&bucket);
|
|
}
|
|
|
|
void* jscomplexproperty_suballoc()
|
|
{
|
|
return bucket_alloc(&bucket, 0);
|
|
}
|
|
|
|
void jscomplexproperty_suballoc_free(IJSComplexProperty* p)
|
|
{
|
|
// explicit dtor since caller uses placement new
|
|
p->~IJSComplexProperty();
|
|
bucket_free(&bucket, p);
|
|
}
|