Changeset bd1deed in mainline for kernel/generic

Timestamp:

2007-02-11T20:04:08Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c993e45

Parents:

ce8aed1

Message:

experimental support for Objective C
(disabled by default)

Location:

kernel/generic

Files:

• include/lib/objc.h (added)
• include/memstr.h (modified) (1 diff)
• include/mm/as.h (modified) (3 diffs)
• include/print.h (modified) (1 diff)
• src/lib/memstr.c (modified) (3 diffs)
• src/lib/objc.c (added)
• src/mm/as.c (modified) (6 diffs)
• src/printf/vprintf.c (modified) (2 diffs)

kernel/generic/include/memstr.h

@@ -45 +45 @@
 extern void _memsetb(uintptr_t dst, size_t cnt, uint8_t x);
 extern void _memsetw(uintptr_t dst, size_t cnt, uint16_t x);
+extern char *strcpy(char *dest, const char *src);
 
 #endif

kernel/generic/include/mm/as.h

@@ -80 +80 @@
 /** The page fault was caused by memcpy_from_uspace() or memcpy_to_uspace(). */
 #define AS_PF_DEFER             2
+
+#ifdef __OBJC__
+@interface as_t {
+        @public
+                /** Protected by asidlock. */
+                link_t inactive_as_with_asid_link;
+                
+                mutex_t lock;
+                
+                /** Number of references (i.e tasks that reference this as). */
+                count_t refcount;
+                
+                /** Number of processors on wich is this address space active. */
+                count_t cpu_refcount;
+                
+                /** B+tree of address space areas. */
+                btree_t as_area_btree;
+                
+                /**
+                 *  Address space identifier.
+                 *  Constant on architectures that do not support ASIDs.
+                 */
+                asid_t asid;
+                
+                /** 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.
@@ -122 +159 @@
         void (* page_table_unlock)(as_t *as, bool unlock);
 } as_operations_t;
+#endif
 
 /**
@@ -202 +240 @@
 
 extern as_t *AS_KERNEL;
+
+#ifndef __OBJC__
 extern as_operations_t *as_operations;
+#endif
 
 SPINLOCK_EXTERN(inactive_as_with_asid_lock);

kernel/generic/include/print.h

@@ -45 +45 @@
 #define EOF (-1)
 
+extern int puts(const char *s);
 extern int printf(const char *fmt, ...);
 extern int sprintf(char *str, const char *fmt, ...);

kernel/generic/src/lib/memstr.c

@@ -75 +75 @@
         }
                 
-        return (char *)src;
+        return (char *) src;
 }
 
@@ -93 +93 @@
         uint8_t *p = (uint8_t *) dst;
         
-        for(i=0; i<cnt; i++)
+        for (i = 0; i < cnt; i++)
                 p[i] = x;
 }
@@ -112 +112 @@
         uint16_t *p = (uint16_t *) dst;
         
-        for(i=0; i<cnt; i++)
+        for (i = 0; i < cnt; i++)
                 p[i] = x;       
+}
+
+/** Copy string
+ *
+ * Copy string from src address to dst address.
+ * The copying is done char-by-char until the null
+ * character. The source and destination memory areas
+ * cannot overlap.
+ *
+ * @param src Origin string to copy from.
+ * @param dst Origin string to copy to.
+ *
+ */
+char *strcpy(char *dest, const char *src)
+{
+        char *orig = dest;
+        
+        while ((*(dest++) = *(src++)));
+        return orig;
 }
 

kernel/generic/src/mm/as.c

@@ -82 +82 @@
 #endif /* CONFIG_VIRT_IDX_DCACHE */
 
+#ifndef __OBJC__
 /**
  * Each architecture decides what functions will be used to carry out
@@ -87 +88 @@
  */
 as_operations_t *as_operations = NULL;
+#endif
 
 /**
@@ -993 +995 @@
 pte_t *page_table_create(int flags)
 {
-        ASSERT(as_operations);
-        ASSERT(as_operations->page_table_create);
-
-        return as_operations->page_table_create(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
 }
 
@@ -1007 +1013 @@
 void page_table_destroy(pte_t *page_table)
 {
-        ASSERT(as_operations);
-        ASSERT(as_operations->page_table_destroy);
-
-        as_operations->page_table_destroy(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
 }
 
@@ -1027 +1037 @@
 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
 }
 
@@ -1040 +1054 @@
 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
 }
 

kernel/generic/src/printf/vprintf.c

@@ -37 +37 @@
 #include <putchar.h>
 
-int vprintf_write(const char *str, size_t count, void *unused);
+static int vprintf_write(const char *str, size_t count, void *unused)
+{
+        size_t i;
+        for (i = 0; i < count; i++)
+                putchar(str[i]);
+        return i;
+}
 
-int vprintf_write(const char *str, size_t count, void *unused)
+int puts(const char *s)
 {
-        size_t i = 0;
-        for (; i < count; i++)
-                putchar(str[i]);
+        size_t i;
+        for (i = 0; s[i] != 0; i++)
+                putchar(s[i]);
         return i;
 }
@@ -49 +55 @@
 int vprintf(const char *fmt, va_list ap)
 {
-        struct printf_spec ps = {(int(*)(void *, size_t, void *))vprintf_write, NULL};
+        struct printf_spec ps = {(int(*)(void *, size_t, void *)) vprintf_write, NULL};
         return printf_core(fmt, &ps, ap);