Changeset c993e45 in mainline

Timestamp:

2007-02-11T22:48:43Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bea09de6

Parents:

bd1deed

Message:

small cleanup, more work coming

Location:

kernel

Files:

• Makefile (modified) (1 diff)
• generic/include/lib/objc.h (modified) (2 diffs)
• generic/include/lib/objc_ext.h (added)
• generic/include/mm/as.h (modified) (3 diffs)
• generic/src/lib/objc_ext.c (moved) (moved from kernel/generic/src/lib/objc.c ) (1 diff)
• generic/src/mm/as.c (modified) (7 diffs)

kernel/Makefile

@@ -246 +246 @@
 
 ifeq ($(CONFIG_EXPERIMENTAL),y)
-        GENERIC_SOURCES += generic/src/lib/objc.c
+        GENERIC_SOURCES += generic/src/lib/objc_ext.c \
+                generic/src/lib/objc.c
         EXTRA_OBJECTS = $(LIBDIR)/libobjc.a
         EXTRA_FLAGS += -x objective-c

kernel/generic/include/lib/objc.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Martin Decky
+ * Copyright (c) 2007 Martin Decky
  * All rights reserved.
  *
@@ -36 +36 @@
 #define KERN_OBJC_H_
 
-#include <arch/types.h>
-#include <arch/arg.h>
+extern id class_create_instance(Class _class);
+extern id object_dispose(id object);
 
-extern void *stderr;
+@interface base_t {
+    Class isa;
+}
 
-extern void __assert_fail(const char *assertion, const char *file, unsigned int line, const char *function);
-extern void abort(void);
++ (id) new;
+- (id) free;
 
-extern void *fopen(const char *path, const char *mode);
-extern size_t fread(void *ptr, size_t size, size_t nmemb, void *stream);
-extern size_t fwrite(const void *ptr, size_t size, size_t nmemb, void *stream);
-extern int fflush(void *stream);
-extern int feof(void *stream);
-extern int fclose(void *stream);
-
-extern int vfprintf(void *stream, const char *format, va_list ap);
-extern int sscanf(const char *str, const char *format, ...);
-extern const unsigned short **__ctype_b_loc(void);
-extern long int __strtol_internal(const char *__nptr, char **__endptr, int __base, int __group);
-
-extern void *memset(void *s, int c, size_t n);
-extern void *calloc(size_t nmemb, size_t size);
+@end
 
 #endif
-
-/** @}
- */

kernel/generic/include/mm/as.h

@@ -54 +54 @@
 #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
@@ -82 +86 @@
 
 #ifdef __OBJC__
-@interface as_t {
+@interface as_t : base_t {
         @public
                 /** Protected by asidlock. */
@@ -110 +114 @@
                 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
 

kernel/generic/src/lib/objc_ext.c

@@ -40 +40 @@
  */
 
-#include <lib/objc.h>
+#include <lib/objc_ext.h>
 #include <panic.h>
 #include <arch/memstr.h>

kernel/generic/src/mm/as.c

@@ -88 +88 @@
  */
 as_operations_t *as_operations = NULL;
-#endif
 
 /**
@@ -94 +93 @@
  */
 static slab_cache_t *as_slab;
+#endif
 
 /**
@@ -116 +116 @@
 static void sh_info_remove_reference(share_info_t *sh_info);
 
+#ifndef __OBJC__
 static int as_constructor(void *obj, int flags)
 {
@@ -135 +136 @@
         return as_destructor_arch(as);
 }
+#endif
 
 /** Initialize address space subsystem. */
@@ -140 +142 @@
 {
         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);
@@ -158 +162 @@
         as_t *as;
 
+#ifdef __OBJC__
+        as = [as_t new];
+        link_initialize(&as->inactive_as_with_asid_link);
+        mutex_initialize(&as->lock);    
+        (void) as_constructor_arch(as, flags);
+#else
         as = (as_t *) slab_alloc(as_slab, 0);
+#endif
         (void) as_create_arch(as, 0);
         
@@ -229 +240 @@
 
         interrupts_restore(ipl);
-        
+
+#ifdef __OBJC__
+        [as free];
+#else
         slab_free(as_slab, as);
+#endif
 }