apps/CMakeLists.txt

@@ -1,7 +1,6 @@
 function(luna_app SOURCE_FILE APP_NAME)
     add_executable(${APP_NAME} ${SOURCE_FILE})
     add_dependencies(${APP_NAME} libc)
-    target_include_directories(${APP_NAME} PRIVATE ${LUNA_BASE}/usr/include)
     install(TARGETS ${APP_NAME} DESTINATION ${LUNA_ROOT}/initrd/bin)
 endfunction()
 

apps/app.c

@@ -1,6 +1,5 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <time.h>
 
 void bye()
 {
@@ -16,11 +15,6 @@ int main()
 
     console_print(buffer);
 
-    time_t now = time(NULL);
-    snprintf(buffer, sizeof(buffer), "Realtime clock: %ld s\n", now);
-
-    console_print(buffer);
-
     for (int i = 0; i < atoi("8"); i++) { console_print("."); }
 
     console_print("\n");

kernel/CMakeLists.txt

@@ -18,7 +18,6 @@ set(SOURCES
     src/sys/Syscall.cpp
     src/sys/exit.cpp
     src/sys/console_print.cpp
-    src/sys/clock_gettime.cpp
     src/InitRD.cpp
     src/ELF.cpp
 )
@@ -79,7 +78,6 @@ target_link_options(moon PRIVATE -lgcc -Wl,--build-id=none -z max-page-size=0x10
 set_target_properties(moon PROPERTIES CXX_STANDARD 20)
 
 target_include_directories(moon PRIVATE ${CMAKE_CURRENT_LIST_DIR}/src)
-target_include_directories(moon PRIVATE ${LUNA_BASE}/usr/include)
 
 configure_file(src/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/gen/config.h @ONLY)
 

kernel/src/arch/Timer.cpp

@@ -3,7 +3,6 @@
 #include "arch/Serial.h"
 #include "boot/bootboot.h"
 
-// FIXME: Storing these values as unsigned integers doesn't allow for pre-epoch times.
 static u64 timer_ticks = 0;
 static u64 boot_timestamp;
 

kernel/src/memory/MemoryManager.cpp

@@ -364,35 +364,6 @@ namespace MemoryManager
         return true;
     }
 
-    bool copy_to_user(void* user, const void* kernel, usize size)
-    {
-        uintptr_t user_ptr = (uintptr_t)user;
-        uintptr_t user_page = align_down<ARCH_PAGE_SIZE>(user_ptr);
-
-        const char* kernel_ptr = (const char*)kernel;
-
-        // Userspace pointer not aligned on page boundary
-        if (user_ptr != user_page)
-        {
-            // FIXME: Validate that this page is writable by the user, not just the kernel.
-            if (!validate_writable_page(user_page)) return false;
-        }
-
-        while (size--)
-        {
-            // Crossed a page boundary, gotta check the page tables again before touching any memory!!
-            if (user_ptr % ARCH_PAGE_SIZE)
-            {
-                if (!validate_writable_page(user_ptr)) return false;
-            }
-
-            *(char*)user_ptr = *kernel_ptr++;
-            user_ptr++;
-        }
-
-        return true;
-    }
-
     usize free()
     {
         return free_mem;

kernel/src/memory/MemoryManager.h

@@ -22,13 +22,6 @@ namespace MemoryManager
 
     bool validate_userspace_string(u64 address);
 
-    bool copy_to_user(void* user, const void* kernel, usize size);
-
-    template <typename T> bool copy_to_user_typed(T* user, const T* kernel)
-    {
-        return copy_to_user(user, kernel, sizeof(T));
-    }
-
     Result<void> map_frames_at(u64 virt, u64 phys, usize count, int flags);
 
     Result<u64> alloc_at(u64 virt, usize count, int flags);

kernel/src/sys/clock_gettime.cpp

@@ -1,34 +0,0 @@
-#include "arch/Timer.h"
-#include "memory/MemoryManager.h"
-#include "sys/Syscall.h"
-#include <bits/clockid.h>
-#include <bits/timespec.h>
-
-Result<u64> sys_clock_gettime(Registers*, SyscallArgs args)
-{
-    clockid_t id = (clockid_t)args[0];
-    struct timespec* ts = (struct timespec*)args[1];
-
-    switch (id)
-    {
-    case CLOCK_MONOTONIC: {
-        usize ticks = Timer::ticks_ns();
-        struct timespec kernel_ts;
-        kernel_ts.tv_sec = (time_t)(ticks / NS_PER_SECOND);
-        kernel_ts.tv_nsec = (long)(ticks % NS_PER_SECOND);
-        if (!MemoryManager::copy_to_user_typed(ts, &kernel_ts)) return err(EFAULT);
-        break;
-    }
-    case CLOCK_REALTIME: {
-        usize clock = Timer::clock_ns();
-        struct timespec kernel_ts;
-        kernel_ts.tv_sec = (time_t)(clock / NS_PER_SECOND);
-        kernel_ts.tv_nsec = (long)(clock % NS_PER_SECOND);
-        if (!MemoryManager::copy_to_user_typed(ts, &kernel_ts)) return err(EFAULT);
-        break;
-    }
-    default: return err(EINVAL);
-    }
-
-    return 0;
-}

libc/CMakeLists.txt

@@ -9,7 +9,6 @@ set(SOURCES
     src/string.cpp
     src/atexit.cpp
     src/ctype.cpp
-    src/time.cpp
 )
 
 if(${ARCH} STREQUAL "x86_64")
@@ -31,7 +30,7 @@ target_link_libraries(bare_libc PUBLIC luna)
 
 target_include_directories(bare_libc PUBLIC include/)
 
-target_compile_options(bare_libc PRIVATE -Wall -Wextra -Werror -pedantic -nostdlib -fno-exceptions -fno-rtti)
+target_compile_options(bare_libc PRIVATE -Wall -Wextra -Werror -pedantic -nostdlib)
 
 target_link_options(bare_libc PRIVATE -nostdlib)
 

libc/include/bits/clockid.h

@@ -1,12 +0,0 @@
-#ifndef _BITS_CLOCKID_H
-#define _BITS_CLOCKID_H
-
-typedef int clockid_t;
-
-enum __clockid
-{
-    CLOCK_REALTIME,
-    CLOCK_MONOTONIC
-};
-
-#endif

libc/include/bits/timespec.h

@@ -1,12 +0,0 @@
-#ifndef _BITS_TIMESPEC_H
-#define _BITS_TIMESPEC_H
-
-#include <sys/types.h>
-
-struct timespec
-{
-    time_t tv_sec;
-    long tv_nsec;
-};
-
-#endif

libc/include/sys/types.h

@@ -6,6 +6,4 @@
 
 typedef int pid_t;
 
-typedef long time_t;
-
 #endif

libc/include/time.h

@@ -1,22 +1,4 @@
 #ifndef _TIME_H
 #define _TIME_H
 
-#include <bits/clockid.h>
-#include <bits/timespec.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-    /* Get the current value of a system clock. */
-    int clock_gettime(clockid_t id, struct timespec* ts);
-
-    /* Get the current wall clock time. */
-    time_t time(time_t* tp);
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif

libc/src/stdlib.cpp

@@ -101,7 +101,6 @@ extern "C"
         __builtin_unreachable();
     }
 
-    // FIXME: This is walking a UTF-8 string twice. Once to decode, and another to count code points.
     size_t mbstowcs(wchar_t* buf, const char* src, size_t max)
     {
         if (max == 0) return 0;

libc/src/time.cpp

@@ -1,23 +0,0 @@
-#include <bits/errno-return.h>
-#include <sys/syscall.h>
-#include <time.h>
-#include <unistd.h>
-
-extern "C"
-{
-    int clock_gettime(clockid_t id, struct timespec* ts)
-    {
-        long rc = syscall(SYS_clock_gettime, id, ts);
-        __errno_return(rc, int);
-    }
-
-    time_t time(time_t* tp)
-    {
-        struct timespec ts;
-        if (clock_gettime(CLOCK_REALTIME, &ts) < 0) return (time_t)-1;
-
-        if (tp) *tp = ts.tv_sec;
-
-        return ts.tv_sec;
-    }
-}

luna/CMakeLists.txt

@@ -41,7 +41,7 @@ target_compile_options(luna PRIVATE -Wall -Wextra -Werror -Wvla)
 target_compile_options(luna PRIVATE -Wdisabled-optimization -Wformat=2 -Winit-self)
 target_compile_options(luna PRIVATE -Wmissing-include-dirs -Wswitch-default -Wcast-qual -Wundef) 
 target_compile_options(luna PRIVATE -Wcast-align -Wwrite-strings -Wlogical-op -Wredundant-decls -Wshadow -Wconversion)
-target_compile_options(luna PRIVATE -fno-asynchronous-unwind-tables -fno-omit-frame-pointer -std=c++20 -fno-rtti -fno-exceptions)
+target_compile_options(luna PRIVATE -fno-asynchronous-unwind-tables -fno-omit-frame-pointer -std=c++20)
 target_include_directories(luna PUBLIC include/)
 target_include_directories(luna PUBLIC ${LUNA_BASE}/usr/include)
 

luna/include/luna/Syscall.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#define enumerate_syscalls(_e) _e(exit) _e(console_print) _e(clock_gettime)
+#define enumerate_syscalls(_e) _e(exit) _e(console_print)
 
 enum Syscalls
 {