cvsuser 02/11/19 11:28:35
Modified: jit/alpha core.jit jit_emit.h
Log:
Renaming.
Revision Changes Path
1.6 +51 -51 parrot/jit/alpha/core.jit
Index: core.jit
===================================================================
RCS file: /cvs/public/parrot/jit/alpha/core.jit,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- core.jit 4 Aug 2002 21:41:52 -0000 1.5
+++ core.jit 19 Nov 2002 19:28:35 -0000 1.6
@@ -2,7 +2,7 @@
; alpha/core.jit
;
;
-; $Id: core.jit,v 1.5 2002/08/04 21:41:52 grunblatt Exp $
+; $Id: core.jit,v 1.6 2002/11/19 19:28:35 grunblatt Exp $
;
Parrot_noop {
@@ -11,105 +11,105 @@
Parrot_set_i_i {
if (MAP[1] && MAP[2]) {
- emit_mov(NATIVECODE, MAP[2], MAP[1]);
+ jit_emit_mov_rr(NATIVECODE, MAP[2], MAP[1]);
}
else if (MAP[1]) {
- emit_ldq(NATIVECODE, MAP[1], &INT_REG[2]);
+ jit_emit_load_rd_i(NATIVECODE, MAP[1], &INT_REG[2]);
}
else if (MAP[2]) {
- emit_stq(NATIVECODE, MAP[2], &INT_REG[1]);
+ jit_emit_store_rd_i(NATIVECODE, MAP[2], &INT_REG[1]);
}
else {
- emit_ldq(NATIVECODE, REG0_v0, &INT_REG[2]);
- emit_stq(NATIVECODE, REG0_v0, &INT_REG[1]);
+ jit_emit_load_rd_i(NATIVECODE, REG0_v0, &INT_REG[2]);
+ jit_emit_store_rd_i(NATIVECODE, REG0_v0, &INT_REG[1]);
}
}
Parrot_set_i_ic {
if (MAP[1]) {
- emit_lc(NATIVECODE, MAP[1], *INT_CONST[2]);
+ jit_emit_load_ri_i(NATIVECODE, MAP[1], *INT_CONST[2]);
}
else {
- emit_lc(NATIVECODE, REG0_v0, *INT_CONST[2]);
- emit_stq(NATIVECODE, REG0_v0, &INT_REG[1]);
+ jit_emit_load_ri_i(NATIVECODE, REG0_v0, *INT_CONST[2]);
+ jit_emit_store_rd_i(NATIVECODE, REG0_v0, &INT_REG[1]);
}
}
Parrot_sub_i_i_i {
if (MAP[1] && MAP[2] && MAP[3]) {
- emit_subq(NATIVECODE, MAP[2], MAP[3], MAP[1]);
+ jit_emit_sub_rrr(NATIVECODE, MAP[2], MAP[3], MAP[1]);
}
else if (MAP[1] && MAP[2]) {
- emit_ldq(NATIVECODE, REG0_v0, &INT_REG[3]);
- emit_subq(NATIVECODE, MAP[2], REG0_v0, MAP[1]);
+ jit_emit_load_rd_i(NATIVECODE, REG0_v0, &INT_REG[3]);
+ jit_emit_sub_rrr(NATIVECODE, MAP[2], REG0_v0, MAP[1]);
}
else if (MAP[1] && MAP[3]) {
- emit_ldq(NATIVECODE, REG0_v0, &INT_REG[2]);
- emit_subq(NATIVECODE, REG0_v0, MAP[3], MAP[1]);
+ jit_emit_load_rd_i(NATIVECODE, REG0_v0, &INT_REG[2]);
+ jit_emit_sub_rrr(NATIVECODE, REG0_v0, MAP[3], MAP[1]);
}
else if (MAP[2] && MAP[3]) {
- emit_subq(NATIVECODE, MAP[2], MAP[3], REG0_v0);
- emit_stq(NATIVECODE, REG0_v0, &INT_REG[1]);
+ jit_emit_sub_rrr(NATIVECODE, MAP[2], MAP[3], REG0_v0);
+ jit_emit_store_rd_i(NATIVECODE, REG0_v0, &INT_REG[1]);
}
else if (MAP[1]) {
- emit_ldq(NATIVECODE, REG0_v0, &INT_REG[3]);
- emit_ldq(NATIVECODE, REG8_t7, &INT_REG[2]);
- emit_subq(NATIVECODE, REG8_t7, REG0_v0, MAP[1]);
+ jit_emit_load_rd_i(NATIVECODE, REG0_v0, &INT_REG[3]);
+ jit_emit_load_rd_i(NATIVECODE, REG8_t7, &INT_REG[2]);
+ jit_emit_sub_rrr(NATIVECODE, REG8_t7, REG0_v0, MAP[1]);
}
else if (MAP[2]) {
- emit_ldq(NATIVECODE, REG0_v0, &INT_REG[3]);
- emit_subq(NATIVECODE, MAP[2], REG0_v0, REG0_v0);
- emit_stq(NATIVECODE, REG0_v0, &INT_REG[1]);
+ jit_emit_load_rd_i(NATIVECODE, REG0_v0, &INT_REG[3]);
+ jit_emit_sub_rrr(NATIVECODE, MAP[2], REG0_v0, REG0_v0);
+ jit_emit_store_rd_i(NATIVECODE, REG0_v0, &INT_REG[1]);
}
else if (MAP[3]) {
- emit_ldq(NATIVECODE, REG0_v0, &INT_REG[2]);
- emit_subq(NATIVECODE, REG0_v0, MAP[3], REG0_v0);
- emit_stq(NATIVECODE, REG0_v0, &INT_REG[1]);
+ jit_emit_load_rd_i(NATIVECODE, REG0_v0, &INT_REG[2]);
+ jit_emit_sub_rrr(NATIVECODE, REG0_v0, MAP[3], REG0_v0);
+ jit_emit_store_rd_i(NATIVECODE, REG0_v0, &INT_REG[1]);
}
else {
- emit_ldq(NATIVECODE, REG0_v0, &INT_REG[3]);
- emit_ldq(NATIVECODE, REG8_t7, &INT_REG[2]);
- emit_subq(NATIVECODE, REG0_v0, REG8_t7, REG0_v0);
- emit_stq(NATIVECODE, REG0_v0, &INT_REG[1]);
+ jit_emit_load_rd_i(NATIVECODE, REG0_v0, &INT_REG[3]);
+ jit_emit_load_rd_i(NATIVECODE, REG8_t7, &INT_REG[2]);
+ jit_emit_sub_rrr(NATIVECODE, REG0_v0, REG8_t7, REG0_v0);
+ jit_emit_store_rd_i(NATIVECODE, REG0_v0, &INT_REG[1]);
}
}
Parrot_add_i_i_i {
if (MAP[1] && MAP[2] && MAP[3]) {
- emit_addq(NATIVECODE, MAP[2], MAP[3], MAP[1]);
+ jit_emit_add_rrr(NATIVECODE, MAP[2], MAP[3], MAP[1]);
}
else if (MAP[1] && MAP[2]) {
- emit_ldq(NATIVECODE, REG0_v0, &INT_REG[3]);
- emit_addq(NATIVECODE, MAP[2], REG0_v0, MAP[1]);
+ jit_emit_load_rd_i(NATIVECODE, REG0_v0, &INT_REG[3]);
+ jit_emit_add_rrr(NATIVECODE, MAP[2], REG0_v0, MAP[1]);
}
else if (MAP[1] && MAP[3]) {
- emit_ldq(NATIVECODE, REG0_v0, &INT_REG[2]);
- emit_addq(NATIVECODE, REG0_v0, MAP[3], MAP[1]);
+ jit_emit_load_rd_i(NATIVECODE, REG0_v0, &INT_REG[2]);
+ jit_emit_add_rrr(NATIVECODE, REG0_v0, MAP[3], MAP[1]);
}
else if (MAP[2] && MAP[3]) {
- emit_addq(NATIVECODE, MAP[2], MAP[3], REG0_v0);
- emit_stq(NATIVECODE, REG0_v0, &INT_REG[1]);
+ jit_emit_add_rrr(NATIVECODE, MAP[2], MAP[3], REG0_v0);
+ jit_emit_store_rd_i(NATIVECODE, REG0_v0, &INT_REG[1]);
}
else if (MAP[1]) {
- emit_ldq(NATIVECODE, REG0_v0, &INT_REG[3]);
- emit_ldq(NATIVECODE, REG8_t7, &INT_REG[2]);
- emit_addq(NATIVECODE, REG8_t7, REG0_v0, MAP[1]);
+ jit_emit_load_rd_i(NATIVECODE, REG0_v0, &INT_REG[3]);
+ jit_emit_load_rd_i(NATIVECODE, REG8_t7, &INT_REG[2]);
+ jit_emit_add_rrr(NATIVECODE, REG8_t7, REG0_v0, MAP[1]);
}
else if (MAP[2]) {
- emit_ldq(NATIVECODE, REG0_v0, &INT_REG[3]);
- emit_addq(NATIVECODE, MAP[2], REG0_v0, REG0_v0);
- emit_stq(NATIVECODE, REG0_v0, &INT_REG[1]);
+ jit_emit_load_rd_i(NATIVECODE, REG0_v0, &INT_REG[3]);
+ jit_emit_add_rrr(NATIVECODE, MAP[2], REG0_v0, REG0_v0);
+ jit_emit_store_rd_i(NATIVECODE, REG0_v0, &INT_REG[1]);
}
else if (MAP[3]) {
- emit_ldq(NATIVECODE, REG0_v0, &INT_REG[2]);
- emit_addq(NATIVECODE, REG0_v0, MAP[3], REG0_v0);
- emit_stq(NATIVECODE, REG0_v0, &INT_REG[1]);
+ jit_emit_load_rd_i(NATIVECODE, REG0_v0, &INT_REG[2]);
+ jit_emit_add_rrr(NATIVECODE, REG0_v0, MAP[3], REG0_v0);
+ jit_emit_store_rd_i(NATIVECODE, REG0_v0, &INT_REG[1]);
}
else {
- emit_ldq(NATIVECODE, REG0_v0, &INT_REG[3]);
- emit_ldq(NATIVECODE, REG8_t7, &INT_REG[2]);
- emit_addq(NATIVECODE, REG0_v0, REG8_t7, REG0_v0);
- emit_stq(NATIVECODE, REG0_v0, &INT_REG[1]);
+ jit_emit_load_rd_i(NATIVECODE, REG0_v0, &INT_REG[3]);
+ jit_emit_load_rd_i(NATIVECODE, REG8_t7, &INT_REG[2]);
+ jit_emit_add_rrr(NATIVECODE, REG0_v0, REG8_t7, REG0_v0);
+ jit_emit_store_rd_i(NATIVECODE, REG0_v0, &INT_REG[1]);
}
}
@@ -118,13 +118,13 @@
emit_bne(NATIVECODE, MAP[1], *INT_CONST[2]);
}
else {
- emit_ldq(NATIVECODE, REG0_v0, &INT_REG[1]);
+ jit_emit_load_rd_i(NATIVECODE, REG0_v0, &INT_REG[1]);
emit_bne(NATIVECODE, REG0_v0, *INT_CONST[2]);
}
}
Parrot_end {
-; emit_mov(NATIVECODE, REG15_s6, REG30_sp);
+; jit_emit_mov_rr(NATIVECODE, REG15_s6, REG30_sp);
emit_ldq_b(NATIVECODE, REG26_ra, 0, REG30_sp);
emit_ldq_b(NATIVECODE, REG15_s6, 8, REG30_sp);
emit_lda_b(NATIVECODE, REG30_sp, 16, REG30_sp);
1.11 +86 -85 parrot/jit/alpha/jit_emit.h
Index: jit_emit.h
===================================================================
RCS file: /cvs/public/parrot/jit/alpha/jit_emit.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- jit_emit.h 16 Nov 2002 10:36:04 -0000 1.10
+++ jit_emit.h 19 Nov 2002 19:28:35 -0000 1.11
@@ -3,7 +3,7 @@
*
* ALPHA
*
- * $Id: jit_emit.h,v 1.10 2002/11/16 10:36:04 leo Exp $
+ * $Id: jit_emit.h,v 1.11 2002/11/19 19:28:35 grunblatt Exp $
*/
/* Register usage:
@@ -96,7 +96,7 @@
*(pc++) = 0xff; \
*(pc++) = 0x47; }
-#define emit_mov(pc, src, Ra) { \
+#define jit_emit_mov_rr(pc, src, Ra) { \
*(pc++) = Ra; \
*(pc++) = 0x04; \
*(pc++) = 0xe0 + src; \
@@ -143,7 +143,7 @@
#define emit_lda_b(pc, Ra, addr, Rb) \
emit_mem(pc, LDA, Ra, Rb, addr)
-#define emit_ldq(pc, Ra, addr) \
+#define jit_emit_load_rd_i(pc, Ra, addr) \
emit_l_s_r(pc, LDQ, Ra, base_reg, addr)
#define emit_lda(pc, Ra, addr) \
@@ -155,7 +155,7 @@
#define emit_stq_b(pc, Ra, addr, Rb) \
emit_mem(pc, STQ, Ra, Rb, addr)
-#define emit_stq(pc, Ra, addr) \
+#define jit_emit_store_rd_i(pc, Ra, addr) \
emit_l_s_r(pc, STQ, Ra, base_reg, addr)
/* Branch instruction format
@@ -210,7 +210,7 @@
*
*/
-#define emit_addq(pc, Ra, Rb, Rc) \
+#define jit_emit_add_rrr(pc, Ra, Rb, Rc) \
emit_operate1(pc, 16, Ra, Rb, 128, Rc)
/* Subq (Operate instruction)
@@ -220,7 +220,7 @@
*
*/
-#define emit_subq(pc, Ra, Rb, Rc) \
+#define jit_emit_sub_rrr(pc, Ra, Rb, Rc) \
emit_operate1(pc, 16, Ra, Rb, 161, Rc)
/* Mulq (Operate instruction)
@@ -235,7 +235,7 @@
/* Load a constant */
-#define emit_lc(pc, target, constant) \
+#define jit_emit_load_ri_i(pc, target, constant) \
pc = emit_l_c(jit_info, interpreter, target, (long)constant)
static void
@@ -358,15 +358,15 @@
emit_lda_b(jit_info->native_ptr, REG30_sp, -16, REG30_sp);
emit_stq_b(jit_info->native_ptr, REG26_ra, 0, REG30_sp);
emit_stq_b(jit_info->native_ptr, REG15_s6, 8, REG30_sp);
- emit_mov(jit_info->native_ptr,REG16_a0,REG9_s0);
- emit_mov(jit_info->native_ptr,REG27_t12,REG15_s6);
+ jit_emit_mov_rr(jit_info->native_ptr,REG16_a0,REG9_s0);
+ jit_emit_mov_rr(jit_info->native_ptr,REG27_t12,REG15_s6);
/* TODO
emit_ldah(jit_info->native_ptr,REG15_s6, -1, REG15_s6);
*/
emit_lda_b(jit_info->native_ptr, REG15_s6, -0x7ff8, REG15_s6);
- emit_lc(jit_info->native_ptr, REG10_s1, interpreter->code->byte_code);
- emit_lc(jit_info->native_ptr, REG11_s2, jit_info->arena.op_map);
- /* TODO emit restart code, s. i386 */
+ jit_emit_load_ri_i(jit_info->native_ptr, REG10_s1,
+ interpreter->code->byte_code);
+ jit_emit_load_ri_i(jit_info->native_ptr, REG11_s2, jit_info->arena.op_map);
}
void
@@ -414,7 +414,8 @@
{
char *pc = jit_info->native_ptr;
- emit_lc(pc, REG27_t12, interpreter->op_func_table[*(jit_info->cur_op)]);
+ jit_emit_load_ri_i(pc, REG27_t12,
+ interpreter->op_func_table[*(jit_info->cur_op)]);
Parrot_jit_newfixup(jit_info);
jit_info->arena.fixups->type = JIT_ALPHABSR;
@@ -448,8 +449,8 @@
Parrot_jit_normal_op(Parrot_jit_info_t *jit_info,
struct Parrot_Interp *interpreter)
{
- emit_lc(jit_info->native_ptr, REG16_a0, jit_info->cur_op);
- emit_mov(jit_info->native_ptr, REG9_s0, REG17_a1);
+ jit_emit_load_ri_i(jit_info->native_ptr, REG16_a0, jit_info->cur_op);
+ jit_emit_mov_rr(jit_info->native_ptr, REG9_s0, REG17_a1);
jit_info->native_ptr = emit_bsr(jit_info, interpreter);
}
@@ -459,8 +460,8 @@
{
Parrot_jit_normal_op(jit_info,interpreter);
- emit_subq(jit_info->native_ptr, REG0_v0, REG10_s1, REG0_v0);
- emit_addq(jit_info->native_ptr, REG0_v0, REG11_s2, REG0_v0);
+ jit_emit_sub_rrr(jit_info->native_ptr, REG0_v0, REG10_s1, REG0_v0);
+ jit_emit_add_rrr(jit_info->native_ptr, REG0_v0, REG11_s2, REG0_v0);
emit_ldq_b(jit_info->native_ptr, REG0_v0, 0, REG0_v0);
/* XXX this is incorrect, might blow the stack, use jmp instead */
emit_jsr(jit_info->native_ptr);
@@ -475,7 +476,7 @@
while (i--)
if (cur_se->int_reg_dir[cur_se->int_reg_usage[i]] & PARROT_ARGDIR_IN) {
- emit_ldq(jit_info->native_ptr, jit_info->intval_map[i],
+ jit_emit_load_rd_i(jit_info->native_ptr, jit_info->intval_map[i],
&interpreter->ctx.int_reg.registers[cur_se->int_reg_usage[i]]);
}
@@ -496,7 +497,7 @@
while (i--)
if (cur_se->int_reg_dir[cur_se->int_reg_usage[i]] & PARROT_ARGDIR_OUT) {
- emit_stq(jit_info->native_ptr, jit_info->intval_map[i],
+ jit_emit_store_rd_i(jit_info->native_ptr, jit_info->intval_map[i],
&interpreter->ctx.int_reg.registers[cur_se->int_reg_usage[i]]);
}
}
