| /trunk/kernel/kernel.config |
|---|
| 167,9 → 167,3 |
| # Compile kernel tests |
| ! CONFIG_TEST (y/n) |
| ## Experimental features |
| # Enable experimental features |
| ! CONFIG_EXPERIMENTAL (n/y) |
| /trunk/kernel/genarch/include/mm/page_pt.h |
|---|
| 116,9 → 116,7 |
| #define PTE_WRITABLE(p) PTE_WRITABLE_ARCH((p)) |
| #define PTE_EXECUTABLE(p) PTE_EXECUTABLE_ARCH((p)) |
| #ifndef __OBJC__ |
| extern as_operations_t as_pt_operations; |
| #endif |
| extern page_mapping_operations_t pt_mapping_operations; |
| extern void page_mapping_insert_pt(as_t *as, uintptr_t page, uintptr_t frame, |
| /trunk/kernel/genarch/src/mm/as_pt.c |
|---|
| 52,31 → 52,6 |
| static void pt_lock(as_t *as, bool lock); |
| static void pt_unlock(as_t *as, bool unlock); |
| #ifdef __OBJC__ |
| @implementation as_t |
| + (pte_t *) page_table_create: (int) flags |
| { |
| return ptl0_create(flags); |
| } |
| + (void) page_table_destroy: (pte_t *) page_table |
| { |
| ptl0_destroy(page_table); |
| } |
| - (void) page_table_lock: (bool) _lock |
| { |
| pt_lock(self, _lock); |
| } |
| - (void) page_table_unlock: (bool) unlock |
| { |
| pt_unlock(self, unlock); |
| } |
| @end |
| #else |
| as_operations_t as_pt_operations = { |
| .page_table_create = ptl0_create, |
| .page_table_destroy = ptl0_destroy, |
| 83,7 → 58,6 |
| .page_table_lock = pt_lock, |
| .page_table_unlock = pt_unlock |
| }; |
| #endif |
| /** Create PTL0. |
| * |
| /trunk/kernel/generic/include/lib/objc_ext.h |
|---|
| File deleted |
| /trunk/kernel/generic/include/lib/objc.h |
|---|
| File deleted |
| /trunk/kernel/generic/include/mm/as.h |
|---|
| 53,10 → 53,6 |
| #include <adt/btree.h> |
| #include <lib/elf.h> |
| #ifdef __OBJC__ |
| #include <lib/objc.h> |
| #endif |
| /** |
| * Defined to be true if user address space and kernel address space shadow each |
| * other. |
| 84,47 → 80,6 |
| /** The page fault was caused by memcpy_from_uspace() or memcpy_to_uspace(). */ |
| #define AS_PF_DEFER 2 |
| #ifdef __OBJC__ |
| @interface as_t : base_t { |
| @public |
| /** Protected by asidlock. */ |
| link_t inactive_as_with_asid_link; |
| /** |
| * Number of processors on wich is this address space active. |
| * Protected by asidlock. |
| */ |
| count_t cpu_refcount; |
| /** |
| * Address space identifier. |
| * Constant on architectures that do not support ASIDs. |
| * Protected by asidlock. |
| */ |
| asid_t asid; |
| /** Number of references (i.e tasks that reference this as). */ |
| atomic_t refcount; |
| mutex_t lock; |
| /** B+tree of address space areas. */ |
| btree_t as_area_btree; |
| /** Non-generic content. */ |
| as_genarch_t genarch; |
| /** Architecture specific content. */ |
| as_arch_t arch; |
| } |
| + (pte_t *) page_table_create: (int) flags; |
| + (void) page_table_destroy: (pte_t *) page_table; |
| - (void) page_table_lock: (bool) _lock; |
| - (void) page_table_unlock: (bool) unlock; |
| @end |
| #else |
| /** Address space structure. |
| * |
| * as_t contains the list of as_areas of userspace accessible |
| 168,7 → 123,6 |
| void (* page_table_lock)(as_t *as, bool lock); |
| void (* page_table_unlock)(as_t *as, bool unlock); |
| } as_operations_t; |
| #endif |
| /** |
| * This structure contains information associated with the shared address space |
| 249,10 → 203,7 |
| extern as_t *AS_KERNEL; |
| #ifndef __OBJC__ |
| extern as_operations_t *as_operations; |
| #endif |
| extern link_t inactive_as_with_asid_head; |
| extern void as_init(void); |
| /trunk/kernel/generic/src/lib/objc_ext.c |
|---|
| File deleted |
| /trunk/kernel/generic/src/lib/objc.c |
|---|
| File deleted |
| /trunk/kernel/generic/src/mm/as.c |
|---|
| 82,7 → 82,6 |
| #include <arch/mm/cache.h> |
| #endif /* CONFIG_VIRT_IDX_DCACHE */ |
| #ifndef __OBJC__ |
| /** |
| * Each architecture decides what functions will be used to carry out |
| * address space operations such as creating or locking page tables. |
| 93,7 → 92,6 |
| * Slab for as_t objects. |
| */ |
| static slab_cache_t *as_slab; |
| #endif |
| /** |
| * This lock serializes access to the ASID subsystem. |
| 119,7 → 117,6 |
| as_area_t *avoid_area); |
| static void sh_info_remove_reference(share_info_t *sh_info); |
| #ifndef __OBJC__ |
| static int as_constructor(void *obj, int flags) |
| { |
| as_t *as = (as_t *) obj; |
| 139,7 → 136,6 |
| return as_destructor_arch(as); |
| } |
| #endif |
| /** Initialize address space subsystem. */ |
| void as_init(void) |
| 146,10 → 142,8 |
| { |
| as_arch_init(); |
| #ifndef __OBJC__ |
| as_slab = slab_cache_create("as_slab", sizeof(as_t), 0, |
| as_constructor, as_destructor, SLAB_CACHE_MAGDEFERRED); |
| #endif |
| AS_KERNEL = as_create(FLAG_AS_KERNEL); |
| if (!AS_KERNEL) |
| 165,14 → 159,7 |
| { |
| as_t *as; |
| #ifdef __OBJC__ |
| as = [as_t new]; |
| link_initialize(&as->inactive_as_with_asid_link); |
| mutex_initialize(&as->lock, MUTEX_PASSIVE); |
| (void) as_constructor_arch(as, flags); |
| #else |
| as = (as_t *) slab_alloc(as_slab, 0); |
| #endif |
| (void) as_create_arch(as, 0); |
| btree_create(&as->as_area_btree); |
| 263,11 → 250,7 |
| interrupts_restore(ipl); |
| #ifdef __OBJC__ |
| [as free]; |
| #else |
| slab_free(as_slab, as); |
| #endif |
| } |
| /** Create address space area of common attributes. |
| 1163,14 → 1146,10 |
| */ |
| pte_t *page_table_create(int flags) |
| { |
| #ifdef __OBJC__ |
| return [as_t page_table_create: flags]; |
| #else |
| ASSERT(as_operations); |
| ASSERT(as_operations->page_table_create); |
| return as_operations->page_table_create(flags); |
| #endif |
| } |
| /** Destroy page table. |
| 1181,14 → 1160,10 |
| */ |
| void page_table_destroy(pte_t *page_table) |
| { |
| #ifdef __OBJC__ |
| return [as_t page_table_destroy: page_table]; |
| #else |
| ASSERT(as_operations); |
| ASSERT(as_operations->page_table_destroy); |
| as_operations->page_table_destroy(page_table); |
| #endif |
| } |
| /** Lock page table. |
| 1205,14 → 1180,10 |
| */ |
| void page_table_lock(as_t *as, bool lock) |
| { |
| #ifdef __OBJC__ |
| [as page_table_lock: lock]; |
| #else |
| ASSERT(as_operations); |
| ASSERT(as_operations->page_table_lock); |
| as_operations->page_table_lock(as, lock); |
| #endif |
| } |
| /** Unlock page table. |
| 1222,14 → 1193,10 |
| */ |
| void page_table_unlock(as_t *as, bool unlock) |
| { |
| #ifdef __OBJC__ |
| [as page_table_unlock: unlock]; |
| #else |
| ASSERT(as_operations); |
| ASSERT(as_operations->page_table_unlock); |
| as_operations->page_table_unlock(as, unlock); |
| #endif |
| } |
| /trunk/kernel/Makefile |
|---|
| 317,16 → 317,6 |
| test/sysinfo/sysinfo1.c |
| endif |
| ## Experimental features |
| # |
| ifeq ($(CONFIG_EXPERIMENTAL),y) |
| GENERIC_SOURCES += generic/src/lib/objc_ext.c \ |
| generic/src/lib/objc.c |
| EXTRA_OBJECTS = $(LIBDIR)/libobjc.a |
| EXTRA_FLAGS += -x objective-c |
| endif |
| GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES))) |
| ARCH_OBJECTS := $(addsuffix .o,$(basename $(ARCH_SOURCES))) |
| GENARCH_OBJECTS := $(addsuffix .o,$(basename $(GENARCH_SOURCES))) |
| /trunk/kernel/arch/ia32/src/mm/as.c |
|---|
| 39,9 → 39,7 |
| /** Architecture dependent address space init. */ |
| void as_arch_init(void) |
| { |
| #ifndef __OBJC__ |
| as_operations = &as_pt_operations; |
| #endif |
| } |
| /** @} |