Index: kernel/arch/amd64/Makefile.inc =================================================================== --- kernel/arch/amd64/Makefile.inc (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) +++ kernel/arch/amd64/Makefile.inc (revision 3fafe5e03bb501f8627b315f8e97330dd3996f86) @@ -85,7 +85,7 @@ endif -ARCH_AUTOGENS_AG = \ - arch/$(KARCH)/include/arch/istate_struct.ag \ - arch/$(KARCH)/include/arch/context_struct.ag \ - arch/$(KARCH)/include/arch/kseg_struct.ag \ - arch/$(KARCH)/include/arch/boot/memmap_struct.ag +ARCH_AUTOCHECK_HEADERS = \ + arch/$(KARCH)/include/arch/istate_struct.h \ + arch/$(KARCH)/include/arch/context_struct.h \ + arch/$(KARCH)/include/arch/kseg_struct.h \ + arch/$(KARCH)/include/arch/boot/memmap_struct.h Index: kernel/arch/amd64/include/arch/boot/memmap_struct.ag =================================================================== --- kernel/arch/amd64/include/arch/boot/memmap_struct.ag (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../ia32/include/arch/boot/memmap_struct.ag Index: kernel/arch/amd64/include/arch/boot/memmap_struct.h =================================================================== --- kernel/arch/amd64/include/arch/boot/memmap_struct.h (revision 3fafe5e03bb501f8627b315f8e97330dd3996f86) +++ kernel/arch/amd64/include/arch/boot/memmap_struct.h (revision 3fafe5e03bb501f8627b315f8e97330dd3996f86) @@ -0,0 +1,48 @@ +/* Copyright (c) 2016 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 KERN_ARCH_BOOT_MEMMAP_STRUCT_H_ +#define KERN_ARCH_BOOT_MEMMAP_STRUCT_H_ + +#define E820MEMMAP_OFFSET_BASE_ADDRESS 0x00 +#define E820MEMMAP_OFFSET_SIZE 0x08 +#define E820MEMMAP_OFFSET_TYPE 0x10 +#define E820MEMMAP_SIZE 0x14 + +#ifndef __ASSEMBLER__ + +#include + +typedef struct e820memmap { + uint64_t base_address; + uint64_t size; + uint32_t type; +} __attribute__((packed)) e820memmap_t; + +#endif +#endif + Index: kernel/arch/amd64/include/arch/context_struct.ag =================================================================== --- kernel/arch/amd64/include/arch/context_struct.ag (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) +++ (revision ) @@ -1,87 +1,0 @@ -# Copyright (c) 2014 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - 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. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. -# - -{ - name : context, - - includes : [ - { - include : - } - ], - - members : [ - # - # We include only registers that must be preserved - # during function call. - # - - { - name : sp, - type : uint64_t - }, - { - name : pc, - type : uint64_t - }, - - { - name : rbx, - type : uint64_t - }, - { - name : rbp, - type : uint64_t - }, - - { - name : r12, - type : uint64_t - }, - { - name : r13, - type : uint64_t - }, - { - name : r14, - type : uint64_t - }, - { - name : r15, - type : uint64_t - }, - { - name : tp, - type : uint64_t - }, - - { - name : ipl, - type : ipl_t - } - ] -} Index: kernel/arch/amd64/include/arch/context_struct.h =================================================================== --- kernel/arch/amd64/include/arch/context_struct.h (revision 3fafe5e03bb501f8627b315f8e97330dd3996f86) +++ kernel/arch/amd64/include/arch/context_struct.h (revision 3fafe5e03bb501f8627b315f8e97330dd3996f86) @@ -0,0 +1,65 @@ +/* Copyright (c) 2014 Jakub Jermar + * All rights preserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 KERN_ARCH_CONTEXT_STRUCT_H_ +#define KERN_ARCH_CONTEXT_STRUCT_H_ + +#define CONTEXT_OFFSET_SP 0x00 +#define CONTEXT_OFFSET_PC 0x08 +#define CONTEXT_OFFSET_RBX 0x10 +#define CONTEXT_OFFSET_RBP 0x18 +#define CONTEXT_OFFSET_R12 0x20 +#define CONTEXT_OFFSET_R13 0x28 +#define CONTEXT_OFFSET_R14 0x30 +#define CONTEXT_OFFSET_R15 0x38 +#define CONTEXT_OFFSET_TP 0x40 +#define CONTEXT_OFFSET_IPL 0x48 +#define CONTEXT_SIZE 0x50 + +#ifndef __ASSEMBLER__ + +#include + +typedef struct context { + /* We include only registers that must be preserved + * during function call. + */ + uint64_t sp; + uint64_t pc; + uint64_t rbx; + uint64_t rbp; + uint64_t r12; + uint64_t r13; + uint64_t r14; + uint64_t r15; + uint64_t tp; + ipl_t ipl; +} context_t; + +#endif +#endif + Index: kernel/arch/amd64/include/arch/istate_struct.ag =================================================================== --- kernel/arch/amd64/include/arch/istate_struct.ag (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) +++ (revision ) @@ -1,150 +1,0 @@ -# Copyright (c) 2014 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - 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. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. -# - -{ - name : istate, - - includes : [ - { - guard : KERNEL, - include : - }, - { - negative-guard: KERNEL, - include : - }, - { - negative-guard: KERNEL, - include : - } - ], - - members : [ - { - name : rax, - type : uint64_t - }, - { - name : rbx, - type : uint64_t - }, - { - name : rcx, - type : uint64_t - }, - { - name : rdx, - type : uint64_t - }, - { - name : rsi, - type : uint64_t - }, - { - name : rdi, - type : uint64_t - }, - { - name : rbp, - type : uint64_t - }, - { - name : r8, - type : uint64_t - }, - { - name : r9, - type : uint64_t - }, - { - name : r10, - type : uint64_t - }, - { - name : r11, - type : uint64_t - }, - { - name : r12, - type : uint64_t - }, - { - name : r13, - type : uint64_t - }, - { - name : r14, - type : uint64_t - }, - { - name : r15, - type : uint64_t - }, - { - # align rbp_frame on multiple of 16 - name : alignment, - type : uint64_t - }, - { - # imitation of frame pointer linkage - name : rbp_frame, - type : uint64_t - }, - { - # imitation of frame address linkage - name : rip_frame, - type : uint64_t - }, - { - # real or fake error word - name : error_word, - type : uint64_t - }, - { - name : rip, - type : uint64_t - }, - { - name : cs, - type : uint64_t - }, - { - name : rflags, - type : uint64_t - }, - { - # only if istate_t is from uspace - name : rsp, - type : uint64_t - }, - { - # only if istate_t is from uspace - name : ss, - type : uint64_t - } - ] -} Index: kernel/arch/amd64/include/arch/istate_struct.h =================================================================== --- kernel/arch/amd64/include/arch/istate_struct.h (revision 3fafe5e03bb501f8627b315f8e97330dd3996f86) +++ kernel/arch/amd64/include/arch/istate_struct.h (revision 3fafe5e03bb501f8627b315f8e97330dd3996f86) @@ -0,0 +1,96 @@ +/* Copyright (c) 2014 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 KERN_ARCH_ISTATE_STRUCT_H_ +#define KERN_ARCH_ISTATE_STRUCT_H_ + +#define ISTATE_OFFSET_RAX 0x00 +#define ISTATE_OFFSET_RBX 0x08 +#define ISTATE_OFFSET_RCX 0x10 +#define ISTATE_OFFSET_RDX 0x18 +#define ISTATE_OFFSET_RSI 0x20 +#define ISTATE_OFFSET_RDI 0x28 +#define ISTATE_OFFSET_RBP 0x30 +#define ISTATE_OFFSET_R8 0x38 +#define ISTATE_OFFSET_R9 0x40 +#define ISTATE_OFFSET_R10 0x48 +#define ISTATE_OFFSET_R11 0x50 +#define ISTATE_OFFSET_R12 0x58 +#define ISTATE_OFFSET_R13 0x60 +#define ISTATE_OFFSET_R14 0x68 +#define ISTATE_OFFSET_R15 0x70 +#define ISTATE_OFFSET_ALIGNMENT 0x78 +#define ISTATE_OFFSET_RBP_FRAME 0x80 +#define ISTATE_OFFSET_RIP_FRAME 0x88 +#define ISTATE_OFFSET_ERROR_WORD 0x90 +#define ISTATE_OFFSET_RIP 0x98 +#define ISTATE_OFFSET_CS 0xa0 +#define ISTATE_OFFSET_RFLAGS 0xa8 +#define ISTATE_OFFSET_RSP 0xb0 +#define ISTATE_OFFSET_SS 0xb8 +#define ISTATE_SIZE 0xc0 + +#ifndef __ASSEMBLER__ + +#include + +typedef struct istate { + uint64_t rax; + uint64_t rbx; + uint64_t rcx; + uint64_t rdx; + uint64_t rsi; + uint64_t rdi; + uint64_t rbp; + uint64_t r8; + uint64_t r9; + uint64_t r10; + uint64_t r11; + uint64_t r12; + uint64_t r13; + uint64_t r14; + uint64_t r15; + /* align rbp_frame on multiple of 16 */ + uint64_t alignment; + /* imitation of frame pointer linkage */ + uint64_t rbp_frame; + /* imitation of frame address linkage */ + uint64_t rip_frame; + /* real or fake error word */ + uint64_t error_word; + uint64_t rip; + uint64_t cs; + uint64_t rflags; + /* only if istate_t is from uspace */ + uint64_t rsp; + /* only if istate_t is from uspace */ + uint64_t ss; +} istate_t; + +#endif +#endif + Index: kernel/arch/amd64/include/arch/kseg_struct.ag =================================================================== --- kernel/arch/amd64/include/arch/kseg_struct.ag (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) +++ (revision ) @@ -1,51 +1,0 @@ -# Copyright (c) 2016 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - 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. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. -# - -{ - name : kseg, - - includes : [ - { - include : - } - ], - - members : [ - { - name : ustack_rsp, - type : uint64_t - }, - { - name : kstack_rsp, - type : uint64_t - }, - { - name : fsbase, - type : uint64_t - } - ] -} Index: kernel/arch/amd64/include/arch/kseg_struct.h =================================================================== --- kernel/arch/amd64/include/arch/kseg_struct.h (revision 3fafe5e03bb501f8627b315f8e97330dd3996f86) +++ kernel/arch/amd64/include/arch/kseg_struct.h (revision 3fafe5e03bb501f8627b315f8e97330dd3996f86) @@ -0,0 +1,48 @@ +/* Copyright (c) 2016 Jakub Jermar + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - 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. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 KERN_ARCH_KSEG_STRUCT_H_ +#define KERN_ARCH_KSEG_STRUCT_H_ + +#define KSEG_OFFSET_USTACK_RSP 0x00 +#define KSEG_OFFSET_KSTACK_RSP 0x08 +#define KSEG_OFFSET_FSBASE 0x10 +#define KSEG_SIZE 0x18 + +#ifndef __ASSEMBLER__ + +#include + +typedef struct kseg { + uint64_t ustack_rsp; + uint64_t kstack_rsp; + uint64_t fsbase; +} kseg_t; + +#endif +#endif +