TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Add wrappers for more precise Valgrind physfs diagnostics

Browse source
This commit is contained in:
Kp 2017-01-01 23:19:21 +00:00
parent 61fe5c2bbd
commit 55822d0b4d
4 changed files with 79 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SConstruct
View file

@ -3563,6 +3563,8 @@ class DXXArchive(DXXCommon):
'misc/hmp.cpp',
'misc/ignorecase.cpp',
'misc/strutil.cpp',
'misc/vgrphys.cpp',
'misc/vgwphys.cpp',
'texmap/ntmap.cpp',
'texmap/scanline.cpp'
]

26
common/misc/vg-wrap-physfs.h Normal file
View file

@ -0,0 +1,26 @@
#include <physfs.h>
#include "dxxsconf.h"
#ifndef DXX_ENABLE_wrap_PHYSFS_write
#define DXX_ENABLE_wrap_PHYSFS_write DXX_HAVE_POISON_VALGRIND
#endif
#if DXX_ENABLE_wrap_PHYSFS_write
extern "C" {
DXX_VG_DECLARE_EXTERN_C(PHYSFS_write);
DXX_VG_DECLARE_EXTERN_C(PHYSFS_writeSBE16);
DXX_VG_DECLARE_EXTERN_C(PHYSFS_writeSBE32);
DXX_VG_DECLARE_EXTERN_C(PHYSFS_writeSLE16);
DXX_VG_DECLARE_EXTERN_C(PHYSFS_writeSLE32);
DXX_VG_DECLARE_EXTERN_C(PHYSFS_writeULE16);
DXX_VG_DECLARE_EXTERN_C(PHYSFS_writeULE32);
}
DXX_VG_DEFINE_WRITE(PHYSFS_writeSBE16, PHYSFS_sint16);
DXX_VG_DEFINE_WRITE(PHYSFS_writeSBE32, PHYSFS_sint32);
DXX_VG_DEFINE_WRITE(PHYSFS_writeSLE16, PHYSFS_sint16);
DXX_VG_DEFINE_WRITE(PHYSFS_writeSLE32, PHYSFS_sint32);
DXX_VG_DEFINE_WRITE(PHYSFS_writeULE16, PHYSFS_uint16);
DXX_VG_DEFINE_WRITE(PHYSFS_writeULE32, PHYSFS_uint32);
#endif

16
common/misc/vgrphys.cpp Normal file
View file

@ -0,0 +1,16 @@
#define DXX_VG_DECLARE_EXTERN_C(F) \
decltype(F) __real_##F
#define DXX_VG_DEFINE_WRITE(F,V) \
int __real_##F(PHYSFS_File *const file, V val) { \
return F(file, val); \
}
#include "vg-wrap-physfs.h"
#if DXX_ENABLE_wrap_PHYSFS_write
PHYSFS_sint64 __real_PHYSFS_write(PHYSFS_File *const handle, const void *const buffer, const PHYSFS_uint32 objSize, const PHYSFS_uint32 objCount)
{
return PHYSFS_write(handle, buffer, objSize, objCount);
}
#endif

35
common/misc/vgwphys.cpp Normal file
View file

@ -0,0 +1,35 @@
#define DXX_VG_DECLARE_EXTERN_C(F) \
decltype(F) __real_##F, __wrap_##F
#define DXX_VG_DEFINE_WRITE(F,V) \
int __wrap_##F(PHYSFS_File *const file, V val) { \
dxx_vg_wrap_check_value(__builtin_return_address(0), &val, sizeof(val)); \
return __real_##F(file, val); \
}
static void dxx_vg_wrap_check_value(const void *, const void *, unsigned long);
#include "vg-wrap-physfs.h"
#if DXX_ENABLE_wrap_PHYSFS_write
#include "console.h"
#include "dxxerror.h"
#include "poison.h"
static void dxx_vg_wrap_check_value(const void *const ret, const void *const val, const unsigned long vlen)
{
if (const auto o = VALGRIND_CHECK_MEM_IS_DEFINED(val, vlen))
con_printf(CON_URGENT, DXX_STRINGIZE_FL(__FILE__, __LINE__, "BUG: ret=%p VALGRIND_CHECK_MEM_IS_DEFINED(%p, %lu)=%p (offset=%p)"), ret, val, vlen, reinterpret_cast<void *>(o), reinterpret_cast<void *>(o - reinterpret_cast<uintptr_t>(val)));
}
PHYSFS_sint64 __wrap_PHYSFS_write(PHYSFS_File *const handle, const void *const buffer, const PHYSFS_uint32 objSize, const PHYSFS_uint32 objCount)
{
const uint8_t *p = reinterpret_cast<const uint8_t *>(buffer);
for (PHYSFS_uint32 i = 0; i != objCount; ++i, p += objSize)
{
if (const auto o = VALGRIND_CHECK_MEM_IS_DEFINED(p, objSize))
con_printf(CON_URGENT, DXX_STRINGIZE_FL(__FILE__, __LINE__, "BUG: ret=%p buffer=%p i=%.3u/%.3u VALGRIND_CHECK_MEM_IS_DEFINED(%p, %u)=%p (offset=%p)"), __builtin_return_address(0), buffer, i, objCount, p, objSize, reinterpret_cast<void *>(o), reinterpret_cast<void *>(o - reinterpret_cast<uintptr_t>(p)));
}
return __real_PHYSFS_write(handle, buffer, objSize, objCount);
}
#endif