X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Fmmu.h;h=7e68b29481442dbb399c2559917f14ff41b6cdcb;hb=f6580e9ad405b519dbe85027691bf3c66074b0a4;hp=76073976f6534319aee21cbbc96e7f91a51da20d;hpb=e16cf23bd993de3726287f9920efa8f667232423;p=pintos-anon diff --git a/src/threads/mmu.h b/src/threads/mmu.h index 7607397..7e68b29 100644 --- a/src/threads/mmu.h +++ b/src/threads/mmu.h @@ -1,46 +1,9 @@ -/* - * Copyright (C) 1997 Massachusetts Institute of Technology - * - * This software is being provided by the copyright holders under the - * following license. By obtaining, using and/or copying this software, - * you agree that you have read, understood, and will comply with the - * following terms and conditions: - * - * Permission to use, copy, modify, distribute, and sell this software - * and its documentation for any purpose and without fee or royalty is - * hereby granted, provided that the full text of this NOTICE appears on - * ALL copies of the software and documentation or portions thereof, - * including modifications, that you make. - * - * THIS SOFTWARE IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO - * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, - * BUT NOT LIMITATION, COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR - * WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR - * THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY - * THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS. COPYRIGHT - * HOLDERS WILL BEAR NO LIABILITY FOR ANY USE OF THIS SOFTWARE OR - * DOCUMENTATION. - * - * The name and trademarks of copyright holders may NOT be used in - * advertising or publicity pertaining to the software without specific, - * written prior permission. Title to copyright in this software and any - * associated documentation will at all times remain with copyright - * holders. See the file AUTHORS which should have accompanied this software - * for a list of all copyright holders. - * - * This file may be derived from previously copyrighted software. This - * copyright applies only to those changes made by the copyright - * holders listed in the AUTHORS file. The rest of this file is covered by - * the copyright notices, if any, listed below. - */ - - -#ifndef _MMU_H_ -#define _MMU_H_ +#ifndef HEADER_MMU_H +#define HEADER_MMU_H 1 #ifndef __ASSEMBLER__ #include -#include "debug.h" +#include "lib/debug.h" #endif #include "loader.h" @@ -93,7 +56,7 @@ static inline void *pg_round_down (void *va) { /* Returns kernel virtual address at which physical address PADDR is mapped. */ static inline void * -ptov (uintptr_t paddr) +ptov (uintptr_t paddr) { ASSERT ((void *) paddr < PHYS_BASE); @@ -103,7 +66,7 @@ ptov (uintptr_t paddr) /* Returns physical address at which kernel virtual address VADDR is mapped. */ static inline uintptr_t -vtop (void *vaddr) +vtop (void *vaddr) { ASSERT (vaddr >= PHYS_BASE); @@ -111,121 +74,15 @@ vtop (void *vaddr) } #endif -/* Page Table/Directory Entry flags - * these are defined by the hardware - */ -#define PG_P 0x1 /* Present */ -#define PG_W 0x2 /* Writeable */ -#define PG_U 0x4 /* User */ -#define PG_A 0x20 /* Accessed */ -#define PG_D 0x40 /* Dirty */ -/* - * The PG_USER bits are not used by the kernel and they are - * not interpreted by the hardware. The kernel allows - * user processes to set them arbitrarily. - */ +/* Page Directory Entry (PDE) and Page Table Entry (PTE) flags. */ +#define PG_P 0x1 /* 1=present, 0=not present. */ +#define PG_W 0x2 /* 1=read/write, 0=read-only. */ +#define PG_U 0x4 /* 1=user/kernel, 0=kernel only. */ +#define PG_A 0x20 /* 1=accessed, 0=not acccessed. */ +#define PG_D 0x40 /* 1=dirty, 0=not dirty. */ /* EFLAGS Register. */ #define FLAG_MBS 0x00000002 /* Must be set. */ #define FLAG_IF 0x00000200 /* Interrupt Flag. */ -/* Page fault error codes */ -#define FEC_PR 0x1 /* Page fault caused by protection violation */ -#define FEC_WR 0x2 /* Page fault caused by a write */ -#define FEC_U 0x4 /* Page fault occured while in user mode */ - - -/* Application segment type bits */ -#define STA_X 0x8 /* Executable segment */ -#define STA_A 0x1 /* Accessed */ - -#define STA_C 0x4 /* Conforming code segment (executable only) */ -#define STA_R 0x2 /* Readable (executable segments) */ - -#define STA_E 0x4 /* Expand down (non-executable segments) */ -#define STA_W 0x2 /* Writeable (non-executable segments) */ - - -/* Segment selectors. */ -#define SEL_NULL 0x00 /* Null selector. */ -#define SEL_KCSEG 0x08 /* Kernel code selector. */ -#define SEL_KDSEG 0x10 /* Kernel data selector. */ -#define SEL_UCSEG 0x1B /* User code selector. */ -#define SEL_UDSEG 0x23 /* User data selector. */ -#define SEL_TSS 0x28 /* Task-state segment. */ -#define SEL_CNT 6 /* Number of segments. */ - -#ifndef __ASSEMBLER__ -struct tss - { - uint16_t back_link, :16; - uint32_t esp0; - uint16_t ss0, :16; - uint32_t esp1; - uint16_t ss1, :16; - uint32_t esp2; - uint16_t ss2, :16; - uint32_t cr3; - uint32_t eip; - uint32_t eflags; - uint32_t eax, ecx, edx, ebx; - uint32_t esp, ebp, esi, edi; - uint16_t es, :16; - uint16_t cs, :16; - uint16_t ss, :16; - uint16_t ds, :16; - uint16_t fs, :16; - uint16_t gs, :16; - uint16_t ldt, :16; - uint16_t trace, bitmap; - }; - -enum seg_system - { - SYS_SYSTEM = 0, /* System segment. */ - SYS_CODE_DATA = 1 /* Code or data segment. */ - }; - -enum seg_granularity - { - GRAN_BYTE = 0, /* Limit has 1-byte granularity. */ - GRAN_PAGE = 1 /* Limit has 4 kB granularity. */ - }; - -enum seg_type - { - /* System segment types. */ - TYPE_TSS_16_A = 1, /* 16-bit TSS (available). */ - TYPE_LDT = 2, /* LDT. */ - TYPE_TSS_16_B = 3, /* 16-bit TSS (busy). */ - TYPE_CALL_16 = 4, /* 16-bit call gate. */ - TYPE_TASK = 5, /* Task gate. */ - TYPE_INT_16 = 6, /* 16-bit interrupt gate. */ - TYPE_TRAP_16 = 7, /* 16-bit trap gate. */ - TYPE_TSS_32_A = 9, /* 32-bit TSS (available). */ - TYPE_TSS_32_B = 11, /* 32-bit TSS (busy). */ - TYPE_CALL_32 = 12, /* 32-bit call gate. */ - TYPE_INT_32 = 14, /* 32-bit interrupt gate. */ - TYPE_TRAP_32 = 15, /* 32-bit trap gate. */ - - /* Code/data segment types. */ - TYPE_CODE = 8, /* 1=Code segment, 0=data segment. */ - TYPE_ACCESSED = 1, /* Set if accessed. */ - - /* Data segment types. */ - TYPE_EXPAND_DOWN = 4, /* 1=Expands up, 0=expands down. */ - TYPE_WRITABLE = 2, /* 1=Read/write, 0=read-only. */ - - /* Code segment types. */ - TYPE_CONFORMING = 4, /* 1=Conforming, 0=nonconforming. */ - TYPE_READABLE = 2 /* 1=Exec/read, 0=exec-only. */ - }; - -static inline uint64_t -make_dtr_operand (uint16_t limit, void *base) -{ - return limit | ((uint64_t) (uint32_t) base << 16); -} -#endif - -#endif /* !_MMU_H_ */ +#endif /* mmu.h */