mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-16 01:11:50 +00:00
fb50df2c63
surprised if this doesn't build in Linux right now. The CMakeLists.txt
were checked with MinGW and NMake, but how they fair under Linux is an
unknown to me at this time.
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
- Added the gdtoa package from netlib's fp library so that ZDoom's printf-style
formatting can be entirely independant of the CRT.
SVN r1082 (trunk)
112 lines
3.3 KiB
C++
112 lines
3.3 KiB
C++
/*
|
|
** m_alloc.cpp
|
|
** Wrappers for the malloc family of functions that count used bytes.
|
|
**
|
|
**---------------------------------------------------------------------------
|
|
** Copyright 1998-2008 Randy Heit
|
|
** All rights reserved.
|
|
**
|
|
** Redistribution and use in source and binary forms, with or without
|
|
** modification, are permitted provided that the following conditions
|
|
** are met:
|
|
**
|
|
** 1. Redistributions of source code must retain the above copyright
|
|
** notice, this list of conditions and the following disclaimer.
|
|
** 2. Redistributions in binary form must reproduce the above copyright
|
|
** notice, this list of conditions and the following disclaimer in the
|
|
** documentation and/or other materials provided with the distribution.
|
|
** 3. The name of the author may not be used to endorse or promote products
|
|
** derived from this software without specific prior written permission.
|
|
**
|
|
** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
**---------------------------------------------------------------------------
|
|
**
|
|
*/
|
|
|
|
#include <malloc.h>
|
|
#include "i_system.h"
|
|
|
|
#ifndef _MSC_VER
|
|
#define _NORMAL_BLOCK 0
|
|
#define _malloc_dbg(s,b,f,l) malloc(s)
|
|
#define _realloc_dbg(p,s,b,f,l) realloc(p,s)
|
|
#endif
|
|
#ifndef _WIN32
|
|
#define _msize(p) malloc_usable_size(p) // from glibc/FreeBSD
|
|
#endif
|
|
|
|
#ifndef _DEBUG
|
|
void *M_Malloc(size_t size)
|
|
{
|
|
void *block = malloc(size);
|
|
|
|
if (block == NULL)
|
|
I_FatalError("Could not malloc %zu bytes", size);
|
|
|
|
GC::AllocBytes += _msize(block);
|
|
return block;
|
|
}
|
|
|
|
void *M_Realloc(void *memblock, size_t size)
|
|
{
|
|
if (memblock != NULL)
|
|
{
|
|
GC::AllocBytes -= _msize(memblock);
|
|
}
|
|
void *block = realloc(memblock, size);
|
|
if (block == NULL)
|
|
{
|
|
I_FatalError("Could not realloc %zu bytes", size);
|
|
}
|
|
GC::AllocBytes += _msize(block);
|
|
return block;
|
|
}
|
|
#else
|
|
#ifdef _MSC_VER
|
|
#include <crtdbg.h>
|
|
#endif
|
|
|
|
void *M_Malloc_Dbg(size_t size, const char *file, int lineno)
|
|
{
|
|
void *block = _malloc_dbg(size, _NORMAL_BLOCK, file, lineno);
|
|
|
|
if (block == NULL)
|
|
I_FatalError("Could not malloc %zu bytes", size);
|
|
|
|
GC::AllocBytes += _msize(block);
|
|
return block;
|
|
}
|
|
|
|
void *M_Realloc_Dbg(void *memblock, size_t size, const char *file, int lineno)
|
|
{
|
|
if (memblock != NULL)
|
|
{
|
|
GC::AllocBytes -= _msize(memblock);
|
|
}
|
|
void *block = _realloc_dbg(memblock, size, _NORMAL_BLOCK, file, lineno);
|
|
if (block == NULL)
|
|
{
|
|
I_FatalError("Could not realloc %zu bytes", size);
|
|
}
|
|
GC::AllocBytes += _msize(block);
|
|
return block;
|
|
}
|
|
#endif
|
|
|
|
void M_Free (void *block)
|
|
{
|
|
if (block != NULL)
|
|
{
|
|
GC::AllocBytes -= _msize(block);
|
|
free(block);
|
|
}
|
|
}
|