Index: kernel/generic/include/lib/objc.h =================================================================== --- kernel/generic/include/lib/objc.h (revision 46d8eb9b258c351fc7a0ec7a45162776b8adc3a2) +++ (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 46d8eb9b258c351fc7a0ec7a45162776b8adc3a2) +++ (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 46d8eb9b258c351fc7a0ec7a45162776b8adc3a2) +++ kernel/generic/include/mm/as.h (revision 57b4f469e7b99aef70031cf3f2d0a09930de3f2d) @@ -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;