From 33079c8ab91fdd63a07f0da8d598ce5bbbab787f Mon Sep 17 00:00:00 2001 From: Ben Wiederhake Date: Tue, 23 Nov 2021 01:07:30 +0100 Subject: [PATCH] Kernel+UE+LibC: Remove unused dbgputch syscall Everything uses the dbgputstr syscall anyway, so there is no need to keep supporting it. --- Kernel/API/Syscall.h | 1 - Kernel/Process.h | 1 - Kernel/Syscalls/debug.cpp | 7 ------- Kernel/kprintf.cpp | 6 ------ Kernel/kstdio.h | 1 - Userland/DevTools/UserspaceEmulator/Emulator.h | 1 - Userland/DevTools/UserspaceEmulator/Emulator_syscalls.cpp | 8 -------- Userland/Libraries/LibC/stdio.cpp | 5 ----- Userland/Libraries/LibC/stdio.h | 1 - 9 files changed, 31 deletions(-) diff --git a/Kernel/API/Syscall.h b/Kernel/API/Syscall.h index f29a85dcd3..334a5c5213 100644 --- a/Kernel/API/Syscall.h +++ b/Kernel/API/Syscall.h @@ -62,7 +62,6 @@ enum class NeedsBigProcessLock { S(connect, NeedsBigProcessLock::Yes) \ S(create_inode_watcher, NeedsBigProcessLock::Yes) \ S(create_thread, NeedsBigProcessLock::Yes) \ - S(dbgputch, NeedsBigProcessLock::No) \ S(dbgputstr, NeedsBigProcessLock::No) \ S(detach_thread, NeedsBigProcessLock::Yes) \ S(disown, NeedsBigProcessLock::Yes) \ diff --git a/Kernel/Process.h b/Kernel/Process.h index d5ec72130f..4fcac337b3 100644 --- a/Kernel/Process.h +++ b/Kernel/Process.h @@ -273,7 +273,6 @@ public: ErrorOr sys$create_inode_watcher(u32 flags); ErrorOr sys$inode_watcher_add_watch(Userspace user_params); ErrorOr sys$inode_watcher_remove_watch(int fd, int wd); - ErrorOr sys$dbgputch(u8); ErrorOr sys$dbgputstr(Userspace, size_t); ErrorOr sys$dump_backtrace(); ErrorOr sys$gettid(); diff --git a/Kernel/Syscalls/debug.cpp b/Kernel/Syscalls/debug.cpp index fc9a5f781a..dc0e066828 100644 --- a/Kernel/Syscalls/debug.cpp +++ b/Kernel/Syscalls/debug.cpp @@ -18,13 +18,6 @@ ErrorOr Process::sys$dump_backtrace() return 0; } -ErrorOr Process::sys$dbgputch(u8 ch) -{ - VERIFY_NO_PROCESS_BIG_LOCK(this); - dbgputch(ch); - return 0; -} - ErrorOr Process::sys$dbgputstr(Userspace characters, size_t size) { VERIFY_NO_PROCESS_BIG_LOCK(this); diff --git a/Kernel/kprintf.cpp b/Kernel/kprintf.cpp index 6b8e432348..b2e533860f 100644 --- a/Kernel/kprintf.cpp +++ b/Kernel/kprintf.cpp @@ -152,12 +152,6 @@ static inline void internal_dbgputch(char ch) IO::out8(IO::BOCHS_DEBUG_PORT, ch); } -extern "C" void dbgputch(char ch) -{ - SpinlockLocker lock(s_log_lock); - internal_dbgputch(ch); -} - extern "C" void dbgputstr(const char* characters, size_t length) { if (!characters) diff --git a/Kernel/kstdio.h b/Kernel/kstdio.h index 33890e89b7..111debc58c 100644 --- a/Kernel/kstdio.h +++ b/Kernel/kstdio.h @@ -10,7 +10,6 @@ #include extern "C" { -void dbgputch(char); void dbgputstr(const char*, size_t); void kernelputstr(const char*, size_t); void kernelcriticalputstr(const char*, size_t); diff --git a/Userland/DevTools/UserspaceEmulator/Emulator.h b/Userland/DevTools/UserspaceEmulator/Emulator.h index ff54269edf..5de623ae6c 100644 --- a/Userland/DevTools/UserspaceEmulator/Emulator.h +++ b/Userland/DevTools/UserspaceEmulator/Emulator.h @@ -180,7 +180,6 @@ private: int virt$clock_gettime(int, FlatPtr); int virt$clock_nanosleep(FlatPtr); int virt$dbgputstr(FlatPtr characters, int length); - int virt$dbgputch(char); int virt$chmod(FlatPtr, size_t, mode_t); int virt$fchmod(int, mode_t); int virt$chown(FlatPtr); diff --git a/Userland/DevTools/UserspaceEmulator/Emulator_syscalls.cpp b/Userland/DevTools/UserspaceEmulator/Emulator_syscalls.cpp index e30f6f32d5..6088f548ee 100644 --- a/Userland/DevTools/UserspaceEmulator/Emulator_syscalls.cpp +++ b/Userland/DevTools/UserspaceEmulator/Emulator_syscalls.cpp @@ -169,8 +169,6 @@ u32 Emulator::virt_syscall(u32 function, u32 arg1, u32 arg2, u32 arg3) return virt$set_process_name(arg1, arg2); case SC_dbgputstr: return virt$dbgputstr(arg1, arg2); - case SC_dbgputch: - return virt$dbgputch(arg1); case SC_chmod: return virt$chmod(arg1, arg2, arg3); case SC_fchmod: @@ -538,12 +536,6 @@ int Emulator::virt$shutdown(int sockfd, int how) return syscall(SC_shutdown, sockfd, how); } -int Emulator::virt$dbgputch(char ch) -{ - dbgputch(ch); - return 0; -} - int Emulator::virt$listen(int fd, int backlog) { return syscall(SC_listen, fd, backlog); diff --git a/Userland/Libraries/LibC/stdio.cpp b/Userland/Libraries/LibC/stdio.cpp index 8bc739effd..ac66b256e0 100644 --- a/Userland/Libraries/LibC/stdio.cpp +++ b/Userland/Libraries/LibC/stdio.cpp @@ -1149,11 +1149,6 @@ int rename(const char* oldpath, const char* newpath) __RETURN_WITH_ERRNO(rc, rc, -1); } -void dbgputch(char ch) -{ - syscall(SC_dbgputch, ch); -} - void dbgputstr(const char* characters, size_t length) { syscall(SC_dbgputstr, characters, length); diff --git a/Userland/Libraries/LibC/stdio.h b/Userland/Libraries/LibC/stdio.h index 9c97eec31f..b8879e4fb3 100644 --- a/Userland/Libraries/LibC/stdio.h +++ b/Userland/Libraries/LibC/stdio.h @@ -75,7 +75,6 @@ int vsprintf(char* buffer, const char* fmt, va_list) __attribute__((format(print int vsnprintf(char* buffer, size_t, const char* fmt, va_list) __attribute__((format(printf, 3, 0))); int fprintf(FILE*, const char* fmt, ...) __attribute__((format(printf, 2, 3))); int printf(const char* fmt, ...) __attribute__((format(printf, 1, 2))); -void dbgputch(char); void dbgputstr(const char*, size_t); int sprintf(char* buffer, const char* fmt, ...) __attribute__((format(printf, 2, 3))); int asprintf(char** strp, const char* fmt, ...) __attribute__((format(printf, 2, 3)));