Index: uspace/lib/c/arch/amd64/include/libarch/fibril_context.ag =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/fibril_context.ag (revision 5af6cf3d6b44b525ad694f194a5101ab4bd5e115) +++ (revision ) @@ -1,86 +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 : - }, - { - 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 : tls, - type : uint64_t - } - ] -} Index: uspace/lib/c/arch/amd64/include/libarch/fibril_context.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/fibril_context.h (revision 5af6cf3d6b44b525ad694f194a5101ab4bd5e115) +++ uspace/lib/c/arch/amd64/include/libarch/fibril_context.h (revision db3c88347157ed2aeffe98179283d9e4e0243edd) @@ -1,39 +1,36 @@ +/* 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. + */ -/***************************************************************************** - * AUTO-GENERATED FILE, DO NOT EDIT!!! - * Generated by: tools/autogen.py - * Generated from: arch/amd64/include/libarch/fibril_context.ag - *****************************************************************************/ +#pragma once +#include -#ifndef AUTOGEN_CONTEXT_H -#define AUTOGEN_CONTEXT_H - -#ifndef __ASM__ -#include -#include -#endif - -#define CONTEXT_OFFSET_SP 0 -#define CONTEXT_SIZE_SP 8 -#define CONTEXT_OFFSET_PC 8 -#define CONTEXT_SIZE_PC 8 -#define CONTEXT_OFFSET_RBX 16 -#define CONTEXT_SIZE_RBX 8 -#define CONTEXT_OFFSET_RBP 24 -#define CONTEXT_SIZE_RBP 8 -#define CONTEXT_OFFSET_R12 32 -#define CONTEXT_SIZE_R12 8 -#define CONTEXT_OFFSET_R13 40 -#define CONTEXT_SIZE_R13 8 -#define CONTEXT_OFFSET_R14 48 -#define CONTEXT_SIZE_R14 8 -#define CONTEXT_OFFSET_R15 56 -#define CONTEXT_SIZE_R15 8 -#define CONTEXT_OFFSET_TLS 64 -#define CONTEXT_SIZE_TLS 8 -#define CONTEXT_SIZE 72 - -#ifndef __ASM__ typedef struct context { + /* We include only registers that must be preserved + * during function call. + */ uint64_t sp; uint64_t pc; @@ -46,6 +43,3 @@ uint64_t tls; } context_t; -#endif -#endif - Index: uspace/lib/c/arch/amd64/include/libarch/istate_struct.ag =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/istate_struct.ag (revision 5af6cf3d6b44b525ad694f194a5101ab4bd5e115) +++ (revision ) @@ -1,1 +1,0 @@ -../../../../../../../kernel/arch/amd64/include/arch/istate_struct.ag Index: uspace/lib/c/arch/amd64/include/libarch/istate_struct.h =================================================================== --- uspace/lib/c/arch/amd64/include/libarch/istate_struct.h (revision 5af6cf3d6b44b525ad694f194a5101ab4bd5e115) +++ uspace/lib/c/arch/amd64/include/libarch/istate_struct.h (revision db3c88347157ed2aeffe98179283d9e4e0243edd) @@ -1,103 +1,1 @@ - -/***************************************************************************** - * AUTO-GENERATED FILE, DO NOT EDIT!!! - * Generated by: tools/autogen.py - * Generated from: arch/amd64/include/libarch/istate_struct.ag - *****************************************************************************/ - -#ifndef AUTOGEN_ISTATE_H -#define AUTOGEN_ISTATE_H - -#ifndef __ASM__ -#ifdef KERNEL -#include -#endif -#ifndef KERNEL -#include -#endif -#ifndef KERNEL -#include -#endif -#endif - -#define ISTATE_OFFSET_RAX 0 -#define ISTATE_SIZE_RAX 8 -#define ISTATE_OFFSET_RBX 8 -#define ISTATE_SIZE_RBX 8 -#define ISTATE_OFFSET_RCX 16 -#define ISTATE_SIZE_RCX 8 -#define ISTATE_OFFSET_RDX 24 -#define ISTATE_SIZE_RDX 8 -#define ISTATE_OFFSET_RSI 32 -#define ISTATE_SIZE_RSI 8 -#define ISTATE_OFFSET_RDI 40 -#define ISTATE_SIZE_RDI 8 -#define ISTATE_OFFSET_RBP 48 -#define ISTATE_SIZE_RBP 8 -#define ISTATE_OFFSET_R8 56 -#define ISTATE_SIZE_R8 8 -#define ISTATE_OFFSET_R9 64 -#define ISTATE_SIZE_R9 8 -#define ISTATE_OFFSET_R10 72 -#define ISTATE_SIZE_R10 8 -#define ISTATE_OFFSET_R11 80 -#define ISTATE_SIZE_R11 8 -#define ISTATE_OFFSET_R12 88 -#define ISTATE_SIZE_R12 8 -#define ISTATE_OFFSET_R13 96 -#define ISTATE_SIZE_R13 8 -#define ISTATE_OFFSET_R14 104 -#define ISTATE_SIZE_R14 8 -#define ISTATE_OFFSET_R15 112 -#define ISTATE_SIZE_R15 8 -#define ISTATE_OFFSET_ALIGNMENT 120 -#define ISTATE_SIZE_ALIGNMENT 8 -#define ISTATE_OFFSET_RBP_FRAME 128 -#define ISTATE_SIZE_RBP_FRAME 8 -#define ISTATE_OFFSET_RIP_FRAME 136 -#define ISTATE_SIZE_RIP_FRAME 8 -#define ISTATE_OFFSET_ERROR_WORD 144 -#define ISTATE_SIZE_ERROR_WORD 8 -#define ISTATE_OFFSET_RIP 152 -#define ISTATE_SIZE_RIP 8 -#define ISTATE_OFFSET_CS 160 -#define ISTATE_SIZE_CS 8 -#define ISTATE_OFFSET_RFLAGS 168 -#define ISTATE_SIZE_RFLAGS 8 -#define ISTATE_OFFSET_RSP 176 -#define ISTATE_SIZE_RSP 8 -#define ISTATE_OFFSET_SS 184 -#define ISTATE_SIZE_SS 8 -#define ISTATE_SIZE 192 - -#ifndef __ASM__ -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; - uint64_t alignment; - uint64_t rbp_frame; - uint64_t rip_frame; - uint64_t error_word; - uint64_t rip; - uint64_t cs; - uint64_t rflags; - uint64_t rsp; - uint64_t ss; -} istate_t; -#endif - -#endif - +../../../../../../../kernel/arch/amd64/include/arch/istate_struct.h