Author: bernhard
Date: Sun Dec 21 05:17:24 2008
New Revision: 34197
Modified:
trunk/languages/pipp/src/common/pipp.pir
trunk/src/jit/amd64/jit_defs.c
trunk/src/jit/amd64/jit_emit.h
Log:
[codingstd] trailing space, C++ comments, CPP indention
Modified: trunk/languages/pipp/src/common/pipp.pir
==============================================================================
--- trunk/languages/pipp/src/common/pipp.pir (original)
+++ trunk/languages/pipp/src/common/pipp.pir Sun Dec 21 05:17:24 2008
@@ -96,7 +96,7 @@
.sub 'eval_string'
say '# eval_string() was called'
-
+
.return (1)
.end
Modified: trunk/src/jit/amd64/jit_defs.c
==============================================================================
--- trunk/src/jit/amd64/jit_defs.c (original)
+++ trunk/src/jit/amd64/jit_defs.c Sun Dec 21 05:17:24 2008
@@ -27,9 +27,9 @@
* R15 for INTERP
*/
R12,
-# ifndef USE_OP_MAP_AND_CODE_START
+#ifndef USE_OP_MAP_AND_CODE_START
R13, R14,
-# endif
+#endif
/* Unpreserved */
RCX, RSI, RDI, R8, R9, R10, RDX
};
@@ -58,13 +58,13 @@
/* JIT_CODE_FILE */
{
Parrot_jit_begin, /* emit code prologue */
-# ifdef USE_OP_MAP_AND_CODE_START
+#ifdef USE_OP_MAP_AND_CODE_START
7,
1,
-# else
+#else
9, /* mapped int */
3, /* preserved int */
-# endif
+#endif
intval_map, /* which ints mapped */
14, /* mapped float */
0, /* preserved float */
@@ -127,14 +127,14 @@
Parrot_emit_jump_to_rax(Parrot_jit_info_t *jit_info, Interp *interp)
{
if (!jit_info->objfile) {
-# ifdef USE_OP_MAP_AND_CODE_START
+#ifdef USE_OP_MAP_AND_CODE_START
/* Get interp->code->base.data */
jit_emit_load_code_start(jit_info->native_ptr);
emit_sub_r_r(jit_info->native_ptr, RAX, CODE_START);
/* Get interp->code->jit_info->arena->op_map */
jit_emit_load_op_map(jit_info->native_ptr);
-# else
+#else
/* emit code that gets interp->code->base.data */
emit_mov_r_mr(jit_info->native_ptr, RCX, INTERP,
(long)offsetof(Interp, code));
emit_mov_r_mr(jit_info->native_ptr, RDX, RCX,
(long)offsetof(PackFile_Segment, data));
@@ -144,16 +144,16 @@
emit_mov_r_mr(jit_info->native_ptr, RDX, RCX,
(long)offsetof(PackFile_ByteCode, jit_info));
emit_lea_r_mr(jit_info->native_ptr, RDX, RDX,
(long)offsetof(Parrot_jit_info_t, arena));
emit_mov_r_mr(jit_info->native_ptr, RDX, RDX,
(long)offsetof(Parrot_jit_arena_t, op_map));
-# endif
+#endif
}
/* Base pointer */
emit_mov_r_mr(jit_info->native_ptr, RBX, INTERP, (long)offsetof(Interp,
ctx.bp));
-# ifdef USE_OP_MAP_AND_CODE_START
+#ifdef USE_OP_MAP_AND_CODE_START
emit_jmp_r_r(jit_info->native_ptr, RAX, OP_MAP);
-# else
+#else
emit_jmp_r_r(jit_info->native_ptr, RAX, RDX);
-# endif
+#endif
}
void
@@ -210,7 +210,7 @@
/* Quick fixup, but we know it's 12, anyway it needs to be a byte */
emit_jcc(jit_info->native_ptr, jcc_jnz, 0x00);
sav_ptr = (char *)(jit_info->native_ptr - 1);
- //Parrot_end_jit(jit_info, interp);
+ /* Parrot_end_jit(jit_info, interp); */
jit_emit_end(jit_info->native_ptr);
*sav_ptr = (char)(jit_info->native_ptr - sav_ptr - 1);
Modified: trunk/src/jit/amd64/jit_emit.h
==============================================================================
--- trunk/src/jit/amd64/jit_emit.h (original)
+++ trunk/src/jit/amd64/jit_emit.h Sun Dec 21 05:17:24 2008
@@ -846,7 +846,7 @@
}
/*********************************************************/
-# ifdef USE_OP_MAP_AND_CODE_START
+#ifdef USE_OP_MAP_AND_CODE_START
/* These two can be mixed together just like in the i386 jit. All the places I
* can see this being called require it to be included, but for the moment I'm
* keeping it as these macros. */
@@ -854,7 +854,7 @@
* emit code that gets interp->code->jit_info->arena->op_map
* and sets the OP_MAP register
*/
-# define jit_emit_load_op_map(pc) { \
+# define jit_emit_load_op_map(pc) { \
emit_mov_r_mr((pc), OP_MAP, INTERP, (long)offsetof(Interp, code)); \
emit_mov_r_mr((pc), OP_MAP, OP_MAP, (long)offsetof(PackFile_ByteCode,
jit_info)); \
emit_lea_r_mr((pc), OP_MAP, OP_MAP, (long)offsetof(Parrot_jit_info_t,
arena)); \
@@ -865,12 +865,12 @@
* emit code that gets interp->code->base.data
* and sets the CODE_START register
*/
-# define jit_emit_load_code_start(pc) { \
+# define jit_emit_load_code_start(pc) { \
emit_mov_r_mr((pc), CODE_START, INTERP, (long)offsetof(Interp, code));
\
emit_mov_r_mr((pc), CODE_START, CODE_START,
(long)offsetof(PackFile_Segment, data)); \
}
-# endif /* USE_OP_MAP_AND_CODE_START */
+#endif /* USE_OP_MAP_AND_CODE_START */
void call_func(Parrot_jit_info_t *jit_info, void *addr);
void Parrot_emit_jump_to_rax(Parrot_jit_info_t *jit_info, Interp *interp);
@@ -887,7 +887,7 @@
/*
* release stack frame end exit see core.jit
*/
-//extern static void Parrot_end_jit(Parrot_jit_info_t *, Interp *);
+/* extern static void Parrot_end_jit(Parrot_jit_info_t *, Interp *); */
# undef Parrot_jit_restart_op
