diff --git a/sljit_src/sljitConfig.h b/sljit_src/sljitConfig.h
index 364c8bb7..993f4fe2 100644
--- a/sljit_src/sljitConfig.h
+++ b/sljit_src/sljitConfig.h
@@ -29,7 +29,7 @@
 
 #ifdef __cplusplus
 extern "C" {
-#endif
+#endif /* __cplusplus */
 
 /*
   This file contains the basic configuration options for the SLJIT compiler
@@ -47,19 +47,19 @@ extern "C" {
 #ifndef SLJIT_UTIL_STACK
 /* Enabled by default */
 #define SLJIT_UTIL_STACK 1
-#endif
+#endif /* SLJIT_UTIL_STACK */
 
 /* Uses user provided allocator to allocate the stack (see SLJIT_UTIL_STACK) */
 #ifndef SLJIT_UTIL_SIMPLE_STACK_ALLOCATION
 /* Disabled by default */
 #define SLJIT_UTIL_SIMPLE_STACK_ALLOCATION 0
-#endif
+#endif /* SLJIT_UTIL_SIMPLE_STACK_ALLOCATION */
 
 /* Single threaded application. Does not require any locks. */
 #ifndef SLJIT_SINGLE_THREADED
 /* Disabled by default. */
 #define SLJIT_SINGLE_THREADED 0
-#endif
+#endif /* SLJIT_SINGLE_THREADED */
 
 /* --------------------------------------------------------------------- */
 /*  Configuration                                                        */
@@ -70,7 +70,7 @@ extern "C" {
 #ifndef SLJIT_STD_MACROS_DEFINED
 /* Disabled by default. */
 #define SLJIT_STD_MACROS_DEFINED 0
-#endif
+#endif /* SLJIT_STD_MACROS_DEFINED */
 
 /* Executable code allocation:
    If SLJIT_EXECUTABLE_ALLOCATOR is not defined, the application should
@@ -93,7 +93,7 @@ extern "C" {
 #ifndef SLJIT_PROT_EXECUTABLE_ALLOCATOR
 /* Disabled by default. */
 #define SLJIT_PROT_EXECUTABLE_ALLOCATOR 0
-#endif
+#endif /* SLJIT_PROT_EXECUTABLE_ALLOCATOR */
 
 /* When SLJIT_WX_EXECUTABLE_ALLOCATOR is enabled SLJIT uses an
    allocator which does not set writable and executable permission
@@ -104,7 +104,7 @@ extern "C" {
 #ifndef SLJIT_WX_EXECUTABLE_ALLOCATOR
 /* Disabled by default. */
 #define SLJIT_WX_EXECUTABLE_ALLOCATOR 0
-#endif
+#endif /* SLJIT_WX_EXECUTABLE_ALLOCATOR */
 
 #endif /* !SLJIT_EXECUTABLE_ALLOCATOR */
 
@@ -112,19 +112,19 @@ extern "C" {
 #ifndef SLJIT_ARGUMENT_CHECKS
 /* Disabled by default */
 #define SLJIT_ARGUMENT_CHECKS 0
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 
 /* Debug checks (assertions, etc.). */
 #ifndef SLJIT_DEBUG
 /* Enabled by default */
 #define SLJIT_DEBUG 1
-#endif
+#endif /* SLJIT_DEBUG */
 
 /* Verbose operations. */
 #ifndef SLJIT_VERBOSE
 /* Enabled by default */
 #define SLJIT_VERBOSE 1
-#endif
+#endif /* SLJIT_VERBOSE */
 
 /*
   SLJIT_IS_FPU_AVAILABLE
@@ -137,6 +137,6 @@ extern "C" {
 
 #ifdef __cplusplus
 } /* extern "C" */
-#endif
+#endif /* __cplusplus */
 
 #endif /* SLJIT_CONFIG_H_ */
diff --git a/sljit_src/sljitConfigCPU.h b/sljit_src/sljitConfigCPU.h
index 2720bdab..dcf88efb 100644
--- a/sljit_src/sljitConfigCPU.h
+++ b/sljit_src/sljitConfigCPU.h
@@ -169,7 +169,7 @@
 #if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6) || (defined SLJIT_CONFIG_ARM_V7 && SLJIT_CONFIG_ARM_V7) \
 	|| (defined SLJIT_CONFIG_ARM_THUMB2 && SLJIT_CONFIG_ARM_THUMB2)
 #define SLJIT_CONFIG_ARM_32 1
-#endif
+#endif /* SLJIT_CONFIG_ARM_V6 || SLJIT_CONFIG_ARM_V7 || SLJIT_CONFIG_ARM_THUMB2 */
 
 #if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32) || (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
 #define SLJIT_CONFIG_X86 1
diff --git a/sljit_src/sljitLir.c b/sljit_src/sljitLir.c
index fc36a14f..3685d499 100644
--- a/sljit_src/sljitLir.c
+++ b/sljit_src/sljitLir.c
@@ -119,9 +119,9 @@
 
 #if (defined SLJIT_32BIT_ARCHITECTURE && SLJIT_32BIT_ARCHITECTURE)
 #define ABUF_SIZE	2048
-#else
+#else /* !SLJIT_32BIT_ARCHITECTURE */
 #define ABUF_SIZE	4096
-#endif
+#endif /* SLJIT_32BIT_ARCHITECTURE */
 
 /* Parameter parsing. */
 #define REG_MASK		0x7f
@@ -346,19 +346,19 @@
 
 #if defined(__NetBSD__)
 #include "allocator_src/sljitProtExecAllocatorNetBSD.c"
-#else
+#else /* !__NetBSD__ */
 #include "allocator_src/sljitProtExecAllocatorPosix.c"
-#endif
+#endif /* __NetBSD__ */
 
 #elif (defined SLJIT_WX_EXECUTABLE_ALLOCATOR && SLJIT_WX_EXECUTABLE_ALLOCATOR)
 
 #if defined(_WIN32)
 #include "allocator_src/sljitWXExecAllocatorWindows.c"
-#else
+#else /* !_WIN32 */
 #include "allocator_src/sljitWXExecAllocatorPosix.c"
-#endif
+#endif /* _WIN32 */
 
-#else
+#else /* !SLJIT_PROT_EXECUTABLAE_ALLOCATOR && !SLJIT_WX_EXECUTABLE_ALLOCATOR */
 
 #if defined(_WIN32)
 #include "allocator_src/sljitExecAllocatorWindows.c"
@@ -366,25 +366,25 @@
 #include "allocator_src/sljitExecAllocatorApple.c"
 #elif defined(__FreeBSD__)
 #include "allocator_src/sljitExecAllocatorFreeBSD.c"
-#else
+#else /* !_WIN32 && !__APPLE__ && !__FreeBSD__ */
 #include "allocator_src/sljitExecAllocatorPosix.c"
-#endif
+#endif /* _WIN32 */
 
-#endif
+#endif /* SLJIT_PROT_EXECUTABLE_ALLOCATOR */
 
 #else /* !SLJIT_EXECUTABLE_ALLOCATOR */
 
 #ifndef SLJIT_UPDATE_WX_FLAGS
 #define SLJIT_UPDATE_WX_FLAGS(from, to, enable_exec)
-#endif
+#endif /* SLJIT_UPDATE_WX_FLAGS */
 
 #endif /* SLJIT_EXECUTABLE_ALLOCATOR */
 
 #if (defined SLJIT_PROT_EXECUTABLE_ALLOCATOR && SLJIT_PROT_EXECUTABLE_ALLOCATOR)
 #define SLJIT_ADD_EXEC_OFFSET(ptr, exec_offset) ((sljit_u8 *)(ptr) + (exec_offset))
-#else
+#else /* !SLJIT_PROT_EXECUTABLE_ALLOCATOR */
 #define SLJIT_ADD_EXEC_OFFSET(ptr, exec_offset) ((sljit_u8 *)(ptr))
-#endif
+#endif /* SLJIT_PROT_EXECUTABLE_ALLOCATOR */
 
 /* Argument checking features. */
 
@@ -446,7 +446,7 @@
 #define CHECK_PTR(x) x
 #define CHECK_REG_INDEX(x) x
 
-#else
+#else /* !SLJIT_ARGUMENT_CHECKS && !SLJIT_DEBUG && !SLJIT_VERBOSE */
 
 /* Arguments are not checked. */
 #define CHECK(x)
@@ -464,7 +464,7 @@
 static sljit_s32 compiler_initialized = 0;
 /* A thread safe initialization. */
 static void init_compiler(void);
-#endif
+#endif /* SLJIT_CONFIG_X86 */
 
 SLJIT_API_FUNC_ATTRIBUTE struct sljit_compiler* sljit_create_compiler(void *allocator_data)
 {
@@ -552,7 +552,7 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_compiler* sljit_create_compiler(void *allo
 		init_compiler();
 		compiler_initialized = 1;
 	}
-#endif
+#endif /* SLJIT_NEEDS_COMPILER_INIT */
 
 	return compiler;
 }
@@ -580,7 +580,7 @@ SLJIT_API_FUNC_ATTRIBUTE void sljit_free_compiler(struct sljit_compiler *compile
 
 #if (defined SLJIT_CONFIG_ARM_V6 && SLJIT_CONFIG_ARM_V6)
 	SLJIT_FREE(compiler->cpool, allocator_data);
-#endif
+#endif /* SLJIT_CONFIG_ARM_V6 */
 	SLJIT_FREE(compiler, allocator_data);
 }
 
@@ -623,14 +623,14 @@ SLJIT_API_FUNC_ATTRIBUTE void sljit_set_current_flags(struct sljit_compiler *com
 
 #if (defined SLJIT_HAS_STATUS_FLAGS_STATE && SLJIT_HAS_STATUS_FLAGS_STATE)
 	compiler->status_flags_state = current_flags;
-#endif
+#endif /* SLJIT_HAS_STATUS_FLAGS_STATE */
 
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	compiler->last_flags = 0;
 	if ((current_flags & ~(VARIABLE_FLAG_MASK | SLJIT_SET_Z | SLJIT_CURRENT_FLAGS_ALL)) == 0) {
 		compiler->last_flags = GET_FLAG_TYPE(current_flags) | (current_flags & (SLJIT_32 | SLJIT_SET_Z));
 	}
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 }
 
 /* --------------------------------------------------------------------- */
@@ -683,11 +683,11 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_alloc_memory(struct sljit_compiler *compile
 	if (size <= 0 || size > 128)
 		return NULL;
 	size = (size + 7) & ~7;
-#else
+#else /* !SLJIT_64BIT_ARCHITECTURE */
 	if (size <= 0 || size > 64)
 		return NULL;
 	size = (size + 3) & ~3;
-#endif
+#endif /* SLJIT_64BIT_ARCHITECTURE */
 	return ensure_abuf(compiler, (sljit_uw)size);
 }
 
@@ -787,7 +787,7 @@ static SLJIT_INLINE void set_emit_enter(struct sljit_compiler *compiler,
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	compiler->last_return = args & SLJIT_ARG_MASK;
 	compiler->logical_local_size = local_size;
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 }
 
 static SLJIT_INLINE void set_set_context(struct sljit_compiler *compiler,
@@ -809,7 +809,7 @@ static SLJIT_INLINE void set_set_context(struct sljit_compiler *compiler,
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	compiler->last_return = args & SLJIT_ARG_MASK;
 	compiler->logical_local_size = local_size;
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 }
 
 static SLJIT_INLINE void set_label(struct sljit_label *label, struct sljit_compiler *compiler)
@@ -924,9 +924,9 @@ static sljit_s32 function_check_arguments(sljit_s32 arg_types, sljit_s32 scratch
 
 #if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
 #define CHECK_IF_VIRTUAL_REGISTER(p) ((p) <= SLJIT_S3 && (p) >= SLJIT_S8)
-#else
+#else /* !SLJIT_CONFIG_X86_32 */
 #define CHECK_IF_VIRTUAL_REGISTER(p) 0
-#endif
+#endif /* SLJIT_CONFIG_X86_32 */
 
 static sljit_s32 function_check_src_mem(struct sljit_compiler *compiler, sljit_s32 p, sljit_sw i)
 {
@@ -1115,15 +1115,15 @@ SLJIT_API_FUNC_ATTRIBUTE void sljit_compiler_verbose(struct sljit_compiler *comp
 #ifdef _WIN64
 #ifdef __GNUC__
 #	define SLJIT_PRINT_D	"ll"
-#else
+#else /* !__GNUC__ */
 #	define SLJIT_PRINT_D	"I64"
-#endif
-#else
+#endif  /* __GNUC__ */
+#else /* !_WIN64 */
 #	define SLJIT_PRINT_D	"l"
-#endif
-#else
+#endif /* _WIN64 */
+#else /* !SLJIT_64BIT_ARCHITECTURE */
 #	define SLJIT_PRINT_D	""
-#endif
+#endif /* SLJIT_64BIT_ARCHITECTURE */
 
 static void sljit_verbose_reg(struct sljit_compiler *compiler, sljit_s32 r)
 {
@@ -1322,7 +1322,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_generate_code(struct sljit_com
 {
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	struct sljit_jump *jump;
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 
 	SLJIT_UNUSED_ARG(compiler);
 
@@ -1334,7 +1334,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_generate_code(struct sljit_com
 		CHECK_ARGUMENT((jump->flags & JUMP_ADDR) || jump->u.label != NULL);
 		jump = jump->next;
 	}
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 	CHECK_RETURN_OK;
 }
 
@@ -1426,7 +1426,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_enter(struct sljit_compil
 			ENTER_GET_REGS(scratches), ENTER_GET_REGS(saveds), ENTER_GET_FLOAT_REGS(scratches), ENTER_GET_FLOAT_REGS(saveds), local_size);
 #endif /* SLJIT_SEPARATE_VECTOR_REGISTERS */
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -1443,7 +1443,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_set_context(struct sljit_compi
 	sljit_s32 real_vscratches = ENTER_GET_VECTOR_REGS(scratches);
 	sljit_s32 real_vsaveds = ENTER_GET_VECTOR_REGS(saveds);
 #endif /* SLJIT_SEPARATE_VECTOR_REGISTERS */
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 	SLJIT_UNUSED_ARG(compiler);
 
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
@@ -1471,7 +1471,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_set_context(struct sljit_compi
 		(options & SLJIT_ENTER_REG_ARG) ? 0 : real_saveds, real_fscratches));
 
 	compiler->last_flags = 0;
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  set_context ret[%s", call_arg_names[arg_types & SLJIT_ARG_MASK]);
@@ -1512,7 +1512,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_set_context(struct sljit_compi
 			ENTER_GET_REGS(scratches), ENTER_GET_REGS(saveds), ENTER_GET_FLOAT_REGS(scratches), ENTER_GET_FLOAT_REGS(saveds), local_size);
 #endif /* SLJIT_SEPARATE_VECTOR_REGISTERS */
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -1527,13 +1527,13 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_return_void(struct sljit_
 
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	CHECK_ARGUMENT(compiler->last_return == SLJIT_ARG_TYPE_RET_VOID);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  return_void\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -1572,7 +1572,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_return(struct sljit_compi
 		FUNCTION_FCHECK(src, srcw, op & SLJIT_32);
 	}
 	compiler->last_flags = 0;
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		if (GET_OPCODE(op) < SLJIT_MOV_F64) {
@@ -1585,7 +1585,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_return(struct sljit_compi
 		}
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -1594,14 +1594,14 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_return_to(struct sljit_co
 {
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	FUNCTION_CHECK_SRC(src, srcw);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  return_to ");
 		sljit_verbose_param(compiler, src, srcw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -1614,7 +1614,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op0(struct sljit_compiler
 	CHECK_ARGUMENT(SLJIT_CHECK_OPCODE(op, 0) < SLJIT_LMUL_UW || SLJIT_CHECK_OPCODE(op, 0) >= SLJIT_MEMORY_BARRIER || compiler->scratches >= 2);
 	if ((SLJIT_CHECK_OPCODE(op, 0) >= SLJIT_LMUL_UW && SLJIT_CHECK_OPCODE(op, 0) <= SLJIT_DIV_SW) || op == SLJIT_SKIP_FRAMES_BEFORE_RETURN)
 		compiler->last_flags = 0;
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose))
 	{
@@ -1624,7 +1624,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op0(struct sljit_compiler
 		}
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -1659,7 +1659,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op1(struct sljit_compiler
 
 	FUNCTION_CHECK_DST(dst, dstw);
 	FUNCTION_CHECK_SRC(src, srcw);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  %s%s%s ", op1_names[GET_OPCODE(op) - SLJIT_OP1_BASE],
@@ -1670,7 +1670,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op1(struct sljit_compiler
 		sljit_verbose_param(compiler, src, srcw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -1848,7 +1848,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op2(struct sljit_compiler
 	FUNCTION_CHECK_SRC(src1, src1w);
 	FUNCTION_CHECK_SRC(src2, src2w);
 	compiler->last_flags = GET_FLAG_TYPE(op) | (op & (SLJIT_32 | SLJIT_SET_Z));
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  %s%s%s%s%s ", op2_names[GET_OPCODE(op) - SLJIT_OP2_BASE], !(op & SLJIT_32) ? "" : "32",
@@ -1864,7 +1864,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op2(struct sljit_compiler
 		sljit_verbose_param(compiler, src2, src2w);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -1879,7 +1879,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op2r(struct sljit_compile
 	FUNCTION_CHECK_SRC(src1, src1w);
 	FUNCTION_CHECK_SRC(src2, src2w);
 	compiler->last_flags = 0;
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  %s%s ", op2r_names[GET_OPCODE(op) - SLJIT_OP2R_BASE], !(op & SLJIT_32) ? "" : "32");
@@ -1891,7 +1891,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op2r(struct sljit_compile
 		sljit_verbose_param(compiler, src2, src2w);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -1910,7 +1910,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_shift_into(struct sljit_c
 	CHECK_ARGUMENT(FUNCTION_CHECK_IS_REG(src2_reg));
 	FUNCTION_CHECK_SRC(src3, src3w);
 	CHECK_ARGUMENT(dst_reg != src2_reg);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  %s%s.into%s ", op2_names[GET_OPCODE(op) - SLJIT_OP2_BASE], !(op & SLJIT_32) ? "" : "32",
@@ -1925,7 +1925,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_shift_into(struct sljit_c
 		sljit_verbose_param(compiler, src3, src3w);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -1942,14 +1942,14 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op_src(struct sljit_compi
 	} else if (op >= SLJIT_PREFETCH_L1 && op <= SLJIT_PREFETCH_ONCE) {
 		CHECK_ARGUMENT(src & SLJIT_MEM);
 	}
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  %s ", op_src_dst_names[op - SLJIT_OP_SRC_DST_BASE]);
 		sljit_verbose_param(compiler, src, srcw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -1962,14 +1962,14 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op_dst(struct sljit_compi
 
 	if (op == SLJIT_FAST_ENTER)
 		compiler->last_flags = 0;
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  %s ", op_src_dst_names[op - SLJIT_OP_SRC_DST_BASE]);
 		sljit_verbose_param(compiler, dst, dstw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -1993,7 +1993,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_get_register_index(sljit_s32 t
 		CHECK_ARGUMENT((reg > 0 && reg <= SLJIT_NUMBER_OF_FLOAT_REGISTERS)
 			|| (reg >= SLJIT_TMP_FREGISTER_BASE && reg < (SLJIT_TMP_FREGISTER_BASE + SLJIT_NUMBER_OF_TEMPORARY_FLOAT_REGISTERS)));
 	}
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 	CHECK_RETURN_OK;
 }
 
@@ -2002,7 +2002,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op_custom(struct sljit_co
 {
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	sljit_u32 i;
-#endif
+#endif /* SLJIT_VERBOSE */
 
 	SLJIT_UNUSED_ARG(compiler);
 
@@ -2016,12 +2016,12 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op_custom(struct sljit_co
 		|| (size == 4 && (((sljit_sw)instruction) & 0x3) == 0));
 #elif (defined SLJIT_CONFIG_S390X && SLJIT_CONFIG_S390X)
 	CHECK_ARGUMENT(size == 2 || size == 4 || size == 6);
-#else
+#else /* !SLJIT_CONFIG_X86 && !SLJIT_CONFIG_ARM_THUMB2 && !SLJIT_CONFIG_S390X */
 	CHECK_ARGUMENT(size == 4 && (((sljit_sw)instruction) & 0x3) == 0);
-#endif
+#endif /* SLJIT_CONFIG_X86 */
 
 	compiler->last_flags = 0;
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  op_custom");
@@ -2029,7 +2029,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op_custom(struct sljit_co
 			fprintf(compiler->verbose, " 0x%x", ((sljit_u8*)instruction)[i]);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2048,7 +2048,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fop1(struct sljit_compile
 	CHECK_ARGUMENT(!(op & (SLJIT_SET_Z | VARIABLE_FLAG_MASK)));
 	FUNCTION_FVCHECK(src, srcw, op & SLJIT_32);
 	FUNCTION_FVCHECK(dst, dstw, op & SLJIT_32);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		if (GET_OPCODE(op) == SLJIT_CONV_F64_FROM_F32)
@@ -2063,7 +2063,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fop1(struct sljit_compile
 		sljit_verbose_fparam(compiler, src, srcw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2073,7 +2073,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fop1_cmp(struct sljit_com
 {
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	compiler->last_flags = GET_FLAG_TYPE(op) | (op & SLJIT_32);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 
 	if (SLJIT_UNLIKELY(compiler->skip_checks)) {
 		compiler->skip_checks = 0;
@@ -2088,7 +2088,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fop1_cmp(struct sljit_com
 		|| (GET_FLAG_TYPE(op) >= SLJIT_F_EQUAL && GET_FLAG_TYPE(op) <= SLJIT_ORDERED_LESS_EQUAL));
 	FUNCTION_FCHECK(src1, src1w, op & SLJIT_32);
 	FUNCTION_FCHECK(src2, src2w, op & SLJIT_32);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  %s%s", fop1_names[SLJIT_CMP_F64 - SLJIT_FOP1_BASE], (op & SLJIT_32) ? ".f32" : ".f64");
@@ -2101,7 +2101,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fop1_cmp(struct sljit_com
 		sljit_verbose_fparam(compiler, src2, src2w);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2119,7 +2119,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fop1_conv_sw_from_f64(str
 	CHECK_ARGUMENT(!(op & (SLJIT_SET_Z | VARIABLE_FLAG_MASK)));
 	FUNCTION_FCHECK(src, srcw, op & SLJIT_32);
 	FUNCTION_CHECK_DST(dst, dstw);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  %s%s.from%s ", fop1_names[GET_OPCODE(op) - SLJIT_FOP1_BASE],
@@ -2130,7 +2130,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fop1_conv_sw_from_f64(str
 		sljit_verbose_fparam(compiler, src, srcw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2148,7 +2148,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fop1_conv_f64_from_w(stru
 	CHECK_ARGUMENT(!(op & (SLJIT_SET_Z | VARIABLE_FLAG_MASK)));
 	FUNCTION_CHECK_SRC(src, srcw);
 	FUNCTION_FCHECK(dst, dstw, op & SLJIT_32);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  %s%s.from.%s ", fop1_names[GET_OPCODE(op) - SLJIT_FOP1_BASE],
@@ -2159,7 +2159,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fop1_conv_f64_from_w(stru
 		sljit_verbose_param(compiler, src, srcw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2180,7 +2180,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fop2(struct sljit_compile
 	FUNCTION_FCHECK(src1, src1w, op & SLJIT_32);
 	FUNCTION_FCHECK(src2, src2w, op & SLJIT_32);
 	FUNCTION_FCHECK(dst, dstw, op & SLJIT_32);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  %s%s ", fop2_names[GET_OPCODE(op) - SLJIT_FOP2_BASE], (op & SLJIT_32) ? ".f32" : ".f64");
@@ -2191,7 +2191,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fop2(struct sljit_compile
 		sljit_verbose_fparam(compiler, src2, src2w);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2206,7 +2206,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fop2r(struct sljit_compil
 	FUNCTION_FCHECK(src1, src1w, op & SLJIT_32);
 	FUNCTION_FCHECK(src2, src2w, op & SLJIT_32);
 	CHECK_ARGUMENT(FUNCTION_CHECK_IS_FREG(dst_freg, op & SLJIT_32));
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  %s%s ", fop2r_names[GET_OPCODE(op) - SLJIT_FOP2R_BASE], (op & SLJIT_32) ? ".f32" : ".f64");
@@ -2217,7 +2217,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fop2r(struct sljit_compil
 		sljit_verbose_fparam(compiler, src2, src2w);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2234,14 +2234,14 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fset32(struct sljit_compi
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	CHECK_ARGUMENT(sljit_has_cpu_feature(SLJIT_HAS_FPU));
 	CHECK_ARGUMENT(FUNCTION_CHECK_IS_FREG(freg, 1));
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  fset32 ");
 		sljit_verbose_freg(compiler, freg);
 		fprintf(compiler->verbose, ", %f\n", value);
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2258,14 +2258,14 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fset64(struct sljit_compi
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	CHECK_ARGUMENT(sljit_has_cpu_feature(SLJIT_HAS_FPU));
 	CHECK_ARGUMENT(FUNCTION_CHECK_IS_FREG(freg, 0));
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  fset64 ");
 		sljit_verbose_freg(compiler, freg);
 		fprintf(compiler->verbose, ", %f\n", value);
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2303,7 +2303,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fcopy(struct sljit_compil
 		break;
 	}
 #endif /* SLJIT_64BIT_ARCHITECTURE */
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  copy%s_%s_f%s ", (op & SLJIT_32) ? "32" : "",
@@ -2323,7 +2323,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fcopy(struct sljit_compil
 			fprintf(compiler->verbose, "\n");
 		}
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2338,12 +2338,12 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_label(struct sljit_compil
 
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	compiler->last_flags = 0;
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose))
 		fprintf(compiler->verbose, "label:\n");
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2353,9 +2353,9 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_label(struct sljit_compil
 #define CHECK_UNORDERED(type, last_flags) \
 	((((type) & 0xfe) == SLJIT_ORDERED) && \
 		((last_flags) & 0xff) >= SLJIT_UNORDERED && ((last_flags) & 0xff) <= SLJIT_ORDERED_LESS_EQUAL)
-#else
+#else /* !SLJIT_CONFIG_X86 || SLJIT_CONFIG_ARM */
 #define CHECK_UNORDERED(type, last_flags) 0
-#endif
+#endif /* SLJIT_CONFIG_X86 || SLJIT_CONFIG_ARM */
 #endif /* SLJIT_ARGUMENT_CHECKS */
 
 static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_jump(struct sljit_compiler *compiler, sljit_s32 type)
@@ -2379,12 +2379,12 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_jump(struct sljit_compile
 			CHECK_ARGUMENT((type & 0xfe) == (compiler->last_flags & 0xff)
 				|| CHECK_UNORDERED(type, compiler->last_flags));
 	}
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose))
 		fprintf(compiler->verbose, "  jump%s %s\n", !(type & SLJIT_REWRITABLE_JUMP) ? "" : ".r",
 			jump_names[type & 0xff]);
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2405,7 +2405,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_call(struct sljit_compile
 			CHECK_ARGUMENT((type & 0xff) != SLJIT_CALL_REG_ARG);
 		}
 	}
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  %s%s%s ret[%s", jump_names[type & 0xff],
@@ -2425,7 +2425,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_call(struct sljit_compile
 		}
 		fprintf(compiler->verbose, "]\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2439,7 +2439,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_cmp(struct sljit_compiler
 	FUNCTION_CHECK_SRC(src1, src1w);
 	FUNCTION_CHECK_SRC(src2, src2w);
 	compiler->last_flags = 0;
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  cmp%s%s %s, ", (type & SLJIT_32) ? "32" : "",
@@ -2449,7 +2449,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_cmp(struct sljit_compiler
 		sljit_verbose_param(compiler, src2, src2w);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2464,7 +2464,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fcmp(struct sljit_compile
 	FUNCTION_FCHECK(src1, src1w, type & SLJIT_32);
 	FUNCTION_FCHECK(src2, src2w, type & SLJIT_32);
 	compiler->last_flags = 0;
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  fcmp%s%s %s, ", (type & SLJIT_32) ? ".f32" : ".f64",
@@ -2474,7 +2474,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fcmp(struct sljit_compile
 		sljit_verbose_fparam(compiler, src2, src2w);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2489,14 +2489,14 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_ijump(struct sljit_compil
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	CHECK_ARGUMENT(type >= SLJIT_JUMP && type <= SLJIT_FAST_CALL);
 	FUNCTION_CHECK_SRC(src, srcw);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  ijump.%s ", jump_names[type]);
 		sljit_verbose_param(compiler, src, srcw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2519,7 +2519,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_icall(struct sljit_compil
 			CHECK_ARGUMENT((type & 0xff) != SLJIT_CALL_REG_ARG);
 		}
 	}
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  i%s%s ret[%s", jump_names[type & 0xff],
@@ -2540,7 +2540,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_icall(struct sljit_compil
 		sljit_verbose_param(compiler, src, srcw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2564,7 +2564,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op_flags(struct sljit_com
 
 	if (GET_OPCODE(op) >= SLJIT_ADD)
 		compiler->last_flags = GET_FLAG_TYPE(op) | (op & (SLJIT_32 | SLJIT_SET_Z));
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  flags.%s%s%s ",
@@ -2574,7 +2574,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_op_flags(struct sljit_com
 		sljit_verbose_param(compiler, dst, dstw);
 		fprintf(compiler->verbose, ", %s\n", jump_names[type]);
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2601,7 +2601,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_select(struct sljit_compi
 	} else
 		CHECK_ARGUMENT((cond & 0xfe) == (compiler->last_flags & 0xff)
 			|| CHECK_UNORDERED(cond, compiler->last_flags));
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  select%s %s, ",
@@ -2614,7 +2614,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_select(struct sljit_compi
 		sljit_verbose_reg(compiler, src2_reg);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2641,7 +2641,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fselect(struct sljit_comp
 	} else
 		CHECK_ARGUMENT((cond & 0xfe) == (compiler->last_flags & 0xff)
 			|| CHECK_UNORDERED(cond, compiler->last_flags));
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  fselect%s %s, ",
@@ -2654,7 +2654,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fselect(struct sljit_comp
 		sljit_verbose_freg(compiler, src2_freg);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2708,7 +2708,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_mem(struct sljit_compiler
 	}
 
 	FUNCTION_CHECK_SRC_MEM(mem, memw);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		if ((type & 0xff) == SLJIT_MOV32)
@@ -2740,7 +2740,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_mem(struct sljit_compiler
 		sljit_verbose_param(compiler, mem, memw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2759,7 +2759,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_mem_update(struct sljit_c
 	CHECK_ARGUMENT((mem & REG_MASK) != 0 && (mem & REG_MASK) != reg);
 
 	FUNCTION_CHECK_SRC_MEM(mem, memw);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		if (type & SLJIT_MEM_SUPP)
@@ -2785,7 +2785,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_mem_update(struct sljit_c
 		sljit_verbose_param(compiler, mem, memw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2809,7 +2809,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fmem(struct sljit_compile
 	CHECK_ARGUMENT(!(type & ~(0xff | SLJIT_32 | SLJIT_MEM_STORE | SLJIT_MEM_UNALIGNED | SLJIT_MEM_ALIGNED_16 | SLJIT_MEM_ALIGNED_32)));
 	CHECK_ARGUMENT(FUNCTION_CHECK_IS_FREG(freg, type & SLJIT_32));
 	FUNCTION_CHECK_SRC_MEM(mem, memw);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  %s.%s",
@@ -2829,7 +2829,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fmem(struct sljit_compile
 		sljit_verbose_param(compiler, mem, memw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2843,7 +2843,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fmem_update(struct sljit_
 	CHECK_ARGUMENT((type & ~(0xff | SLJIT_32 | SLJIT_MEM_STORE | SLJIT_MEM_SUPP | SLJIT_MEM_POST)) == 0);
 	FUNCTION_CHECK_SRC_MEM(mem, memw);
 	CHECK_ARGUMENT(FUNCTION_CHECK_IS_FREG(freg, type & SLJIT_32));
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		if (type & SLJIT_MEM_SUPP)
@@ -2863,7 +2863,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_fmem_update(struct sljit_
 		sljit_verbose_param(compiler, mem, memw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2879,7 +2879,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_mov(struct sljit_com
 	CHECK_ARGUMENT(SLJIT_SIMD_GET_ELEM2_SIZE(type) <= (srcdst & SLJIT_MEM) ? SLJIT_SIMD_GET_REG_SIZE(type) : 0);
 	CHECK_ARGUMENT(FUNCTION_CHECK_IS_VREG(vreg, 0));
 	FUNCTION_VCHECK(srcdst, srcdstw, 0);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		if (type & SLJIT_SIMD_TEST)
@@ -2905,7 +2905,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_mov(struct sljit_com
 		sljit_verbose_vparam(compiler, srcdst, srcdstw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2929,7 +2929,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_replicate(struct slj
 	} else if (src != SLJIT_IMM) {
 		FUNCTION_CHECK_DST(src, srcw);
 	}
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		if (type & SLJIT_SIMD_TEST)
@@ -2952,7 +2952,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_replicate(struct slj
 			sljit_verbose_param(compiler, src, srcw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -2977,7 +2977,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_lane_mov(struct slji
 	} else if ((type & SLJIT_SIMD_STORE) || srcdst != SLJIT_IMM) {
 		FUNCTION_CHECK_DST(srcdst, srcdstw);
 	}
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		if (type & SLJIT_SIMD_TEST)
@@ -3004,7 +3004,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_lane_mov(struct slji
 			sljit_verbose_param(compiler, srcdst, srcdstw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -3020,7 +3020,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_lane_replicate(struc
 	CHECK_ARGUMENT(FUNCTION_CHECK_IS_VREG(vreg, 0));
 	CHECK_ARGUMENT(FUNCTION_CHECK_IS_VREG(src, 0));
 	CHECK_ARGUMENT(src_lane_index >= 0 && src_lane_index < (1 << (SLJIT_SIMD_GET_REG_SIZE(type) - SLJIT_SIMD_GET_ELEM_SIZE(type))));
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		if (type & SLJIT_SIMD_TEST)
@@ -3040,7 +3040,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_lane_replicate(struc
 		sljit_verbose_vreg(compiler, src);
 		fprintf(compiler->verbose, "[%d]\n", src_lane_index);
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -3057,7 +3057,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_extend(struct sljit_
 	CHECK_ARGUMENT(SLJIT_SIMD_GET_ELEM_SIZE(type) < SLJIT_SIMD_GET_ELEM2_SIZE(type));
 	CHECK_ARGUMENT(FUNCTION_CHECK_IS_VREG(vreg, 0));
 	FUNCTION_VCHECK(src, srcw, SLJIT_SIMD_GET_ELEM_SIZE(type) == 2);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		if (type & SLJIT_SIMD_TEST)
@@ -3080,7 +3080,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_extend(struct sljit_
 		sljit_verbose_vparam(compiler, src, srcw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -3095,7 +3095,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_sign(struct sljit_co
 	CHECK_ARGUMENT(SLJIT_SIMD_GET_ELEM_SIZE(type) < SLJIT_SIMD_GET_REG_SIZE(type));
 	CHECK_ARGUMENT(FUNCTION_CHECK_IS_VREG(vreg, 0));
 	FUNCTION_CHECK_DST(dst, dstw);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		if (type & SLJIT_SIMD_TEST)
@@ -3116,7 +3116,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_sign(struct sljit_co
 		sljit_verbose_param(compiler, dst, dstw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -3133,7 +3133,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_op2(struct sljit_com
 	CHECK_ARGUMENT(FUNCTION_CHECK_IS_VREG(dst_vreg, 0));
 	CHECK_ARGUMENT(FUNCTION_CHECK_IS_VREG(src1_vreg, 0));
 	FUNCTION_VCHECK(src2, src2w, 0);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		if (type & SLJIT_SIMD_TEST)
@@ -3160,7 +3160,7 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_simd_op2(struct sljit_com
 		sljit_verbose_vparam(compiler, src2, src2w);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -3171,14 +3171,14 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_get_local_base(struct sljit_co
 
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	FUNCTION_CHECK_DST(dst, dstw);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  local_base ");
 		sljit_verbose_param(compiler, dst, dstw);
 		fprintf(compiler->verbose, ", #%" SLJIT_PRINT_D "d\n", offset);
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -3188,14 +3188,14 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_const(struct sljit_compil
 
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	FUNCTION_CHECK_DST(dst, dstw);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  const ");
 		sljit_verbose_param(compiler, dst, dstw);
 		fprintf(compiler->verbose, ", #%" SLJIT_PRINT_D "d\n", init_value);
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -3203,14 +3203,14 @@ static SLJIT_INLINE CHECK_RETURN_TYPE check_sljit_emit_mov_addr(struct sljit_com
 {
 #if (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS)
 	FUNCTION_CHECK_DST(dst, dstw);
-#endif
+#endif /* SLJIT_ARGUMENT_CHECKS */
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 	if (SLJIT_UNLIKELY(!!compiler->verbose)) {
 		fprintf(compiler->verbose, "  mov_addr ");
 		sljit_verbose_param(compiler, dst, dstw);
 		fprintf(compiler->verbose, "\n");
 	}
-#endif
+#endif /* SLJIT_VERBOSE */
 	CHECK_RETURN_OK;
 }
 
@@ -3288,23 +3288,23 @@ static sljit_s32 sljit_emit_fmem_unaligned(struct sljit_compiler *compiler, slji
 #define SLJIT_CPUINFO_PART1 " 32bit ("
 #elif (defined SLJIT_64BIT_ARCHITECTURE && SLJIT_64BIT_ARCHITECTURE)
 #define SLJIT_CPUINFO_PART1 " 64bit ("
-#else
+#else /* !SLJIT_32BIT_ARCHITECTURE && !SLJIT_64BIT_ARCHITECTURE */
 #error "Internal error: CPU type info missing"
-#endif
+#endif /* SLJIT_32BIT_ARCHITECTURE */
 
 #if (defined SLJIT_LITTLE_ENDIAN && SLJIT_LITTLE_ENDIAN)
 #define SLJIT_CPUINFO_PART2 "little endian + "
 #elif (defined SLJIT_BIG_ENDIAN && SLJIT_BIG_ENDIAN)
 #define SLJIT_CPUINFO_PART2 "big endian + "
-#else
+#else /* !SLJIT_LITTLE_ENDIAN && !SLJIT_BIG_ENDIAN */
 #error "Internal error: CPU type info missing"
-#endif
+#endif /* SLJIT_LITTLE_ENDIAN */
 
 #if (defined SLJIT_UNALIGNED && SLJIT_UNALIGNED)
 #define SLJIT_CPUINFO_PART3 "unaligned)"
-#else
+#else /* !SLJIT_UNALIGNED */
 #define SLJIT_CPUINFO_PART3 "aligned)"
-#endif
+#endif /* SLJIT_UNALIGNED */
 
 #define SLJIT_CPUINFO SLJIT_CPUINFO_PART1 SLJIT_CPUINFO_PART2 SLJIT_CPUINFO_PART3
 
@@ -3328,7 +3328,7 @@ static sljit_s32 sljit_emit_fmem_unaligned(struct sljit_compiler *compiler, slji
 #	include "sljitNativeS390X.c"
 #elif (defined SLJIT_CONFIG_LOONGARCH && SLJIT_CONFIG_LOONGARCH)
 #	include "sljitNativeLOONGARCH_64.c"
-#endif
+#endif /* SLJIT_CONFIG_X86 */
 
 #include "sljitSerialize.c"
 
@@ -3338,10 +3338,10 @@ static SLJIT_INLINE sljit_s32 emit_mov_before_return(struct sljit_compiler *comp
 	/* At the moment the pointer size is always equal to sljit_sw. May be changed in the future. */
 	if (src == SLJIT_RETURN_REG && (op == SLJIT_MOV || op == SLJIT_MOV_P))
 		return SLJIT_SUCCESS;
-#else
+#else /* !SLJIT_64BIT_ARCHITECTURE */
 	if (src == SLJIT_RETURN_REG && (op == SLJIT_MOV || op == SLJIT_MOV_U32 || op == SLJIT_MOV_S32 || op == SLJIT_MOV_P))
 		return SLJIT_SUCCESS;
-#endif
+#endif /* SLJIT_64BIT_ARCHITECTURE */
 
 	SLJIT_SKIP_CHECKS(compiler);
 	return sljit_emit_op1(compiler, op, SLJIT_RETURN_REG, 0, src, srcw);
@@ -3423,7 +3423,7 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_jump* sljit_emit_cmp(struct sljit_compiler
 		if (src2 == SLJIT_IMM && !src2w)
 			return emit_cmp_to0(compiler, type, src1, src1w);
 	}
-#endif
+#endif /* SLJIT_CONFIG_ARM_64 */
 
 	if (SLJIT_UNLIKELY(src1 == SLJIT_IMM && src2 != SLJIT_IMM)) {
 		/* Immediate is preferred as second argument by most architectures. */
diff --git a/sljit_src/sljitLir.h b/sljit_src/sljitLir.h
index ef8a8688..c732239d 100644
--- a/sljit_src/sljitLir.h
+++ b/sljit_src/sljitLir.h
@@ -87,7 +87,7 @@ of sljitConfigInternal.h */
 
 #ifdef __cplusplus
 extern "C" {
-#endif
+#endif /* __cplusplus */
 
 /* Version numbers. */
 #define SLJIT_MAJOR_VERSION	0
@@ -686,7 +686,7 @@ static SLJIT_INLINE void* sljit_compiler_get_user_data(struct sljit_compiler *co
 #if (defined SLJIT_VERBOSE && SLJIT_VERBOSE)
 /* Passing NULL disables verbose. */
 SLJIT_API_FUNC_ATTRIBUTE void sljit_compiler_verbose(struct sljit_compiler *compiler, FILE* verbose);
-#endif
+#endif /* SLJIT_VERBOSE */
 
 /* Option bits for sljit_generate_code. */
 
@@ -779,12 +779,12 @@ static SLJIT_INLINE sljit_uw sljit_get_generated_code_size(struct sljit_compiler
 #define SLJIT_HAS_AVX			100
 /* [Not emulated] AVX2 support is available on x86. */
 #define SLJIT_HAS_AVX2			101
-#endif
+#endif /* SLJIT_CONFIG_X86 */
 
 #if (defined SLJIT_CONFIG_LOONGARCH)
 /* [Not emulated] LASX support is available on LoongArch */
 #define SLJIT_HAS_LASX        201
-#endif
+#endif /* SLJIT_CONFIG_LOONGARCH */
 
 SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_has_cpu_feature(sljit_s32 feature_type);
 
@@ -2570,10 +2570,10 @@ SLJIT_API_FUNC_ATTRIBUTE void sljit_set_function_context(void** func_ptr, struct
    it is sometimes desired to free all unused memory regions, e.g.
    before the application terminates. */
 SLJIT_API_FUNC_ATTRIBUTE void sljit_free_unused_memory_exec(void);
-#endif
+#endif /* SLJIT_EXECUTABLE_ALLOCATOR */
 
 #ifdef __cplusplus
 } /* extern "C" */
-#endif
+#endif /* __cplusplus */
 
 #endif /* SLJIT_LIR_H_ */
diff --git a/sljit_src/sljitNativeRISCV_common.c b/sljit_src/sljitNativeRISCV_common.c
index 2e9684cb..deb47316 100644
--- a/sljit_src/sljitNativeRISCV_common.c
+++ b/sljit_src/sljitNativeRISCV_common.c
@@ -153,7 +153,7 @@ static const sljit_u8 vreg_map[SLJIT_NUMBER_OF_VECTOR_REGISTERS + 3] = {
 #define REV8		(F12(0x698) | F3(0x5) | OPC(0x13))
 #elif defined SLJIT_CONFIG_RISCV_64
 #define REV8		(F12(0x6b8) | F3(0x5) | OPC(0x13))
-#endif
+#endif /* SLJIT_CONFIG_RISCV_32 */
 #define ROL		(F7(0x30) | F3(0x1) | OPC(0x33))
 #define ROR		(F7(0x30) | F3(0x5) | OPC(0x33))
 #define RORI		(F7(0x30) | F3(0x5) | OPC(0x13))
@@ -213,7 +213,7 @@ static const sljit_u8 vreg_map[SLJIT_NUMBER_OF_VECTOR_REGISTERS + 3] = {
 #define ZEXTH		(F7(0x4) | F3(0x4) | OPC(0x33))
 #elif defined SLJIT_CONFIG_RISCV_64
 #define ZEXTH		(F7(0x4) | F3(0x4) | OPC(0x3B))
-#endif
+#endif /* SLJIT_CONFIG_RISCV_32 */
 #endif /* __riscv_zbb */
 
 #define SIMM_MAX	(0x7ff)
@@ -228,7 +228,7 @@ static const sljit_u8 vreg_map[SLJIT_NUMBER_OF_VECTOR_REGISTERS + 3] = {
 #define S32_MIN		(-0x80000000l)
 #define S44_MAX		(0x7fffffff7ffl)
 #define S52_MAX		(0x7ffffffffffffl)
-#endif
+#endif /* SLJIT_CONFIG_RISCV_64 */
 
 static sljit_s32 push_inst(struct sljit_compiler *compiler, sljit_ins ins)
 {
@@ -286,9 +286,9 @@ static SLJIT_INLINE sljit_ins* detect_jump_type(struct sljit_jump *jump, sljit_i
 		if (jump->flags & IS_COND) {
 #if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
 			code_ptr[-1] -= (sljit_ins)(1 * sizeof(sljit_ins)) << 7;
-#else
+#else /* !SLJIT_CONFIG_RISCV_32 */
 			code_ptr[-1] -= (sljit_ins)(5 * sizeof(sljit_ins)) << 7;
-#endif
+#endif /* SLJIT_CONFIG_RISCV_32 */
 		}
 
 		jump->flags |= PATCH_J;
@@ -331,16 +331,16 @@ static SLJIT_INLINE sljit_ins* detect_jump_type(struct sljit_jump *jump, sljit_i
 		code_ptr[4] = code_ptr[0];
 		return code_ptr + 4;
 	}
-#endif
+#endif /* SLJIT_CONFIG_RISCV_64 */
 
 exit:
 #if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
 	code_ptr[1] = code_ptr[0];
 	return code_ptr + 1;
-#else
+#else /* !SLJIT_CONFIG_RISCV_32 */
 	code_ptr[5] = code_ptr[0];
 	return code_ptr + 5;
-#endif
+#endif /* SLJIT_CONFIG_RISCV_32 */
 }
 
 #if (defined SLJIT_CONFIG_RISCV_64 && SLJIT_CONFIG_RISCV_64)
@@ -402,7 +402,7 @@ static SLJIT_INLINE void load_addr_to_reg(struct sljit_jump *jump, sljit_sw exec
 	sljit_u32 reg = (flags & JUMP_MOV_ADDR) ? *ins : TMP_REG1;
 #if (defined SLJIT_CONFIG_RISCV_64 && SLJIT_CONFIG_RISCV_64)
 	sljit_sw high;
-#endif
+#endif /* SLJIT_CONFIG_RISCV_64 */
 	SLJIT_UNUSED_ARG(executable_offset);
 
 #if (defined SLJIT_CONFIG_RISCV_64 && SLJIT_CONFIG_RISCV_64)
@@ -423,7 +423,7 @@ static SLJIT_INLINE void load_addr_to_reg(struct sljit_jump *jump, sljit_sw exec
 			ins[1] = ADDI | RD(reg) | RS1(reg) | IMM_I(addr);
 		return;
 	}
-#endif
+#endif /* SLJIT_CONFIG_RISCV_64 */
 
 	if ((addr & 0x800) != 0)
 		addr += 0x1000;
@@ -735,7 +735,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_has_cpu_feature(sljit_s32 feature_type)
 		return (SLJIT_IS_FPU_AVAILABLE) != 0;
 #elif defined(__riscv_float_abi_soft)
 		return 0;
-#else
+#else /* !SLJIT_IS_FPU_AVAILABLE && !__riscv_float_abi_soft */
 		return 1;
 #endif /* SLJIT_IS_FPU_AVAILABLE */
 	case SLJIT_HAS_ZERO_REGISTER:
@@ -747,7 +747,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_has_cpu_feature(sljit_s32 feature_type)
 	case SLJIT_HAS_MEMORY_BARRIER:
 #ifdef __riscv_vector
 	case SLJIT_HAS_SIMD:
-#endif
+#endif /* __riscv_vector */
 		return 1;
 #ifdef __riscv_zbb
 	case SLJIT_HAS_CLZ:
@@ -755,7 +755,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_has_cpu_feature(sljit_s32 feature_type)
 	case SLJIT_HAS_REV:
 	case SLJIT_HAS_ROT:
 		return 1;
-#endif
+#endif /* __riscv_zbb */
 	default:
 		return 0;
 	}
@@ -813,16 +813,16 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_cmp_info(sljit_s32 type)
 #if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
 #define STACK_STORE	SW
 #define STACK_LOAD	LW
-#else
+#else /* !SLJIT_CONFIG_RISCV_32 */
 #define STACK_STORE	SD
 #define STACK_LOAD	LD
-#endif
+#endif /* SLJIT_CONFIG_RISCV_32 */
 
 #if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
 #include "sljitNativeRISCV_32.c"
-#else
+#else /* !SLJIT_CONFIG_RISCV_32 */
 #include "sljitNativeRISCV_64.c"
-#endif
+#endif /* SLJIT_CONFIG_RISCV_32 */
 
 #define STACK_MAX_DISTANCE (-SIMM_MIN)
 
@@ -850,9 +850,9 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
 			local_size += SSIZE_OF(sw);
 		local_size += GET_SAVED_FLOAT_REGISTERS_SIZE(fscratches, fsaveds, f64);
 	}
-#else
+#else /* !SLJIT_CONFIG_RISCV_32 */
 	local_size += GET_SAVED_FLOAT_REGISTERS_SIZE(fscratches, fsaveds, f64);
-#endif
+#endif /* SLJIT_CONFIG_RISCV_32 */
 	local_size = (local_size + SLJIT_LOCALS_OFFSET + 15) & ~0xf;
 	compiler->local_size = local_size;
 
@@ -887,7 +887,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi
 	/* This alignment is valid because offset is not used after storing FPU regs. */
 	if ((offset & SSIZE_OF(sw)) != 0)
 		offset -= SSIZE_OF(sw);
-#endif
+#endif /* SLJIT_CONFIG_RISCV_32 */
 
 	tmp = SLJIT_FS0 - fsaveds;
 	for (i = SLJIT_FS0; i > tmp; i--) {
@@ -949,9 +949,9 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_set_context(struct sljit_compiler *comp
 			local_size += SSIZE_OF(sw);
 		local_size += GET_SAVED_FLOAT_REGISTERS_SIZE(fscratches, fsaveds, f64);
 	}
-#else
+#else /* !SLJIT_CONFIG_RISCV_32 */
 	local_size += GET_SAVED_FLOAT_REGISTERS_SIZE(fscratches, fsaveds, f64);
-#endif
+#endif /* SLJIT_CONFIG_RISCV_32 */
 	compiler->local_size = (local_size + SLJIT_LOCALS_OFFSET + 15) & ~0xf;
 
 	return SLJIT_SUCCESS;
@@ -997,7 +997,7 @@ static sljit_s32 emit_stack_frame_release(struct sljit_compiler *compiler, sljit
 	/* This alignment is valid because offset is not used after storing FPU regs. */
 	if ((offset & SSIZE_OF(sw)) != 0)
 		offset -= SSIZE_OF(sw);
-#endif
+#endif /* SLJIT_CONFIG_RISCV_32 */
 
 	tmp = SLJIT_FS0 - compiler->fsaveds;
 	for (i = SLJIT_FS0; i > tmp; i--) {
@@ -1053,9 +1053,9 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_return_to(struct sljit_compiler *c
 
 #if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
 #define ARCH_32_64(a, b)	a
-#else
+#else /* !SLJIT_CONFIG_RISCV_32 */
 #define ARCH_32_64(a, b)	b
-#endif
+#endif /* SLJIT_CONFIG_RISCV_32 */
 
 static const sljit_ins data_transfer_insts[16 + 4] = {
 /* u w s */ ARCH_32_64(F3(0x2) | OPC(0x23) /* sw */, F3(0x3) | OPC(0x23) /* sd */),
@@ -2098,7 +2098,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op1(struct sljit_compiler *compile
 #if (defined SLJIT_CONFIG_RISCV_64 && SLJIT_CONFIG_RISCV_64)
 	if (op & SLJIT_32)
 		flags = INT_DATA | SIGNED_DATA;
-#endif
+#endif /* SLJIT_CONFIG_RISCV_64 */
 
 	switch (GET_OPCODE(op)) {
 	case SLJIT_MOV:
@@ -2106,7 +2106,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op1(struct sljit_compiler *compile
 	case SLJIT_MOV_U32:
 	case SLJIT_MOV_S32:
 	case SLJIT_MOV32:
-#endif
+#endif /* SLJIT_CONFIG_RISCV_32 */
 	case SLJIT_MOV_P:
 		return emit_op(compiler, SLJIT_MOV, WORD_DATA | MOVE_OP, dst, dstw, TMP_ZERO, 0, src, srcw);
 
@@ -2118,7 +2118,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op1(struct sljit_compiler *compile
 	/* Logical operators have no W variant, so sign extended input is necessary for them. */
 	case SLJIT_MOV32:
 		return emit_op(compiler, SLJIT_MOV_S32, INT_DATA | SIGNED_DATA | MOVE_OP, dst, dstw, TMP_ZERO, 0, src, (src == SLJIT_IMM) ? (sljit_s32)srcw : srcw);
-#endif
+#endif /* SLJIT_CONFIG_RISCV_64 */
 
 	case SLJIT_MOV_U8:
 		return emit_op(compiler, op, BYTE_DATA | MOVE_OP, dst, dstw, TMP_ZERO, 0, src, (src == SLJIT_IMM) ? (sljit_u8)srcw : srcw);
@@ -2171,7 +2171,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op2(struct sljit_compiler *compile
 		if (src2 == SLJIT_IMM)
 			src2w = (sljit_s32)src2w;
 	}
-#endif
+#endif /* SLJIT_CONFIG_RISCV_64 */
 
 	switch (GET_OPCODE(op)) {
 	case SLJIT_ADD:
@@ -2429,9 +2429,9 @@ static SLJIT_INLINE sljit_s32 sljit_emit_fop1_conv_sw_from_f64(struct sljit_comp
 {
 #if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
 #	define flags (sljit_u32)0
-#else
+#else /* !SLJIT_CONFIG_RISCV_32 */
 	sljit_u32 flags = ((sljit_u32)(GET_OPCODE(op) == SLJIT_CONV_SW_FROM_F64)) << 21;
-#endif
+#endif /* SLJIT_CONFIG_RISCV_32 */
 	sljit_s32 dst_r = FAST_IS_REG(dst) ? dst : TMP_REG2;
 
 	if (src & SLJIT_MEM) {
@@ -2445,15 +2445,15 @@ static SLJIT_INLINE sljit_s32 sljit_emit_fop1_conv_sw_from_f64(struct sljit_comp
 	if (dst & SLJIT_MEM) {
 #if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
 		return emit_op_mem2(compiler, WORD_DATA, TMP_REG2, dst, dstw, 0, 0);
-#else
+#else /* !SLJIT_CONFIG_RISCV_32 */
 		return emit_op_mem2(compiler, flags ? WORD_DATA : INT_DATA, TMP_REG2, dst, dstw, 0, 0);
-#endif
+#endif /* SLJIT_CONFIG_RISCV_32 */
 	}
 	return SLJIT_SUCCESS;
 
 #if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
 #	undef flags
-#endif
+#endif /* SLJIT_CONFIG_RISCV_32 */
 }
 
 static sljit_s32 sljit_emit_fop1_conv_f64_from_w(struct sljit_compiler *compiler, sljit_ins ins,
@@ -2751,9 +2751,9 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_label* sljit_emit_label(struct sljit_compi
 
 #if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
 #define BRANCH_LENGTH	((sljit_ins)(3 * sizeof(sljit_ins)) << 7)
-#else
+#else /* !SLJIT_CONFIG_RISCV_32 */
 #define BRANCH_LENGTH	((sljit_ins)(7 * sizeof(sljit_ins)) << 7)
-#endif
+#endif /* SLJIT_CONFIG_RISCV_32 */
 
 static sljit_ins get_jump_instruction(sljit_s32 type)
 {
@@ -3022,9 +3022,9 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op_flags(struct sljit_compiler *co
 	sljit_s32 saved_op = op;
 #if (defined SLJIT_CONFIG_RISCV_32 && SLJIT_CONFIG_RISCV_32)
 	sljit_s32 mem_type = WORD_DATA;
-#else
+#else /* !SLJIT_CONFIG_RISCV_32 */
 	sljit_s32 mem_type = ((op & SLJIT_32) || op == SLJIT_MOV32) ? (INT_DATA | SIGNED_DATA) : WORD_DATA;
-#endif
+#endif /* SLJIT_CONFIG_RISCV_32 */
 
 	CHECK_ERROR();
 	CHECK(check_sljit_emit_op_flags(compiler, op, dst, dstw, type));
diff --git a/test_src/sljitTest.c b/test_src/sljitTest.c
index b9d271c3..9af4c741 100644
--- a/test_src/sljitTest.c
+++ b/test_src/sljitTest.c
@@ -34,19 +34,19 @@
 #ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable: 4127) /* conditional expression is constant */
-#endif
+#endif /* _MSC_VER */
 
 #if defined _WIN32 || defined _WIN64
 #define COLOR_RED
 #define COLOR_GREEN
 #define COLOR_ARCH
 #define COLOR_DEFAULT
-#else
+#else /* !_WIN32 && !_WIN64 */
 #define COLOR_RED "\33[31m"
 #define COLOR_GREEN "\33[32m"
 #define COLOR_ARCH "\33[33m"
 #define COLOR_DEFAULT "\33[0m"
-#endif
+#endif /* _WIN32 || _WIN64 */
 
 union executable_code {
 	void* code;
@@ -198,14 +198,14 @@ static void test_exec_allocator(void)
 	MALLOC_EXEC(ptr2, 512);
 #if (defined SLJIT_EXECUTABLE_ALLOCATOR && SLJIT_EXECUTABLE_ALLOCATOR)
 	sljit_free_unused_memory_exec();
-#endif
+#endif /* SLJIT_EXECUTABLE_ALLOCATOR */
 	FREE_EXEC(ptr3);
 	FREE_EXEC(ptr1);
 	FREE_EXEC(ptr2);
 
 #if (defined SLJIT_EXECUTABLE_ALLOCATOR && SLJIT_EXECUTABLE_ALLOCATOR)
 	sljit_free_unused_memory_exec();
-#endif
+#endif /* SLJIT_EXECUTABLE_ALLOCATOR */
 }
 
 #undef MALLOC_EXEC
@@ -877,9 +877,9 @@ static void test9(void)
 	sljit_s32 i;
 #ifdef SLJIT_PREF_SHIFT_REG
 	sljit_s32 shift_reg = SLJIT_PREF_SHIFT_REG;
-#else
+#else /* !SLJIT_PREF_SHIFT_REG */
 	sljit_s32 shift_reg = SLJIT_R2;
-#endif
+#endif /* SLJIT_PREF_SHIFT_REG */
 
 	SLJIT_ASSERT(shift_reg >= SLJIT_R2 && shift_reg <= SLJIT_R3);
 
@@ -950,20 +950,20 @@ static void test9(void)
 	sljit_emit_op2(compiler, SLJIT_LSHR32, SLJIT_R0, 0, SLJIT_R0, 0, SLJIT_IMM, 32);
 #if IS_64BIT
 	sljit_emit_op1(compiler, SLJIT_MOV_U32, SLJIT_R0, 0, SLJIT_R0, 0);
-#endif
+#endif /* IS_64BIT */
 	sljit_emit_op2(compiler, SLJIT_OR, SLJIT_R1, 0, SLJIT_R1, 0, SLJIT_R0, 0);
 	sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_R0, 0, SLJIT_IMM, 0xe30000);
 #if IS_64BIT
 	sljit_emit_op2(compiler, SLJIT_ASHR, SLJIT_R0, 0, SLJIT_R0, 0, SLJIT_IMM, 0xffc0);
-#else
+#else /* !IS_64BIT */
 	sljit_emit_op2(compiler, SLJIT_ASHR, SLJIT_R0, 0, SLJIT_R0, 0, SLJIT_IMM, 0xffe0);
-#endif
+#endif /* IS_64BIT */
 	sljit_emit_op2(compiler, SLJIT_OR, SLJIT_R1, 0, SLJIT_R1, 0, SLJIT_R0, 0);
 	sljit_emit_op1(compiler, SLJIT_MOV32, SLJIT_R0, 0, SLJIT_IMM, 0x25000000);
 	sljit_emit_op2(compiler, SLJIT_SHL32, SLJIT_R0, 0, SLJIT_R0, 0, SLJIT_IMM, 0xfffe1);
 #if IS_64BIT
 	sljit_emit_op1(compiler, SLJIT_MOV_U32, SLJIT_R0, 0, SLJIT_R0, 0);
-#endif
+#endif /* IS_64BIT */
 	/* buf[11] */
 	sljit_emit_op2(compiler, SLJIT_OR, SLJIT_MEM1(SLJIT_S0), sizeof(sljit_sw) * 11, SLJIT_R1, 0, SLJIT_R0, 0);
 
@@ -975,7 +975,7 @@ static void test9(void)
 #if IS_64BIT
 	/* Alternative form of uint32 type cast. */
 	sljit_emit_op2(compiler, SLJIT_AND, SLJIT_R0, 0, SLJIT_R0, 0, SLJIT_IMM, 0xffffffff);
-#endif
+#endif /* IS_64BIT */
 	sljit_emit_op2(compiler, SLJIT_OR, SLJIT_R1, 0, SLJIT_R1, 0, SLJIT_R0, 0);
 	sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_R0, 0, SLJIT_IMM, 0x630000);
 	sljit_emit_op2(compiler, SLJIT_ASHR, SLJIT_R0, 0, SLJIT_R0, 0, shift_reg, 0);
@@ -1069,7 +1069,7 @@ static void test10(void)
 	sljit_emit_op2(compiler, SLJIT_MUL, SLJIT_R0, 0, SLJIT_R1, 0, SLJIT_IMM, SLJIT_W(0x123456789));
 	/* buf[6] */
 	sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_MEM1(SLJIT_S0), sizeof(sljit_sw) * 6, SLJIT_R0, 0);
-#endif
+#endif /* IS_64BIT */
 	sljit_emit_op2(compiler, SLJIT_MUL, SLJIT_RETURN_REG, 0, SLJIT_IMM, 11, SLJIT_IMM, 10);
 	sljit_emit_return(compiler, SLJIT_MOV, SLJIT_RETURN_REG, 0);
 
@@ -1086,7 +1086,7 @@ static void test10(void)
 	FAILED(buf[5] != 81, "test10 case 7 failed\n");
 #if IS_64BIT
 	FAILED(buf[6] != SLJIT_W(0x123456789) * 3, "test10 case 8 failed\n");
-#endif
+#endif /* IS_64BIT */
 
 	sljit_free_code(code.code, NULL);
 	successful_tests++;
@@ -1411,9 +1411,9 @@ static void test15(void)
 	buf[9] = 0;
 #if IS_64BIT && (defined SLJIT_BIG_ENDIAN && SLJIT_BIG_ENDIAN)
 	buf[10] = SLJIT_W(1) << 32;
-#else
+#else /* !IS_64BIT || !SLJIT_BIG_ENDIAN */
 	buf[10] = 1;
-#endif
+#endif /* IS_64BIT && SLJIT_BIG_ENDIAN */
 
 	sljit_emit_enter(compiler, 0, SLJIT_ARGS1V(P), 3, 2, 0);
 
@@ -1940,12 +1940,12 @@ static void test20(void)
 	FAILED(u.asbytes[1] != 0x56, "test20 case 14 failed\n");
 	FAILED(u.asbytes[2] != 0x34, "test20 case 15 failed\n");
 	FAILED(u.asbytes[3] != 0x12, "test20 case 16 failed\n");
-#else
+#else /* !SLJIT_LITTLE_ENDIAN */
 	FAILED(u.asbytes[0] != 0x12, "test20 case 13 failed\n");
 	FAILED(u.asbytes[1] != 0x34, "test20 case 14 failed\n");
 	FAILED(u.asbytes[2] != 0x56, "test20 case 15 failed\n");
 	FAILED(u.asbytes[3] != 0x78, "test20 case 16 failed\n");
-#endif
+#endif /* SLJIT_LITTLE_ENDIAN */
 
 	sljit_free_code(code.code, NULL);
 	successful_tests++;
@@ -2074,7 +2074,7 @@ static void test21(void)
 	FAILED(bbuf[5] != 99, "test21 case 14 failed\n");
 #if IS_64BIT
 	FAILED(bbuf[6] != -128, "test21 case 15 failed\n");
-#endif
+#endif /* IS_64BIT */
 
 	sljit_free_code(code.code, NULL);
 	successful_tests++;
@@ -2242,9 +2242,9 @@ static void test24(void)
 		sljit_emit_op2(compiler, SLJIT_ADD, SLJIT_S0, 0, SLJIT_S0, 0, SLJIT_IMM, 1);
 #if IS_64BIT
 #define RESULT(i) i
-#else
+#else /* !IS_64BIT */
 #define RESULT(i) (3 - i)
-#endif
+#endif /* IS_64BIT */
 
 	/* Playing with conditional flags. */
 	executable_code code;
@@ -2253,9 +2253,9 @@ static void test24(void)
 	sljit_u32 i;
 #ifdef SLJIT_PREF_SHIFT_REG
 	sljit_s32 shift_reg = SLJIT_PREF_SHIFT_REG;
-#else
+#else /* !SLJIT_PREF_SHIFT_REG */
 	sljit_s32 shift_reg = SLJIT_R2;
-#endif
+#endif /* SLJIT_PREF_SHIFT_REG */
 
 	SLJIT_ASSERT(shift_reg >= SLJIT_R2 && shift_reg <= SLJIT_R3);
 
@@ -2437,9 +2437,9 @@ static void test24(void)
 	SET_NEXT_BYTE(SLJIT_SIG_LESS);
 #if IS_64BIT
 	sljit_emit_op1(compiler, SLJIT_MOV32, SLJIT_R0, 0, SLJIT_IMM, SLJIT_W(0x12300000000) - 43);
-#else
+#else /* !IS_64BIT */
 	sljit_emit_op1(compiler, SLJIT_MOV32, SLJIT_R0, 0, SLJIT_IMM, -43);
-#endif
+#endif /* IS_64BIT */
 	sljit_emit_op1(compiler, SLJIT_MOV32, SLJIT_R1, 0, SLJIT_IMM, -96);
 	sljit_emit_op2u(compiler, SLJIT_SUB32 | SLJIT_SET_LESS, SLJIT_R0, 0, SLJIT_R1, 0);
 	/* buf[38] */
@@ -2757,9 +2757,9 @@ static void test27(void)
 	sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_R4, 0, SLJIT_IMM, 1);
 #if IS_64BIT
 	sljit_emit_op1(compiler, SLJIT_MOV32, SLJIT_S1, 0, SLJIT_IMM, SLJIT_W(-0x123ffffffff));
-#else
+#else /* !IS_64BIT */
 	sljit_emit_op1(compiler, SLJIT_MOV32, SLJIT_S1, 0, SLJIT_IMM, 1);
-#endif
+#endif /* IS_64BIT */
 	sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_S2, 0, SLJIT_IMM, 1);
 	sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_S3, 0, SLJIT_IMM, 1);
 	sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_S4, 0, SLJIT_IMM, 1);
@@ -2932,9 +2932,9 @@ static void test29(void)
 	/* buf[4-5] */
 #if IS_64BIT
 	sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_R0, 0, SLJIT_IMM, (sljit_sw)SLJIT_W(0x8000000000000000));
-#else
+#else /* !IS_64BIT */
 	sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_R0, 0, SLJIT_IMM, (sljit_sw)SLJIT_W(0x80000000));
-#endif
+#endif /* IS_64BIT */
 	sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_R1, 0, SLJIT_IMM, 1);
 	sljit_emit_op2(compiler, SLJIT_SUB | SLJIT_SET_Z | SLJIT_SET_OVERFLOW, SLJIT_R2, 0, SLJIT_R0, 0, SLJIT_R1, 0);
 	sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_MEM1(SLJIT_S0), 4 * sizeof(sljit_sw), SLJIT_IMM, 33);
@@ -2960,9 +2960,9 @@ static void test29(void)
 	/* buf[8] */
 #if IS_64BIT
 	sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_R0, 0, SLJIT_IMM, (sljit_sw)SLJIT_W(0x8000000000000000));
-#else
+#else /* !IS_64BIT */
 	sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_R0, 0, SLJIT_IMM, (sljit_sw)SLJIT_W(0x80000000));
-#endif
+#endif /* IS_64BIT */
 	sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_R1, 0, SLJIT_R0, 0);
 	sljit_emit_op2(compiler, SLJIT_ADD | SLJIT_SET_Z | SLJIT_SET_OVERFLOW, SLJIT_R2, 0, SLJIT_R0, 0, SLJIT_R1, 0);
 	sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_MEM1(SLJIT_S0), 8 * sizeof(sljit_sw), SLJIT_IMM, 30);
@@ -3549,7 +3549,7 @@ static void test34(void)
 	FAILED(code.func0() != 4567, "test34 case 1 failed\n");
 
 	sljit_free_code(code.code, NULL);
-#endif
+#endif /* SLJIT_UTIL_STACK */
 	successful_tests++;
 }
 
@@ -3728,16 +3728,16 @@ static void test37(void)
 #elif (defined SLJIT_CONFIG_X86_64 && SLJIT_CONFIG_X86_64)
 	sljit_u8 inst[16];
 	sljit_s32 reg;
-#else
+#else /* !SLJIT_CONFIG_X86_32 && !SLJIT_CONFIG_X86_64 */
 	sljit_u32 inst;
-#endif
+#endif /* SLJIT_CONFIG_X86_32 */
 
 	if (verbose)
 		printf("Run test37\n");
 
 #if !(defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
 	SLJIT_ASSERT(sljit_has_cpu_feature(SLJIT_HAS_VIRTUAL_REGISTERS) == 0);
-#endif
+#endif /* !SLJIT_CONFIG_X86_32 */
 
 	for (i = 0; i < SLJIT_NUMBER_OF_REGISTERS; i++) {
 #if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
@@ -3745,7 +3745,7 @@ static void test37(void)
 			SLJIT_ASSERT(sljit_get_register_index(SLJIT_GP_REGISTER, SLJIT_R(i)) == -1);
 			continue;
 		}
-#endif
+#endif /* SLJIT_CONFIG_X86_32 */
 		SLJIT_ASSERT(sljit_get_register_index(SLJIT_GP_REGISTER, SLJIT_R(i)) >= 0
 			&& sljit_get_register_index(SLJIT_GP_REGISTER, SLJIT_R(i)) < 64);
 	}
@@ -3849,7 +3849,7 @@ static void test37(void)
 	FAILED(code.func2(1000, 234) != 1234, "test37 case 2 failed\n");
 #if IS_64BIT
 	FAILED(code.func2(SLJIT_W(0x20f0a04090c06070), SLJIT_W(0x020f0a04090c0607)) != SLJIT_W(0x22ffaa4499cc6677), "test37 case 3 failed\n");
-#endif
+#endif /* IS_64BIT */
 
 	sljit_free_code(code.code, NULL);
 	successful_tests++;
@@ -4283,13 +4283,13 @@ static void test41(void)
 	sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_R0, 0, SLJIT_IMM, 0xd37c10);
 #if IS_64BIT
 	sljit_set_target(sljit_emit_jump(compiler, SLJIT_LESS), SLJIT_W(0x112233445566));
-#endif
+#endif /* IS_64BIT */
 	sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_MEM1(SLJIT_S0), sizeof(sljit_sw), SLJIT_R0, 0);
 	/* buf[2] */
 	sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_R0, 0, SLJIT_IMM, 0x59b48e);
 #if IS_64BIT
 	sljit_set_target(sljit_emit_jump(compiler, SLJIT_LESS), SLJIT_W(0x1122334455667788));
-#endif
+#endif /* IS_64BIT */
 	sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_MEM1(SLJIT_S0), 2 * sizeof(sljit_sw), SLJIT_R0, 0);
 	sljit_emit_return(compiler, SLJIT_MOV, SLJIT_RETURN_REG, 0);
 
@@ -4575,7 +4575,7 @@ static void test44(void)
 
 #if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32)
 	SLJIT_ASSERT(sljit_get_register_index(SLJIT_GP_REGISTER, SLJIT_R3) == -1 && sljit_get_register_index(SLJIT_GP_REGISTER, SLJIT_R4) == -1);
-#endif
+#endif /* SLJIT_CONFIG_X86_32 */
 	sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_R0, 0, SLJIT_IMM, 7);
 	sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_R3, 0, SLJIT_IMM, -45);
 	sljit_emit_op2(compiler, SLJIT_MUL | SLJIT_SET_OVERFLOW, SLJIT_R1, 0, SLJIT_R0, 0, SLJIT_IMM, 8);
@@ -4957,9 +4957,9 @@ static void test47(void)
 	labels[2] = sljit_emit_label(compiler);
 #if IS_64BIT
 	sljit_emit_op_src(compiler, SLJIT_PREFETCH_L3, SLJIT_MEM1(SLJIT_R0), SLJIT_W(0x1122334455667788));
-#else
+#else /* !IS_64BIT */
 	sljit_emit_op_src(compiler, SLJIT_PREFETCH_L3, SLJIT_MEM1(SLJIT_R0), 0x11223344);
-#endif
+#endif /* IS_64BIT */
 	labels[3] = sljit_emit_label(compiler);
 	sljit_emit_op_src(compiler, SLJIT_PREFETCH_ONCE, SLJIT_MEM1(SLJIT_R0), sizeof(sljit_sw));
 	labels[4] = sljit_emit_label(compiler);
@@ -5141,7 +5141,7 @@ static void test48(void)
 	/* TODO: at least for ARM (both V5 and V7) the range below needs further fixing */
 	SLJIT_ASSERT(sljit_emit_mem_update(compiler, SLJIT_MOV | SLJIT_MEM_SUPP, SLJIT_R1, SLJIT_MEM1(SLJIT_R0), 256) == SLJIT_ERR_UNSUPPORTED);
 	SLJIT_ASSERT(sljit_emit_mem_update(compiler, SLJIT_MOV | SLJIT_MEM_SUPP | SLJIT_MEM_POST, SLJIT_R1, SLJIT_MEM1(SLJIT_R0), -257) == SLJIT_ERR_UNSUPPORTED);
-#endif
+#endif /* SLJIT_CONFIG_ARM_THUMB2 || SLJIT_CONFIG_ARM_64 */
 
 	sljit_emit_return_void(compiler);
 
@@ -6682,9 +6682,9 @@ static void test63(void)
 	sljit_s32 i;
 #ifdef SLJIT_PREF_SHIFT_REG
 	sljit_s32 shift_reg = SLJIT_PREF_SHIFT_REG;
-#else
+#else /* !SLJIT_PREF_SHIFT_REG */
 	sljit_s32 shift_reg = SLJIT_R2;
-#endif
+#endif /* SLJIT_PREF_SHIFT_REG */
 
 	if (verbose)
 		printf("Run test63\n");
@@ -6844,9 +6844,9 @@ static void test64(void)
 	sljit_s32 i;
 #ifdef SLJIT_PREF_SHIFT_REG
 	sljit_s32 shift_reg = SLJIT_PREF_SHIFT_REG;
-#else
+#else /* !SLJIT_PREF_SHIFT_REG */
 	sljit_s32 shift_reg = SLJIT_R2;
-#endif
+#endif /* SLJIT_PREF_SHIFT_REG */
 
 	if (verbose)
 		printf("Run test64\n");
@@ -9064,7 +9064,7 @@ static void test76(void)
 	sljit_emit_op0(compiler, SLJIT_DIVMOD_S32);
 	sljit_emit_op1(compiler, SLJIT_MOV32, SLJIT_MEM1(SLJIT_S0), 2 * sizeof(sljit_sw), SLJIT_R0, 0);
 	sljit_emit_op1(compiler, SLJIT_MOV32, SLJIT_MEM1(SLJIT_S0), 3 * sizeof(sljit_sw), SLJIT_R1, 0);
-#endif
+#endif /* SLJIT_UPPER_BITS_IGNORED */
 #if (defined SLJIT_UPPER_BITS_ZERO_EXTENDED && SLJIT_UPPER_BITS_ZERO_EXTENDED)
 	sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_R0, 0, SLJIT_IMM, 123456789);
 	sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_R1, 0, SLJIT_IMM, 234567890);
@@ -9075,7 +9075,7 @@ static void test76(void)
 	sljit_emit_op1(compiler, SLJIT_MOV32, SLJIT_R1, 0, SLJIT_IMM, 234567890);
 	sljit_emit_op2(compiler, SLJIT_MUL32, SLJIT_R0, 0, SLJIT_R0, 0, SLJIT_R1, 0);
 	sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_MEM1(SLJIT_S0), 5 * sizeof(sljit_sw), SLJIT_R0, 0);
-#endif
+#endif /* SLJIT_UPPER_BITS_ZERO_EXTENDED */
 #if (defined SLJIT_UPPER_BITS_SIGN_EXTENDED && SLJIT_UPPER_BITS_SIGN_EXTENDED)
 	sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_R0, 0, SLJIT_IMM, -123456789);
 	sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_R1, 0, SLJIT_IMM, 234567890);
@@ -9086,7 +9086,7 @@ static void test76(void)
 	sljit_emit_op1(compiler, SLJIT_MOV32, SLJIT_R1, 0, SLJIT_IMM, 234567890);
 	sljit_emit_op2(compiler, SLJIT_MUL32, SLJIT_R0, 0, SLJIT_R0, 0, SLJIT_R1, 0);
 	sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_MEM1(SLJIT_S0), 5 * sizeof(sljit_sw), SLJIT_R0, 0);
-#endif
+#endif /* SLJIT_UPPER_BITS_SIGN_EXTENDED */
 #if (defined SLJIT_UPPER_BITS_PRESERVED && SLJIT_UPPER_BITS_PRESERVED)
 	sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_R0, 0, SLJIT_IMM, SLJIT_W(0x12345678f8a432eb) /* -123456789 */);
 	sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_R1, 0, SLJIT_IMM, 234567890);
@@ -9097,8 +9097,8 @@ static void test76(void)
 	sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_R1, 0, SLJIT_IMM, 234567890);
 	sljit_emit_op2(compiler, SLJIT_MUL32, SLJIT_R0, 0, SLJIT_R0, 0, SLJIT_R1, 0);
 	sljit_emit_op1(compiler, SLJIT_MOV, SLJIT_MEM1(SLJIT_S0), 5 * sizeof(sljit_sw), SLJIT_R0, 0);
-#endif
-#endif
+#endif /* SLJIT_UPPER_BITS_PRESERVED */
+#endif /* IS_64BIT */
 
 	sljit_emit_return_void(compiler);
 
@@ -9114,20 +9114,20 @@ static void test76(void)
 	FAILED(buf[1] != SLJIT_W(29963923505), "test76 case 2 failed\n");
 	FAILED(*(sljit_s32*)(buf + 2) != -34567, "test76 case 3 failed\n");
 	FAILED(*(sljit_s32*)(buf + 3) != -567, "test76 case 4 failed\n");
-#endif
+#endif /* SLJIT_UPPER_BITS_IGNORED */
 #if (defined SLJIT_UPPER_BITS_ZERO_EXTENDED && SLJIT_UPPER_BITS_ZERO_EXTENDED)
 	FAILED(buf[4] != SLJIT_W(28958998501905210), "test76 case 5 failed\n");
 	FAILED(buf[5] != 1119998778, "test76 case 6 failed\n");
-#endif
+#endif /* SLJIT_UPPER_BITS_ZERO_EXTENDED */
 #if (defined SLJIT_UPPER_BITS_SIGN_EXTENDED && SLJIT_UPPER_BITS_SIGN_EXTENDED)
 	FAILED(buf[4] != SLJIT_W(-28958998501905210), "test76 case 7 failed\n");
 	FAILED(buf[5] != -1119998778, "test76 case 8 failed\n");
-#endif
+#endif /* SLJIT_UPPER_BITS_SIGN_EXTENDED */
 #if (defined SLJIT_UPPER_BITS_PRESERVED && SLJIT_UPPER_BITS_PRESERVED)
 	FAILED(buf[4] != SLJIT_W(5698607360772025542), "test76 case 9 failed\n");
 	FAILED(buf[5] != SLJIT_W(0x12345678bd3e2cc6), "test76 case 10 failed\n");
-#endif
-#endif
+#endif /* SLJIT_UPPER_BITS_PRESERVED */
+#endif /* IS_64BIT */
 
 	sljit_free_code(code.code, NULL);
 	successful_tests++;
@@ -9149,7 +9149,7 @@ int sljit_test(int argc, char* argv[])
 
 #if !(defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED)
 	test_exec_allocator();
-#endif
+#endif /* !SLJIT_CONFIG_UNSUPPORTED */
 	test_macros();
 	test1();
 	test2();
@@ -9305,7 +9305,7 @@ int sljit_test(int argc, char* argv[])
 
 #if (defined SLJIT_EXECUTABLE_ALLOCATOR && SLJIT_EXECUTABLE_ALLOCATOR)
 	sljit_free_unused_memory_exec();
-#endif
+#endif /* SLJIT_EXECUTABLE_ALLOCATOR */
 
 #	define TEST_COUNT 125
 
@@ -9323,4 +9323,4 @@ int sljit_test(int argc, char* argv[])
 
 #ifdef _MSC_VER
 #pragma warning(pop)
-#endif
+#endif /* _MSC_VER */