mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-29 19:30:36 +02:00
Code Activity

riscv: clean patch jumps

Browse source
This commit is contained in:
Ekaitz Zarraga 2024-11-14 13:24:48 +01:00
parent f6f2a757c3
commit 93380fc377
2 changed files with 12 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lightening/riscv-cpu.c
View file

@ -205,7 +205,9 @@ Btype(int32_t op, int32_t fct, int32_t rs1, int32_t rs2, int32_t imm)
assert(!(fct & ~0x07));
assert(!(rs1 & ~0x1f));
assert(!(rs2 & ~0x1f));
assert(!(imm & 1) && simm12_p(imm));
assert(!(imm & 1));
assert(simm12_p(imm >> 1));
i.B.opcode = op;
i.B.imm11 = (imm >> 11) & 0x1;
i.B.imm4_1 = (imm >> 1) & 0xf;
@ -236,7 +238,9 @@ Jtype(int32_t op, int32_t rd, int32_t imm)
instr_t i;
assert(!(op & ~0x7f));
assert(!(rd & ~0x1f));
assert(!(imm & 1) && imm <= 1048575 && imm >= -1048576);
assert(!(imm & 1));
assert(simm20_p(imm >> 1));
i.J.opcode = op;
i.J.rd = rd;
i.J.imm19_12= (imm >> 12) & 0xff;
@ -1102,11 +1106,7 @@ static uint32_t
patch_cc_jump(uint32_t inst, int32_t offset){
instr_t i;
i.w = inst;
i.B.imm11 = (offset >> 11) & 0x1;
i.B.imm4_1 = (offset >> 1) & 0xf;
i.B.imm10_5 = (offset >> 5) & 0x3f;
i.B.imm12 = (offset >> 12) & 0x1;
return i.w;
return Btype(i.B.opcode, i.B.funct3, i.B.rs1, i.B.rs2, offset);
}
static jit_reloc_t
@ -2250,11 +2250,7 @@ patch_jump(uint32_t inst, int32_t offset)
{
instr_t i;
i.w = inst;
i.J.imm20 = (offset >> 20) & 0x1;
i.J.imm19_12= (offset >> 12) & 0xff;
i.J.imm11 = (offset >> 11) & 0x1;
i.J.imm10_1 = (offset >> 1) & 0x3ff;
return i.w;
return Jtype(i.J.opcode, i.J.rd, offset);
}
static jit_reloc_t
emit_jump(jit_state_t *_jit, uint32_t inst)

15
lightening/riscv.c
View file

@ -219,12 +219,8 @@ patch_veneer(uint32_t *loc, jit_pointer_t addr)
static void
patch_jcc_offset(uint32_t *loc, ptrdiff_t v)
{
instr_t *i = (instr_t *) loc;
i->B.imm11 = (v >> 11) & 0x1;
i->B.imm4_1 = (v >> 1) & 0xf;
i->B.imm10_5 = (v >> 5) & 0x3f;
i->B.imm12 = (v >> 12) & 0x1;
i->w = patch_cc_jump(i->w, v);
}
static void
patch_veneer_jcc_offset(uint32_t *loc, ptrdiff_t offset){
@ -251,7 +247,7 @@ offset_in_jcc_range(ptrdiff_t offset, int flags)
if(offset & 1)
return 0;
else
return -0x1000 <= offset && offset <= 0xFFF;
return simm12_p(offset);
}
/*
@ -275,17 +271,14 @@ offset_in_jmp_range(ptrdiff_t offset, int flags)
if(offset & 1)
return 0;
else
return -0x100000 <= offset && offset <= 0xFFFFF;
return simm20_p(offset);
}
static void
patch_jmp_offset(uint32_t *loc, ptrdiff_t v)
{
instr_t *i = (instr_t *) loc;
i->J.imm20 = (v >> 20) & 0x1;
i->J.imm19_12= (v >> 12) & 0xff;
i->J.imm11 = (v >> 11) & 0x1;
i->J.imm10_1 = (v >> 1) & 0x3ff;
i->w = patch_jump(i->w, v);
}
static void