Mirrors/Ventoy
1
0
Fork 0
mirror of https://github.com/ventoy/Ventoy.git synced 2025-12-17 09:06:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

loongarch: Add support for ELF psABI v2.00 relocations

Browse Source 
A new set of relocation types was added in the LoongArch ELF psABI v2.00
spec [1], [2] to replace the stack-based scheme in v1.00. Toolchain
support is available from binutils 2.40 and gcc 13 onwards.

This patch adds support for the new relocation types, that are simpler
to handle (in particular, stack operations are gone). Support for the
v1.00 relocs are kept for now, for compatibility with older toolchains.

[1] https://github.com/loongson/LoongArch-Documentation/pull/57
[2] https://loongson.github.io/LoongArch-Documentation/LoongArch-ELF-ABI-EN.html#_appendix_revision_history

Signed-off-by: Xiaotian Wu <wuxiaotian@loongson.cn>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
This commit is contained in:
Wentao Guan
2024-08-25 16:05:11 +08:00
parent a12fcf90ed
commit 30b840dae2
7 changed files with 193 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
GRUB2/MOD_SRC/grub-2.04/util/grub-mkimagexx.c
View File

@@ -1192,11 +1192,20 @@ SUFFIX (relocate_addrs) (Elf_Ehdr *e, struct section_metadata *smd,
}
case EM_LOONGARCH:
{
grub_int64_t pc;
grub_uint32_t *t32 = (grub_uint32_t *) target;
sym_addr += addend;
pc = offset + target_section_addr + image_target->vaddr_offset;
switch (ELF_R_TYPE (info))
{
case R_LARCH_64:
*target = grub_host_to_target64 (grub_target_to_host64 (*target) + sym_addr);
{
grub_uint64_t *t64 = (grub_uint64_t *) target;
*t64 = grub_host_to_target64 (grub_target_to_host64 (*t64) + sym_addr);
}
break;
case R_LARCH_MARK_LA:
break;
@@ -1207,6 +1216,37 @@ SUFFIX (relocate_addrs) (Elf_Ehdr *e, struct section_metadata *smd,
+offset
+image_target->vaddr_offset));
break;
case R_LARCH_B26:
{
grub_int64_t off;
off = sym_addr - target_section_addr - offset - image_target->vaddr_offset;
grub_loongarch64_b26 (t32, off);
}
break;
case R_LARCH_ABS_HI20:
grub_loongarch64_xxx_hi20 (t32, sym_addr);
break;
case R_LARCH_ABS64_LO20:
grub_loongarch64_xxx64_lo20 (t32, sym_addr);
break;
case R_LARCH_ABS64_HI12:
grub_loongarch64_xxx64_hi12 (t32, sym_addr);
break;
case R_LARCH_PCALA_HI20:
{
grub_int32_t hi20;
hi20 = (((sym_addr + 0x800) & ~0xfffULL) - (pc & ~0xfffULL));
grub_loongarch64_xxx_hi20 (t32, hi20);
}
break;
case R_LARCH_ABS_LO12:
case R_LARCH_PCALA_LO12:
grub_loongarch64_xxx_lo12 (t32, sym_addr);
break;
GRUB_LOONGARCH64_RELOCATION (&stack, target, sym_addr)
default:
grub_util_error (_("relocation 0x%x is not implemented yet"),
@@ -1801,6 +1841,13 @@ translate_relocation_pe (struct translate_context *ctx,
case R_LARCH_SOP_POP_32_S_5_20:
case R_LARCH_SOP_POP_32_S_0_5_10_16_S2:
case R_LARCH_SOP_POP_32_S_0_10_10_16_S2:
case R_LARCH_B26:
case R_LARCH_ABS_HI20:
case R_LARCH_ABS_LO12:
case R_LARCH_ABS64_LO20:
case R_LARCH_ABS64_HI12:
case R_LARCH_PCALA_HI20:
case R_LARCH_PCALA_LO12:
grub_util_info (" %s: not adding fixup: 0x%08x : 0x%08x",
__FUNCTION__,
(unsigned int) addr,

7
GRUB2/MOD_SRC/grub-2.04/util/grub-module-verifier.c
View File

@@ -140,6 +140,13 @@ struct grub_module_verifier_arch archs[] = {
R_LARCH_SOP_POP_32_S_5_20,
R_LARCH_SOP_POP_32_S_0_5_10_16_S2,
R_LARCH_SOP_POP_32_S_0_10_10_16_S2,
R_LARCH_B26,
R_LARCH_ABS_HI20,
R_LARCH_ABS_LO12,
R_LARCH_ABS64_LO20,
R_LARCH_ABS64_HI12,
R_LARCH_PCALA_HI20,
R_LARCH_PCALA_LO12,
-1
}, (int[]){
-1