From 309f5973d29a5dad617907dd71992b4ece5f7e6e Mon Sep 17 00:00:00 2001
From: Zhou Kang <gameoverboss@163.com>
Date: Fri, 28 Jul 2023 13:03:02 +0000
Subject: [PATCH] clean code

---
 src/elf_link_common.h | 40 ----------------------------------------
 src/elf_read_elf.h    | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/src/elf_link_common.h b/src/elf_link_common.h
index b9f63bd..0d60471 100644
--- a/src/elf_link_common.h
+++ b/src/elf_link_common.h
@@ -241,45 +241,6 @@ static inline bool is_need_preinit(elf_link_t *elf_link)
 	return false;
 }
 
-static inline int elf_read_s32(elf_file_t *ef, unsigned long offset)
-{
-	void *addr = ((void *)ef->hdr + (unsigned long)offset);
-	return *(int *)addr;
-}
-
-static inline int elf_read_s32_va(elf_file_t *ef, unsigned long va)
-{
-	return elf_read_s32(ef, elf_va_to_offset(ef, va));
-}
-
-static inline unsigned elf_read_u32(elf_file_t *ef, unsigned long offset)
-{
-	void *addr = ((void *)ef->hdr + (unsigned long)offset);
-	return *(unsigned *)addr;
-}
-
-static inline unsigned elf_read_u32_va(elf_file_t *ef, unsigned long va)
-{
-	return elf_read_u32(ef, elf_va_to_offset(ef, va));
-}
-
-static inline unsigned long elf_read_u64(elf_file_t *ef, unsigned long offset)
-{
-	void *addr = ((void *)ef->hdr + (unsigned long)offset);
-	return *(unsigned long *)addr;
-}
-
-static inline unsigned elf_read_u64_va(elf_file_t *ef, unsigned long va)
-{
-	return elf_read_u64(ef, elf_va_to_offset(ef, va));
-}
-
-static inline void elf_write_u64(elf_file_t *ef, unsigned long addr_, unsigned long value)
-{
-	unsigned long *addr = ((void *)ef->hdr + (unsigned long)addr_);
-	*addr = value;
-}
-
 static inline void elf_write_u32(elf_file_t *ef, unsigned long addr_, unsigned value)
 {
 	unsigned *addr = ((void *)ef->hdr + (unsigned long)addr_);
@@ -304,7 +265,6 @@ static inline void modify_elf_file(elf_link_t *elf_link, unsigned long loc, void
 	memcpy(dst, val, len);
 }
 
-
 // symbol
 bool is_symbol_maybe_undefined(const char *name);
 bool is_gnu_weak_symbol(Elf64_Sym *sym);
diff --git a/src/elf_read_elf.h b/src/elf_read_elf.h
index fb52706..bfd4af5 100644
--- a/src/elf_read_elf.h
+++ b/src/elf_read_elf.h
@@ -166,6 +166,46 @@ static inline Elf64_Sym *elf_get_dynsym_by_rela(elf_file_t *ef, Elf64_Rela *rela
 }
 
 unsigned long elf_va_to_offset(elf_file_t *ef, unsigned long va);
+
+static inline int elf_read_s32(elf_file_t *ef, unsigned long offset)
+{
+	void *addr = ((void *)ef->hdr + (unsigned long)offset);
+	return *(int *)addr;
+}
+
+static inline int elf_read_s32_va(elf_file_t *ef, unsigned long va)
+{
+	return elf_read_s32(ef, elf_va_to_offset(ef, va));
+}
+
+static inline unsigned elf_read_u32(elf_file_t *ef, unsigned long offset)
+{
+	void *addr = ((void *)ef->hdr + (unsigned long)offset);
+	return *(unsigned *)addr;
+}
+
+static inline unsigned elf_read_u32_va(elf_file_t *ef, unsigned long va)
+{
+	return elf_read_u32(ef, elf_va_to_offset(ef, va));
+}
+
+static inline unsigned long elf_read_u64(elf_file_t *ef, unsigned long offset)
+{
+	void *addr = ((void *)ef->hdr + (unsigned long)offset);
+	return *(unsigned long *)addr;
+}
+
+static inline unsigned long elf_read_u64_va(elf_file_t *ef, unsigned long va)
+{
+	return elf_read_u64(ef, elf_va_to_offset(ef, va));
+}
+
+static inline void elf_write_u64(elf_file_t *ef, unsigned long addr_, unsigned long value)
+{
+	unsigned long *addr = ((void *)ef->hdr + (unsigned long)addr_);
+	*addr = value;
+}
+
 int elf_find_func_range_by_name(elf_file_t *ef, const char *func_name,
 				unsigned long *start, unsigned long *end);
 
-- 
Gitee