From 1ca7b175378ae7764146f82e87a0645b6e3a5e8b Mon Sep 17 00:00:00 2001
From: Rui Ueyama <ruiu@bluewhale.systems>
Date: Sun, 8 Jan 2023 11:47:29 +0800
Subject: [PATCH] Refactor

---
 elf/output-chunks.cc | 11 +++++------
 elf/tls.cc           | 25 +++++++++++++------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/elf/output-chunks.cc b/elf/output-chunks.cc
index 5061c4628d..62cf345753 100644
--- a/elf/output-chunks.cc
+++ b/elf/output-chunks.cc
@@ -296,12 +296,11 @@ static std::vector<ElfPhdr<E>> create_phdr(Context<E> &ctx) {
 
   // Create a PT_TLS.
   for (i64 i = 0; i < ctx.chunks.size(); i++) {
-    if (!(ctx.chunks[i]->shdr.sh_flags & SHF_TLS))
-      continue;
-
-    define(PT_TLS, PF_R, 1, ctx.chunks[i++]);
-    while (i < ctx.chunks.size() && (ctx.chunks[i]->shdr.sh_flags & SHF_TLS))
-      append(ctx.chunks[i++]);
+    if (ctx.chunks[i]->shdr.sh_flags & SHF_TLS) {
+      define(PT_TLS, PF_R, 1, ctx.chunks[i++]);
+      while (i < ctx.chunks.size() && (ctx.chunks[i]->shdr.sh_flags & SHF_TLS))
+        append(ctx.chunks[i++]);
+    }
   }
 
   // Add PT_DYNAMIC
diff --git a/elf/tls.cc b/elf/tls.cc
index 7a3ebdbe74..56eb23b339 100644
--- a/elf/tls.cc
+++ b/elf/tls.cc
@@ -33,20 +33,20 @@
 // for new threads, and no one write to it at runtime.
 //
 // Now, let's think about how to access a TLV. We need to know the TLV's
-// address to access it, and that can be done in various ways as follows:
+// address to access it which can be done in various ways as follows:
 //
 //  1. If we are creating an executable, we know the exact size of the TLS
 //     template image we are creating, and we know where the TP will be
 //     set to after the template is copied to the TLS block. Therefore,
-//     the TP-relative address of a TLV in the main executable can be
-//     computed at link-time. That means, computing a TLV's address can be
-//     as easy as `add %dst, %tp, <link-time constant>`.
+//     the TP-relative address of a TLV in the main executable is known at
+//     link-time. That means, computing a TLV's address can be as easy as
+//     `add %dst, %tp, <link-time constant>`.
 //
 //  2. If we are creating a shared library, we don't excatly know where
-//     its TLS template image will be copied to relative to other files'
-//     TLS blocks, because we don't know how large is the main
-//     executable's and other libraries' TLS template images are. Only the
-//     runtime knows the exact TP-relative address.
+//     its TLS template image will be copied to relative TP, because we
+//     don't know how large is the main executable's and other libraries'
+//     TLS template images are. Only the runtime knows the exact
+//     TP-relative address.
 //
 //     We can solve the problem with an indirection. Specifically, for
 //     each TLV whose TP-relative address is only known at process startup
@@ -141,7 +141,9 @@ u64 get_tls_begin(Context<E> &ctx) {
 }
 
 // Returns the TP address which can be used for efficient TLV accesses in
-// the main executable.
+// the main executable. TP at runtime refers to a per-process TLS block
+// whose address is not known at link-time. So the address returned from
+// this function is the TP if the TLS template image were a TLS block.
 template <typename E>
 u64 get_tp_addr(Context<E> &ctx) {
   ElfPhdr<E> *phdr = get_tls_segment(ctx);
@@ -172,14 +174,13 @@ u64 get_tp_addr(Context<E> &ctx) {
   // TP. RISC-V load/store instructions usually take 12-bits signed
   // immediates, so the beginning of TLV ± 2 KiB is accessible with a
   // single load/store instruction.
-  if (is_riscv<E>)
+  if constexpr (is_riscv<E>)
     return phdr->p_vaddr;
 
   unreachable();
 }
 
-// Returns the address in the TLS template image when __tls_get_addr would
-// be called with offset 0.
+// Returns the address when __tls_get_addr would be called with offset 0.
 template <typename E>
 u64 get_dtp_addr(Context<E> &ctx) {
   ElfPhdr<E> *phdr = get_tls_segment(ctx);