pussuw commented on code in PR #11322:
URL: https://github.com/apache/nuttx/pull/11322#discussion_r1422432498
##########
libs/libc/machine/risc-v/arch_elf.c:
##########
@@ -317,58 +396,101 @@ int up_relocateadd(const Elf_Rela *rel, const Elf_Sym
*sym,
break;
case R_RISCV_PCREL_LO12_I:
- case R_RISCV_PCREL_LO12_S:
{
+ long imm_hi;
+ long imm_lo;
+
binfo("%s at %08" PRIxPTR " [%08" PRIx32 "] "
"to sym=%p st_value=%08lx\n",
_get_rname(relotype),
addr, _get_val((uint16_t *)addr),
sym, sym->st_value);
- /* NOTE: imm value for mv has been adjusted in previous HI20 */
+ offset = _find_hi20(arch_data, sym->st_value);
+
+ /* Adjust imm for MV(ADDI) / JR (JALR) : I-type */
+
+ _calc_imm(offset, &imm_hi, &imm_lo);
+
+ _add_val((uint16_t *)(addr), ((int32_t)imm_lo << 20));
}
break;
- case R_RISCV_PCREL_HI20:
- case R_RISCV_CALL:
- case R_RISCV_CALL_PLT:
+ case R_RISCV_PCREL_LO12_S:
{
+ uint32_t val;
Review Comment:
These are the types used by the original code, I decided not to touch them.
u32 is enough here (for adjusting the immediate)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
