mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-21 11:10:21 +02:00
Code Activity

Correct extra regressions found by the call.tst test case.

Browse source 
* lib/jit_arm.c, lib/jit_mips-cpu.c, lib/jit_mips.c: Correct
	regressions when patching jit_calli for a forward function.

	* lib/jit_ppc-cpu.c: Correct wrong arguments to ANDI opcode
	in jit_getarg_u{c,s} implementation.
This commit is contained in:
pcpa 2012-12-28 10:28:50 -02:00
parent 3ee09ecc64
commit 1287a2d448
5 changed files with 40 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

40
lib/jit_arm.c
View file

@ -1468,26 +1468,21 @@ _jit_emit(jit_state_t *_jit)
assert(_jit->patches.ptr[offset].kind & arm_patch_node);
node = _jit->patches.ptr[offset].node;
word = _jit->patches.ptr[offset].inst;
if (node->code == jit_code_movi) {
if (jit_thumb_p())
value = node->v.n->u.w;
else {
/* calculate where to patch word */
value = *(jit_int32_t *)word;
assert((value & 0x0f700000) == ARM_LDRI);
/* offset may become negative (-4) if last instruction
* before unconditional branch and data following
* FIXME can this cause issues in the preprocessor prefetch
* or something else? should not, as the constants are after
* an unconditional jump */
if (value & ARM_P) value = value & 0x00000fff;
else value = -(value & 0x00000fff);
word = word + 8 + value;
value = node->v.n->u.w;
}
}
else
value = node->u.n->u.w;
if (!jit_thumb_p() &&
(node->code == jit_code_movi || node->code == jit_code_calli)) {
/* calculate where to patch word */
value = *(jit_int32_t *)word;
assert((value & 0x0f700000) == ARM_LDRI);
/* offset may become negative (-4) if last instruction
* before unconditional branch and data following
* FIXME can this cause issues in the preprocessor prefetch
* or something else? should not, as the constants are after
* an unconditional jump */
if (value & ARM_P) value = value & 0x00000fff;
else value = -(value & 0x00000fff);
word = word + 8 + value;
}
value = node->code == jit_code_movi ? node->v.n->u.w : node->u.n->u.w;
patch_at(_jit->patches.ptr[offset].kind & ~arm_patch_node, word, value);
}
@ -1715,12 +1710,9 @@ _patch(jit_state_t *_jit, jit_word_t instr, jit_node_t *node)
}
else {
flag = node->u.n->flag;
#if 1
/* should work if #if 0'ed, but better to avoid the goto fallback */
if (node->code == jit_code_calli && jit_thumb_p())
if (node->code == jit_code_calli)
kind = arm_patch_word;
else
#endif
kind = arm_patch_jump;
}
assert(!(flag & jit_flag_patch));