Skip to content

Enable all debug flags when compiling in debug mode #498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 5, 2024
Merged

Enable all debug flags when compiling in debug mode #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f3d7ee
Enable all debug flags when compiling in debug mode
saghul Sep 5, 2024
b8b9f50
Fix misleading indentation compilation errors
saghul Sep 5, 2024
a1cea8d
Silence format-zero-length warning
saghul Sep 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,6 @@ endif()

add_library(qjs ${qjs_sources})
target_compile_definitions(qjs PRIVATE ${qjs_defines})
if(CMAKE_BUILD_TYPE MATCHES Debug OR DUMP_LEAKS)
target_compile_definitions(qjs PRIVATE
DUMP_LEAKS
)
endif()
target_include_directories(qjs PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
Expand Down
63 changes: 34 additions & 29 deletions quickjs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,31 +67,30 @@
#define CONFIG_ATOMICS
#endif

// Debug trace system:
// uncomment one or more DUMP_XXX definition to produce debug output.
// define the DUMP_XXX symbol as empty or 0 for unconditional output
// otherwhise the debug output will be produced to the dump stream (currently
// stdout) if qjs is invoked with -d<bitmask> with the corresponding bit set.

//#define DUMP_BYTECODE_FINAL 0x01 /* dump pass 3 final byte code */
//#define DUMP_BYTECODE_PASS2 0x02 /* dump pass 2 code */
//#define DUMP_BYTECODE_PASS1 0x04 /* dump pass 1 code */
//#define DUMP_BYTECODE_HEX 0x10 /* dump bytecode in hex */
//#define DUMP_BYTECODE_PC2LINE 0x20 /* dump line number table */
//#define DUMP_BYTECODE_STACK 0x40 /* dump compute_stack_size */
//#define DUMP_BYTECODE_STEP 0x80 /* dump executed bytecode */
//#define DUMP_READ_OBJECT 0x100 /* dump the marshalled objects at load time */
//#define DUMP_FREE 0x200 /* dump every object free */
//#define DUMP_GC 0x400 /* dump the occurrence of the automatic GC */
//#define DUMP_GC_FREE 0x800 /* dump objects freed by the GC */
//#define DUMP_MODULE_RESOLVE 0x1000 /* dump module resolution steps */
//#define DUMP_PROMISE 0x2000 /* dump promise steps */
//#define DUMP_LEAKS 0x4000 /* dump leaked objects and strings in JS_FreeRuntime */
//#define DUMP_ATOM_LEAKS 0x8000 /* dump leaked atoms in JS_FreeRuntime */
//#define DUMP_MEM 0x10000 /* dump memory usage in JS_FreeRuntime */
//#define DUMP_OBJECTS 0x20000 /* dump objects in JS_FreeRuntime */
//#define DUMP_ATOMS 0x40000 /* dump atoms in JS_FreeRuntime */
//#define DUMP_SHAPES 0x80000 /* dump shapes in JS_FreeRuntime */
// Debug trace system: the debug output will be produced to the dump stream (currently
// stdout) if qjs is invoked with -D<bitmask> with the corresponding bit set.

#ifndef NDEBUG
#define DUMP_BYTECODE_FINAL 0x01 /* dump pass 3 final byte code */
#define DUMP_BYTECODE_PASS2 0x02 /* dump pass 2 code */
#define DUMP_BYTECODE_PASS1 0x04 /* dump pass 1 code */
#define DUMP_BYTECODE_HEX 0x10 /* dump bytecode in hex */
#define DUMP_BYTECODE_PC2LINE 0x20 /* dump line number table */
#define DUMP_BYTECODE_STACK 0x40 /* dump compute_stack_size */
#define DUMP_BYTECODE_STEP 0x80 /* dump executed bytecode */
#define DUMP_READ_OBJECT 0x100 /* dump the marshalled objects at load time */
#define DUMP_FREE 0x200 /* dump every object free */
#define DUMP_GC 0x400 /* dump the occurrence of the automatic GC */
#define DUMP_GC_FREE 0x800 /* dump objects freed by the GC */
#define DUMP_MODULE_RESOLVE 0x1000 /* dump module resolution steps */
#define DUMP_PROMISE 0x2000 /* dump promise steps */
#define DUMP_LEAKS 0x4000 /* dump leaked objects and strings in JS_FreeRuntime */
#define DUMP_ATOM_LEAKS 0x8000 /* dump leaked atoms in JS_FreeRuntime */
#define DUMP_MEM 0x10000 /* dump memory usage in JS_FreeRuntime */
#define DUMP_OBJECTS 0x20000 /* dump objects in JS_FreeRuntime */
#define DUMP_ATOMS 0x40000 /* dump atoms in JS_FreeRuntime */
#define DUMP_SHAPES 0x80000 /* dump shapes in JS_FreeRuntime */
#endif

//#define FORCE_GC_AT_MALLOC /* test the GC by forcing it before each object allocation */

Expand Down Expand Up @@ -26494,8 +26493,10 @@ JSValue JS_GetModuleNamespace(JSContext *ctx, JSModuleDef *m)

#ifdef DUMP_MODULE_RESOLVE
#define module_trace(ctx, ...) \
do if (check_dump_flag(ctx->rt, DUMP_MODULE_RESOLVE)) \
printf(__VA_ARGS__); while (0)
do { \
if (check_dump_flag(ctx->rt, DUMP_MODULE_RESOLVE)) \
printf(__VA_ARGS__); \
} while (0)
#else
#define module_trace(...)
#endif
Expand Down Expand Up @@ -34042,6 +34043,7 @@ typedef struct BCReaderState {
} BCReaderState;

#ifdef DUMP_READ_OBJECT
#pragma GCC diagnostic ignored "-Wformat-zero-length"
static void __attribute__((format(printf, 2, 3))) bc_read_trace(BCReaderState *s, const char *fmt, ...) {
va_list ap;
int i, n, n0;
Expand Down Expand Up @@ -34075,6 +34077,7 @@ static void __attribute__((format(printf, 2, 3))) bc_read_trace(BCReaderState *s
if (strchr(fmt, '{'))
s->level++;
}
#pragma GCC diagnostic warning "-Wformat-zero-length"
#else
#define bc_read_trace(...)
#endif
Expand Down Expand Up @@ -46339,8 +46342,10 @@ static void promise_reaction_data_free(JSRuntime *rt,

#ifdef DUMP_PROMISE
#define promise_trace(ctx, ...) \
do if (check_dump_flag(ctx->rt, DUMP_PROMISE)) \
printf(__VA_ARGS__); while (0)
do { \
if (check_dump_flag(ctx->rt, DUMP_PROMISE)) \
printf(__VA_ARGS__); \
} while (0)
#else
#define promise_trace(...)
#endif
Expand Down
Loading