cvsuser 02/11/22 12:51:51
Modified: . jit.c
include/parrot jit.h
jit/alpha jit_emit.h
jit/arm jit_emit.h
jit/i386 jit_emit.h
jit/ppc jit_emit.h
jit/sun4 jit_emit.h
Log:
jit_info is part of interpreter
Revision Changes Path
1.45 +5 -5 parrot/jit.c
Index: jit.c
===================================================================
RCS file: /cvs/public/parrot/jit.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -w -r1.44 -r1.45
--- jit.c 22 Nov 2002 20:04:29 -0000 1.44
+++ jit.c 22 Nov 2002 20:51:05 -0000 1.45
@@ -1,7 +1,7 @@
/*
* jit.c
*
- * $Id: jit.c,v 1.44 2002/11/22 20:04:29 nicholas Exp $
+ * $Id: jit.c,v 1.45 2002/11/22 20:51:05 grunblatt Exp $
*/
#include <parrot/parrot.h>
@@ -465,13 +465,13 @@
for (i = sect->int_registers_used-1; i >= 0; --i)
if (sect->int_reg_dir[sect->int_reg_usage[i]] & PARROT_ARGDIR_IN)
- Parrot_jit_emit_mov_rm(jit_info, interpreter, jit_info->intval_map[i],
+ Parrot_jit_emit_mov_rm(interpreter, jit_info->intval_map[i],
(char*)&interpreter->ctx.int_reg.registers[sect->int_reg_usage[i]]);
#if FLOAT_REGISTERS_TO_MAP
for (i = sect->float_registers_used-1; i >= 0; --i)
if (sect->float_reg_dir[sect->float_reg_usage[i]] & PARROT_ARGDIR_IN)
- Parrot_jit_emit_mov_rm_n(jit_info, interpreter,
+ Parrot_jit_emit_mov_rm_n(interpreter,
jit_info->floatval_map[i],
(char*) &interpreter->ctx.num_reg.registers[
sect->float_reg_usage[i]]);
@@ -496,13 +496,13 @@
for (i = 0; i < sect->int_registers_used; ++i)
if (sect->int_reg_dir[sect->int_reg_usage[i]] & PARROT_ARGDIR_OUT)
- Parrot_jit_emit_mov_mr(jit_info, interpreter,
+ Parrot_jit_emit_mov_mr(interpreter,
(char*)&interpreter->ctx.int_reg.registers[
sect->int_reg_usage[i]], jit_info->intval_map[i]);
#if FLOAT_REGISTERS_TO_MAP
for (i = 0; i < sect->float_registers_used; ++i)
if (sect->float_reg_dir[sect->float_reg_usage[i]] & PARROT_ARGDIR_OUT)
- Parrot_jit_emit_mov_mr_n(jit_info, interpreter,
+ Parrot_jit_emit_mov_mr_n(interpreter,
(char*)&interpreter->ctx.num_reg.registers[
sect->float_reg_usage[i]], jit_info->floatval_map[i]);
#endif
1.25 +5 -5 parrot/include/parrot/jit.h
Index: jit.h
===================================================================
RCS file: /cvs/public/parrot/include/parrot/jit.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -w -r1.24 -r1.25
--- jit.h 22 Nov 2002 13:43:55 -0000 1.24
+++ jit.h 22 Nov 2002 20:51:14 -0000 1.25
@@ -1,7 +1,7 @@
/*
* jit.h
*
- * $Id: jit.h,v 1.24 2002/11/22 13:43:55 grunblatt Exp $
+ * $Id: jit.h,v 1.25 2002/11/22 20:51:14 grunblatt Exp $
*/
#ifndef JIT_H_GUARD
@@ -224,13 +224,13 @@
Parrot_jit_optimizer_t *optimize_jit(struct Parrot_Interp *interpreter,
opcode_t *pc, opcode_t *code_start, opcode_t *code_end);
-void Parrot_jit_emit_mov_mr_n(Parrot_jit_info_t *,
+void Parrot_jit_emit_mov_mr_n(
struct Parrot_Interp *interpreter, char *mem, int);
-void Parrot_jit_emit_mov_mr(Parrot_jit_info_t *,
+void Parrot_jit_emit_mov_mr(
struct Parrot_Interp *interpreter, char *mem, int);
-void Parrot_jit_emit_mov_rm_n(Parrot_jit_info_t *,
+void Parrot_jit_emit_mov_rm_n(
struct Parrot_Interp *interpreter, int reg, char *mem);
-void Parrot_jit_emit_mov_rm(Parrot_jit_info_t *,
+void Parrot_jit_emit_mov_rm(
struct Parrot_Interp *interpreter, int reg, char *mem);
#endif /* JIT_H_GUARD */
1.17 +9 -11 parrot/jit/alpha/jit_emit.h
Index: jit_emit.h
===================================================================
RCS file: /cvs/public/parrot/jit/alpha/jit_emit.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -w -r1.16 -r1.17
--- jit_emit.h 22 Nov 2002 13:48:39 -0000 1.16
+++ jit_emit.h 22 Nov 2002 20:51:27 -0000 1.17
@@ -3,7 +3,7 @@
*
* ALPHA
*
- * $Id: jit_emit.h,v 1.16 2002/11/22 13:48:39 grunblatt Exp $
+ * $Id: jit_emit.h,v 1.17 2002/11/22 20:51:27 grunblatt Exp $
*/
/* Register usage:
@@ -475,31 +475,29 @@
/* move reg to mem (i.e. intreg) */
void
-Parrot_jit_emit_mov_mr(Parrot_jit_info_t *jit_info,
- struct Parrot_Interp * interpreter, char *mem, int reg)
+Parrot_jit_emit_mov_mr(struct Parrot_Interp * interpreter, char *mem, int reg)
{
- jit_emit_mov_mr_i(jit_info->native_ptr, mem, reg);
+ jit_emit_mov_mr_i(
+ ((Parrot_jit_info_t *)(interpreter->jit_info))->native_ptr, mem, reg);
}
/* move mem (i.e. intreg) to reg */
void
-Parrot_jit_emit_mov_rm(Parrot_jit_info_t *jit_info,
- struct Parrot_Interp * interpreter, int reg, char *mem)
+Parrot_jit_emit_mov_rm(struct Parrot_Interp * interpreter, int reg, char *mem)
{
- jit_emit_mov_rm_i(jit_info->native_ptr, reg, mem);
+ jit_emit_mov_rm_i(
+ ((Parrot_jit_info_t *)(interpreter->jit_info))->native_ptr, reg, mem);
}
/* move reg to mem (i.e. numreg) */
void
-Parrot_jit_emit_mov_mr_n(Parrot_jit_info_t *jit_info,
- struct Parrot_Interp * interpreter, char *mem, int reg)
+Parrot_jit_emit_mov_mr_n(struct Parrot_Interp * interpreter, char *mem, int reg)
{
}
/* move mem (i.e. numreg) to reg */
void
-Parrot_jit_emit_mov_rm_n(Parrot_jit_info_t *jit_info,
- struct Parrot_Interp * interpreter, int reg, char *mem)
+Parrot_jit_emit_mov_rm_n(struct Parrot_Interp * interpreter, int reg, char *mem)
{
}
1.16 +5 -9 parrot/jit/arm/jit_emit.h
Index: jit_emit.h
===================================================================
RCS file: /cvs/public/parrot/jit/arm/jit_emit.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -w -r1.15 -r1.16
--- jit_emit.h 22 Nov 2002 13:48:40 -0000 1.15
+++ jit_emit.h 22 Nov 2002 20:51:37 -0000 1.16
@@ -3,7 +3,7 @@
*
* ARM (I think this is all ARM2 or later, although it is APCS-32)
*
- * $Id: jit_emit.h,v 1.15 2002/11/22 13:48:40 grunblatt Exp $
+ * $Id: jit_emit.h,v 1.16 2002/11/22 20:51:37 grunblatt Exp $
*/
#ifdef ARM
@@ -961,29 +961,25 @@
/* move reg to mem (i.e. intreg) */
void
-Parrot_jit_emit_mov_mr(Parrot_jit_info_t *jit_info,
- struct Parrot_Interp * interpreter, char *mem, int reg)
+Parrot_jit_emit_mov_mr(struct Parrot_Interp * interpreter, char *mem, int reg)
{
}
/* move mem (i.e. intreg) to reg */
void
-Parrot_jit_emit_mov_rm(Parrot_jit_info_t *jit_info,
- struct Parrot_Interp * interpreter, int reg, char *mem)
+Parrot_jit_emit_mov_rm(struct Parrot_Interp * interpreter, int reg, char *mem)
{
}
/* move reg to mem (i.e. numreg) */
void
-Parrot_jit_emit_mov_mr_n(Parrot_jit_info_t *jit_info,
- struct Parrot_Interp * interpreter, char *mem, int reg)
+Parrot_jit_emit_mov_mr_n(struct Parrot_Interp * interpreter, char *mem, int reg)
{
}
/* move mem (i.e. numreg) to reg */
void
-Parrot_jit_emit_mov_rm_n(Parrot_jit_info_t *jit_info,
- struct Parrot_Interp * interpreter, int reg, char *mem)
+Parrot_jit_emit_mov_rm_n(struct Parrot_Interp * interpreter, int reg, char *mem)
{
}
1.24 +13 -13 parrot/jit/i386/jit_emit.h
Index: jit_emit.h
===================================================================
RCS file: /cvs/public/parrot/jit/i386/jit_emit.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -w -r1.23 -r1.24
--- jit_emit.h 22 Nov 2002 13:43:56 -0000 1.23
+++ jit_emit.h 22 Nov 2002 20:51:41 -0000 1.24
@@ -3,7 +3,7 @@
*
* i386
*
- * $Id: jit_emit.h,v 1.23 2002/11/22 13:43:56 grunblatt Exp $
+ * $Id: jit_emit.h,v 1.24 2002/11/22 20:51:41 grunblatt Exp $
*/
#include <assert.h>
@@ -1229,31 +1229,31 @@
void
-Parrot_jit_emit_mov_mr_n(Parrot_jit_info_t *jit_info,
- struct Parrot_Interp * interpreter, char *mem, int reg)
+Parrot_jit_emit_mov_mr_n(struct Parrot_Interp * interpreter, char *mem, int reg)
{
- jit_emit_mov_mr_n(jit_info->native_ptr, mem, reg);
+ jit_emit_mov_mr_n(
+ ((Parrot_jit_info_t *)(interpreter->jit_info))->native_ptr, mem, reg);
}
void
-Parrot_jit_emit_mov_mr(Parrot_jit_info_t *jit_info,
- struct Parrot_Interp * interpreter, char *mem, int reg)
+Parrot_jit_emit_mov_mr(struct Parrot_Interp * interpreter, char *mem, int reg)
{
- jit_emit_mov_mr(jit_info->native_ptr, mem, reg);
+ jit_emit_mov_mr(
+ ((Parrot_jit_info_t *)(interpreter->jit_info))->native_ptr, mem, reg);
}
void
-Parrot_jit_emit_mov_rm_n(Parrot_jit_info_t *jit_info,
- struct Parrot_Interp * interpreter, int reg, char *mem)
+Parrot_jit_emit_mov_rm_n(struct Parrot_Interp * interpreter, int reg, char *mem)
{
- jit_emit_mov_rm_n(jit_info->native_ptr, reg, mem);
+ jit_emit_mov_rm_n(
+ ((Parrot_jit_info_t *)(interpreter->jit_info))->native_ptr, reg, mem);
}
void
-Parrot_jit_emit_mov_rm(Parrot_jit_info_t *jit_info,
- struct Parrot_Interp * interpreter, int reg, char *mem)
+Parrot_jit_emit_mov_rm(struct Parrot_Interp * interpreter, int reg, char *mem)
{
- jit_emit_mov_rm(jit_info->native_ptr, reg, mem);
+ jit_emit_mov_rm(
+ ((Parrot_jit_info_t *)(interpreter->jit_info))->native_ptr, reg, mem);
}
static void
1.19 +13 -13 parrot/jit/ppc/jit_emit.h
Index: jit_emit.h
===================================================================
RCS file: /cvs/public/parrot/jit/ppc/jit_emit.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -w -r1.18 -r1.19
--- jit_emit.h 22 Nov 2002 13:48:44 -0000 1.18
+++ jit_emit.h 22 Nov 2002 20:51:47 -0000 1.19
@@ -3,7 +3,7 @@
*
* PPC
*
- * $Id: jit_emit.h,v 1.18 2002/11/22 13:48:44 grunblatt Exp $
+ * $Id: jit_emit.h,v 1.19 2002/11/22 20:51:47 grunblatt Exp $
*/
#include <unistd.h>
@@ -645,34 +645,34 @@
/* move reg to mem (i.e. intreg) */
void
-Parrot_jit_emit_mov_mr(Parrot_jit_info_t *jit_info,
- struct Parrot_Interp * interpreter, char *mem, int reg)
+Parrot_jit_emit_mov_mr(struct Parrot_Interp * interpreter, char *mem, int reg)
{
- jit_emit_mov_mr_i(jit_info->native_ptr, mem, reg);
+ jit_emit_mov_mr_i(
+ ((Parrot_jit_info_t *)(interpreter->jit_info))->native_ptr, mem, reg);
}
/* move mem (i.e. intreg) to reg */
void
-Parrot_jit_emit_mov_rm(Parrot_jit_info_t *jit_info,
- struct Parrot_Interp * interpreter, int reg, char *mem)
+Parrot_jit_emit_mov_rm(struct Parrot_Interp * interpreter, int reg, char *mem)
{
- jit_emit_mov_rm_i(jit_info->native_ptr, reg, mem);
+ jit_emit_mov_rm_i(
+ ((Parrot_jit_info_t *)(interpreter->jit_info))->native_ptr, reg, mem);
}
/* move reg to mem (i.e. numreg) */
void
-Parrot_jit_emit_mov_mr_n(Parrot_jit_info_t *jit_info,
- struct Parrot_Interp * interpreter, char *mem, int reg)
+Parrot_jit_emit_mov_mr_n(struct Parrot_Interp * interpreter, char *mem, int reg)
{
- jit_emit_mov_mr_n(jit_info->native_ptr, mem, reg);
+ jit_emit_mov_mr_n(
+ ((Parrot_jit_info_t *)(interpreter->jit_info))->native_ptr, mem, reg);
}
/* move mem (i.e. numreg) to reg */
void
-Parrot_jit_emit_mov_rm_n(Parrot_jit_info_t *jit_info,
- struct Parrot_Interp * interpreter, int reg, char *mem)
+Parrot_jit_emit_mov_rm_n(struct Parrot_Interp * interpreter, int reg, char *mem)
{
- jit_emit_mov_rm_n(jit_info->native_ptr, reg, mem);
+ jit_emit_mov_rm_n(
+ ((Parrot_jit_info_t *)(interpreter->jit_info))->native_ptr, reg, mem);
}
#else
1.17 +5 -9 parrot/jit/sun4/jit_emit.h
Index: jit_emit.h
===================================================================
RCS file: /cvs/public/parrot/jit/sun4/jit_emit.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -w -r1.16 -r1.17
--- jit_emit.h 22 Nov 2002 13:48:47 -0000 1.16
+++ jit_emit.h 22 Nov 2002 20:51:51 -0000 1.17
@@ -3,7 +3,7 @@
**
** SPARC
**
-** $Id: jit_emit.h,v 1.16 2002/11/22 13:48:47 grunblatt Exp $
+** $Id: jit_emit.h,v 1.17 2002/11/22 20:51:51 grunblatt Exp $
**/
/*
@@ -574,29 +574,25 @@
/* move reg to mem (i.e. intreg) */
void
-Parrot_jit_emit_mov_mr(Parrot_jit_info_t *jit_info,
- struct Parrot_Interp * interpreter, char *mem, int reg)
+Parrot_jit_emit_mov_mr(struct Parrot_Interp * interpreter, char *mem, int reg)
{
}
/* move mem (i.e. intreg) to reg */
void
-Parrot_jit_emit_mov_rm(Parrot_jit_info_t *jit_info,
- struct Parrot_Interp * interpreter, int reg, char *mem)
+Parrot_jit_emit_mov_rm(struct Parrot_Interp * interpreter, int reg, char *mem)
{
}
/* move reg to mem (i.e. numreg) */
void
-Parrot_jit_emit_mov_mr_n(Parrot_jit_info_t *jit_info,
- struct Parrot_Interp * interpreter, char *mem, int reg)
+Parrot_jit_emit_mov_mr_n(struct Parrot_Interp * interpreter, char *mem, int reg)
{
}
/* move mem (i.e. numreg) to reg */
void
-Parrot_jit_emit_mov_rm_n(Parrot_jit_info_t *jit_info,
- struct Parrot_Interp * interpreter, int reg, char *mem)
+Parrot_jit_emit_mov_rm_n(struct Parrot_Interp * interpreter, int reg, char *mem)
{
}
