loongarch: Rename function names

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>

diff --git a/grub-core/kern/loongarch64/dl.c b/grub-core/kern/loongarch64/dl.c
index 43080e72e75dd1348094bbae6bbd5474f9d609a1..7f923b41599e6ce96b187ea60c3dbf94b8977261 100644 (file)
--- a/grub-core/kern/loongarch64/dl.c
+++ b/grub-core/kern/loongarch64/dl.c
@@ -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:

diff --git a/grub-core/kern/loongarch64/dl_helper.c b/grub-core/kern/loongarch64/dl_helper.c
index e869ce9acb2aeb07bdfef33d63ffb6b9cfa4be5e..879ae618912761741fa7bd6f19742bd9b86c76bf 100644 (file)
--- a/grub-core/kern/loongarch64/dl_helper.c
+++ b/grub-core/kern/loongarch64/dl_helper.c
@@ -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;

diff --git a/include/grub/loongarch64/reloc.h b/include/grub/loongarch64/reloc.h
index dec7a6b3665741ce1e9fc87e5badbfbc1507ebcd..8ba35538581185071cbc91638b91938d9ef7fece 100644 (file)
--- a/include/grub/loongarch64/reloc.h
+++ b/include/grub/loongarch64/reloc.h
@@ -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:                              \

diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
index a3ab04eb1671b144be08c063bd563484369f452a..e50b29533c62c3c6640edfa3f090c5deab8486eb 100644 (file)
--- a/util/grub-mkimagexx.c
+++ b/util/grub-mkimagexx.c
@@ -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:
                     {