summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.in4
-rw-r--r--lib/libc/include/bits/types.h64
-rw-r--r--lib/libc/include/fcntl.h3
-rw-r--r--lib/libc/include/stddef.h2
-rw-r--r--lib/libc/include/stdint.h28
-rw-r--r--lib/libc/include/unistd.h1
-rw-r--r--lib/libc/src/unistd/open.c1
-rw-r--r--sys/include/sys/limine.h2
-rw-r--r--sys/include/sys/limits.h1
-rw-r--r--sys/include/sys/mman.h4
-rw-r--r--sys/include/sys/types.h79
-rw-r--r--sys/include/vm/tlsf.h2
-rw-r--r--sys/vm/tlsf.c3
-rw-r--r--sys/vm/vm_map.c89
14 files changed, 169 insertions, 114 deletions
diff --git a/Makefile.in b/Makefile.in
index 7783676..edf7193 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,10 +20,10 @@ override KERNEL_DEFINES = $ -DHYRA_VERSION="\"$(HYRA_VERSION)\""\
override TOOLCHAIN = @TOOLCHAIN@
ifeq ($(TOOLCHAIN), clang)
ifeq ($(ARCH), amd64)
- override CC = clang -target x86_64-none-elf
+ override CC = clang -target x86_64-none-elf -ffreestanding -nostdlib
override LD = ld.lld
else
- override CC = clang -target $(ARCH)-none-elf
+ override CC = clang -target $(ARCH)-none-elf -ffreestanding -nostdlib
override LD = ld.lld
endif
else ifeq ($(TOOLCHAIN), gcc)
diff --git a/lib/libc/include/bits/types.h b/lib/libc/include/bits/types.h
deleted file mode 100644
index 7b0c2f4..0000000
--- a/lib/libc/include/bits/types.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2023-2025 Ian Marco Moffett and the Osmora Team.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Hyra nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _BITS_TYPES_H
-#define _BITS_TYPES_H
-
-/* Fixed width integer types */
-typedef unsigned long __size_t;
-typedef long __ssize_t;
-typedef long __ptrdiff_t;
-
-typedef unsigned char __uint8_t;
-typedef unsigned short __uint16_t;
-typedef unsigned int __uint32_t;
-typedef unsigned long long __uint64_t;
-
-typedef signed char __int8_t;
-typedef short __int16_t;
-typedef int __int32_t;
-typedef long long __int64_t;
-
-/* Fixed width integer type limits */
-#define __INT8_MIN (-0x7F - 1)
-#define __INT16_MIN (-0x7FFF - 1)
-#define __INT32_MIN (-0x7FFFFFFF - 1)
-#define __INT64_MIN (-0x7FFFFFFFFFFFFFFFLL - 1)
-
-#define __INT8_MAX 0x7F
-#define __INT16_MAX 0x7FFF
-#define __INT32_MAX 0x7FFFFFFF
-#define __INT64_MAX 0x7FFFFFFFFFFFFFFFLL
-
-#define __UINT8_MAX 0xFF
-#define __UINT16_MAX 0xFFFF
-#define __UINT32_MAX 0xFFFFFFFFU
-#define __UINT64_MAX 0xFFFFFFFFFFFFFFFFULL
-
-#endif /* !_BITS_TYPES_H */
diff --git a/lib/libc/include/fcntl.h b/lib/libc/include/fcntl.h
index 8b439d2..5f5ed8a 100644
--- a/lib/libc/include/fcntl.h
+++ b/lib/libc/include/fcntl.h
@@ -30,9 +30,8 @@
#ifndef _FCNTL_H
#define _FCNTL_H
-#include <sys/types.h>
-#include <sys/fcntl.h>
#include <sys/cdefs.h>
+#include <sys/fcntl.h>
__BEGIN_DECLS
diff --git a/lib/libc/include/stddef.h b/lib/libc/include/stddef.h
index 8b81c5b..557f69b 100644
--- a/lib/libc/include/stddef.h
+++ b/lib/libc/include/stddef.h
@@ -30,7 +30,7 @@
#ifndef _STDDEF_H
#define _STDDEF_H
-#include <bits/types.h>
+#include <sys/types.h>
#if __cplusplus >= 201103L
#define NULL nullptr
diff --git a/lib/libc/include/stdint.h b/lib/libc/include/stdint.h
index 9351933..7ea872d 100644
--- a/lib/libc/include/stdint.h
+++ b/lib/libc/include/stdint.h
@@ -30,32 +30,6 @@
#ifndef _STDINT_H
#define _STDINT_H
-#include <bits/types.h>
-
-typedef __uint8_t uint8_t;
-typedef __uint16_t uint16_t;
-typedef __uint32_t uint32_t;
-typedef __uint64_t uint64_t;
-typedef __size_t uintptr_t;
-
-typedef __int8_t int8_t;
-typedef __int16_t int16_t;
-typedef __int32_t int32_t;
-typedef __int64_t int64_t;
-
-#define INT8_MIN __INT8_MIN
-#define INT16_MIN __INT16_MIN
-#define INT32_MIN __INT32_MIN
-#define INT64_MIN __INT64_MIN
-
-#define INT8_MAX __INT8_MAX
-#define INT16_MAX __INT16_MAX
-#define INT32_MAX __INT32_MAX
-#define INT64_MAX __INT64_MAX
-
-#define UINT8_MAX __UINT8_MAX
-#define UINT16_MAX __UINT16_MAX
-#define UINT32_MAX __UINT32_MAX
-#define UINT64_MAX __UINT64_MAX
+#include <sys/types.h>
#endif /* !_STDINT_H */
diff --git a/lib/libc/include/unistd.h b/lib/libc/include/unistd.h
index c487d38..0a8c429 100644
--- a/lib/libc/include/unistd.h
+++ b/lib/libc/include/unistd.h
@@ -32,6 +32,7 @@
#include <sys/types.h>
#include <sys/cdefs.h>
+#include <stddef.h>
__BEGIN_DECLS
diff --git a/lib/libc/src/unistd/open.c b/lib/libc/src/unistd/open.c
index 0131785..85b9710 100644
--- a/lib/libc/src/unistd/open.c
+++ b/lib/libc/src/unistd/open.c
@@ -28,6 +28,7 @@
*/
#include <sys/syscall.h>
+#include <sys/types.h>
#include <fcntl.h>
int
diff --git a/sys/include/sys/limine.h b/sys/include/sys/limine.h
index 57ccc4a..8317c84 100644
--- a/sys/include/sys/limine.h
+++ b/sys/include/sys/limine.h
@@ -23,7 +23,7 @@
extern "C" {
#endif
-#include <stdint.h>
+#include <sys/types.h>
/* Misc */
diff --git a/sys/include/sys/limits.h b/sys/include/sys/limits.h
index 5f66a0b..6185719 100644
--- a/sys/include/sys/limits.h
+++ b/sys/include/sys/limits.h
@@ -32,5 +32,6 @@
#define PATH_MAX 1024
#define SSIZE_MAX 32767
+#define CHAR_BIT 8
#endif /* !_SYS_LIMITS_H_ */
diff --git a/sys/include/sys/mman.h b/sys/include/sys/mman.h
index 98ff8fe..4ead9ba 100644
--- a/sys/include/sys/mman.h
+++ b/sys/include/sys/mman.h
@@ -80,6 +80,9 @@ struct mmap_lgdr {
size_t nbytes;
};
+/* Kernel munmap() routine */
+int munmap_at(void *addr, size_t len);
+
/* Kernel mmap() routine */
void *mmap_at(void *addr, size_t len, int prot, int flags,
int fildes, off_t off);
@@ -90,5 +93,6 @@ RBT_PROTOTYPE(lgdr_entries, mmap_entry, hd, mmap_entrycmp)
/* Syscall layer */
scret_t mmap(struct syscall_args *scargs);
+scret_t munmap(struct syscall_args *scargs);
#endif /* !_SYS_MMAN_H_ */
diff --git a/sys/include/sys/types.h b/sys/include/sys/types.h
index 9c92ad2..5501cc3 100644
--- a/sys/include/sys/types.h
+++ b/sys/include/sys/types.h
@@ -30,34 +30,75 @@
#ifndef _SYS_TYPES_H_
#define _SYS_TYPES_H_
+#ifndef _HAVE_STYPES
+#define _HAVE_STYPES
+#endif
+
+/* Compat */
+#if defined(_KERNEL)
#define true 1
#define false 0
+#if !defined(NULL)
#define NULL ((void *)0)
+#endif /* !NULL */
+#endif /* _KERNEL */
+
+/* Fixed width integer types */
+typedef long __ptrdiff_t;
+typedef unsigned char __uint8_t;
+typedef unsigned short __uint16_t;
+typedef unsigned int __uint32_t;
+typedef unsigned long long __uint64_t;
+
+typedef signed char __int8_t;
+typedef short __int16_t;
+typedef int __int32_t;
+typedef long long __int64_t;
+
+/* Fixed width integer type limits */
+#define __INT8_MIN (-0x7F - 1)
+#define __INT16_MIN (-0x7FFF - 1)
+#define __INT32_MIN (-0x7FFFFFFF - 1)
+#define __INT64_MIN (-0x7FFFFFFFFFFFFFFFLL - 1)
+
+#define __INT8_MAX 0x7F
+#define __INT16_MAX 0x7FFF
+#define __INT32_MAX 0x7FFFFFFF
+#define __INT64_MAX 0x7FFFFFFFFFFFFFFFLL
-typedef signed char int8_t;
-typedef unsigned char uint8_t;
-typedef short int16_t;
-typedef unsigned short uint16_t;
-typedef int int32_t;
-typedef unsigned int uint32_t;
+#define __UINT8_MAX 0xFF
+#define __UINT16_MAX 0xFFFF
+#define __UINT32_MAX 0xFFFFFFFFU
+#define __UINT64_MAX 0xFFFFFFFFFFFFFFFFULL
+
+typedef __int8_t int8_t;
+typedef __uint8_t uint8_t;
+typedef __int16_t int16_t;
+typedef __uint16_t uint16_t;
+typedef __int32_t int32_t;
+typedef __uint32_t uint32_t;
#if __SIZEOF_LONG__ == 8
-typedef long int64_t;
-typedef unsigned long uint64_t;
+typedef __int64_t int64_t;
+typedef __uint64_t uint64_t;
#endif
#if __SIZEOF_SIZE_T__ == 8
-typedef uint64_t size_t;
-typedef int64_t ssize_t; /* Byte count or error */
+typedef uint64_t __size_t;
+typedef int64_t __ssize_t; /* Byte count or error */
#elif __SIZEOF_SIZE_T__ == 4
-typedef uint32_t size_t;
-typedef int32_t ssize_t; /* Byte count or error */
+typedef uint32_t __size_t;
+typedef int32_t __ssize_t; /* Byte count or error */
#else
#error "Unsupported size_t size"
#endif
-typedef size_t uintptr_t;
-typedef size_t off_t;
-typedef _Bool bool;
+#if defined(_KERNEL) || defined(_HYRA)
+typedef __size_t size_t;
+#endif
+typedef __ssize_t ssize_t;
+
+typedef __size_t uintptr_t;
+typedef __size_t off_t;
typedef int pid_t;
typedef int dev_t;
typedef uint32_t mode_t;
@@ -68,6 +109,14 @@ typedef uint32_t gid_t;
typedef uint32_t blksize_t;
typedef uint32_t blkcnt_t;
typedef uint64_t time_t;
+#if defined(_HAVE_PTRDIFF_T)
+typedef __ptrdiff_t ptrdiff_t;
+#endif /* _HAVE_PTRDIFF_T */
+
+/* Compat */
+#if defined(_KERNEL)
+typedef _Bool bool;
+#endif
#if defined(_KERNEL)
typedef uintptr_t paddr_t;
diff --git a/sys/include/vm/tlsf.h b/sys/include/vm/tlsf.h
index e9b5a91..5405927 100644
--- a/sys/include/vm/tlsf.h
+++ b/sys/include/vm/tlsf.h
@@ -38,7 +38,7 @@
** SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <stddef.h>
+#include <sys/types.h>
#if defined(__cplusplus)
extern "C" {
diff --git a/sys/vm/tlsf.c b/sys/vm/tlsf.c
index d4a6ddf..8e425a1 100644
--- a/sys/vm/tlsf.c
+++ b/sys/vm/tlsf.c
@@ -1,7 +1,8 @@
#include <sys/syslog.h>
+#define _HAVE_PTRDIFF_T
#include <sys/types.h>
+#include <sys/limits.h>
#include <assert.h>
-#include <limits.h>
#include <string.h>
#include <vm/tlsf.h>
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index 3dd4d01..b56e896 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -31,6 +31,7 @@
#include <sys/types.h>
#include <sys/errno.h>
#include <sys/proc.h>
+#include <sys/systm.h>
#include <sys/syscall.h>
#include <sys/syslog.h>
#include <sys/mman.h>
@@ -77,6 +78,22 @@ mmap_add(struct proc *td, struct mmap_entry *ep)
}
/*
+ * Remove memory mapping from mmap ledger
+ *
+ * @td: Process to remove mapping from.
+ * @ep: Memory map entry to remove.
+ */
+static inline void
+mmap_remove(struct proc *td, struct mmap_entry *ep)
+{
+ struct mmap_lgdr *lp = td->mlgdr;
+
+ RBT_REMOVE(lgdr_entries, &lp->hd, ep);
+ lp->nbytes -= ep->size;
+ dynfree(ep);
+}
+
+/*
* Create/destroy virtual memory mappings in a specific
* address space.
*
@@ -217,6 +234,61 @@ mmap_at(void *addr, size_t len, int prot, int flags, int fildes, off_t off)
}
/*
+ * Remove mappings for entire pages that
+ * belong to the current process.
+ *
+ * XXX: POSIX munmap(3) requires `addr' to be page-aligned
+ * and will return -EINVAL if otherwise. However, with
+ * OUSI munmap(3), `addr' is rounded down to the nearest
+ * multiple of the machine page size.
+ */
+int
+munmap_at(void *addr, size_t len)
+{
+ int pgno;
+ vaddr_t va;
+ struct proc *td;
+ struct mmap_lgdr *lp;
+ struct mmap_entry find, *res;
+ struct vas vas;
+
+ if (addr == NULL || len == 0) {
+ return -EINVAL;
+ }
+
+ /* Apply machine specific addr/len adjustments */
+ va = ALIGN_DOWN((vaddr_t)addr, DEFAULT_PAGESIZE);
+ len = ALIGN_UP(len, DEFAULT_PAGESIZE);
+ pgno = va >> 12;
+
+ td = this_td();
+ __assert(td != NULL && "no pid 1");
+ vas = pmap_read_vas();
+
+ /*
+ * Try to get the mmap ledger, should not run into
+ * any issues as long as the PCB isn't borked. However,
+ * if it somehow is, just segfault ourselves.
+ */
+ if ((lp = td->mlgdr) == NULL) {
+ __sigraise(SIGSEGV);
+ return -EFAULT; /* Unreachable */
+ }
+
+ /* Lookup entry in ledger with virtual address */
+ find.va_start = va;
+ res = RBT_FIND(lgdr_entries, &lp->hd, &find);
+ if (res == NULL) {
+ pr_error("munmap: page %d not in ledger\n", pgno);
+ return -EINVAL;
+ }
+
+ vm_unmap(vas, va, len);
+ mmap_remove(td, res);
+ return 0;
+}
+
+/*
* mmap() syscall
*
* arg0 -> addr
@@ -244,6 +316,23 @@ mmap(struct syscall_args *scargs)
}
/*
+ * munmap() syscall
+ *
+ * arg0 -> addr
+ * arg1 -> len
+ */
+scret_t
+munmap(struct syscall_args *scargs)
+{
+ void *addr;
+ size_t len;
+
+ addr = (void *)scargs->arg0;
+ len = scargs->arg1;
+ return (scret_t)munmap_at(addr, len);
+}
+
+/*
* Create a virtual memory mapping in a specific
* address space.
*
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-31 03:38:10 +0000