Changeset bd1deed in mainline for kernel/generic/src

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/src

Files:

• lib/memstr.c (modified) (3 diffs)
• lib/objc.c (added)
• mm/as.c (modified) (6 diffs)
• printf/vprintf.c (modified) (2 diffs)

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);