mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-04 22:40:25 +02:00
Allow jit_jmpi on an immediate constant address.
* lib/jit_aarch64.c, lib/jit_alpha.c, lib/jit_arm.c, lib/jit_hppa.c, lib/jit_ia64.c, lib/jit_mips.c, lib/jit_ppc.c, lib/jit_s390x.c, lib/jit_sparc.c, lib/jit_x86.c, lib/lightning.c: Allow jit_jmpi on a target that is not a node. This may lead to hard to debug code generation, but is a required feature for certain generators, like the ones that used lightning 1.2x. Note that previously, but not really well documented, it was instructed to use: jit_movi(rn, addr); jit_jmpr(rn); but now, plain: jit_patch_abs(jit_jmpi(), addr); should also work.
This commit is contained in:
pcpa
parent
1d75fe625a
commit
20a2f1f9c5
12 changed files with 144 additions and 87 deletions
16
ChangeLog
16
ChangeLog
|
|
@ -1,3 +1,19 @@
|
|||
2014-09-29 Paulo Andrade <pcpa@gnu.org>
|
||||
|
||||
* lib/jit_aarch64.c, lib/jit_alpha.c, lib/jit_arm.c,
|
||||
lib/jit_hppa.c, lib/jit_ia64.c, lib/jit_mips.c,
|
||||
lib/jit_ppc.c, lib/jit_s390x.c, lib/jit_sparc.c,
|
||||
lib/jit_x86.c, lib/lightning.c: Allow jit_jmpi on a
|
||||
target that is not a node. This may lead to hard to
|
||||
debug code generation, but is a required feature for
|
||||
certain generators, like the ones that used lightning
|
||||
1.2x. Note that previously, but not really well
|
||||
documented, it was instructed to use:
|
||||
jit_movi(rn, addr); jit_jmpr(rn);
|
||||
but now, plain:
|
||||
jit_patch_abs(jit_jmpi(), addr);
|
||||
should also work.
|
||||
|
||||
2014-09-24 Paulo Andrade <pcpa@gnu.org>
|
||||
|
||||
* lib/jit_x86-sz.c: Generate information about instruction
|
||||
|
|
|
|||
|
|
@ -1070,6 +1070,7 @@ _emit_code(jit_state_t *_jit)
|
|||
jmpr(rn(node->u.w));
|
||||
break;
|
||||
case jit_code_jmpi:
|
||||
if (node->flag & jit_flag_node) {
|
||||
temp = node->u.n;
|
||||
assert(temp->code == jit_code_label ||
|
||||
temp->code == jit_code_epilog);
|
||||
|
|
@ -1079,6 +1080,9 @@ _emit_code(jit_state_t *_jit)
|
|||
word = jmpi_p(_jit->pc.w);
|
||||
patch(word, node);
|
||||
}
|
||||
}
|
||||
else
|
||||
jmpi(node->u.w);
|
||||
break;
|
||||
case jit_code_callr:
|
||||
callr(rn(node->u.w));
|
||||
|
|
|
|||
|
|
@ -1097,6 +1097,7 @@ _emit_code(jit_state_t *_jit)
|
|||
jmpr(rn(node->u.w));
|
||||
break;
|
||||
case jit_code_jmpi:
|
||||
if (node->flag & jit_flag_node) {
|
||||
temp = node->u.n;
|
||||
assert(temp->code == jit_code_label ||
|
||||
temp->code == jit_code_epilog);
|
||||
|
|
@ -1106,6 +1107,9 @@ _emit_code(jit_state_t *_jit)
|
|||
word = jmpi_p(_jit->pc.w);
|
||||
patch(word, node);
|
||||
}
|
||||
}
|
||||
else
|
||||
jmpi(node->u.w);
|
||||
break;
|
||||
case jit_code_callr:
|
||||
callr(rn(node->u.w));
|
||||
|
|
|
|||
|
|
@ -1385,6 +1385,7 @@ _emit_code(jit_state_t *_jit)
|
|||
flush_consts();
|
||||
break;
|
||||
case jit_code_jmpi:
|
||||
if (node->flag & jit_flag_node) {
|
||||
temp = node->u.n;
|
||||
assert(temp->code == jit_code_label ||
|
||||
temp->code == jit_code_epilog);
|
||||
|
|
@ -1394,6 +1395,9 @@ _emit_code(jit_state_t *_jit)
|
|||
word = jmpi_p(_jit->pc.w);
|
||||
patch(word, node);
|
||||
}
|
||||
}
|
||||
else
|
||||
jmpi(node->u.w);
|
||||
flush_consts();
|
||||
break;
|
||||
case jit_code_callr:
|
||||
|
|
|
|||
|
|
@ -1059,16 +1059,19 @@ _emit_code(jit_state_t *_jit)
|
|||
jmpr(rn(node->u.w));
|
||||
break;
|
||||
case jit_code_jmpi:
|
||||
if (node->flag & jit_flag_node) {
|
||||
temp = node->u.n;
|
||||
assert(temp->code == jit_code_label ||
|
||||
temp->code == jit_code_epilog);
|
||||
/* no support for jump outside jit */
|
||||
if (temp->flag & jit_flag_patch)
|
||||
jmpi(temp->u.w);
|
||||
else {
|
||||
word = jmpi_p(_jit->pc.w);
|
||||
patch(word, node);
|
||||
}
|
||||
}
|
||||
else
|
||||
jmpi(node->u.w);
|
||||
break;
|
||||
case jit_code_callr:
|
||||
callr(rn(node->u.w));
|
||||
|
|
|
|||
|
|
@ -1214,6 +1214,7 @@ _emit_code(jit_state_t *_jit)
|
|||
jmpr(rn(node->u.w));
|
||||
break;
|
||||
case jit_code_jmpi:
|
||||
if (node->flag & jit_flag_node) {
|
||||
if (_jit->pc.uc == _jit->code.ptr + 16)
|
||||
_jitc->jump = 1;
|
||||
temp = node->u.n;
|
||||
|
|
@ -1225,6 +1226,9 @@ _emit_code(jit_state_t *_jit)
|
|||
word = jmpi_p(_jit->pc.w);
|
||||
patch(word, node);
|
||||
}
|
||||
}
|
||||
else
|
||||
jmpi(node->u.w);
|
||||
break;
|
||||
case jit_code_callr:
|
||||
callr(rn(node->u.w));
|
||||
|
|
|
|||
|
|
@ -1343,6 +1343,7 @@ _emit_code(jit_state_t *_jit)
|
|||
jmpr(rn(node->u.w));
|
||||
break;
|
||||
case jit_code_jmpi:
|
||||
if (node->flag & jit_flag_node) {
|
||||
temp = node->u.n;
|
||||
assert(temp->code == jit_code_label ||
|
||||
temp->code == jit_code_epilog);
|
||||
|
|
@ -1352,6 +1353,9 @@ _emit_code(jit_state_t *_jit)
|
|||
word = jmpi(_jit->pc.w);
|
||||
patch(word, node);
|
||||
}
|
||||
}
|
||||
else
|
||||
jmpi(node->u.w);
|
||||
break;
|
||||
case jit_code_callr:
|
||||
callr(rn(node->u.w));
|
||||
|
|
|
|||
|
|
@ -1236,6 +1236,7 @@ _emit_code(jit_state_t *_jit)
|
|||
jmpr(rn(node->u.w));
|
||||
break;
|
||||
case jit_code_jmpi:
|
||||
if (node->flag & jit_flag_node) {
|
||||
#if __powerpc__
|
||||
if (_jit->pc.uc == _jit->code.ptr + sizeof(void*) * 3)
|
||||
_jitc->jump = 1;
|
||||
|
|
@ -1243,13 +1244,15 @@ _emit_code(jit_state_t *_jit)
|
|||
temp = node->u.n;
|
||||
assert(temp->code == jit_code_label ||
|
||||
temp->code == jit_code_epilog);
|
||||
/* no support for jump outside jit */
|
||||
if (temp->flag & jit_flag_patch)
|
||||
jmpi(temp->u.w);
|
||||
else {
|
||||
word = jmpi(_jit->pc.w);
|
||||
patch(word, node);
|
||||
}
|
||||
}
|
||||
else
|
||||
jmpi(node->u.w);
|
||||
break;
|
||||
case jit_code_callr:
|
||||
callr(rn(node->u.w));
|
||||
|
|
|
|||
|
|
@ -1052,6 +1052,7 @@ _emit_code(jit_state_t *_jit)
|
|||
jmpr(rn(node->u.w));
|
||||
break;
|
||||
case jit_code_jmpi:
|
||||
if (node->flag & jit_flag_node) {
|
||||
temp = node->u.n;
|
||||
assert(temp->code == jit_code_label ||
|
||||
temp->code == jit_code_epilog);
|
||||
|
|
@ -1061,6 +1062,9 @@ _emit_code(jit_state_t *_jit)
|
|||
word = jmpi_p(_jit->pc.w);
|
||||
patch(word, node);
|
||||
}
|
||||
}
|
||||
else
|
||||
jmpi(node->u.w);
|
||||
break;
|
||||
case jit_code_callr:
|
||||
callr(rn(node->u.w));
|
||||
|
|
|
|||
|
|
@ -1055,6 +1055,7 @@ _emit_code(jit_state_t *_jit)
|
|||
jmpr(rn(node->u.w));
|
||||
break;
|
||||
case jit_code_jmpi:
|
||||
if (node->flag & jit_flag_node) {
|
||||
temp = node->u.n;
|
||||
assert(temp->code == jit_code_label ||
|
||||
temp->code == jit_code_epilog);
|
||||
|
|
@ -1064,6 +1065,9 @@ _emit_code(jit_state_t *_jit)
|
|||
word = jmpi_p(_jit->pc.w);
|
||||
patch(word, node);
|
||||
}
|
||||
}
|
||||
else
|
||||
jmpi(node->u.w);
|
||||
break;
|
||||
case jit_code_callr:
|
||||
callr(rn(node->u.w));
|
||||
|
|
|
|||
|
|
@ -1668,6 +1668,7 @@ _emit_code(jit_state_t *_jit)
|
|||
jmpr(rn(node->u.w));
|
||||
break;
|
||||
case jit_code_jmpi:
|
||||
if (node->flag & jit_flag_node) {
|
||||
temp = node->u.n;
|
||||
assert(temp->code == jit_code_label ||
|
||||
temp->code == jit_code_epilog);
|
||||
|
|
@ -1677,6 +1678,9 @@ _emit_code(jit_state_t *_jit)
|
|||
word = jmpi(_jit->pc.w);
|
||||
patch(word, node);
|
||||
}
|
||||
}
|
||||
else
|
||||
jmpi(node->u.w);
|
||||
break;
|
||||
case jit_code_callr:
|
||||
callr(rn(node->u.w));
|
||||
|
|
|
|||
|
|
@ -2295,6 +2295,8 @@ _shortcut_jump(jit_state_t *_jit, jit_node_t *prev, jit_node_t *node)
|
|||
for (next = jump->next; next; next = next->next) {
|
||||
switch (next->code) {
|
||||
case jit_code_jmpi:
|
||||
if (!(next->flag & jit_flag_node))
|
||||
return (0);
|
||||
if (jump->link == node)
|
||||
jump->link = node->link;
|
||||
else {
|
||||
|
|
@ -2500,7 +2502,8 @@ _reverse_jump(jit_state_t *_jit, jit_node_t *prev, jit_node_t *node)
|
|||
return (0);
|
||||
/* =><cond_jump L0> <jump L1> <label L0> */
|
||||
local_next = node->next;
|
||||
if (local_next->code != jit_code_jmpi)
|
||||
if (local_next->code != jit_code_jmpi ||
|
||||
!(local_next->flag & jit_flag_node))
|
||||
return (0);
|
||||
/* <cond_jump L0> =><jump L1> <label L0> */
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue