From 07c01cafbbfd4c18bd63f644946fd6ce7b384280 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Olivier=20Cr=C3=AAte?= Date: Mon, 14 Oct 2013 15:25:14 -0400 Subject: [PATCH] Make it ANSI-C Use /* */ instead of // Define _GNU_SOURCE in the ORC_CFLAGS --- configure.ac | 2 +- orc-test/orcarray.c | 2 +- orc-test/orcprofile.c | 2 +- orc-test/orctest.c | 16 ++-- orc/orcarm.c | 2 +- orc/orcbytecode.c | 8 +- orc/orccodemem.c | 2 +- orc/orccpu-arm.c | 4 +- orc/orccpu-powerpc.c | 2 +- orc/orccpu-x86.c | 4 +- orc/orcexecutor.c | 4 +- orc/orcparse.c | 8 +- orc/orcpowerpc.c | 2 +- orc/orcprogram-altivec.c | 14 ++-- orc/orcprogram-arm.c | 74 ++++++++--------- orc/orcprogram-c64x-c.c | 6 +- orc/orcprogram-neon.c | 26 +++--- orc/orcrules-altivec.c | 6 +- orc/orcrules-mmx.c | 54 ++++++------- orc/orcrules-neon.c | 150 +++++++++++++++++------------------ orc/orcrules-sse.c | 54 ++++++------- orc/orcutils.h | 10 +-- testsuite/benchmorc/benchmorc.c | 6 +- testsuite/memcpy_speed.c | 20 ++--- testsuite/perf_opcodes_sys_compare.c | 2 +- testsuite/test-schro.c | 4 +- testsuite/test_accsadubl.c | 4 +- tools/orcc.c | 6 +- 28 files changed, 248 insertions(+), 246 deletions(-) diff --git a/configure.ac b/configure.ac index eeb9b7e..3ee8a90 100644 --- a/configure.ac +++ b/configure.ac @@ -184,7 +184,7 @@ AM_CONDITIONAL(ENABLE_BACKEND_MIPS, test "x$ENABLE_BACKEND_MIPS" = "xyes") AC_DEFINE(ORC_EXPORTS, 1, [Defined for compiling internal code]) -ORC_CFLAGS="$ORC_CFLAGS \$(ERROR_CFLAGS) -I\$(top_srcdir)" +ORC_CFLAGS="$ORC_CFLAGS \$(ERROR_CFLAGS) -I\$(top_srcdir) -D_GNU_SOURCE" AC_SUBST(ERROR_CFLAGS) AC_SUBST(ORC_CFLAGS) diff --git a/orc-test/orcarray.c b/orc-test/orcarray.c index 2ee6bbf..9860204 100644 --- a/orc-test/orcarray.c +++ b/orc-test/orcarray.c @@ -21,7 +21,7 @@ #ifdef HAVE_MMAP /* This can be used to test non-zero high-32-bits of pointers. */ -//#define USE_MMAP +/* #define USE_MMAP */ #endif #define EXTEND_ROWS 16 diff --git a/orc-test/orcprofile.c b/orc-test/orcprofile.c index 85de41b..c4e4f5b 100644 --- a/orc-test/orcprofile.c +++ b/orc-test/orcprofile.c @@ -173,7 +173,7 @@ oil_profile_stamp_default (void) return ts; #elif defined(__GNUC__) && defined(HAVE_ARM) && defined(USE_CORTEX_A8_COUNTER) unsigned int ts; - //__asm__ __volatile__(" mrc p14, 0, %0, c1, c0, 0 \n" : "=r" (ts)); + /* __asm__ __volatile__(" mrc p14, 0, %0, c1, c0, 0 \n" : "=r" (ts)); */ __asm__ __volatile__(" mrc p15, 0, %0, c9, c13, 0 \n" : "=r" (ts)); return ts; #elif defined(_MSC_VER) && defined(HAVE_I386) diff --git a/orc-test/orctest.c b/orc-test/orctest.c index a19388e..ef4e6ed 100644 --- a/orc-test/orctest.c +++ b/orc-test/orctest.c @@ -109,7 +109,7 @@ orc_test_gcc_compile (OrcProgram *p) return ORC_TEST_FAILED; } if (!ORC_COMPILE_RESULT_IS_SUCCESSFUL(result)) { - //printf (" no code generated: %s\n", orc_program_get_error (p)); + /* printf (" no code generated: %s\n", orc_program_get_error (p)); */ return ORC_TEST_INDETERMINATE; } @@ -232,7 +232,7 @@ orc_test_gcc_compile_neon (OrcProgram *p) result = orc_program_compile_full (p, target, flags); if (!ORC_COMPILE_RESULT_IS_SUCCESSFUL(result)) { - //printf (" no code generated: %s\n", orc_program_get_error (p)); + /* printf (" no code generated: %s\n", orc_program_get_error (p)); */ return ORC_TEST_INDETERMINATE; } @@ -326,7 +326,7 @@ orc_test_gcc_compile_c64x (OrcProgram *p) result = orc_program_compile_full (p, target, flags); if (!ORC_COMPILE_RESULT_IS_SUCCESSFUL(result)) { - //printf (" no code generated: %s\n", orc_program_get_error (p)); + /* printf (" no code generated: %s\n", orc_program_get_error (p)); */ return ORC_TEST_INDETERMINATE; } @@ -346,7 +346,7 @@ orc_test_gcc_compile_c64x (OrcProgram *p) ret = system (cmd); if (ret != 0) { ORC_ERROR ("compiler failed"); - //printf("%s\n", orc_program_get_asm_code (p)); + /* printf("%s\n", orc_program_get_asm_code (p)); */ return ORC_TEST_INDETERMINATE; } @@ -585,7 +585,7 @@ orc_test_compare_output_full (OrcProgram *program, int flags) goto out; } if (!ORC_COMPILE_RESULT_IS_SUCCESSFUL(result)) { - //printf (" no code generated: %s\n", orc_program_get_error (program)); + /* printf (" no code generated: %s\n", orc_program_get_error (program)); */ ret = ORC_TEST_INDETERMINATE; goto out; } @@ -985,7 +985,7 @@ orc_test_performance_full (OrcProgram *program, int flags, result = orc_program_compile_full (program, target, flags); if (!ORC_COMPILE_RESULT_IS_SUCCESSFUL(result)) { - //printf("compile failed\n"); + /* printf("compile failed\n"); */ orc_program_reset (program); return 0; } @@ -994,7 +994,7 @@ orc_test_performance_full (OrcProgram *program, int flags, if (program->constant_n > 0) { n = program->constant_n; } else { - //n = 64 + (orc_random(&rand_context)&0xf); + /* n = 64 + (orc_random(&rand_context)&0xf); */ n = 1000; } @@ -1113,7 +1113,7 @@ orc_test_gcc_compile_mips (OrcProgram *p) result = orc_program_compile_full (p, target, flags); if (!ORC_COMPILE_RESULT_IS_SUCCESSFUL(result)) { - //printf (" no code generated: %s\n", orc_program_get_error (p)); + /* printf (" no code generated: %s\n", orc_program_get_error (p)); */ return ORC_TEST_INDETERMINATE; } diff --git a/orc/orcarm.c b/orc/orcarm.c index 3622ac3..d60c1d9 100644 --- a/orc/orcarm.c +++ b/orc/orcarm.c @@ -54,7 +54,7 @@ orc_arm_reg_name (int reg) "r4", "r5", "r6", "r7", "r8", "r9", "r10", "r11", "ip", "sp", "lr", "pc" }; - //"r12", "r13", "r14", "r15" }; + /* "r12", "r13", "r14", "r15" }; */ #endif if (reg < ORC_GP_REG_BASE || reg >= ORC_GP_REG_BASE+16) { diff --git a/orc/orcbytecode.c b/orc/orcbytecode.c index f568e14..49339b3 100644 --- a/orc/orcbytecode.c +++ b/orc/orcbytecode.c @@ -78,7 +78,7 @@ orc_bytecode_from_program (OrcProgram *p) bytecode_append_string (bytecode, p->name); } #if 0 - //if (!is_inline) { + /* if (!is_inline) { */ if (p->backup_function) { bytecode_append_code (bytecode, ORC_BC_SET_BACKUP_FUNCTION); bytecode_pointer (bytecode, p->backup_function); @@ -105,7 +105,7 @@ orc_bytecode_from_program (OrcProgram *p) if (var->size) { bytecode_append_code (bytecode, ORC_BC_ADD_ACCUMULATOR); bytecode_append_int (bytecode, var->size); - //bytecode_append_int (bytecode, var->alignment); + /* bytecode_append_int (bytecode, var->alignment); */ } } for(i=0;i<8;i++){ @@ -377,7 +377,7 @@ orc_bytecode_parse_function (OrcProgram *program, const orc_uint8 *bytecode) { OrcBytecodeParse _parse; OrcBytecodeParse *parse = &_parse; - //int in_function = FALSE; + /* int in_function = FALSE; */ int bc; int size; int alignment; @@ -397,7 +397,7 @@ orc_bytecode_parse_function (OrcProgram *program, const orc_uint8 *bytecode) /* FIXME this is technically an error */ return 0; case ORC_BC_BEGIN_FUNCTION: - //in_function = TRUE; + /* in_function = TRUE; */ break; case ORC_BC_END_FUNCTION: return 0; diff --git a/orc/orccodemem.c b/orc/orccodemem.c index f470be5..b28a4ed 100644 --- a/orc/orccodemem.c +++ b/orc/orccodemem.c @@ -170,7 +170,7 @@ orc_code_allocate_codemem (OrcCode *code, int size) code->code = ORC_PTR_OFFSET(region->write_ptr, chunk->offset); code->exec = ORC_PTR_OFFSET(region->exec_ptr, chunk->offset); code->code_size = size; - //compiler->codeptr = ORC_PTR_OFFSET(region->write_ptr, chunk->offset); + /* compiler->codeptr = ORC_PTR_OFFSET(region->write_ptr, chunk->offset); */ } void diff --git a/orc/orccpu-arm.c b/orc/orccpu-arm.c index cb013c3..9c32c98 100644 --- a/orc/orccpu-arm.c +++ b/orc/orccpu-arm.c @@ -81,8 +81,8 @@ orc_check_neon_proc_auxv (void) } if (aux[0] == AT_HWCAP) { - //if (aux[1] & 64) flags |= ORC_TARGET_NEON_VFP; - //if (aux[1] & 512) flags |= ORC_TARGET_NEON_IWMMXT; + /* if (aux[1] & 64) flags |= ORC_TARGET_NEON_VFP; */ + /* if (aux[1] & 512) flags |= ORC_TARGET_NEON_IWMMXT; */ if (aux[1] & 4096) flags |= ORC_TARGET_NEON_NEON; if (aux[1] & 128) flags |= ORC_TARGET_ARM_EDSP; ORC_INFO("arm hwcap %08x", aux[1]); diff --git a/orc/orccpu-powerpc.c b/orc/orccpu-powerpc.c index 93c9910..bc87777 100644 --- a/orc/orccpu-powerpc.c +++ b/orc/orccpu-powerpc.c @@ -200,7 +200,7 @@ orc_cpu_detect_arch(void) orc_check_altivec_fault(); #endif - //_orc_profile_stamp = orc_profile_stamp_tb; + /* _orc_profile_stamp = orc_profile_stamp_tb; */ } diff --git a/orc/orccpu-x86.c b/orc/orccpu-x86.c index 813dbc8..f55b2c5 100644 --- a/orc/orccpu-x86.c +++ b/orc/orccpu-x86.c @@ -388,8 +388,8 @@ orc_sse_detect_cpuid_intel (orc_uint32 level) case 28: orc_x86_microarchitecture = ORC_X86_BONNELL; break; - //orc_x86_microarchitecture = ORC_X86_WESTMERE; - //orc_x86_microarchitecture = ORC_X86_SANDY_BRIDGE; + /* orc_x86_microarchitecture = ORC_X86_WESTMERE; */ + /* orc_x86_microarchitecture = ORC_X86_SANDY_BRIDGE; */ } } else if (_orc_cpu_family == 15) { orc_x86_microarchitecture = ORC_X86_NETBURST; diff --git a/orc/orcexecutor.c b/orc/orcexecutor.c index a1b3840..96a7fc9 100644 --- a/orc/orcexecutor.c +++ b/orc/orcexecutor.c @@ -49,7 +49,7 @@ orc_executor_run (OrcExecutor *ex) } if (func) { func (ex); - //ORC_ERROR("counters %d %d %d", ex->counter1, ex->counter2, ex->counter3); + /* ORC_ERROR("counters %d %d %d", ex->counter1, ex->counter2, ex->counter3); */ } else { orc_executor_emulate (ex); } @@ -68,7 +68,7 @@ orc_executor_run_backup (OrcExecutor *ex) } if (func) { func (ex); - //ORC_ERROR("counters %d %d %d", ex->counter1, ex->counter2, ex->counter3); + /* ORC_ERROR("counters %d %d %d", ex->counter1, ex->counter2, ex->counter3); */ } else { orc_executor_emulate (ex); } diff --git a/orc/orcparse.c b/orc/orcparse.c index c41410a..0fb25ca 100644 --- a/orc/orcparse.c +++ b/orc/orcparse.c @@ -84,7 +84,7 @@ orc_parse_full (const char *code, OrcProgram ***programs, char **log) p = parser->line; end = p + strlen (p); - //printf("%d: %s\n", parser->line_number, parser->line); + /* printf("%d: %s\n", parser->line_number, parser->line); */ while (p[0] == ' ' || p[0] == '\t') p++; @@ -93,7 +93,7 @@ orc_parse_full (const char *code, OrcProgram ***programs, char **log) } if (p[0] == '#') { - //printf("comment: %s\n", p+1); + /* printf("comment: %s\n", p+1); */ continue; } @@ -118,9 +118,9 @@ orc_parse_full (const char *code, OrcProgram ***programs, char **log) { int i; for(i=0;icodeptr++ = 0xc3; + /* *compiler->codeptr++ = 0xc3; */ } void diff --git a/orc/orcprogram-altivec.c b/orc/orcprogram-altivec.c index 56fbc7d..b9af609 100644 --- a/orc/orcprogram-altivec.c +++ b/orc/orcprogram-altivec.c @@ -40,7 +40,7 @@ powerpc_emit_prologue (OrcCompiler *compiler) for(i=POWERPC_R13;i<=POWERPC_R31;i++){ if (compiler->used_regs[i]) { - //powerpc_emit_push (compiler, 4, i); + /* powerpc_emit_push (compiler, 4, i); */ } } } @@ -52,7 +52,7 @@ powerpc_emit_epilogue (OrcCompiler *compiler) for(i=POWERPC_R31;i>=POWERPC_R31;i--){ if (compiler->used_regs[i]) { - //powerpc_emit_pop (compiler, 4, i); + /* powerpc_emit_pop (compiler, 4, i); */ } } @@ -188,7 +188,7 @@ orc_compiler_powerpc_assemble (OrcCompiler *compiler) int k; OrcInstruction *insn; OrcStaticOpcode *opcode; - //OrcVariable *args[10]; + /* OrcVariable *args[10]; */ OrcRule *rule; int label_outer_loop_start; int label_loop_start; @@ -224,7 +224,7 @@ orc_compiler_powerpc_assemble (OrcCompiler *compiler) (int)ORC_STRUCT_OFFSET(OrcExecutorAlt, m_index)); } - //powerpc_load_constants (compiler); + /* powerpc_load_constants (compiler); */ powerpc_load_inner_constants (compiler); for(k=0;k<4;k++){ @@ -232,7 +232,7 @@ orc_compiler_powerpc_assemble (OrcCompiler *compiler) if (compiler->vars[ORC_VAR_A1 + k].name == NULL) continue; - //powerpc_emit_VX_2(p, "vxor", 0x100004c4, reg, reg, reg); + /* powerpc_emit_VX_2(p, "vxor", 0x100004c4, reg, reg, reg); */ powerpc_emit_vxor (compiler, var->alloc, var->alloc, var->alloc); } @@ -278,7 +278,7 @@ orc_compiler_powerpc_assemble (OrcCompiler *compiler) switch (var->vartype) { case ORC_VAR_TYPE_SRC: case ORC_VAR_TYPE_DEST: - //powerpc_emit_load_src (compiler, var); + /* powerpc_emit_load_src (compiler, var); */ break; case ORC_VAR_TYPE_CONST: break; @@ -305,7 +305,7 @@ orc_compiler_powerpc_assemble (OrcCompiler *compiler) switch (var->vartype) { case ORC_VAR_TYPE_DEST: - //powerpc_emit_store_dest (compiler, var); + /* powerpc_emit_store_dest (compiler, var); */ break; case ORC_VAR_TYPE_TEMP: break; diff --git a/orc/orcprogram-arm.c b/orc/orcprogram-arm.c index f300d9c..1b62f78 100644 --- a/orc/orcprogram-arm.c +++ b/orc/orcprogram-arm.c @@ -78,7 +78,7 @@ orc_arm_emit_epilogue (OrcCompiler *compiler) if (regs) orc_arm_emit_pop (compiler, regs); orc_arm_emit_bx_lr (compiler); - //orc_arm_dump_insns (compiler); + /* orc_arm_dump_insns (compiler); */ } static OrcTarget orc_arm_target = { @@ -130,7 +130,7 @@ orc_compiler_orc_arm_init (OrcCompiler *compiler) for(i=ORC_GP_REG_BASE;ivalid_regs[i] = 1; } - //compiler->valid_regs[ORC_ARM_SB] = 0; + /* compiler->valid_regs[ORC_ARM_SB] = 0; */ compiler->valid_regs[ORC_ARM_IP] = 0; compiler->valid_regs[ORC_ARM_SP] = 0; compiler->valid_regs[ORC_ARM_LR] = 0; @@ -161,16 +161,16 @@ orc_arm_load_constants_outer (OrcCompiler *compiler) if (compiler->vars[i].name == NULL) continue; switch (compiler->vars[i].vartype) { case ORC_VAR_TYPE_CONST: - //orc_arm_emit_load_imm (compiler, compiler->vars[i].alloc, - // (int)compiler->vars[i].value); + /* orc_arm_emit_load_imm (compiler, compiler->vars[i].alloc, */ + /* (int)compiler->vars[i].value); */ break; case ORC_VAR_TYPE_PARAM: ORC_PROGRAM_ERROR(compiler,"unimplemented"); return; /* FIXME offset is too large */ - //orc_arm_loadw (compiler, compiler->vars[i].alloc, - // compiler->exec_reg, - // (int)ORC_STRUCT_OFFSET(OrcExecutor, params[i])); + /* orc_arm_loadw (compiler, compiler->vars[i].alloc, */ + /* compiler->exec_reg, */ + /* (int)ORC_STRUCT_OFFSET(OrcExecutor, params[i])); */ break; case ORC_VAR_TYPE_SRC: case ORC_VAR_TYPE_DEST: @@ -228,9 +228,9 @@ orc_arm_emit_load_src (OrcCompiler *compiler, OrcVariable *var) if (var->ptr_register == 0) { int i; i = var - compiler->vars; - //orc_arm_emit_mov_memoffset_reg (compiler, orc_arm_ptr_size, - // (int)ORC_STRUCT_OFFSET(OrcExecutor, arrays[i]), - // compiler->exec_reg, X86_ECX); + /* orc_arm_emit_mov_memoffset_reg (compiler, orc_arm_ptr_size, */ + /* (int)ORC_STRUCT_OFFSET(OrcExecutor, arrays[i]), */ + /* compiler->exec_reg, X86_ECX); */ ptr_reg = ORC_ARM_PC; } else { ptr_reg = var->ptr_register; @@ -238,23 +238,23 @@ orc_arm_emit_load_src (OrcCompiler *compiler, OrcVariable *var) switch (var->size << compiler->loop_shift) { case 1: orc_arm_loadb (compiler, var->alloc, ptr_reg, 0); - //orc_arm_emit_mov_memoffset_reg (compiler, 1, 0, ptr_reg, X86_ECX); - //orc_arm_emit_mov_reg_arm (compiler, X86_ECX, var->alloc); + /* orc_arm_emit_mov_memoffset_reg (compiler, 1, 0, ptr_reg, X86_ECX); */ + /* orc_arm_emit_mov_reg_arm (compiler, X86_ECX, var->alloc); */ break; case 2: orc_arm_loadw (compiler, var->alloc, ptr_reg, 0); - //orc_arm_emit_mov_memoffset_reg (compiler, 2, 0, ptr_reg, X86_ECX); - //orc_arm_emit_mov_reg_arm (compiler, X86_ECX, var->alloc); + /* orc_arm_emit_mov_memoffset_reg (compiler, 2, 0, ptr_reg, X86_ECX); */ + /* orc_arm_emit_mov_reg_arm (compiler, X86_ECX, var->alloc); */ break; case 4: orc_arm_loadl (compiler, var->alloc, ptr_reg, 0); - //orc_arm_emit_mov_memoffset_arm (compiler, 4, 0, ptr_reg, var->alloc); + /* orc_arm_emit_mov_memoffset_arm (compiler, 4, 0, ptr_reg, var->alloc); */ break; - //case 8: - //orc_arm_emit_mov_memoffset_arm (compiler, 8, 0, ptr_reg, var->alloc); + /* case 8: */ + /* orc_arm_emit_mov_memoffset_arm (compiler, 8, 0, ptr_reg, var->alloc); */ break; - //case 16: - //orc_arm_emit_mov_memoffset_arm (compiler, 16, 0, ptr_reg, var->alloc); + /* case 16: */ + /* orc_arm_emit_mov_memoffset_arm (compiler, 16, 0, ptr_reg, var->alloc); */ break; default: ORC_COMPILER_ERROR(compiler, "bad size %d", var->size << compiler->loop_shift); @@ -266,8 +266,8 @@ orc_arm_emit_store_dest (OrcCompiler *compiler, OrcVariable *var) { int ptr_reg; if (var->ptr_register == 0) { - //orc_arm_emit_mov_memoffset_reg (compiler, orc_arm_ptr_size, - // var->ptr_offset, compiler->exec_reg, X86_ECX); + /* orc_arm_emit_mov_memoffset_reg (compiler, orc_arm_ptr_size, */ + /* var->ptr_offset, compiler->exec_reg, X86_ECX); */ ptr_reg = ORC_ARM_PC; } else { ptr_reg = var->ptr_register; @@ -275,26 +275,26 @@ orc_arm_emit_store_dest (OrcCompiler *compiler, OrcVariable *var) switch (var->size << compiler->loop_shift) { case 1: orc_arm_storeb (compiler, ptr_reg, 0, var->alloc); - //orc_arm_emit_mov_orc_arm_reg (compiler, var->alloc, X86_ECX); - //orc_arm_emit_mov_reg_memoffset (compiler, 1, X86_ECX, 0, ptr_reg); + /* orc_arm_emit_mov_orc_arm_reg (compiler, var->alloc, X86_ECX); */ + /* orc_arm_emit_mov_reg_memoffset (compiler, 1, X86_ECX, 0, ptr_reg); */ break; case 2: orc_arm_storew (compiler, ptr_reg, 0, var->alloc); - //orc_arm_emit_mov_orc_arm_reg (compiler, var->alloc, X86_ECX); - //orc_arm_emit_mov_reg_memoffset (compiler, 2, X86_ECX, 0, ptr_reg); + /* orc_arm_emit_mov_orc_arm_reg (compiler, var->alloc, X86_ECX); */ + /* orc_arm_emit_mov_reg_memoffset (compiler, 2, X86_ECX, 0, ptr_reg); */ break; case 4: orc_arm_storel (compiler, ptr_reg, 0, var->alloc); - //orc_arm_emit_mov_orc_arm_memoffset (compiler, 4, var->alloc, 0, ptr_reg, - // var->is_aligned, var->is_uncached); + /* orc_arm_emit_mov_orc_arm_memoffset (compiler, 4, var->alloc, 0, ptr_reg, */ + /* var->is_aligned, var->is_uncached); */ break; case 8: - //orc_arm_emit_mov_orc_arm_memoffset (compiler, 8, var->alloc, 0, ptr_reg, - // var->is_aligned, var->is_uncached); + /* orc_arm_emit_mov_orc_arm_memoffset (compiler, 8, var->alloc, 0, ptr_reg, */ + /* var->is_aligned, var->is_uncached); */ break; case 16: - //orc_arm_emit_mov_orc_arm_memoffset (compiler, 16, var->alloc, 0, ptr_reg, - // var->is_aligned, var->is_uncached); + /* orc_arm_emit_mov_orc_arm_memoffset (compiler, 16, var->alloc, 0, ptr_reg, */ + /* var->is_aligned, var->is_uncached); */ break; default: ORC_COMPILER_ERROR(compiler, "bad size %d", var->size << compiler->loop_shift); @@ -396,7 +396,7 @@ orc_arm_emit_loop (OrcCompiler *compiler) switch (compiler->vars[insn->src_args[k]].vartype) { case ORC_VAR_TYPE_SRC: case ORC_VAR_TYPE_DEST: - //orc_arm_emit_load_src (compiler, &compiler->vars[insn->src_args[k]]); + /* orc_arm_emit_load_src (compiler, &compiler->vars[insn->src_args[k]]); */ break; case ORC_VAR_TYPE_CONST: break; @@ -427,7 +427,7 @@ orc_arm_emit_loop (OrcCompiler *compiler) switch (compiler->vars[insn->dest_args[k]].vartype) { case ORC_VAR_TYPE_DEST: - //orc_arm_emit_store_dest (compiler, &compiler->vars[insn->dest_args[k]]); + /* orc_arm_emit_store_dest (compiler, &compiler->vars[insn->dest_args[k]]); */ break; case ORC_VAR_TYPE_TEMP: break; @@ -447,10 +447,10 @@ orc_arm_emit_loop (OrcCompiler *compiler) compiler->vars[k].ptr_register, compiler->vars[k].size << compiler->loop_shift); } else { - //orc_arm_emit_add_imm_memoffset (compiler, orc_arm_ptr_size, - // compiler->vars[k].size << compiler->loop_shift, - // (int)ORC_STRUCT_OFFSET(OrcExecutor, arrays[k]), - // compiler->exec_reg); + /* orc_arm_emit_add_imm_memoffset (compiler, orc_arm_ptr_size, */ + /* compiler->vars[k].size << compiler->loop_shift, */ + /* (int)ORC_STRUCT_OFFSET(OrcExecutor, arrays[k]), */ + /* compiler->exec_reg); */ } } } diff --git a/orc/orcprogram-c64x-c.c b/orc/orcprogram-c64x-c.c index 8361fee..8323dcd 100644 --- a/orc/orcprogram-c64x-c.c +++ b/orc/orcprogram-c64x-c.c @@ -8,7 +8,7 @@ #include #include -//static const char *c_get_type_name (int size); +/* static const char *c_get_type_name (int size); */ void orc_c_init (void); @@ -52,8 +52,8 @@ orc_target_c64x_c_get_asm_preamble (void) " int counter3;\n" " void *arrays[ORC_N_VARIABLES];\n" " int params[ORC_N_VARIABLES];\n" - " //OrcVariable vars[ORC_N_VARIABLES];\n" - " //OrcVariable *args[ORC_OPCODE_N_ARGS];\n" + " /* OrcVariable vars[ORC_N_VARIABLES]; */\n" + " /* OrcVariable *args[ORC_OPCODE_N_ARGS]; */\n" "};\n" "#define ORC_CLAMP(x,a,b) ((x)<(a) ? (a) : ((x)>(b) ? (b) : (x)))\n" "#define ORC_ABS(a) ((a)<0 ? -(a) : (a))\n" diff --git a/orc/orcprogram-neon.c b/orc/orcprogram-neon.c index 5bea613..984b089 100644 --- a/orc/orcprogram-neon.c +++ b/orc/orcprogram-neon.c @@ -83,7 +83,7 @@ orc_neon_emit_epilogue (OrcCompiler *compiler) if (regs) orc_arm_emit_pop (compiler, regs); orc_arm_emit_bx_lr (compiler); - //arm_dump_insns (compiler); + /* arm_dump_insns (compiler); */ } static OrcTarget neon_target = { @@ -137,7 +137,7 @@ orc_compiler_neon_init (OrcCompiler *compiler) for(i=ORC_VEC_REG_BASE+0;ivalid_regs[i] = 1; } - //compiler->valid_regs[ORC_ARM_SB] = 0; + /* compiler->valid_regs[ORC_ARM_SB] = 0; */ compiler->valid_regs[ORC_ARM_IP] = 0; compiler->valid_regs[ORC_ARM_SP] = 0; compiler->valid_regs[ORC_ARM_LR] = 0; @@ -330,9 +330,9 @@ orc_neon_emit_load_src (OrcCompiler *compiler, OrcVariable *var, int unroll_inde if (var->ptr_register == 0) { int i; i = var - compiler->vars; - //arm_emit_mov_memoffset_reg (compiler, arm_ptr_size, - // (int)ORC_STRUCT_OFFSET(OrcExecutor, arrays[i]), - // p->exec_reg, X86_ECX); + /* arm_emit_mov_memoffset_reg (compiler, arm_ptr_size, */ + /* (int)ORC_STRUCT_OFFSET(OrcExecutor, arrays[i]), */ + /* p->exec_reg, X86_ECX); */ ptr_reg = ORC_ARM_PC; } else { ptr_reg = var->ptr_register; @@ -378,8 +378,8 @@ orc_neon_emit_store_dest (OrcCompiler *compiler, OrcVariable *var) { int ptr_reg; if (var->ptr_register == 0) { - //arm_emit_mov_memoffset_reg (compiler, arm_ptr_size, - // var->ptr_offset, p->exec_reg, X86_ECX); + /* arm_emit_mov_memoffset_reg (compiler, arm_ptr_size, */ + /* var->ptr_offset, p->exec_reg, X86_ECX); */ ptr_reg = ORC_ARM_PC; } else { ptr_reg = var->ptr_register; @@ -748,7 +748,7 @@ orc_neon_emit_loop (OrcCompiler *compiler, int unroll_index) switch (compiler->vars[insn->src_args[k]].vartype) { case ORC_VAR_TYPE_SRC: case ORC_VAR_TYPE_DEST: - //orc_neon_emit_load_src (compiler, &compiler->vars[insn->src_args[k]], unroll_index); + /* orc_neon_emit_load_src (compiler, &compiler->vars[insn->src_args[k]], unroll_index); */ break; case ORC_VAR_TYPE_CONST: break; @@ -788,7 +788,7 @@ orc_neon_emit_loop (OrcCompiler *compiler, int unroll_index) switch (compiler->vars[insn->dest_args[k]].vartype) { case ORC_VAR_TYPE_DEST: - //orc_neon_emit_store_dest (compiler, &compiler->vars[insn->dest_args[k]]); + /* orc_neon_emit_store_dest (compiler, &compiler->vars[insn->dest_args[k]]); */ break; case ORC_VAR_TYPE_TEMP: break; @@ -808,10 +808,10 @@ orc_neon_emit_loop (OrcCompiler *compiler, int unroll_index) compiler->vars[k].ptr_register, compiler->vars[k].size << compiler->loop_shift); } else { - //arm_emit_add_imm_memoffset (compiler, arm_ptr_size, - // compiler->vars[k].size << compiler->loop_shift, - // (int)ORC_STRUCT_OFFSET(OrcExecutor, arrays[k]), - // p->exec_reg); + /* arm_emit_add_imm_memoffset (compiler, arm_ptr_size, */ + /* compiler->vars[k].size << compiler->loop_shift, */ + /* (int)ORC_STRUCT_OFFSET(OrcExecutor, arrays[k]), */ + /* p->exec_reg); */ } } } diff --git a/orc/orcrules-altivec.c b/orc/orcrules-altivec.c index f18b633..336794c 100644 --- a/orc/orcrules-altivec.c +++ b/orc/orcrules-altivec.c @@ -343,7 +343,7 @@ RULE(addb, "vaddubm", 0x10000000) RULE(addssb, "vaddsbs", 0x10000300) RULE(addusb, "vaddubs", 0x10000200) RULE(andb, "vand", 0x10000404) -//RULE(andnb, "vandc", 0x10000444) +/* RULE(andnb, "vandc", 0x10000444) */ RULE(avgsb, "vavgsb", 0x10000502) RULE(avgub, "vavgub", 0x10000402) RULE(cmpeqb, "vcmpequb", 0x10000006) @@ -365,7 +365,7 @@ RULE(addw, "vadduhm", 0x10000040) RULE(addssw, "vaddshs", 0x10000340) RULE(addusw, "vadduhs", 0x10000240) RULE(andw, "vand", 0x10000404) -//RULE(andnw, "vandc", 0x10000444) +/* RULE(andnw, "vandc", 0x10000444) */ RULE(avgsw, "vavgsh", 0x10000542) RULE(avguw, "vavguh", 0x10000442) RULE(cmpeqw, "vcmpequh", 0x10000046) @@ -387,7 +387,7 @@ RULE(addl, "vadduwm", 0x10000080) RULE(addssl, "vaddsws", 0x10000380) RULE(addusl, "vadduws", 0x10000280) RULE(andl, "vand", 0x10000404) -//RULE(andnl, "vandc", 0x10000444) +/* RULE(andnl, "vandc", 0x10000444) */ RULE(avgsl, "vavgsw", 0x10000582) RULE(avgul, "vavguw", 0x10000482) RULE(cmpeql, "vcmpequw", 0x10000086) diff --git a/orc/orcrules-mmx.c b/orc/orcrules-mmx.c index 4875410..82f7c20 100644 --- a/orc/orcrules-mmx.c +++ b/orc/orcrules-mmx.c @@ -441,7 +441,7 @@ mmx_rule_ldresnearl (OrcCompiler *compiler, void *user, OrcInstruction *insn) orc_x86_emit_mov_memindex_mmx (compiler, 4, 0, src->ptr_register, compiler->gp_tmpreg, 2, tmp, FALSE); #ifdef MMX - //orc_mmx_emit_punpckldq (compiler, tmp, dest->alloc); + /* orc_mmx_emit_punpckldq (compiler, tmp, dest->alloc); */ orc_mmx_emit_psllq_imm (compiler, 8*4*i, tmp); orc_mmx_emit_por (compiler, tmp, dest->alloc); #else @@ -710,11 +710,11 @@ BINARY(maxsb,pmaxsb,0x383c) BINARY(maxub,pmaxub,0xde) BINARY(minsb,pminsb,0x3838) BINARY(minub,pminub,0xda) -//BINARY(mullb,pmullb,0xd5) -//BINARY(mulhsb,pmulhb,0xe5) -//BINARY(mulhub,pmulhub,0xe4) +/* BINARY(mullb,pmullb,0xd5) */ +/* BINARY(mulhsb,pmulhb,0xe5) */ +/* BINARY(mulhub,pmulhub,0xe4) */ BINARY(orb,por,0xeb) -//UNARY(signb,psignb,0x3808) +/* UNARY(signb,psignb,0x3808) */ BINARY(subb,psubb,0xf8) BINARY(subssb,psubsb,0xe8) BINARY(subusb,psubusb,0xd8) @@ -737,7 +737,7 @@ BINARY(mullw,pmullw,0xd5) BINARY(mulhsw,pmulhw,0xe5) BINARY(mulhuw,pmulhuw,0xe4) BINARY(orw,por,0xeb) -//UNARY(signw,psignw,0x3809) +/* UNARY(signw,psignw,0x3809) */ BINARY(subw,psubw,0xf9) BINARY(subssw,psubsw,0xe9) BINARY(subusw,psubusw,0xd9) @@ -745,11 +745,11 @@ BINARY(xorw,pxor,0xef) UNARY(absl,pabsd,0x381e) BINARY(addl,paddd,0xfe) -//BINARY(addssl,paddsd,0xed) -//BINARY(addusl,paddusd,0xdd) +/* BINARY(addssl,paddsd,0xed) */ +/* BINARY(addusl,paddusd,0xdd) */ BINARY(andl,pand,0xdb) BINARY(andnl,pandn,0xdf) -//BINARY(avgul,pavgd,0xe3) +/* BINARY(avgul,pavgd,0xe3) */ BINARY(cmpeql,pcmpeqd,0x76) BINARY(cmpgtsl,pcmpgtd,0x66) BINARY(maxsl,pmaxsd,0x383d) @@ -757,13 +757,13 @@ BINARY(maxul,pmaxud,0x383f) BINARY(minsl,pminsd,0x3839) BINARY(minul,pminud,0x383b) BINARY(mulll,pmulld,0x3840) -//BINARY(mulhsl,pmulhd,0xe5) -//BINARY(mulhul,pmulhud,0xe4) +/* BINARY(mulhsl,pmulhd,0xe5) */ +/* BINARY(mulhul,pmulhud,0xe4) */ BINARY(orl,por,0xeb) -//UNARY(signl,psignd,0x380a) +/* UNARY(signl,psignd,0x380a) */ BINARY(subl,psubd,0xfa) -//BINARY(subssl,psubsd,0xe9) -//BINARY(subusl,psubusd,0xd9) +/* BINARY(subssl,psubsd,0xe9) */ +/* BINARY(subusl,psubusd,0xd9) */ BINARY(xorl,pxor,0xef) BINARY(andq,pand,0xdb) @@ -932,10 +932,10 @@ static void mmx_rule_shift (OrcCompiler *p, void *user, OrcInstruction *insn) { int type = ORC_PTR_TO_INT(user); - //int imm_code1[] = { 0x71, 0x71, 0x71, 0x72, 0x72, 0x72, 0x73, 0x73 }; - //int imm_code2[] = { 6, 2, 4, 6, 2, 4, 6, 2 }; - //int reg_code[] = { 0xf1, 0xd1, 0xe1, 0xf2, 0xd2, 0xe2, 0xf3, 0xd3 }; - //const char *code[] = { "psllw", "psrlw", "psraw", "pslld", "psrld", "psrad", "psllq", "psrlq" }; + /* int imm_code1[] = { 0x71, 0x71, 0x71, 0x72, 0x72, 0x72, 0x73, 0x73 }; */ + /* int imm_code2[] = { 6, 2, 4, 6, 2, 4, 6, 2 }; */ + /* int reg_code[] = { 0xf1, 0xd1, 0xe1, 0xf2, 0xd2, 0xe2, 0xf3, 0xd3 }; */ + /* const char *code[] = { "psllw", "psrlw", "psraw", "pslld", "psrld", "psrad", "psllq", "psrlq" }; */ const int opcodes[] = { ORC_X86_psllw, ORC_X86_psrlw, ORC_X86_psraw, ORC_X86_pslld, ORC_X86_psrld, ORC_X86_psrad, ORC_X86_psllq, ORC_X86_psrlq }; @@ -1652,7 +1652,7 @@ mmx_rule_mululq (OrcCompiler *p, void *user, OrcInstruction *insn) static void mmx_rule_select0lw (OrcCompiler *p, void *user, OrcInstruction *insn) { - //int src = p->vars[insn->src_args[0]].alloc; + /* int src = p->vars[insn->src_args[0]].alloc; */ int dest = p->vars[insn->dest_args[0]].alloc; /* FIXME slow */ @@ -1666,7 +1666,7 @@ mmx_rule_select0lw (OrcCompiler *p, void *user, OrcInstruction *insn) static void mmx_rule_select1lw (OrcCompiler *p, void *user, OrcInstruction *insn) { - //int src = p->vars[insn->src_args[0]].alloc; + /* int src = p->vars[insn->src_args[0]].alloc; */ int dest = p->vars[insn->dest_args[0]].alloc; /* FIXME slow */ @@ -1706,7 +1706,7 @@ mmx_rule_select1ql (OrcCompiler *p, void *user, OrcInstruction *insn) static void mmx_rule_select0wb (OrcCompiler *p, void *user, OrcInstruction *insn) { - //int src = p->vars[insn->src_args[0]].alloc; + /* int src = p->vars[insn->src_args[0]].alloc; */ int dest = p->vars[insn->dest_args[0]].alloc; /* FIXME slow */ @@ -1720,7 +1720,7 @@ mmx_rule_select0wb (OrcCompiler *p, void *user, OrcInstruction *insn) static void mmx_rule_select1wb (OrcCompiler *p, void *user, OrcInstruction *insn) { - //int src = p->vars[insn->src_args[0]].alloc; + /* int src = p->vars[insn->src_args[0]].alloc; */ int dest = p->vars[insn->dest_args[0]].alloc; /* FIXME slow */ @@ -2245,11 +2245,11 @@ mmx_rule_addssl_slow (OrcCompiler *p, void *user, OrcInstruction *insn) orc_mmx_emit_psrad_imm (p, 31, tmp2); tmp = orc_compiler_get_constant (p, 4, 0x80000000); - orc_mmx_emit_pxor (p, tmp, tmp2); // clamped value + orc_mmx_emit_pxor (p, tmp, tmp2); /* clamped value */ orc_mmx_emit_pand (p, tmp3, tmp2); orc_mmx_emit_paddd (p, src, dest); - orc_mmx_emit_pandn (p, dest, tmp3); // tmp is mask: ~0 is for clamping + orc_mmx_emit_pandn (p, dest, tmp3); /* tmp is mask: ~0 is for clamping */ orc_mmx_emit_movq (p, tmp3, dest); orc_mmx_emit_por (p, tmp2, dest); @@ -2321,11 +2321,11 @@ mmx_rule_subssl_slow (OrcCompiler *p, void *user, OrcInstruction *insn) orc_mmx_emit_pslld_imm (p, 1, tmp2); orc_mmx_emit_movq (p, tmp, tmp3); orc_mmx_emit_pxor (p, tmp2, tmp3); - orc_mmx_emit_psrad_imm (p, 31, tmp3); // tmp3 is mask: ~0 is for clamping + orc_mmx_emit_psrad_imm (p, 31, tmp3); /* tmp3 is mask: ~0 is for clamping */ orc_mmx_emit_psrad_imm (p, 31, tmp2); tmp = orc_compiler_get_constant (p, 4, 0x80000000); - orc_mmx_emit_pxor (p, tmp, tmp2); // clamped value + orc_mmx_emit_pxor (p, tmp, tmp2); /* clamped value */ orc_mmx_emit_pand (p, tmp3, tmp2); orc_mmx_emit_psubd (p, src, dest); @@ -2816,7 +2816,7 @@ orc_compiler_mmx_register_rules (OrcTarget *target) orc_rule_register (rule_set, "convql", mmx_rule_convql, NULL); orc_rule_register (rule_set, "convslq", mmx_rule_convslq, NULL); orc_rule_register (rule_set, "convulq", mmx_rule_convulq, NULL); - //orc_rule_register (rule_set, "convsssql", mmx_rule_convsssql, NULL); + /* orc_rule_register (rule_set, "convsssql", mmx_rule_convsssql, NULL); */ orc_rule_register (rule_set, "mulsbw", mmx_rule_mulsbw, NULL); orc_rule_register (rule_set, "mulubw", mmx_rule_mulubw, NULL); diff --git a/orc/orcrules-neon.c b/orc/orcrules-neon.c index 8d26dea..a28d754 100644 --- a/orc/orcrules-neon.c +++ b/orc/orcrules-neon.c @@ -315,7 +315,7 @@ orc_neon_load_vec_unaligned (OrcCompiler *compiler, OrcVariable *var, code = NEON_BINARY(0xf3b00900, var->alloc, var->aligned_data, var->mask_alloc); orc_arm_emit (compiler, code); -//orc_neon_emit_mov (compiler, var->alloc, var->mask_alloc); +/* orc_neon_emit_mov (compiler, var->alloc, var->mask_alloc); */ orc_neon_emit_mov (compiler, var->aligned_data, var->aligned_data + 1); #endif @@ -334,7 +334,7 @@ orc_neon_load_halfvec_unaligned (OrcCompiler *compiler, OrcVariable *var, code |= (var->ptr_register&0xf) << 16; code |= ((var->alloc)&0xf) << 12; code |= (((var->alloc)>>4)&0x1) << 22; - //code |= (!update) << 1; + /* code |= (!update) << 1; */ code |= (1) << 1; orc_arm_emit (compiler, code); @@ -545,7 +545,7 @@ orc_neon_loadl (OrcCompiler *compiler, OrcVariable *var, int update) orc_neon_load_vec_unaligned (compiler, var, update); } else { if (compiler->insn_shift > 0) { - //ORC_ERROR("slow load"); + /* ORC_ERROR("slow load"); */ } for(i=0;i<(1<insn_shift);i++){ ORC_ASM_CODE(compiler," vld1.32 %s[%d], [%s]%s\n", @@ -1170,9 +1170,9 @@ orc_neon_emit_loadil (OrcCompiler *compiler, int reg, int value) void orc_neon_emit_loadiq (OrcCompiler *compiler, int reg, int value) { - //orc_uint32 code; - //int shift; - //int neg = FALSE; + /* orc_uint32 code; */ + /* int shift; */ + /* int neg = FALSE; */ if (value == 0) { orc_neon_emit_binary_quad (compiler, "veor", 0xf3000110, reg, reg, reg); @@ -1180,7 +1180,7 @@ orc_neon_emit_loadiq (OrcCompiler *compiler, int reg, int value) } if (value < 0) { - //neg = TRUE; + /* neg = TRUE; */ value = ~value; } #if 0 @@ -1625,7 +1625,7 @@ BINARY(addb,"vadd.i8",0xf2000800, 3) BINARY(addssb,"vqadd.s8",0xf2000010, 3) BINARY(addusb,"vqadd.u8",0xf3000010, 3) BINARY(andb,"vand",0xf2000110, 3) -//BINARY(andnb,"vbic",0xf2100110, 3) +/* BINARY(andnb,"vbic",0xf2100110, 3) */ BINARY(avgsb,"vrhadd.s8",0xf2000100, 3) BINARY(avgub,"vrhadd.u8",0xf3000100, 3) BINARY(cmpeqb,"vceq.i8",0xf3000810, 3) @@ -1637,9 +1637,9 @@ BINARY(minsb,"vmin.s8",0xf2000610, 3) BINARY(minub,"vmin.u8",0xf3000610, 3) BINARY(mullb,"vmul.i8",0xf2000910, 3) BINARY(orb,"vorr",0xf2200110, 3) -//LSHIFT(shlb,"vshl.i8",0xf2880510, 3) -//RSHIFT(shrsb,"vshr.s8",0xf2880010,8, 3) -//RSHIFT(shrub,"vshr.u8",0xf3880010,8, 3) +/* LSHIFT(shlb,"vshl.i8",0xf2880510, 3) */ +/* RSHIFT(shrsb,"vshr.s8",0xf2880010,8, 3) */ +/* RSHIFT(shrub,"vshr.u8",0xf3880010,8, 3) */ BINARY(subb,"vsub.i8",0xf3000800, 3) BINARY(subssb,"vqsub.s8",0xf2000210, 3) BINARY(subusb,"vqsub.u8",0xf3000210, 3) @@ -1650,7 +1650,7 @@ BINARY(addw,"vadd.i16",0xf2100800, 2) BINARY(addssw,"vqadd.s16",0xf2100010, 2) BINARY(addusw,"vqadd.u16",0xf3100010, 2) BINARY(andw,"vand",0xf2000110, 2) -//BINARY(andnw,"vbic",0xf2100110, 2) +/* BINARY(andnw,"vbic",0xf2100110, 2) */ BINARY(avgsw,"vrhadd.s16",0xf2100100, 2) BINARY(avguw,"vrhadd.u16",0xf3100100, 2) BINARY(cmpeqw,"vceq.i16",0xf3100810, 2) @@ -1662,9 +1662,9 @@ BINARY(minsw,"vmin.s16",0xf2100610, 2) BINARY(minuw,"vmin.u16",0xf3100610, 2) BINARY(mullw,"vmul.i16",0xf2100910, 2) BINARY(orw,"vorr",0xf2200110, 2) -//LSHIFT(shlw,"vshl.i16",0xf2900510, 2) -//RSHIFT(shrsw,"vshr.s16",0xf2900010,16, 2) -//RSHIFT(shruw,"vshr.u16",0xf3900010,16, 2) +/* LSHIFT(shlw,"vshl.i16",0xf2900510, 2) */ +/* RSHIFT(shrsw,"vshr.s16",0xf2900010,16, 2) */ +/* RSHIFT(shruw,"vshr.u16",0xf3900010,16, 2) */ BINARY(subw,"vsub.i16",0xf3100800, 2) BINARY(subssw,"vqsub.s16",0xf2100210, 2) BINARY(subusw,"vqsub.u16",0xf3100210, 2) @@ -1675,7 +1675,7 @@ BINARY(addl,"vadd.i32",0xf2200800, 1) BINARY(addssl,"vqadd.s32",0xf2200010, 1) BINARY(addusl,"vqadd.u32",0xf3200010, 1) BINARY(andl,"vand",0xf2000110, 1) -//BINARY(andnl,"vbic",0xf2100110, 1) +/* BINARY(andnl,"vbic",0xf2100110, 1) */ BINARY(avgsl,"vrhadd.s32",0xf2200100, 1) BINARY(avgul,"vrhadd.u32",0xf3200100, 1) BINARY(cmpeql,"vceq.i32",0xf3200810, 1) @@ -1687,33 +1687,33 @@ BINARY(minsl,"vmin.s32",0xf2200610, 1) BINARY(minul,"vmin.u32",0xf3200610, 1) BINARY(mulll,"vmul.i32",0xf2200910, 1) BINARY(orl,"vorr",0xf2200110, 1) -//LSHIFT(shll,"vshl.i32",0xf2a00510, 1) -//RSHIFT(shrsl,"vshr.s32",0xf2a00010,32, 1) -//RSHIFT(shrul,"vshr.u32",0xf3a00010,32, 1) +/* LSHIFT(shll,"vshl.i32",0xf2a00510, 1) */ +/* RSHIFT(shrsl,"vshr.s32",0xf2a00010,32, 1) */ +/* RSHIFT(shrul,"vshr.u32",0xf3a00010,32, 1) */ BINARY(subl,"vsub.i32",0xf3200800, 1) BINARY(subssl,"vqsub.s32",0xf2200210, 1) BINARY(subusl,"vqsub.u32",0xf3200210, 1) BINARY(xorl,"veor",0xf3000110, 1) -//UNARY(absq,"vabs.s64",0xf3b10300, 0) +/* UNARY(absq,"vabs.s64",0xf3b10300, 0) */ BINARY(addq,"vadd.i64",0xf2300800, 0) -//BINARY(addssq,"vqadd.s64",0xf2000010, 0) -//BINARY(addusq,"vqadd.u64",0xf3000010, 0) +/* BINARY(addssq,"vqadd.s64",0xf2000010, 0) */ +/* BINARY(addusq,"vqadd.u64",0xf3000010, 0) */ BINARY(andq,"vand",0xf2000110, 0) -//BINARY(avgsq,"vrhadd.s64",0xf2000100, 0) -//BINARY(avguq,"vrhadd.u64",0xf3000100, 0) -//BINARY(cmpeqq,"vceq.i64",0xf3000810, 0) -//BINARY(cmpgtsq,"vcgt.s64",0xf2000300, 0) +/* BINARY(avgsq,"vrhadd.s64",0xf2000100, 0) */ +/* BINARY(avguq,"vrhadd.u64",0xf3000100, 0) */ +/* BINARY(cmpeqq,"vceq.i64",0xf3000810, 0) */ +/* BINARY(cmpgtsq,"vcgt.s64",0xf2000300, 0) */ MOVE(copyq,"vmov",0xf2200110, 0) -//BINARY(maxsq,"vmax.s64",0xf2000600, 0) -//BINARY(maxuq,"vmax.u64",0xf3000600, 0) -//BINARY(minsq,"vmin.s64",0xf2000610, 0) -//BINARY(minuq,"vmin.u64",0xf3000610, 0) -//BINARY(mullq,"vmul.i64",0xf2000910, 0) +/* BINARY(maxsq,"vmax.s64",0xf2000600, 0) */ +/* BINARY(maxuq,"vmax.u64",0xf3000600, 0) */ +/* BINARY(minsq,"vmin.s64",0xf2000610, 0) */ +/* BINARY(minuq,"vmin.u64",0xf3000610, 0) */ +/* BINARY(mullq,"vmul.i64",0xf2000910, 0) */ BINARY(orq,"vorr",0xf2200110, 0) BINARY(subq,"vsub.i64",0xf3300800, 0) -//BINARY(subssq,"vqsub.s64",0xf2000210, 0) -//BINARY(subusq,"vqsub.u64",0xf3000210, 0) +/* BINARY(subssq,"vqsub.s64",0xf2000210, 0) */ +/* BINARY(subusq,"vqsub.u64",0xf3000210, 0) */ BINARY(xorq,"veor",0xf3000110, 0) UNARY_LONG(convsbw,"vmovl.s8",0xf2880a10, 3) @@ -1756,8 +1756,8 @@ BINARY(mulf,"vmul.f32",0xf3000d10, 1) BINARY(maxf,"vmax.f32",0xf2000f00, 1) BINARY(minf,"vmin.f32",0xf2200f00, 1) BINARY(cmpeqf,"vceq.f32",0xf2000e00, 1) -//BINARY_R(cmpltf,"vclt.f32",0xf3200e00, 1) -//BINARY_R(cmplef,"vcle.f32",0xf3000e00, 1) +/* BINARY_R(cmpltf,"vclt.f32",0xf3200e00, 1) */ +/* BINARY_R(cmplef,"vcle.f32",0xf3000e00, 1) */ UNARY(convfl,"vcvt.s32.f32",0xf3bb0700, 1) UNARY(convlf,"vcvt.f32.s32",0xf3bb0600, 1) @@ -1800,7 +1800,7 @@ BINARY_VFP(subd,"vsub.f64",0xee300b40, 0) BINARY_VFP(muld,"vmul.f64",0xee200b00, 0) BINARY_VFP(divd,"vdiv.f64",0xee800b00, 0) UNARY_VFP(sqrtd,"vsqrt.f64",0xeeb10b00, 0) -//BINARY_VFP(cmpeqd,"vcmpe.f64",0xee000000, 0) +/* BINARY_VFP(cmpeqd,"vcmpe.f64",0xee000000, 0) */ UNARY_VFP(convdf,"vcvt.f64.f32",0xee200b00, 0) UNARY_VFP(convfd,"vcvt.f32.f64",0xee200b00, 0) @@ -1817,13 +1817,13 @@ orc_neon_rule_divf (OrcCompiler *p, void *user, OrcInstruction *insn) p->vars[insn->src_args[1]].alloc); for(i = 0; i < NUM_ITERS_DIVF; i++) { orc_neon_emit_binary (p, "vrecps.f32", 0xf2000f10, - p->tmpreg2, //correction factor - p->tmpreg, //the last estimate - p->vars[insn->src_args[1]].alloc); //the original number + p->tmpreg2, /* correction factor */ + p->tmpreg, /* the last estimate */ + p->vars[insn->src_args[1]].alloc); /* the original number */ orc_neon_emit_binary (p, "vmul.f32", 0xf3000d10, - p->tmpreg, //revised estimate - p->tmpreg, //last estimate - p->tmpreg2); //correction factor + p->tmpreg, /* revised estimate */ + p->tmpreg, /* last estimate */ + p->tmpreg2); /* correction factor */ } orc_neon_emit_binary (p, "vmul.f32", 0xf3000d10, @@ -1838,13 +1838,13 @@ orc_neon_rule_divf (OrcCompiler *p, void *user, OrcInstruction *insn) p->vars[insn->src_args[1]].alloc); for(i = 0; i < NUM_ITERS_DIVF; i++) { orc_neon_emit_binary_quad (p, "vrecps.f32", 0xf2000f10, - p->tmpreg2, //correction factor - p->tmpreg, //the last estimate - p->vars[insn->src_args[1]].alloc); //the original number + p->tmpreg2, /* correction factor */ + p->tmpreg, /* the last estimate */ + p->vars[insn->src_args[1]].alloc); /* the original number */ orc_neon_emit_binary_quad (p, "vmul.f32", 0xf3000d10, - p->tmpreg, //revised estimate - p->tmpreg, //last estimate - p->tmpreg2); //correction factor + p->tmpreg, /* revised estimate */ + p->tmpreg, /* last estimate */ + p->tmpreg2); /* correction factor */ } orc_neon_emit_binary_quad (p, "vmul.f32", 0xf3000d10, @@ -1890,13 +1890,13 @@ orc_neon_rule_sqrtf (OrcCompiler *p, void *user, OrcInstruction *insn) for(i=0; i < NUM_ITERS_DIVF; i++) { orc_neon_emit_binary (p, "vrecps.f32", 0xf2000f10, - p->tmpreg2, //correction factor - p->vars[insn->dest_args[0]].alloc, //the last estimate - p->tmpreg); //the original number + p->tmpreg2, /* correction factor */ + p->vars[insn->dest_args[0]].alloc, /* the last estimate */ + p->tmpreg); /* the original number */ orc_neon_emit_binary (p, "vmul.f32", 0xf3000d10, - p->vars[insn->dest_args[0]].alloc, //revised estimate - p->vars[insn->dest_args[0]].alloc, //last estimate - p->tmpreg2); //correction factor + p->vars[insn->dest_args[0]].alloc, /* revised estimate */ + p->vars[insn->dest_args[0]].alloc, /* last estimate */ + p->tmpreg2); /* correction factor */ } } else if (p->insn_shift == vec_shift + 1) { @@ -1925,13 +1925,13 @@ orc_neon_rule_sqrtf (OrcCompiler *p, void *user, OrcInstruction *insn) for(i=0; i < NUM_ITERS_DIVF; i++) { orc_neon_emit_binary_quad (p, "vrecps.f32", 0xf2000f10, - p->tmpreg2, //correction factor - p->vars[insn->dest_args[0]].alloc, //the last estimate - p->tmpreg); //the original number + p->tmpreg2, /* correction factor */ + p->vars[insn->dest_args[0]].alloc, /* the last estimate */ + p->tmpreg); /* the original number */ orc_neon_emit_binary_quad (p, "vmul.f32", 0xf3000d10, - p->vars[insn->dest_args[0]].alloc, //revised estimate - p->vars[insn->dest_args[0]].alloc, //last estimate - p->tmpreg2); //correction factor + p->vars[insn->dest_args[0]].alloc, /* revised estimate */ + p->vars[insn->dest_args[0]].alloc, /* last estimate */ + p->tmpreg2); /* correction factor */ } } else { @@ -2724,7 +2724,7 @@ orc_compiler_neon_register_rules (OrcTarget *target) REG(addssb); REG(addusb); REG(andb); - //REG(andnb); + /* REG(andnb); */ REG(avgsb); REG(avgub); REG(cmpeqb); @@ -2738,9 +2738,9 @@ orc_compiler_neon_register_rules (OrcTarget *target) REG(mulhsb); REG(mulhub); REG(orb); - //REG(shlb); - //REG(shrsb); - //REG(shrub); + /* REG(shlb); */ + /* REG(shrsb); */ + /* REG(shrub); */ REG(signb); REG(subb); REG(subssb); @@ -2752,7 +2752,7 @@ orc_compiler_neon_register_rules (OrcTarget *target) REG(addssw); REG(addusw); REG(andw); - //REG(andnw); + /* REG(andnw); */ REG(avgsw); REG(avguw); REG(cmpeqw); @@ -2766,9 +2766,9 @@ orc_compiler_neon_register_rules (OrcTarget *target) REG(mulhsw); REG(mulhuw); REG(orw); - //REG(shlw); - //REG(shrsw); - //REG(shruw); + /* REG(shlw); */ + /* REG(shrsw); */ + /* REG(shruw); */ REG(signw); REG(subw); REG(subssw); @@ -2780,7 +2780,7 @@ orc_compiler_neon_register_rules (OrcTarget *target) REG(addssl); REG(addusl); REG(andl); - //REG(andnl); + /* REG(andnl); */ REG(avgsl); REG(avgul); REG(cmpeql); @@ -2794,9 +2794,9 @@ orc_compiler_neon_register_rules (OrcTarget *target) REG(mulhsl); REG(mulhul); REG(orl); - //REG(shll); - //REG(shrsl); - //REG(shrul); + /* REG(shll); */ + /* REG(shrsl); */ + /* REG(shrul); */ REG(signl); REG(subl); REG(subssl); @@ -2865,8 +2865,8 @@ orc_compiler_neon_register_rules (OrcTarget *target) REG(maxf); REG(minf); REG(cmpeqf); - //REG(cmpltf); - //REG(cmplef); + /* REG(cmpltf); */ + /* REG(cmplef); */ REG(convfl); REG(convlf); @@ -2875,7 +2875,7 @@ orc_compiler_neon_register_rules (OrcTarget *target) REG(muld); REG(divd); REG(sqrtd); - //REG(cmpeqd); + /* REG(cmpeqd); */ REG(convdf); REG(convfd); diff --git a/orc/orcrules-sse.c b/orc/orcrules-sse.c index 260a4f9..b9a6d3a 100644 --- a/orc/orcrules-sse.c +++ b/orc/orcrules-sse.c @@ -441,7 +441,7 @@ sse_rule_ldresnearl (OrcCompiler *compiler, void *user, OrcInstruction *insn) orc_x86_emit_mov_memindex_sse (compiler, 4, 0, src->ptr_register, compiler->gp_tmpreg, 2, tmp, FALSE); #ifdef MMX - //orc_mmx_emit_punpckldq (compiler, tmp, dest->alloc); + /* orc_mmx_emit_punpckldq (compiler, tmp, dest->alloc); */ orc_sse_emit_psllq_imm (compiler, 8*4*i, tmp); orc_sse_emit_por (compiler, tmp, dest->alloc); #else @@ -710,11 +710,11 @@ BINARY(maxsb,pmaxsb,0x383c) BINARY(maxub,pmaxub,0xde) BINARY(minsb,pminsb,0x3838) BINARY(minub,pminub,0xda) -//BINARY(mullb,pmullb,0xd5) -//BINARY(mulhsb,pmulhb,0xe5) -//BINARY(mulhub,pmulhub,0xe4) +/* BINARY(mullb,pmullb,0xd5) */ +/* BINARY(mulhsb,pmulhb,0xe5) */ +/* BINARY(mulhub,pmulhub,0xe4) */ BINARY(orb,por,0xeb) -//UNARY(signb,psignb,0x3808) +/* UNARY(signb,psignb,0x3808) */ BINARY(subb,psubb,0xf8) BINARY(subssb,psubsb,0xe8) BINARY(subusb,psubusb,0xd8) @@ -737,7 +737,7 @@ BINARY(mullw,pmullw,0xd5) BINARY(mulhsw,pmulhw,0xe5) BINARY(mulhuw,pmulhuw,0xe4) BINARY(orw,por,0xeb) -//UNARY(signw,psignw,0x3809) +/* UNARY(signw,psignw,0x3809) */ BINARY(subw,psubw,0xf9) BINARY(subssw,psubsw,0xe9) BINARY(subusw,psubusw,0xd9) @@ -745,11 +745,11 @@ BINARY(xorw,pxor,0xef) UNARY(absl,pabsd,0x381e) BINARY(addl,paddd,0xfe) -//BINARY(addssl,paddsd,0xed) -//BINARY(addusl,paddusd,0xdd) +/* BINARY(addssl,paddsd,0xed) */ +/* BINARY(addusl,paddusd,0xdd) */ BINARY(andl,pand,0xdb) BINARY(andnl,pandn,0xdf) -//BINARY(avgul,pavgd,0xe3) +/* BINARY(avgul,pavgd,0xe3) */ BINARY(cmpeql,pcmpeqd,0x76) BINARY(cmpgtsl,pcmpgtd,0x66) BINARY(maxsl,pmaxsd,0x383d) @@ -757,13 +757,13 @@ BINARY(maxul,pmaxud,0x383f) BINARY(minsl,pminsd,0x3839) BINARY(minul,pminud,0x383b) BINARY(mulll,pmulld,0x3840) -//BINARY(mulhsl,pmulhd,0xe5) -//BINARY(mulhul,pmulhud,0xe4) +/* BINARY(mulhsl,pmulhd,0xe5) */ +/* BINARY(mulhul,pmulhud,0xe4) */ BINARY(orl,por,0xeb) -//UNARY(signl,psignd,0x380a) +/* UNARY(signl,psignd,0x380a) */ BINARY(subl,psubd,0xfa) -//BINARY(subssl,psubsd,0xe9) -//BINARY(subusl,psubusd,0xd9) +/* BINARY(subssl,psubsd,0xe9) */ +/* BINARY(subusl,psubusd,0xd9) */ BINARY(xorl,pxor,0xef) BINARY(andq,pand,0xdb) @@ -932,10 +932,10 @@ static void sse_rule_shift (OrcCompiler *p, void *user, OrcInstruction *insn) { int type = ORC_PTR_TO_INT(user); - //int imm_code1[] = { 0x71, 0x71, 0x71, 0x72, 0x72, 0x72, 0x73, 0x73 }; - //int imm_code2[] = { 6, 2, 4, 6, 2, 4, 6, 2 }; - //int reg_code[] = { 0xf1, 0xd1, 0xe1, 0xf2, 0xd2, 0xe2, 0xf3, 0xd3 }; - //const char *code[] = { "psllw", "psrlw", "psraw", "pslld", "psrld", "psrad", "psllq", "psrlq" }; + /* int imm_code1[] = { 0x71, 0x71, 0x71, 0x72, 0x72, 0x72, 0x73, 0x73 }; */ + /* int imm_code2[] = { 6, 2, 4, 6, 2, 4, 6, 2 }; */ + /* int reg_code[] = { 0xf1, 0xd1, 0xe1, 0xf2, 0xd2, 0xe2, 0xf3, 0xd3 }; */ + /* const char *code[] = { "psllw", "psrlw", "psraw", "pslld", "psrld", "psrad", "psllq", "psrlq" }; */ const int opcodes[] = { ORC_X86_psllw, ORC_X86_psrlw, ORC_X86_psraw, ORC_X86_pslld, ORC_X86_psrld, ORC_X86_psrad, ORC_X86_psllq, ORC_X86_psrlq }; @@ -1652,7 +1652,7 @@ sse_rule_mululq (OrcCompiler *p, void *user, OrcInstruction *insn) static void sse_rule_select0lw (OrcCompiler *p, void *user, OrcInstruction *insn) { - //int src = p->vars[insn->src_args[0]].alloc; + /* int src = p->vars[insn->src_args[0]].alloc; */ int dest = p->vars[insn->dest_args[0]].alloc; /* FIXME slow */ @@ -1666,7 +1666,7 @@ sse_rule_select0lw (OrcCompiler *p, void *user, OrcInstruction *insn) static void sse_rule_select1lw (OrcCompiler *p, void *user, OrcInstruction *insn) { - //int src = p->vars[insn->src_args[0]].alloc; + /* int src = p->vars[insn->src_args[0]].alloc; */ int dest = p->vars[insn->dest_args[0]].alloc; /* FIXME slow */ @@ -1706,7 +1706,7 @@ sse_rule_select1ql (OrcCompiler *p, void *user, OrcInstruction *insn) static void sse_rule_select0wb (OrcCompiler *p, void *user, OrcInstruction *insn) { - //int src = p->vars[insn->src_args[0]].alloc; + /* int src = p->vars[insn->src_args[0]].alloc; */ int dest = p->vars[insn->dest_args[0]].alloc; /* FIXME slow */ @@ -1720,7 +1720,7 @@ sse_rule_select0wb (OrcCompiler *p, void *user, OrcInstruction *insn) static void sse_rule_select1wb (OrcCompiler *p, void *user, OrcInstruction *insn) { - //int src = p->vars[insn->src_args[0]].alloc; + /* int src = p->vars[insn->src_args[0]].alloc; */ int dest = p->vars[insn->dest_args[0]].alloc; /* FIXME slow */ @@ -2245,11 +2245,11 @@ sse_rule_addssl_slow (OrcCompiler *p, void *user, OrcInstruction *insn) orc_sse_emit_psrad_imm (p, 31, tmp2); tmp = orc_compiler_get_constant (p, 4, 0x80000000); - orc_sse_emit_pxor (p, tmp, tmp2); // clamped value + orc_sse_emit_pxor (p, tmp, tmp2); /* clamped value */ orc_sse_emit_pand (p, tmp3, tmp2); orc_sse_emit_paddd (p, src, dest); - orc_sse_emit_pandn (p, dest, tmp3); // tmp is mask: ~0 is for clamping + orc_sse_emit_pandn (p, dest, tmp3); /* tmp is mask: ~0 is for clamping */ orc_sse_emit_movdqa (p, tmp3, dest); orc_sse_emit_por (p, tmp2, dest); @@ -2321,11 +2321,11 @@ sse_rule_subssl_slow (OrcCompiler *p, void *user, OrcInstruction *insn) orc_sse_emit_pslld_imm (p, 1, tmp2); orc_sse_emit_movdqa (p, tmp, tmp3); orc_sse_emit_pxor (p, tmp2, tmp3); - orc_sse_emit_psrad_imm (p, 31, tmp3); // tmp3 is mask: ~0 is for clamping + orc_sse_emit_psrad_imm (p, 31, tmp3); /* tmp3 is mask: ~0 is for clamping */ orc_sse_emit_psrad_imm (p, 31, tmp2); tmp = orc_compiler_get_constant (p, 4, 0x80000000); - orc_sse_emit_pxor (p, tmp, tmp2); // clamped value + orc_sse_emit_pxor (p, tmp, tmp2); /* clamped value */ orc_sse_emit_pand (p, tmp3, tmp2); orc_sse_emit_psubd (p, src, dest); @@ -2816,7 +2816,7 @@ orc_compiler_sse_register_rules (OrcTarget *target) orc_rule_register (rule_set, "convql", sse_rule_convql, NULL); orc_rule_register (rule_set, "convslq", sse_rule_convslq, NULL); orc_rule_register (rule_set, "convulq", sse_rule_convulq, NULL); - //orc_rule_register (rule_set, "convsssql", sse_rule_convsssql, NULL); + /* orc_rule_register (rule_set, "convsssql", sse_rule_convsssql, NULL); */ orc_rule_register (rule_set, "mulsbw", sse_rule_mulsbw, NULL); orc_rule_register (rule_set, "mulubw", sse_rule_mulubw, NULL); diff --git a/orc/orcutils.h b/orc/orcutils.h index d973ba8..1cf22bc 100644 --- a/orc/orcutils.h +++ b/orc/orcutils.h @@ -29,17 +29,17 @@ #define _ORC_UTILS_H_ /* Orc objects */ -//typedef struct _OrcVariable OrcVariable; -//typedef struct _OrcOpcodeSet OrcOpcodeSet; -//typedef struct _OrcStaticOpcode OrcStaticOpcode; +/* typedef struct _OrcVariable OrcVariable; */ +/* typedef struct _OrcOpcodeSet OrcOpcodeSet; */ +/* typedef struct _OrcStaticOpcode OrcStaticOpcode; */ typedef struct _OrcInstruction OrcInstruction; typedef struct _OrcProgram OrcProgram; typedef struct _OrcCompiler OrcCompiler; typedef struct _OrcConstant OrcConstant; -//typedef struct _OrcFixup OrcFixup; +/* typedef struct _OrcFixup OrcFixup; */ typedef struct _OrcTarget OrcTarget; typedef struct _OrcCode OrcCode; -//typedef struct _OrcCodeChunk OrcCodeChunk; +/* typedef struct _OrcCodeChunk OrcCodeChunk; */ typedef enum { ORC_COMPILE_RESULT_OK = 0, diff --git a/testsuite/benchmorc/benchmorc.c b/testsuite/benchmorc/benchmorc.c index 83546b7..c1a92e6 100644 --- a/testsuite/benchmorc/benchmorc.c +++ b/testsuite/benchmorc/benchmorc.c @@ -15,7 +15,7 @@ int error = FALSE; double weights_ginger[]; double weights_feathers[]; -//double weights_preston[]; +/* double weights_preston[]; */ double weights_n900[]; int @@ -64,9 +64,9 @@ main (int argc, char *argv[]) double weight; perf = orc_test_performance_full (programs[i], 0, NULL); - //weight = weights_ginger[i]; + /* weight = weights_ginger[i]; */ weight = weights_feathers[i]; - //weight = weights_n900[i]; + /* weight = weights_n900[i]; */ sum += weight * perf; } diff --git a/testsuite/memcpy_speed.c b/testsuite/memcpy_speed.c index dda3de7..0715f0e 100644 --- a/testsuite/memcpy_speed.c +++ b/testsuite/memcpy_speed.c @@ -44,11 +44,11 @@ main(int argc, char *argv[]) OrcProgram *p; int level1, level2, level3; int max; - //const uint8_t zero = 0; + /* const uint8_t zero = 0; */ orc_init (); - //cpufreq = 2333e6; + /* cpufreq = 2333e6; */ cpufreq = 1; if (argc > 1) { @@ -74,10 +74,10 @@ main(int argc, char *argv[]) p = orc_program_new (); orc_program_set_name (p, "orc_memcpy"); - //orc_program_set_name (p, "orc_memset"); + /* orc_program_set_name (p, "orc_memset"); */ orc_program_add_destination (p, 1, "d1"); orc_program_add_source (p, 1, "s1"); - //orc_program_add_parameter (p, 1, "p1"); + /* orc_program_add_parameter (p, 1, "p1"); */ orc_program_append (p, "copyb", ORC_VAR_D1, ORC_VAR_S1, ORC_VAR_D1); @@ -121,7 +121,7 @@ main(int argc, char *argv[]) void (*func) (OrcExecutor *); orc_profile_start(&prof); - //orc_memcpy (dest, src, size); + /* orc_memcpy (dest, src, size); */ ex->program = p; ex->n = size; ex->arrays[ORC_VAR_D1] = dest; @@ -164,13 +164,13 @@ main(int argc, char *argv[]) ave -= null; ave_libc -= null; - //printf("%d: %10.4g %10.4g %10.4g %10.4g (libc %10.4g)\n", i, ave, std, - // ave/(1<n_opcodes;i++){ - //printf("opcode_%-20s ", opcode_set->opcodes[i].name); + /* printf("opcode_%-20s ", opcode_set->opcodes[i].name); */ test_opcode_src (opcode_set->opcodes + i); } diff --git a/testsuite/test-schro.c b/testsuite/test-schro.c index 148b53d..59ea5ab 100644 --- a/testsuite/test-schro.c +++ b/testsuite/test-schro.c @@ -236,7 +236,9 @@ main (int argc, char *argv[]) orc_test_init(); for(i=0;i<18;i++){ - //printf("/* %d */\n", i); +#if 0 + printf("/* %d */\n", i); +#endif test_program (i); } diff --git a/testsuite/test_accsadubl.c b/testsuite/test_accsadubl.c index 1388045..0673022 100644 --- a/testsuite/test_accsadubl.c +++ b/testsuite/test_accsadubl.c @@ -70,7 +70,7 @@ orc_sad_u8 (orc_uint8 *s1, orc_uint8 *s2, int n) return 0; } - //printf("%s\n", orc_program_get_asm_code (p)); + /* printf("%s\n", orc_program_get_asm_code (p)); */ } ex = orc_executor_new (p); @@ -80,7 +80,7 @@ orc_sad_u8 (orc_uint8 *s1, orc_uint8 *s2, int n) orc_executor_run (ex); - //sum = orc_executor_get_accumulator (ex, "a1"); + /* sum = orc_executor_get_accumulator (ex, "a1"); */ sum = ex->accumulators[0]; orc_executor_free (ex); diff --git a/tools/orcc.c b/tools/orcc.c index 974e241..04d9808 100644 --- a/tools/orcc.c +++ b/tools/orcc.c @@ -887,7 +887,7 @@ output_program_generation (OrcProgram *p, FILE *output, int is_inline) bytecode = orc_bytecode_from_program (p); fprintf(output, "#if 1\n"); - //fprintf(output, "#ifdef bytecode\n"); + /* fprintf(output, "#ifdef bytecode\n"); */ fprintf(output, " static const orc_uint8 bc[] = {\n"); for(i=0;ilength;i++) { if ((i&0xf) == 0) { @@ -903,7 +903,7 @@ output_program_generation (OrcProgram *p, FILE *output, int is_inline) } fprintf(output, " };\n"); fprintf(output, " p = orc_program_new_from_static_bytecode (bc);\n"); - //fprintf(output, " orc_program_set_name (p, \"%s\");\n", p->name); + /* fprintf(output, " orc_program_set_name (p, \"%s\");\n", p->name); */ if (use_backup && !is_inline) { fprintf(output, " orc_program_set_backup_function (p, _backup_%s);\n", p->name); @@ -1337,7 +1337,7 @@ output_code_assembly (OrcProgram *p, FILE *output) { fprintf(output, "/* %s */\n", p->name); - //output_prototype (p, output); + /* output_prototype (p, output); */ { OrcCompileResult result; OrcTarget *t = orc_target_get_by_name(target); -- 2.7.4