From 445b5e1e9419b83ee93c7d2f11de00fd644ad86c Mon Sep 17 00:00:00 2001
From: Liav A <liavalb@gmail.com>
Date: Tue, 4 Oct 2022 02:51:58 +0300
Subject: [PATCH] Userland: Remove i686 support

---
 .../Libraries/LibWeb/Loader/ResourceLoader.h  |  4 +--
 Userland/Utilities/functrace.cpp              | 14 ++-------
 Userland/Utilities/pmap.cpp                   |  4 ---
 Userland/Utilities/readelf.cpp                | 29 +------------------
 Userland/Utilities/strace.cpp                 | 15 ++--------
 5 files changed, 6 insertions(+), 60 deletions(-)

diff --git a/Userland/Libraries/LibWeb/Loader/ResourceLoader.h b/Userland/Libraries/LibWeb/Loader/ResourceLoader.h
index be9f7d0c39e..20543c541d3 100644
--- a/Userland/Libraries/LibWeb/Loader/ResourceLoader.h
+++ b/Userland/Libraries/LibWeb/Loader/ResourceLoader.h
@@ -18,9 +18,7 @@
 
 namespace Web {
 
-#if ARCH(I386)
-#    define CPU_STRING "x86"
-#elif ARCH(X86_64)
+#if ARCH(X86_64)
 #    define CPU_STRING "x86_64"
 #elif ARCH(AARCH64)
 #    define CPU_STRING "AArch64"
diff --git a/Userland/Utilities/functrace.cpp b/Userland/Utilities/functrace.cpp
index b66f954f0d1..c61787d6566 100644
--- a/Userland/Utilities/functrace.cpp
+++ b/Userland/Utilities/functrace.cpp
@@ -50,15 +50,7 @@ static void print_syscall(PtraceRegisters& regs, size_t depth)
     }
     StringView begin_color = g_should_output_color ? "\033[34;1m"sv : ""sv;
     StringView end_color = g_should_output_color ? "\033[0m"sv : ""sv;
-#if ARCH(I386)
-    outln("=> {}SC_{}({:#x}, {:#x}, {:#x}){}",
-        begin_color,
-        Syscall::to_string((Syscall::Function)regs.eax),
-        regs.edx,
-        regs.ecx,
-        regs.ebx,
-        end_color);
-#elif ARCH(X86_64)
+#if ARCH(X86_64)
     outln("=> {}SC_{}({:#x}, {:#x}, {:#x}){}",
         begin_color,
         Syscall::to_string((Syscall::Function)regs.rax),
@@ -146,9 +138,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
             return Debug::DebugSession::DebugDecision::ContinueBreakAtSyscall;
         }
 
-#if ARCH(I386)
-        const FlatPtr ip = regs.value().eip;
-#elif ARCH(X86_64)
+#if ARCH(X86_64)
         const FlatPtr ip = regs.value().rip;
 #elif ARCH(AARCH64)
         const FlatPtr ip = 0; // FIXME
diff --git a/Userland/Utilities/pmap.cpp b/Userland/Utilities/pmap.cpp
index c6060d5640e..47daa228535 100644
--- a/Userland/Utilities/pmap.cpp
+++ b/Userland/Utilities/pmap.cpp
@@ -30,11 +30,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
 
     outln("{}:", pid);
 
-#if ARCH(I386)
-    auto padding = "";
-#else
     auto padding = "        ";
-#endif
 
     if (extended) {
         outln("Address{}           Size   Resident      Dirty Access  VMObject Type  Purgeable   CoW Pages Name", padding);
diff --git a/Userland/Utilities/readelf.cpp b/Userland/Utilities/readelf.cpp
index bb798dad7d9..74bb8f9d08c 100644
--- a/Userland/Utilities/readelf.cpp
+++ b/Userland/Utilities/readelf.cpp
@@ -187,30 +187,7 @@ static char const* object_symbol_binding_to_string(ElfW(Word) type)
 static char const* object_relocation_type_to_string(ElfW(Word) type)
 {
     switch (type) {
-#if ARCH(I386)
-    case R_386_NONE:
-        return "R_386_NONE";
-    case R_386_32:
-        return "R_386_32";
-    case R_386_PC32:
-        return "R_386_PC32";
-    case R_386_GOT32:
-        return "R_386_GOT32";
-    case R_386_PLT32:
-        return "R_386_PLT32";
-    case R_386_COPY:
-        return "R_386_COPY";
-    case R_386_GLOB_DAT:
-        return "R_386_GLOB_DAT";
-    case R_386_JMP_SLOT:
-        return "R_386_JMP_SLOT";
-    case R_386_RELATIVE:
-        return "R_386_RELATIVE";
-    case R_386_TLS_TPOFF:
-        return "R_386_TLS_TPOFF";
-    case R_386_TLS_TPOFF32:
-        return "R_386_TLS_TPOFF32";
-#else
+#if ARCH(x86_64)
     case R_X86_64_NONE:
         return "R_X86_64_NONE";
     case R_X86_64_64:
@@ -386,11 +363,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
         outln();
     }
 
-#if ARCH(I386)
-    auto addr_padding = "";
-#else
     auto addr_padding = "        ";
-#endif
 
     if (display_section_headers) {
         if (!display_all) {
diff --git a/Userland/Utilities/strace.cpp b/Userland/Utilities/strace.cpp
index f895c833931..a7f5ae5f8a6 100644
--- a/Userland/Utilities/strace.cpp
+++ b/Userland/Utilities/strace.cpp
@@ -210,11 +210,7 @@ END_VALUES_TO_NAMES()
 
 static int g_pid = -1;
 
-#if ARCH(I386)
-using syscall_arg_t = u32;
-#elif ARCH(X86_64) || ARCH(AARCH64)
 using syscall_arg_t = u64;
-#endif
 
 static void handle_sigint(int)
 {
@@ -887,12 +883,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
         }
         PtraceRegisters regs = {};
         TRY(Core::System::ptrace(PT_GETREGS, g_pid, &regs, 0));
-#if ARCH(I386)
-        syscall_arg_t syscall_index = regs.eax;
-        syscall_arg_t arg1 = regs.edx;
-        syscall_arg_t arg2 = regs.ecx;
-        syscall_arg_t arg3 = regs.ebx;
-#elif ARCH(X86_64)
+#if ARCH(X86_64)
         syscall_arg_t syscall_index = regs.rax;
         syscall_arg_t arg1 = regs.rdx;
         syscall_arg_t arg2 = regs.rcx;
@@ -915,9 +906,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
 
         TRY(Core::System::ptrace(PT_GETREGS, g_pid, &regs, 0));
 
-#if ARCH(I386)
-        u32 res = regs.eax;
-#elif ARCH(X86_64)
+#if ARCH(X86_64)
         u64 res = regs.rax;
 #elif ARCH(AARCH64)
         u64 res = 0; // FIXME