From 56a48e52c3abdba51af3178a16beff56600bc91a Mon Sep 17 00:00:00 2001 From: sigsegv7 Date: Wed, 11 Oct 2023 16:45:04 -0400 Subject: kernel: vm: pmap.h -> vm_pmap.h Signed-off-by: sigsegv7 --- sys/arch/amd64/pmap.c | 2 +- sys/include/vm/pmap.h | 54 ------------------------------------------------ sys/include/vm/vm.h | 2 +- sys/include/vm/vm_pmap.h | 54 ++++++++++++++++++++++++++++++++++++++++++++++++ sys/vm/vm_init.c | 1 - 5 files changed, 56 insertions(+), 57 deletions(-) delete mode 100644 sys/include/vm/pmap.h create mode 100644 sys/include/vm/vm_pmap.h (limited to 'sys') diff --git a/sys/arch/amd64/pmap.c b/sys/arch/amd64/pmap.c index 0da80d9..92d559f 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/pmap.h b/sys/include/vm/pmap.h deleted file mode 100644 index 8dd6b7d..0000000 --- a/sys/include/vm/pmap.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2023 Ian Marco Moffett and the VegaOS 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 VegaOS 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 e238cd0..62c1dfd 100644 --- a/sys/include/vm/vm.h +++ b/sys/include/vm/vm.h @@ -34,7 +34,7 @@ #include #include #include -#include +#include extern volatile struct limine_hhdm_request g_hhdm_request; diff --git a/sys/include/vm/vm_pmap.h b/sys/include/vm/vm_pmap.h new file mode 100644 index 0000000..8dd6b7d --- /dev/null +++ b/sys/include/vm/vm_pmap.h @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2023 Ian Marco Moffett and the VegaOS 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 VegaOS 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/vm/vm_init.c b/sys/vm/vm_init.c index 0930b54..e160708 100644 --- a/sys/vm/vm_init.c +++ b/sys/vm/vm_init.c @@ -28,7 +28,6 @@ */ #include -#include #include static volatile struct vas kernel_vas; -- cgit v1.2.3