Mirrors/bx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bx.git synced 2026-02-17 20:52:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Branimir Karadžić
2017-02-06 16:05:58 -08:00
parent 8f9bafac31
commit 17e0713b7b
14 changed files with 49 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/bx/allocator.h
View File

@@ -8,7 +8,6 @@
#include "bx.h"
#include <string.h> //::memmove
#include <new>
#if BX_CONFIG_ALLOCATOR_DEBUG

2
include/bx/allocator.inl
View File

@@ -85,7 +85,7 @@ namespace bx
}
aligned = ptr + offset;
::memmove(newAligned, aligned, _size);
memMove(newAligned, aligned, _size);
uint32_t* header = (uint32_t*)newAligned - 1;
*header = uint32_t(newAligned - ptr);
return newAligned;

8
include/bx/handlealloc.inl
View File

@@ -7,10 +7,6 @@
# error "Must be included from bx/handlealloc.h!"
#endif // BX_HANDLE_ALLOC_H_HEADER_GUARD
#include "bx.h"
#include "allocator.h"
#include "uint32_t.h"
namespace bx
{
inline HandleAlloc::HandleAlloc(uint16_t _maxHandles)
@@ -236,7 +232,7 @@ namespace bx
template <uint16_t MaxHandlesT>
inline void HandleListT<MaxHandlesT>::reset()
{
memset(m_links, 0xff, sizeof(m_links) );
memSet(m_links, 0xff, sizeof(m_links) );
m_front = invalid;
m_back = invalid;
}
@@ -496,7 +492,7 @@ namespace bx
template <uint32_t MaxCapacityT, typename KeyT>
inline void HandleHashMapT<MaxCapacityT, KeyT>::reset()
{
memset(m_handle, 0xff, sizeof(m_handle) );
memSet(m_handle, 0xff, sizeof(m_handle) );
m_numElements = 0;
}

36
include/bx/pixelformat.inl
View File

@@ -641,67 +641,67 @@ namespace bx
// R32I
inline void packR32I(void* _dst, const float* _src)
{
memcpy(_dst, _src, 4);
memCopy(_dst, _src, 4);
}
inline void unpackR32I(float* _dst, const void* _src)
{
memcpy(_dst, _src, 4);
memCopy(_dst, _src, 4);
}
// R32U
inline void packR32U(void* _dst, const float* _src)
{
memcpy(_dst, _src, 4);
memCopy(_dst, _src, 4);
}
inline void unpackR32U(float* _dst, const void* _src)
{
memcpy(_dst, _src, 4);
memCopy(_dst, _src, 4);
}
// R32F
inline void packR32F(void* _dst, const float* _src)
{
memcpy(_dst, _src, 4);
memCopy(_dst, _src, 4);
}
inline void unpackR32F(float* _dst, const void* _src)
{
memcpy(_dst, _src, 4);
memCopy(_dst, _src, 4);
}
// RG32I
inline void packRg32I(void* _dst, const float* _src)
{
memcpy(_dst, _src, 8);
memCopy(_dst, _src, 8);
}
inline void unpackRg32I(float* _dst, const void* _src)
{
memcpy(_dst, _src, 8);
memCopy(_dst, _src, 8);
}
// RG32U
inline void packRg32U(void* _dst, const float* _src)
{
memcpy(_dst, _src, 8);
memCopy(_dst, _src, 8);
}
inline void unpackRg32U(float* _dst, const void* _src)
{
memcpy(_dst, _src, 8);
memCopy(_dst, _src, 8);
}
// RG32F
inline void packRg32F(void* _dst, const float* _src)
{
memcpy(_dst, _src, 8);
memCopy(_dst, _src, 8);
}
inline void unpackRg32F(float* _dst, const void* _src)
{
memcpy(_dst, _src, 8);
memCopy(_dst, _src, 8);
}
template<int32_t MantissaBits, int32_t ExpBits>
@@ -775,34 +775,34 @@ namespace bx
// RGBA32I
inline void packRgba32I(void* _dst, const float* _src)
{
memcpy(_dst, _src, 16);
memCopy(_dst, _src, 16);
}
inline void unpackRgba32I(float* _dst, const void* _src)
{
memcpy(_dst, _src, 16);
memCopy(_dst, _src, 16);
}
// RGBA32U
inline void packRgba32U(void* _dst, const float* _src)
{
memcpy(_dst, _src, 16);
memCopy(_dst, _src, 16);
}
inline void unpackRgba32U(float* _dst, const void* _src)
{
memcpy(_dst, _src, 16);
memCopy(_dst, _src, 16);
}
// RGBA32F
inline void packRgba32F(void* _dst, const float* _src)
{
memcpy(_dst, _src, 16);
memCopy(_dst, _src, 16);
}
inline void unpackRgba32F(float* _dst, const void* _src)
{
memcpy(_dst, _src, 16);
memCopy(_dst, _src, 16);
}
// R5G6B5

8
include/bx/radixsort.inl
View File

@@ -70,7 +70,7 @@ done:
if (0 != (pass&1) )
{
// Odd number of passes needs to do copy to the destination.
memcpy(_keys, _tempKeys, _size*sizeof(uint32_t) );
memCopy(_keys, _tempKeys, _size*sizeof(uint32_t) );
}
}
@@ -139,7 +139,7 @@ done:
if (0 != (pass&1) )
{
// Odd number of passes needs to do copy to the destination.
memcpy(_keys, _tempKeys, _size*sizeof(uint32_t) );
memCopy(_keys, _tempKeys, _size*sizeof(uint32_t) );
for (uint32_t ii = 0; ii < _size; ++ii)
{
_values[ii] = _tempValues[ii];
@@ -204,7 +204,7 @@ done:
if (0 != (pass&1) )
{
// Odd number of passes needs to do copy to the destination.
memcpy(_keys, _tempKeys, _size*sizeof(uint64_t) );
memCopy(_keys, _tempKeys, _size*sizeof(uint64_t) );
}
}
@@ -273,7 +273,7 @@ done:
if (0 != (pass&1) )
{
// Odd number of passes needs to do copy to the destination.
memcpy(_keys, _tempKeys, _size*sizeof(uint64_t) );
memCopy(_keys, _tempKeys, _size*sizeof(uint64_t) );
for (uint32_t ii = 0; ii < _size; ++ii)
{
_values[ii] = _tempValues[ii];

2
include/bx/readerwriter.h
View File

@@ -8,8 +8,6 @@
#include <alloca.h>
#include <stdarg.h> // va_list
#include <stdio.h>
#include <string.h>
#include "bx.h"
#include "allocator.h"

6
include/bx/readerwriter.inl
View File

@@ -170,7 +170,7 @@ namespace bx
int64_t remainder = m_top-m_pos;
int32_t size = uint32_min(_size, uint32_t(int64_min(remainder, INT32_MAX) ) );
memcpy(_data, &m_data[m_pos], size);
memCopy(_data, &m_data[m_pos], size);
m_pos += size;
if (size != _size)
{
@@ -242,7 +242,7 @@ namespace bx
int64_t remainder = m_size-m_pos;
int32_t size = uint32_min(_size, uint32_t(int64_min(remainder, INT32_MAX) ) );
memcpy(&m_data[m_pos], _data, size);
memCopy(&m_data[m_pos], _data, size);
m_pos += size;
m_top = int64_max(m_top, m_pos);
if (size != _size)
@@ -301,7 +301,7 @@ namespace bx
const uint32_t tmp1 = uint32_sels(256 - _size, 256, tmp0);
const uint32_t blockSize = uint32_sels(1024 - _size, 1024, tmp1);
uint8_t* temp = (uint8_t*)alloca(blockSize);
memset(temp, _byte, blockSize);
memSet(temp, _byte, blockSize);
int32_t size = 0;
while (0 < _size)

8
include/bx/ringbuffer.h
View File

@@ -222,12 +222,12 @@ namespace bx
if (eof < m_read)
{
wrap = m_control.m_size - m_read;
memcpy(_data, from, wrap);
memCopy(_data, from, wrap);
_data += wrap;
from = (const char*)&m_buffer[0];
}
memcpy(_data, from, _len-wrap);
memCopy(_data, from, _len-wrap);
m_read = eof;
}
@@ -292,12 +292,12 @@ namespace bx
if (eof < m_write)
{
wrap = m_control.m_size - m_write;
memcpy(to, _data, wrap);
memCopy(to, _data, wrap);
_data += wrap;
to = (char*)&m_buffer[0];
}
memcpy(to, _data, _len-wrap);
memCopy(to, _data, _len-wrap);
m_write = eof;
}

4
include/bx/string.inl
View File

@@ -43,8 +43,8 @@ namespace bx
{
Ty str = _str;
size_t startPos = 0;
const size_t fromLen = strlen(_from);
const size_t toLen = strlen(_to);
const size_t fromLen = strnlen(_from);
const size_t toLen = strnlen(_to);
while ( (startPos = str.find(_from, startPos) ) != Ty::npos)
{
str.replace(startPos, fromLen, _to);

8
src/crt.cpp
View File

@@ -7,6 +7,10 @@
#include <bx/readerwriter.h>
#include <bx/debug.h>
#if !BX_CRT_NONE
# include <string.h> // memcpy, memmove, memset
#endif // !BX_CRT_NONE
namespace bx
{
void* memCopyRef(void* _dst, const void* _src, size_t _numBytes)
@@ -70,7 +74,7 @@ namespace bx
// if (src+_numBytes <= dst || end <= src)
if (dst < src)
{
return memcpy(_dst, _src, _numBytes);
return memCopy(_dst, _src, _numBytes);
}
for (intptr_t ii = _numBytes-1; ii >= 0; --ii)
@@ -402,6 +406,6 @@ extern "C" void* memmove(void* _dst, const void* _src, size_t _numBytes)
extern "C" void* memset(void* _dst, int _ch, size_t _numBytes)
{
return bx::memSet(_dst, _ch, _numBytes);
return bx::memSet(_dst, uint8_t(_ch), _numBytes);
}
#endif // BX_CRT_NONE

2
src/os.cpp
View File

@@ -237,7 +237,7 @@ namespace bx
result = len != 0 && len < *_inOutSize;
if (len < *_inOutSize)
{
strcpy(_out, ptr);
strlncpy(_out, len, ptr);
}
}

2
src/string.cpp
View File

@@ -121,7 +121,7 @@ namespace bx
const size_t len = strnlen(_src, _num);
const size_t max = _dstSize-1;
const size_t num = (len < max ? len : max);
memcpy(_dst, _src, num);
memCopy(_dst, _src, num);
_dst[num] = '\0';
return num;

8
tests/string_test.cpp
View File

@@ -41,15 +41,15 @@ TEST_CASE("strlncpy", "")
REQUIRE(num == 0);
num = bx::strlncpy(dst, 3, "blah", 3);
REQUIRE(0 == strcmp(dst, "bl") );
REQUIRE(0 == bx::strncmp(dst, "bl") );
REQUIRE(num == 2);
num = bx::strlncpy(dst, sizeof(dst), "blah", 3);
REQUIRE(0 == strcmp(dst, "bla") );
REQUIRE(0 == bx::strncmp(dst, "bla") );
REQUIRE(num == 3);
num = bx::strlncpy(dst, sizeof(dst), "blah");
REQUIRE(0 == strcmp(dst, "blah") );
REQUIRE(0 == bx::strncmp(dst, "blah") );
REQUIRE(num == 4);
}
@@ -195,7 +195,7 @@ TEST_CASE("StringView", "")
st.append("test", 2);
REQUIRE(10 == st.getLength() );
REQUIRE(0 == strcmp(st.getPtr(), "testtestte") );
REQUIRE(0 == bx::strncmp(st.getPtr(), "testtestte") );
st.clear();
REQUIRE(0 == st.getLength() );

6
tests/vsnprintf_test.cpp
View File

@@ -18,12 +18,12 @@ TEST_CASE("vsnprintf truncated", "Truncated output buffer.")
char buffer[7];
REQUIRE(10 == bx::snprintf(buffer, BX_COUNTOF(buffer), "Ten chars!") );
REQUIRE(0 == strcmp(buffer, "Ten ch") );
REQUIRE(0 == bx::strncmp(buffer, "Ten ch") );
}
static bool test(const char* _expected, const char* _format, ...)
{
int32_t max = (int32_t)strlen(_expected) + 1;
int32_t max = (int32_t)bx::strnlen(_expected) + 1;
char* temp = (char*)alloca(max);
va_list argList;
@@ -33,7 +33,7 @@ static bool test(const char* _expected, const char* _format, ...)
bool result = true
&& len == max-1
&& 0 == strcmp(_expected, temp)
&& 0 == bx::strncmp(_expected, temp)
;
if (!result)