Changeset af863d0 in mainline for kernel/generic/src/mm/as.c

Timestamp:

2008-07-31T10:42:38Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6e0e8c9

Parents:

2a513972

Message:

move unfinished ObjC support to a separate branch

File:

• kernel/generic/src/mm/as.c (modified) (11 diffs)

kernel/generic/src/mm/as.c

@@ -83 +83 @@
 #endif /* CONFIG_VIRT_IDX_DCACHE */
 
-#ifndef __OBJC__
 /**
  * Each architecture decides what functions will be used to carry out
@@ -94 +93 @@
  */
 static slab_cache_t *as_slab;
-#endif
 
 /**
@@ -120 +118 @@
 static void sh_info_remove_reference(share_info_t *sh_info);
 
-#ifndef __OBJC__
 static int as_constructor(void *obj, int flags)
 {
@@ -140 +137 @@
         return as_destructor_arch(as);
 }
-#endif
 
 /** Initialize address space subsystem. */
@@ -147 +143 @@
         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);
@@ -166 +160 @@
         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);
         
@@ -264 +251 @@
         interrupts_restore(ipl);
 
-#ifdef __OBJC__
-        [as free];
-#else
         slab_free(as_slab, as);
-#endif
 }
 
@@ -1164 +1147 @@
 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
 }
 
@@ -1182 +1161 @@
 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
 }
 
@@ -1206 +1181 @@
 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
 }
 
@@ -1223 +1194 @@
 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
 }