tablet/grub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loongarch: Rename function names

Browse Source 
According to the relocation documentation, the following function names are
renamed to show their exact meaning:
  - from grub_loongarch64_xxx64_hi12() to grub_loongarch64_abs64_hi12(),
  - from grub_loongarch64_xxx64_hi12() to grub_loongarch64_abs64_lo20().

Signed-off-by: Xiaotian Wu <wuxiaotian@loongson.cn>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Xiaotian Wu 2023-06-13 17:06:33 +08:00 committed by Daniel Kiper
parent 1385254f17
commit 22a6f8a482
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
grub-core/kern/loongarch64/dl.c
View File

@ -109,13 +109,13 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
case R_LARCH_ABS64_LO20:
{
grub_uint32_t *abs_place = place;
grub_loongarch64_xxx64_lo20 (abs_place, sym_addr);
grub_loongarch64_abs64_lo20 (abs_place, sym_addr);
}
break;
case R_LARCH_ABS64_HI12:
{
grub_uint32_t *abs_place = place;
grub_loongarch64_xxx64_hi12 (abs_place, sym_addr);
grub_loongarch64_abs64_hi12 (abs_place, sym_addr);
}
break;
case R_LARCH_PCALA_HI20:

4
grub-core/kern/loongarch64/dl_helper.c
View File

@ -235,7 +235,7 @@ void grub_loongarch64_xxx_lo12 (grub_uint32_t *place, grub_int64_t offset)
*place |= grub_cpu_to_le32 (offset << 10) & ~insmask;
}
void grub_loongarch64_xxx64_hi12 (grub_uint32_t *place, grub_int64_t offset)
void grub_loongarch64_abs64_hi12 (grub_uint32_t *place, grub_int64_t offset)
{
const grub_uint32_t insmask = grub_cpu_to_le32_compile_time (0xffc003ff);
grub_uint32_t val;
@ -247,7 +247,7 @@ void grub_loongarch64_xxx64_hi12 (grub_uint32_t *place, grub_int64_t offset)
*place |= grub_cpu_to_le32 (val) & ~insmask;
}
void grub_loongarch64_xxx64_lo20 (grub_uint32_t *place, grub_int64_t offset)
void grub_loongarch64_abs64_lo20 (grub_uint32_t *place, grub_int64_t offset)
{
const grub_uint32_t insmask = grub_cpu_to_le32_compile_time (0xfe00001f);
grub_uint32_t val;

4
include/grub/loongarch64/reloc.h
View File

@ -60,8 +60,8 @@ void grub_loongarch64_sop_32_s_0_10_10_16_s2 (grub_loongarch64_stack_t stack,
void grub_loongarch64_b26 (grub_uint32_t *place, grub_int64_t offset);
void grub_loongarch64_xxx_hi20 (grub_uint32_t *place, grub_int64_t offset);
void grub_loongarch64_xxx_lo12 (grub_uint32_t *place, grub_int64_t offset);
void grub_loongarch64_xxx64_hi12 (grub_uint32_t *place, grub_int64_t offset);
void grub_loongarch64_xxx64_lo20 (grub_uint32_t *place, grub_int64_t offset);
void grub_loongarch64_abs64_hi12 (grub_uint32_t *place, grub_int64_t offset);
void grub_loongarch64_abs64_lo20 (grub_uint32_t *place, grub_int64_t offset);
#define GRUB_LOONGARCH64_RELOCATION(STACK, PLACE, OFFSET) \
case R_LARCH_SOP_PUSH_ABSOLUTE: \

4
util/grub-mkimagexx.c
View File

@ -1165,10 +1165,10 @@ SUFFIX (relocate_addrs) (Elf_Ehdr *e, struct section_metadata *smd,
grub_loongarch64_xxx_hi20 (t32, sym_addr);
break;
case R_LARCH_ABS64_LO20:
grub_loongarch64_xxx64_lo20 (t32, sym_addr);
grub_loongarch64_abs64_lo20 (t32, sym_addr);
break;
case R_LARCH_ABS64_HI12:
grub_loongarch64_xxx64_hi12 (t32, sym_addr);
grub_loongarch64_abs64_hi12 (t32, sym_addr);
break;
case R_LARCH_PCALA_HI20:
{