Index: kernel/Makefile =================================================================== --- kernel/Makefile (revision 848071405dadd94e4b2ea60f5a0985636907cd02) +++ kernel/Makefile (revision 30b3ddbf5f1fe2545ec70af161e38ba91af1d3b4) @@ -318,14 +318,4 @@ 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))) Index: kernel/arch/ia32/src/mm/as.c =================================================================== --- kernel/arch/ia32/src/mm/as.c (revision 848071405dadd94e4b2ea60f5a0985636907cd02) +++ kernel/arch/ia32/src/mm/as.c (revision 30b3ddbf5f1fe2545ec70af161e38ba91af1d3b4) @@ -40,7 +40,5 @@ void as_arch_init(void) { -#ifndef __OBJC__ as_operations = &as_pt_operations; -#endif } Index: kernel/genarch/include/mm/page_pt.h =================================================================== --- kernel/genarch/include/mm/page_pt.h (revision 848071405dadd94e4b2ea60f5a0985636907cd02) +++ kernel/genarch/include/mm/page_pt.h (revision 30b3ddbf5f1fe2545ec70af161e38ba91af1d3b4) @@ -117,7 +117,5 @@ #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; Index: kernel/genarch/src/mm/as_pt.c =================================================================== --- kernel/genarch/src/mm/as_pt.c (revision 848071405dadd94e4b2ea60f5a0985636907cd02) +++ kernel/genarch/src/mm/as_pt.c (revision 30b3ddbf5f1fe2545ec70af161e38ba91af1d3b4) @@ -53,29 +53,4 @@ 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, @@ -84,5 +59,4 @@ .page_table_unlock = pt_unlock }; -#endif /** Create PTL0. Index: kernel/generic/include/lib/objc.h =================================================================== --- kernel/generic/include/lib/objc.h (revision 848071405dadd94e4b2ea60f5a0985636907cd02) +++ (revision ) @@ -1,50 +1,0 @@ -/* - * Copyright (c) 2007 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup generic - * @{ - */ -/** @file - */ - -#ifndef KERN_OBJC_H_ -#define KERN_OBJC_H_ - -extern id class_create_instance(Class _class); -extern id object_dispose(id object); - -@interface base_t { - Class isa; -} - -+ (id) new; -- (id) free; - -@end - -#endif Index: kernel/generic/include/lib/objc_ext.h =================================================================== --- kernel/generic/include/lib/objc_ext.h (revision 848071405dadd94e4b2ea60f5a0985636907cd02) +++ (revision ) @@ -1,64 +1,0 @@ -/* - * Copyright (c) 2007 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup generic - * @{ - */ -/** @file - */ - -#ifndef KERN_OBJC_EXT_H_ -#define KERN_OBJC_EXT_H_ - -#include -#include - -extern void *stderr; - -extern void __assert_fail(const char *assertion, const char *file, unsigned int line, const char *function); -extern void abort(void); - -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); - -#endif - -/** @} - */ Index: kernel/generic/include/mm/as.h =================================================================== --- kernel/generic/include/mm/as.h (revision 848071405dadd94e4b2ea60f5a0985636907cd02) +++ kernel/generic/include/mm/as.h (revision 30b3ddbf5f1fe2545ec70af161e38ba91af1d3b4) @@ -54,8 +54,4 @@ #include -#ifdef __OBJC__ -#include -#endif - /** * Defined to be true if user address space and kernel address space shadow each @@ -85,45 +81,4 @@ #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. * @@ -169,5 +124,4 @@ void (* page_table_unlock)(as_t *as, bool unlock); } as_operations_t; -#endif /** @@ -250,8 +204,5 @@ extern as_t *AS_KERNEL; -#ifndef __OBJC__ extern as_operations_t *as_operations; -#endif - extern link_t inactive_as_with_asid_head; Index: kernel/generic/src/lib/objc.c =================================================================== --- kernel/generic/src/lib/objc.c (revision 848071405dadd94e4b2ea60f5a0985636907cd02) +++ (revision ) @@ -1,60 +1,0 @@ -/* - * Copyright (c) 2007 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup generic - * @{ - */ - -/** - * @file - * @brief Objective C run-time environment. - * - * This file containts the (growing subset of) - * Objective C run-time environment. The code currently - * relies on the external libobjc library, but this - * dependency will be removed eventually. - */ - -#include - -@implementation base_t - -+ (id) new -{ - return class_create_instance(self); -} - -- (id) dispose -{ - return object_dispose(self); -} - -@end - -/** @} - */ Index: kernel/generic/src/lib/objc_ext.c =================================================================== --- kernel/generic/src/lib/objc_ext.c (revision 848071405dadd94e4b2ea60f5a0985636907cd02) +++ (revision ) @@ -1,174 +1,0 @@ -/* - * Copyright (c) 2007 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup generic - * @{ - */ - -/** - * @file - * @brief Objective C bindings. - * - * This file provides architecture independent binding - * functions which are needed to link with libobjc run-time - * library. Many of the functions are just dummy. - */ - -#include -#include -#include -#include - -void *stderr; - -static unsigned short __ctype_b[384] = { - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 2, 2, 2, 2, 2, 2, 2, 2, - 2, 8195, 8194, 8194, 8194, 8194, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, - 24577, 49156, 49156, 49156, 49156, 49156, 49156, 49156, - 49156, 49156, 49156, 49156, 49156, 49156, 49156, 49156, - 55304, 55304, 55304, 55304, 55304, 55304, 55304, 55304, - 55304, 55304, 49156, 49156, 49156, 49156, 49156, 49156, - 49156, 54536, 54536, 54536, 54536, 54536, 54536, 50440, - 50440, 50440, 50440, 50440, 50440, 50440, 50440, 50440, - 50440, 50440, 50440, 50440, 50440, 50440, 50440, 50440, - 50440, 50440, 50440, 49156, 49156, 49156, 49156, 49156, - 49156, 54792, 54792, 54792, 54792, 54792, 54792, 50696, - 50696, 50696, 50696, 50696, 50696, 50696, 50696, 50696, - 50696, 50696, 50696, 50696, 50696, 50696, 50696, 50696, - 50696, 50696, 50696, 49156, 49156, 49156, 49156, 2, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0 -}; - -static const unsigned short *__ctype_b_ptr = __ctype_b + 128; - -void __assert_fail(const char *assertion, const char *file, unsigned int line, const char *function) -{ - panic("Run-time assertion (%s:%u:%s) failed (%s)", file, line, function ? function : "", assertion); -} - -void abort(void) -{ - panic("Run-time scheduled abort"); -} - -void *fopen(const char *path, const char *mode) -{ - return NULL; -} - -size_t fread(void *ptr, size_t size, size_t nmemb, void *stream) -{ - return 0; -} - -size_t fwrite(const void *ptr, size_t size, size_t nmemb, void *stream) -{ - return 0; -} - -int fflush(void *stream) -{ - return 0; -} - -int feof(void *stream) -{ - return 1; -} - -int fclose(void *stream) -{ - return 0; -} - -int vfprintf(void *stream, const char *format, va_list ap) -{ - return 0; -} - -int sscanf(const char *str, const char *format, ...) -{ - return 0; -} - -const unsigned short **__ctype_b_loc(void) -{ - return &__ctype_b_ptr; -} - -long int __strtol_internal(const char *__nptr, char **__endptr, int __base, int __group) -{ - return 0; -} - -void *memset(void *s, int c, size_t n) -{ - memsetb(s, n, c); - return s; -} - -void *calloc(size_t nmemb, size_t size) -{ - return malloc(nmemb * size, 0); -} - -/** @} - */ Index: kernel/generic/src/mm/as.c =================================================================== --- kernel/generic/src/mm/as.c (revision 848071405dadd94e4b2ea60f5a0985636907cd02) +++ kernel/generic/src/mm/as.c (revision 30b3ddbf5f1fe2545ec70af161e38ba91af1d3b4) @@ -83,5 +83,4 @@ #endif /* CONFIG_VIRT_IDX_DCACHE */ -#ifndef __OBJC__ /** * Each architecture decides what functions will be used to carry out @@ -94,5 +93,4 @@ */ static slab_cache_t *as_slab; -#endif /** @@ -120,5 +118,4 @@ static void sh_info_remove_reference(share_info_t *sh_info); -#ifndef __OBJC__ static int as_constructor(void *obj, int flags) { @@ -140,5 +137,4 @@ return as_destructor_arch(as); } -#endif /** Initialize address space subsystem. */ @@ -147,8 +143,6 @@ 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,12 +160,5 @@ 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,9 +251,5 @@ interrupts_restore(ipl); -#ifdef __OBJC__ - [as free]; -#else slab_free(as_slab, as); -#endif } @@ -1164,12 +1147,8 @@ 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,12 +1161,8 @@ 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,12 +1181,8 @@ 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,12 +1194,8 @@ 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 } Index: kernel/kernel.config =================================================================== --- kernel/kernel.config (revision 848071405dadd94e4b2ea60f5a0985636907cd02) +++ kernel/kernel.config (revision 30b3ddbf5f1fe2545ec70af161e38ba91af1d3b4) @@ -168,8 +168,2 @@ # Compile kernel tests ! CONFIG_TEST (y/n) - - -## Experimental features - -# Enable experimental features -! CONFIG_EXPERIMENTAL (n/y)