From 93a81b53875aa6e83631503c9bc5970c87021419 Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Fri, 24 Nov 2023 11:52:03 -0500 Subject: kernel: Fixup VM header naming Signed-off-by: Ian Moffett --- sys/arch/amd64/pmap.c | 2 +- sys/include/vm/page.h | 37 +++++++++++++++++++++++++++++++ sys/include/vm/physseg.h | 39 ++++++++++++++++++++++++++++++++ sys/include/vm/pmap.h | 54 +++++++++++++++++++++++++++++++++++++++++++++ sys/include/vm/vm.h | 4 ++-- sys/include/vm/vm_page.h | 37 ------------------------------- sys/include/vm/vm_physseg.h | 39 -------------------------------- sys/include/vm/vm_pmap.h | 54 --------------------------------------------- sys/kern/init_main.c | 2 +- sys/vm/vm_init.c | 2 +- sys/vm/vm_page.c | 2 +- sys/vm/vm_physseg.c | 2 +- 12 files changed, 137 insertions(+), 137 deletions(-) create mode 100644 sys/include/vm/page.h create mode 100644 sys/include/vm/physseg.h create mode 100644 sys/include/vm/pmap.h delete mode 100644 sys/include/vm/vm_page.h delete mode 100644 sys/include/vm/vm_physseg.h delete mode 100644 sys/include/vm/vm_pmap.h diff --git a/sys/arch/amd64/pmap.c b/sys/arch/amd64/pmap.c index afbdbda..2e3e744 100644 --- a/sys/arch/amd64/pmap.c +++ b/sys/arch/amd64/pmap.c @@ -27,7 +27,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #define PTE_ADDR_MASK 0x000FFFFFFFFFF000 diff --git a/sys/include/vm/page.h b/sys/include/vm/page.h new file mode 100644 index 0000000..21d2a6e --- /dev/null +++ b/sys/include/vm/page.h @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2023 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 _VM_PAGE_H_ +#define _VM_PAGE_H_ + +#include + +void vm_zero_page(void *page, size_t page_count); + +#endif /* !_VM_PAGE_H_ */ diff --git a/sys/include/vm/physseg.h b/sys/include/vm/physseg.h new file mode 100644 index 0000000..d0b474e --- /dev/null +++ b/sys/include/vm/physseg.h @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2023 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 _VM_VM_PHYSSEG_H_ +#define _VM_VM_PHYSSEG_H_ + +#include + +void vm_physseg_init(void); +uintptr_t vm_alloc_pageframe(size_t count); +void vm_free_pageframe(uintptr_t base, size_t count); + +#endif /* !_VM_VM_PHYSSEG_H_ */ diff --git a/sys/include/vm/pmap.h b/sys/include/vm/pmap.h new file mode 100644 index 0000000..f83219d --- /dev/null +++ b/sys/include/vm/pmap.h @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2023 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 _VM_PMAP_H_ +#define _VM_PMAP_H_ + +/* + * Each architecture is expected to implement + * this header. It should contain a `struct vas' + * which will contain information about a VAS + * (virtual address space) + * + * On AMD64 this struct contains: PML4, etc + * + * XXX: Compiler errors pointing to this include means you + * forgot to implement it!!! + * + * `struct vas' MUST have a `struct spinlock lock' field!!! + */ +#include + +/* + * Read virtual address space descriptor + * and return it. + */ +struct vas pmap_read_vas(void); + +#endif /* _VM_PMAP_H_ */ diff --git a/sys/include/vm/vm.h b/sys/include/vm/vm.h index e18df4c..d135b72 100644 --- a/sys/include/vm/vm.h +++ b/sys/include/vm/vm.h @@ -33,8 +33,8 @@ #include #include #include -#include -#include +#include +#include #include extern volatile struct limine_hhdm_request g_hhdm_request; diff --git a/sys/include/vm/vm_page.h b/sys/include/vm/vm_page.h deleted file mode 100644 index 21d2a6e..0000000 --- a/sys/include/vm/vm_page.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2023 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 _VM_PAGE_H_ -#define _VM_PAGE_H_ - -#include - -void vm_zero_page(void *page, size_t page_count); - -#endif /* !_VM_PAGE_H_ */ diff --git a/sys/include/vm/vm_physseg.h b/sys/include/vm/vm_physseg.h deleted file mode 100644 index d0b474e..0000000 --- a/sys/include/vm/vm_physseg.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2023 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 _VM_VM_PHYSSEG_H_ -#define _VM_VM_PHYSSEG_H_ - -#include - -void vm_physseg_init(void); -uintptr_t vm_alloc_pageframe(size_t count); -void vm_free_pageframe(uintptr_t base, size_t count); - -#endif /* !_VM_VM_PHYSSEG_H_ */ diff --git a/sys/include/vm/vm_pmap.h b/sys/include/vm/vm_pmap.h deleted file mode 100644 index f83219d..0000000 --- a/sys/include/vm/vm_pmap.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2023 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 _VM_PMAP_H_ -#define _VM_PMAP_H_ - -/* - * Each architecture is expected to implement - * this header. It should contain a `struct vas' - * which will contain information about a VAS - * (virtual address space) - * - * On AMD64 this struct contains: PML4, etc - * - * XXX: Compiler errors pointing to this include means you - * forgot to implement it!!! - * - * `struct vas' MUST have a `struct spinlock lock' field!!! - */ -#include - -/* - * Read virtual address space descriptor - * and return it. - */ -struct vas pmap_read_vas(void); - -#endif /* _VM_PMAP_H_ */ diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index e4cc524..6f06f9d 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c index 600e61d..c298a6a 100644 --- a/sys/vm/vm_init.c +++ b/sys/vm/vm_init.c @@ -28,7 +28,7 @@ */ #include -#include +#include #include #include diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index f8f50ef..4325cee 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include diff --git a/sys/vm/vm_physseg.c b/sys/vm/vm_physseg.c index 3f2b6b9..d9abc4b 100644 --- a/sys/vm/vm_physseg.c +++ b/sys/vm/vm_physseg.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include -- cgit v1.2.3