Index: src/jit/ia64/jit_emit.h
===================================================================
--- src/jit/ia64/jit_emit.h	(revision 19381)
+++ src/jit/ia64/jit_emit.h	(working copy)
@@ -11,7 +11,7 @@
 
 #if JIT_EMIT
 
-#  define NATIVE_PTR ((Parrot_jit_info_t *)(interpreter->code->jit_info))->native_ptr
+#  define NATIVE_PTR ((Parrot_jit_info_t *)(interp->code->jit_info))->native_ptr
 
 /* r0            Zero
  * r1            Special
@@ -234,11 +234,11 @@
 /* Store a CPU register back to a Parrot register. */
 
 #  define jit_emit_mov_mr_i(pc, addr, reg) \
-    emit_a4(pc, R_INTREP, (((char *)addr) - ((char *)interpreter)), ISR2); \
+    emit_a4(pc, R_INTREP, (((char *)addr) - ((char *)interp)), ISR2); \
     emit_m4(pc, 0x33, ISR2, reg);
 
 #  define jit_emit_mov_rm_i(pc, reg, addr) \
-    emit_a4(pc, R_INTREP, (((char *)addr) - ((char *)interpreter)), ISR2); \
+    emit_a4(pc, R_INTREP, (((char *)addr) - ((char *)interp)), ISR2); \
     emit_m1(pc, 0x3, ISR2, reg);
 
 #  define jit_emit_mov_rr(pc, dst, src) \
@@ -575,7 +575,7 @@
 
 static void
 Parrot_jit_jump_to_ret(Parrot_jit_info_t *jit_info,
-                 Interp * interpreter)
+                 Interp *interp)
 {
     jit_emit_sub_rrr(NATIVE_PTR, ISR1, R_RETURN, R_BYTECODE);
     jit_emit_add_rrr(NATIVE_PTR, ISR1, ISR1, R_OPMAP);
@@ -587,7 +587,7 @@
 
 void
 Parrot_jit_begin(Parrot_jit_info_t *jit_info,
-                 Interp * interpreter)
+                 Interp *interp)
 {
     emit_m34(NATIVE_PTR, RSRV_REG, 2, 0, RSF);
     jit_emit_mov_rr(NATIVE_PTR, 1, 4);
@@ -597,7 +597,7 @@
     jit_emit_mov_rr(NATIVE_PTR, 35, 12);
     emit_i22(NATIVE_PTR, R_RETURN_ADR, 0);
     jit_emit_mov_rr(NATIVE_PTR, 8, R_ARG2);
-    Parrot_jit_jump_to_ret(jit_info, interpreter);
+    Parrot_jit_jump_to_ret(jit_info, interp);
 }
 
 static void
@@ -617,7 +617,7 @@
 
 void
 Parrot_jit_dofixup(Parrot_jit_info_t *jit_info,
-                   Interp * interpreter)
+                   Interp *interp)
 {
     Parrot_jit_fixup_t *fixup;
     char *fixup_ptr, *pit, *disp;
@@ -650,10 +650,10 @@
 
 void
 Parrot_jit_normal_op(Parrot_jit_info_t *jit_info,
-                     Interp * interpreter)
+                     Interp *interp)
 {
     emit_a4(NATIVE_PTR, R_BYTECODE,
-        ((long)jit_info->cur_op - (long)interpreter->code->base.data),
+        ((long)jit_info->cur_op - (long)interp->code->base.data),
             (R_ARG1 + RSRV_REG));
     jit_emit_mov_rr(NATIVE_PTR, (R_ARG2 + RSRV_REG), R_INTREP);
     jit_emit_mov_rr(NATIVE_PTR, 32, 1);
@@ -664,7 +664,7 @@
     jit_info->arena.fixups->type = JIT_IA64_CALL;
     jit_info->arena.fixups->param.fptr =
         (void (*)(void))(*(long *)(
-            interpreter->op_func_table[*(jit_info->cur_op)]));
+            interp->op_func_table[*(jit_info->cur_op)]));
 
     emit_x4(NATIVE_PTR, dh_none, bwh_sptk, 0, ph_many, 0);
     jit_emit_mov_rr(NATIVE_PTR, 1, 32);
@@ -673,20 +673,20 @@
 
 void
 Parrot_jit_cpcf_op(Parrot_jit_info_t *jit_info,
-                   Interp * interpreter)
+                   Interp *interp)
 {
-    Parrot_jit_normal_op(jit_info, interpreter);
-    Parrot_jit_jump_to_ret(jit_info, interpreter);
+    Parrot_jit_normal_op(jit_info, interp);
+    Parrot_jit_jump_to_ret(jit_info, interp);
 }
 
 #  undef Parrot_jit_restart_op
 void
 Parrot_jit_restart_op(Parrot_jit_info_t *jit_info,
-                   Interp * interpreter)
+                   Interp *interp)
 {
     char *jmp_ptr, *sav_ptr;
 
-    Parrot_jit_normal_op(jit_info, interpreter);
+    Parrot_jit_normal_op(jit_info, interp);
     /* test r8, if zero (e.g after trace), return from JIT */
     jit_emit_cmp_r0(jit_info->native_ptr, R_RETURN);
     /* remember PC */
@@ -699,36 +699,36 @@
     fixup_jump_addr(jit_info->native_ptr, (long)((sav_ptr - jmp_ptr) >> 4));
     /* restore PC */
     jit_info->native_ptr = sav_ptr;
-    Parrot_jit_jump_to_ret(jit_info, interpreter);
+    Parrot_jit_jump_to_ret(jit_info, interp);
 }
 
 /* move reg to mem (i.e. intreg) */
 void
-Parrot_jit_emit_mov_mr(Interp * interpreter, char *mem, int reg)
+Parrot_jit_emit_mov_mr(Interp *interp, char *mem, int reg)
 {
     jit_emit_mov_mr_i(
-        ((Parrot_jit_info_t *)(interpreter->code->jit_info))->native_ptr, mem, reg);
+        ((Parrot_jit_info_t *)(interp->code->jit_info))->native_ptr, mem, reg);
     NATIVE_PTR = close_template(NATIVE_PTR);
 }
 
 /* move mem (i.e. intreg) to reg */
 void
-Parrot_jit_emit_mov_rm(Interp * interpreter, int reg, char *mem)
+Parrot_jit_emit_mov_rm(Interp *interp, int reg, char *mem)
 {
     jit_emit_mov_rm_i(
-        ((Parrot_jit_info_t *)(interpreter->code->jit_info))->native_ptr, reg, mem);
+        ((Parrot_jit_info_t *)(interp->code->jit_info))->native_ptr, reg, mem);
     NATIVE_PTR = close_template(NATIVE_PTR);
 }
 
 /* move reg to mem (i.e. numreg) */
 void
-Parrot_jit_emit_mov_mr_n(Interp * interpreter, char *mem,int reg)
+Parrot_jit_emit_mov_mr_n(Interp *interp, char *mem,int reg)
 {
 }
 
 /* move mem (i.e. numreg) to reg */
 void
-Parrot_jit_emit_mov_rm_n(Interp * interpreter, int reg,char *mem)
+Parrot_jit_emit_mov_rm_n(Interp *interp, int reg,char *mem)
 {
 }