wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 452674: change NanoAssert* macros to make it easier to check for nanojit assertions in automated testing. r=danderson.

Browse Source
This commit is contained in:
Jesse Ruderman 2008-08-28 16:57:49 -07:00
parent 977123733e
commit 12aa1d345a
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/nanojit/Assembler.cpp
View File

@ -666,7 +666,7 @@ namespace nanojit
verbose_only( verbose_outputf("--------------------------------------- exit block (LIR_xt|LIR_xf)") );
#ifdef NANOJIT_IA32
NanoAssertMsgf(_fpuStkDepth == _sv_fpuStkDepth, ("LIR_xtf, _fpuStkDepth=%d, expect %d\n",_fpuStkDepth, _sv_fpuStkDepth));
NanoAssertMsgf(_fpuStkDepth == _sv_fpuStkDepth, "LIR_xtf, _fpuStkDepth=%d, expect %d\n",_fpuStkDepth, _sv_fpuStkDepth);
debug_only( _fpuStkDepth = _sv_fpuStkDepth; _sv_fpuStkDepth = 9999; )
#endif
@ -769,7 +769,7 @@ namespace nanojit
// check for resource leaks
debug_only(
for(uint32_t i=_activation.lowwatermark;i<_activation.highwatermark; i++) {
NanoAssertMsgf(_activation.entry[i] == 0, ("frame entry %d wasn't freed\n",-4*i));
NanoAssertMsgf(_activation.entry[i] == 0, "frame entry %d wasn't freed\n",-4*i);
}
)

33
js/src/nanojit/nanojit.h
View File

@ -75,21 +75,30 @@ namespace nanojit
#if defined(_DEBUG)
#ifndef WIN32
#define DebugBreak() AvmAssert(0)
// The NANO_DIE macro matches the JS_Assert function in jsutil.cpp.
#if defined(WIN32)
#define NANO_DIE do { DebugBreak(); exit(3); } while(0)
#elif defined(XP_OS2) || (defined(__GNUC__) && defined(__i386))
#define NANO_DIE do { asm("int $3"); abort(); } while(0)
#else
#define NANO_DIE do { abort(); } while(0)
#endif
#define _NanoAssertMsg(a,m) do { if ((a)==0) { AvmDebugLog(("%s\n", m)); DebugBreak(); } } while (0)
#define NanoAssertMsg(x,y) do { _NanoAssertMsg((x), (y)); } while (0) /* no semi */
#define _NanoAssertMsgf(a,m) do { if ((a)==0) { AvmDebugLog(m); DebugBreak(); } } while (0)
#define NanoAssertMsgf(x,y) do { _NanoAssertMsgf((x), y); } while (0) /* no semi */
#define NanoAssert(x) _NanoAssert((x), __LINE__,__FILE__)
#define _NanoAssert(x, line_, file_) __NanoAssert((x), line_, file_)
#define __NanoAssert(x, line_, file_) do { NanoAssertMsg((x), "Assertion failed: \"" #x "\" (" #file_ ":" #line_ ")"); } while (0) /* no semi */
#define __NanoAssertMsgf(a, file_, line_, f, ...) \
if (!(a)) { \
fprintf(stderr, "Assertion failed: " f "%s (%s:%d)\n", __VA_ARGS__, #a, file_, line_); \
NANO_DIE; \
}
#define _NanoAssertMsgf(a, file_, line_, f, ...) __NanoAssertMsgf(a, file_, line_, f, __VA_ARGS__)
#define NanoAssertMsgf(a,f,...) do { __NanoAssertMsgf(a, __FILE__, __LINE__, f ": ", __VA_ARGS__); } while (0)
#define NanoAssertMsg(a,m) do { __NanoAssertMsgf(a, __FILE__, __LINE__, "\"%s\": ", m); } while (0)
#define NanoAssert(a) do { __NanoAssertMsgf(a, __FILE__, __LINE__, "%s", ""); } while (0)
#else
#define NanoAssertMsgf(x,y) do { } while (0) /* no semi */
#define NanoAssertMsg(x,y) do { } while (0) /* no semi */
#define NanoAssert(x) do { } while (0) /* no semi */
#define NanoAssertMsgf(x,y) do { } while (0) /* no semi */
#define NanoAssertMsg(x,y) do { } while (0) /* no semi */
#define NanoAssert(x) do { } while (0) /* no semi */
#endif
/**