| /kernel/trunk/generic/include/mm/frame.h |
|---|
| 65,12 → 65,12 |
| #define FRAME_NO_MEMORY 1 /* frame_alloc return status */ |
| #define FRAME_ERROR 2 /* frame_alloc return status */ |
| static inline __address PFN2ADDR(pfn_t frame) |
| static inline uintptr_t PFN2ADDR(pfn_t frame) |
| { |
| return (__address)(frame << FRAME_WIDTH); |
| return (uintptr_t)(frame << FRAME_WIDTH); |
| } |
| static inline pfn_t ADDR2PFN(__address addr) |
| static inline pfn_t ADDR2PFN(uintptr_t addr) |
| { |
| return (pfn_t)(addr >> FRAME_WIDTH); |
| } |
| 82,7 → 82,7 |
| return (count_t)((size-1) >> FRAME_WIDTH)+1; |
| } |
| #define IS_BUDDY_ORDER_OK(index, order) ((~(((__native) -1) << (order)) & (index)) == 0) |
| #define IS_BUDDY_ORDER_OK(index, order) ((~(((unative_t) -1) << (order)) & (index)) == 0) |
| #define IS_BUDDY_LEFT_BLOCK(zone, frame) (((frame_index((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 0) |
| #define IS_BUDDY_RIGHT_BLOCK(zone, frame) (((frame_index((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 1) |
| #define IS_BUDDY_LEFT_BLOCK_ABS(zone, frame) (((frame_index_abs((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 0) |
| 91,8 → 91,8 |
| #define frame_alloc(order, flags) frame_alloc_generic(order, flags, NULL) |
| extern void frame_init(void); |
| extern void * frame_alloc_generic(__u8 order, int flags, int *pzone); |
| extern void frame_free(__address frame); |
| extern void * frame_alloc_generic(uint8_t order, int flags, int *pzone); |
| extern void frame_free(uintptr_t frame); |
| extern void frame_reference_add(pfn_t pfn); |
| extern int zone_create(pfn_t start, count_t count, pfn_t confframe, int flags); |
| 99,7 → 99,7 |
| void * frame_get_parent(pfn_t frame, int hint); |
| void frame_set_parent(pfn_t frame, void *data, int hint); |
| void frame_mark_unavailable(pfn_t start, count_t count); |
| __address zone_conf_size(count_t count); |
| uintptr_t zone_conf_size(count_t count); |
| void zone_merge(int z1, int z2); |
| void zone_merge_all(void); |
| /kernel/trunk/generic/include/mm/page.h |
|---|
| 76,9 → 76,9 |
| /** Operations to manipulate page mappings. */ |
| struct page_mapping_operations { |
| void (* mapping_insert)(as_t *as, __address page, __address frame, int flags); |
| void (* mapping_remove)(as_t *as, __address page); |
| pte_t *(* mapping_find)(as_t *as, __address page); |
| void (* mapping_insert)(as_t *as, uintptr_t page, uintptr_t frame, int flags); |
| void (* mapping_remove)(as_t *as, uintptr_t page); |
| pte_t *(* mapping_find)(as_t *as, uintptr_t page); |
| }; |
| typedef struct page_mapping_operations page_mapping_operations_t; |
| 87,13 → 87,13 |
| extern void page_init(void); |
| extern void page_table_lock(as_t *as, bool lock); |
| extern void page_table_unlock(as_t *as, bool unlock); |
| extern void page_mapping_insert(as_t *as, __address page, __address frame, int flags); |
| extern void page_mapping_remove(as_t *as, __address page); |
| extern pte_t *page_mapping_find(as_t *as, __address page); |
| extern void page_mapping_insert(as_t *as, uintptr_t page, uintptr_t frame, int flags); |
| extern void page_mapping_remove(as_t *as, uintptr_t page); |
| extern pte_t *page_mapping_find(as_t *as, uintptr_t page); |
| extern pte_t *page_table_create(int flags); |
| extern void page_table_destroy(pte_t *page_table); |
| extern void map_structure(__address s, size_t size); |
| extern __address hw_map(__address physaddr, size_t size); |
| extern void map_structure(uintptr_t s, size_t size); |
| extern uintptr_t hw_map(uintptr_t physaddr, size_t size); |
| #endif |
| /kernel/trunk/generic/include/mm/slab.h |
|---|
| 90,7 → 90,7 |
| int flags; /**< Flags changing behaviour of cache */ |
| /* Computed values */ |
| __u8 order; /**< Order of frames to be allocated */ |
| uint8_t order; /**< Order of frames to be allocated */ |
| int objects; /**< Number of objects that fit in */ |
| /* Statistics */ |
| /kernel/trunk/generic/include/mm/tlb.h |
|---|
| 58,7 → 58,7 |
| struct tlb_shootdown_msg { |
| tlb_invalidate_type_t type; /**< Message type. */ |
| asid_t asid; /**< Address space identifier. */ |
| __address page; /**< Page address. */ |
| uintptr_t page; /**< Page address. */ |
| count_t count; /**< Number of pages to invalidate. */ |
| }; |
| typedef struct tlb_shootdown_msg tlb_shootdown_msg_t; |
| 66,7 → 66,7 |
| extern void tlb_init(void); |
| #ifdef CONFIG_SMP |
| extern void tlb_shootdown_start(tlb_invalidate_type_t type, asid_t asid, __address page, count_t count); |
| extern void tlb_shootdown_start(tlb_invalidate_type_t type, asid_t asid, uintptr_t page, count_t count); |
| extern void tlb_shootdown_finalize(void); |
| extern void tlb_shootdown_ipi_recv(void); |
| #else |
| 83,7 → 83,7 |
| extern void tlb_invalidate_all(void); |
| extern void tlb_invalidate_asid(asid_t asid); |
| extern void tlb_invalidate_pages(asid_t asid, __address page, count_t cnt); |
| extern void tlb_invalidate_pages(asid_t asid, uintptr_t page, count_t cnt); |
| #endif |
| /** @} |
| /kernel/trunk/generic/include/mm/as.h |
|---|
| 123,8 → 123,8 |
| /** Address space area backend structure. */ |
| typedef struct { |
| int (* page_fault)(as_area_t *area, __address addr, pf_access_t access); |
| void (* frame_free)(as_area_t *area, __address page, __address frame); |
| int (* page_fault)(as_area_t *area, uintptr_t addr, pf_access_t access); |
| void (* frame_free)(as_area_t *area, uintptr_t page, uintptr_t frame); |
| void (* share)(as_area_t *area); |
| } mem_backend_t; |
| 135,7 → 135,7 |
| elf_segment_header_t *segment; |
| }; |
| struct { /**< phys_backend members */ |
| __address base; |
| uintptr_t base; |
| count_t frames; |
| }; |
| } mem_backend_data_t; |
| 151,7 → 151,7 |
| int flags; /**< Flags related to the memory represented by the address space area. */ |
| int attributes; /**< Attributes related to the address space area itself. */ |
| count_t pages; /**< Size of this area in multiples of PAGE_SIZE. */ |
| __address base; /**< Base address of this area. */ |
| uintptr_t base; /**< Base address of this area. */ |
| btree_t used_space; /**< Map of used space. */ |
| share_info_t *sh_info; /**< If the address space area has been shared, this pointer will |
| reference the share info structure. */ |
| 172,20 → 172,20 |
| extern as_t *as_create(int flags); |
| extern void as_destroy(as_t *as); |
| extern void as_switch(as_t *old, as_t *new); |
| extern int as_page_fault(__address page, pf_access_t access, istate_t *istate); |
| extern int as_page_fault(uintptr_t page, pf_access_t access, istate_t *istate); |
| extern as_area_t *as_area_create(as_t *as, int flags, size_t size, __address base, int attrs, |
| extern as_area_t *as_area_create(as_t *as, int flags, size_t size, uintptr_t base, int attrs, |
| mem_backend_t *backend, mem_backend_data_t *backend_data); |
| extern int as_area_destroy(as_t *as, __address address); |
| extern int as_area_resize(as_t *as, __address address, size_t size, int flags); |
| int as_area_share(as_t *src_as, __address src_base, size_t acc_size, |
| as_t *dst_as, __address dst_base, int dst_flags_mask); |
| extern int as_area_destroy(as_t *as, uintptr_t address); |
| extern int as_area_resize(as_t *as, uintptr_t address, size_t size, int flags); |
| int as_area_share(as_t *src_as, uintptr_t src_base, size_t acc_size, |
| as_t *dst_as, uintptr_t dst_base, int dst_flags_mask); |
| extern int as_area_get_flags(as_area_t *area); |
| extern bool as_area_check_access(as_area_t *area, pf_access_t access); |
| extern size_t as_get_size(__address base); |
| extern int used_space_insert(as_area_t *a, __address page, count_t count); |
| extern int used_space_remove(as_area_t *a, __address page, count_t count); |
| extern size_t as_get_size(uintptr_t base); |
| extern int used_space_insert(as_area_t *a, uintptr_t page, count_t count); |
| extern int used_space_remove(as_area_t *a, uintptr_t page, count_t count); |
| /* Interface to be implemented by architectures. */ |
| #ifndef as_install_arch |
| 198,9 → 198,9 |
| extern mem_backend_t phys_backend; |
| /* Address space area related syscalls. */ |
| extern __native sys_as_area_create(__address address, size_t size, int flags); |
| extern __native sys_as_area_resize(__address address, size_t size, int flags); |
| extern __native sys_as_area_destroy(__address address); |
| extern unative_t sys_as_area_create(uintptr_t address, size_t size, int flags); |
| extern unative_t sys_as_area_resize(uintptr_t address, size_t size, int flags); |
| extern unative_t sys_as_area_destroy(uintptr_t address); |
| #endif /* KERNEL */ |
| /kernel/trunk/generic/include/mm/buddy.h |
|---|
| 45,17 → 45,17 |
| link_t *(* find_buddy)(buddy_system_t *, link_t *); /**< Return pointer to left-side or right-side buddy for block passed as argument. */ |
| link_t *(* bisect)(buddy_system_t *, link_t *); /**< Bisect the block passed as argument and return pointer to the new right-side buddy. */ |
| link_t *(* coalesce)(buddy_system_t *, link_t *, link_t *); /**< Coalesce two buddies into a bigger block. */ |
| void (*set_order)(buddy_system_t *, link_t *, __u8); /**< Set order of block passed as argument. */ |
| __u8 (*get_order)(buddy_system_t *, link_t *); /**< Return order of block passed as argument. */ |
| void (*set_order)(buddy_system_t *, link_t *, uint8_t); /**< Set order of block passed as argument. */ |
| uint8_t (*get_order)(buddy_system_t *, link_t *); /**< Return order of block passed as argument. */ |
| void (*mark_busy)(buddy_system_t *, link_t *); /**< Mark block as busy. */ |
| void (*mark_available)(buddy_system_t *, link_t *); /**< Mark block as available. */ |
| /** Find parent of block that has given order */ |
| link_t *(* find_block)(buddy_system_t *, link_t *, __u8); |
| link_t *(* find_block)(buddy_system_t *, link_t *, uint8_t); |
| void (* print_id)(buddy_system_t *, link_t *); |
| }; |
| struct buddy_system { |
| __u8 max_order; /**< Maximal order of block which can be stored by buddy system. */ |
| uint8_t max_order; /**< Maximal order of block which can be stored by buddy system. */ |
| link_t *order; |
| buddy_system_operations_t *op; |
| void *data; /**< Pointer to be used by the implementation. */ |
| 62,10 → 62,10 |
| }; |
| extern void buddy_system_create(buddy_system_t *b, |
| __u8 max_order, |
| uint8_t max_order, |
| buddy_system_operations_t *op, void *data); |
| extern link_t *buddy_system_alloc(buddy_system_t *b, __u8 i); |
| extern bool buddy_system_can_alloc(buddy_system_t *b, __u8 order); |
| extern link_t *buddy_system_alloc(buddy_system_t *b, uint8_t i); |
| extern bool buddy_system_can_alloc(buddy_system_t *b, uint8_t order); |
| extern void buddy_system_free(buddy_system_t *b, link_t *block); |
| extern void buddy_system_structure_print(buddy_system_t *b, size_t elem_size); |
| extern size_t buddy_conf_size(int max_order); |