From patchwork Thu Dec 16 22:52:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicola Pero X-Patchwork-Id: 75820 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id E6DDAB6F2B for ; Fri, 17 Dec 2010 09:53:14 +1100 (EST) Received: (qmail 25965 invoked by alias); 16 Dec 2010 22:53:11 -0000 Received: (qmail 25843 invoked by uid 22791); 16 Dec 2010 22:53:05 -0000 X-SWARE-Spam-Status: No, hits=-1.4 required=5.0 tests=AWL, BAYES_00, TW_BJ, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from fencepost.gnu.org (HELO fencepost.gnu.org) (140.186.70.10) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 16 Dec 2010 22:52:59 +0000 Received: from eggs.gnu.org ([140.186.70.92]:46314) by fencepost.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1PTMgw-0003bV-D6 for gcc-patches@gnu.org; Thu, 16 Dec 2010 17:52:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PTMgx-0002VT-2j for gcc-patches@gnu.org; Thu, 16 Dec 2010 17:52:57 -0500 Received: from smtp201.iad.emailsrvr.com ([207.97.245.201]:38879) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PTMgw-0002VJ-VU for gcc-patches@gnu.org; Thu, 16 Dec 2010 17:52:55 -0500 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp50.relay.iad1a.emailsrvr.com (SMTP Server) with ESMTP id 41F2A370709 for ; Thu, 16 Dec 2010 17:52:54 -0500 (EST) Received: from dynamic3.wm-web.iad.mlsrvr.com (dynamic3.wm-web.iad1a.rsapps.net [192.168.2.152]) by smtp50.relay.iad1a.emailsrvr.com (SMTP Server) with ESMTP id 2F9D1370917 for ; Thu, 16 Dec 2010 17:52:54 -0500 (EST) Received: from meta-innovation.com (localhost [127.0.0.1]) by dynamic3.wm-web.iad.mlsrvr.com (Postfix) with ESMTP id 0885C332006E for ; Thu, 16 Dec 2010 17:52:54 -0500 (EST) Received: by www2.webmail.us (Authenticated sender: nicola.pero@meta-innovation.com, from: nicola.pero@meta-innovation.com) with HTTP; Thu, 16 Dec 2010 23:52:54 +0100 (CET) Date: Thu, 16 Dec 2010 23:52:54 +0100 (CET) Subject: libobjc: Move sendmsg.c to the new API From: "Nicola Pero" To: "gcc-patches@gnu.org" MIME-Version: 1.0 X-Type: plain Message-ID: <1292539974.0327531@192.168.2.228> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org This patch changes libobjc/sendmsg.c to use the new GNU Objective-C Runtime API. Committed to trunk. Thanks 2010-12-16 Nicola Pero * sendmsg.c: Include objc/runtime.h instead of objc/objc-api.h. Include objc-private/module-abi-8.h and objc-private/selector.h instead of objc/encoding.h. (objc_msg_lookup_super): Use super->super_class instead of super->class. (method_get_first_argument, method_get_next_argument): Declare locally. (class_get_instance_method): Declare before using. (objc_msg_sendv): Use 'struct objc_method' instead of 'Method'. (__objc_init_dispatch_tables, __objc_send_initialize): Use sel_registerName() instead of sel_register_name(). (__objc_forward): Use sel_getName() instead of sel_get_name(). (objc_get_uninstalled_dtable): Use 'void' as argument. * objc-private/selector.h: New. Index: sendmsg.c =================================================================== --- sendmsg.c (revision 167954) +++ sendmsg.c (working copy) @@ -33,11 +33,12 @@ see the files COPYING3 and COPYING.RUNTIME respect #include "tconfig.h" #include "coretypes.h" #include "tm.h" -#include "objc/objc-api.h" +#include "objc/runtime.h" #include "objc/thr.h" +#include "objc-private/module-abi-8.h" #include "objc-private/runtime.h" #include "objc-private/sarray.h" -#include "objc/encoding.h" +#include "objc-private/selector.h" /* For sel_is_mapped() */ #include "runtime-info.h" #include /* For assert */ #include /* For strlen */ @@ -50,7 +51,7 @@ see the files COPYING3 and COPYING.RUNTIME respect #define gen_rtx(args...) 1 #define gen_rtx_MEM(args...) 1 #define gen_rtx_REG(args...) 1 -/* Alread defined in gcc/coretypes.h. So prevent double definition warning. */ +/* Already defined in gcc/coretypes.h. So prevent double definition warning. */ #undef rtx #define rtx int @@ -448,17 +449,26 @@ IMP objc_msg_lookup_super (struct objc_super *super, SEL sel) { if (super->self) - return get_imp (super->class, sel); + return get_imp (super->super_class, sel); else return (IMP)nil_method; } -int method_get_sizeof_arguments (Method *); +/* Temporarily defined here until objc_msg_sendv() goes away. */ +char *method_get_first_argument (struct objc_method *, + arglist_t argframe, + const char **type); +char *method_get_next_argument (arglist_t argframe, + const char **type); +int method_get_sizeof_arguments (struct objc_method *); +struct objc_method * +class_get_instance_method (Class class, SEL op); + retval_t objc_msg_sendv (id object, SEL op, arglist_t arg_frame) { - Method *m = class_get_instance_method (object->class_pointer, op); + struct objc_method *m = class_get_instance_method (object->class_pointer, op); const char *type; *((id *) method_get_first_argument (m, arg_frame, &type)) = object; *((SEL *) method_get_next_argument (arg_frame, &type)) = op; @@ -473,8 +483,8 @@ __objc_init_dispatch_tables () __objc_uninstalled_dtable = sarray_new (200, 0); /* TODO: It would be cool to register typed selectors here. */ - selector_resolveClassMethod = sel_register_name ("resolveClassMethod:"); - selector_resolveInstanceMethod =sel_register_name ("resolveInstanceMethod:"); + selector_resolveClassMethod = sel_registerName ("resolveClassMethod:"); + selector_resolveInstanceMethod =sel_registerName ("resolveInstanceMethod:"); } /* This function is called by objc_msg_lookup when the dispatch table @@ -548,7 +558,7 @@ __objc_send_initialize (Class class) __objc_send_initialize (class->super_class); { - SEL op = sel_register_name ("initialize"); + SEL op = sel_registerName ("initialize"); IMP imp = 0; struct objc_method_list * method_list = class->class_pointer->methods; @@ -750,7 +760,7 @@ class_addMethod (Class class_, SEL selector, IMP i || method_types == NULL || (strcmp (method_types, "") == 0)) return NO; - method_name = sel_get_name (selector); + method_name = sel_getName (selector); if (method_name == NULL) return NO; @@ -953,14 +963,14 @@ __objc_forward (id object, SEL sel, arglist_t args /* The object doesn't recognize the method. Check for responding to error:. If it does then sent it. */ { - char msg[256 + strlen ((const char *) sel_get_name (sel)) + char msg[256 + strlen ((const char *) sel_getName (sel)) + strlen ((const char *) object->class_pointer->name)]; sprintf (msg, "(%s) %s does not recognize %s", (CLS_ISMETA (object->class_pointer) ? "class" : "instance" ), - object->class_pointer->name, sel_get_name (sel)); + object->class_pointer->name, sel_getName (sel)); /* TODO: support for error: is surely deprecated ? */ err_sel = sel_get_any_uid ("error:"); @@ -1012,7 +1022,7 @@ __objc_print_dtable_stats () dispatch table points to __objc_uninstalled_dtable then that means it needs its dispatch table to be installed. */ struct sarray * -objc_get_uninstalled_dtable () +objc_get_uninstalled_dtable (void) { return __objc_uninstalled_dtable; } Index: objc-private/selector.h =================================================================== --- objc-private/selector.h (revision 0) +++ objc-private/selector.h (revision 0) @@ -0,0 +1,52 @@ +/* GNU Objective C Runtime selector implementation - Private functions + Copyright (C) 2010 Free Software Foundation, Inc. + Contributed by Nicola Pero + +This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify it under the +terms of the GNU General Public License as published by the Free Software +Foundation; either version 3, or (at your option) any later version. + +GCC is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +details. + +Under Section 7 of GPL version 3, you are granted additional +permissions described in the GCC Runtime Library Exception, version +3.1, as published by the Free Software Foundation. + +You should have received a copy of the GNU General Public License and +a copy of the GCC Runtime Library Exception along with this program; +see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +. */ + +#ifndef __objc_private_selector_INCLUDE_GNU +#define __objc_private_selector_INCLUDE_GNU + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +/* Private runtime functions that may go away or be rewritten or + replaced. */ + +/* Return whether a selector is mapped or not ("mapped" meaning that + it has been inserted into the selector table). This is private as + only the runtime should ever encounter or need to know about + unmapped selectors. */ +BOOL sel_is_mapped (SEL aSel); + +/* Return selector representing name without registering it if it + doesn't exist. Typically used internally by the runtime when it's + looking up methods that may or may not exist (such as +initialize) + in the most efficient way. */ +SEL +sel_get_any_uid (const char *name); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* not __objc_private_selector_INCLUDE_GNU */ Index: ChangeLog =================================================================== --- ChangeLog (revision 167954) +++ ChangeLog (working copy) @@ -1,3 +1,20 @@ +2010-12-16 Nicola Pero + + * sendmsg.c: Include objc/runtime.h instead of objc/objc-api.h. + Include objc-private/module-abi-8.h and objc-private/selector.h + instead of objc/encoding.h. + (objc_msg_lookup_super): Use super->super_class instead of + super->class. + (method_get_first_argument, method_get_next_argument): Declare + locally. + (class_get_instance_method): Declare before using. + (objc_msg_sendv): Use 'struct objc_method' instead of 'Method'. + (__objc_init_dispatch_tables, __objc_send_initialize): Use + sel_registerName() instead of sel_register_name(). + (__objc_forward): Use sel_getName() instead of sel_get_name(). + (objc_get_uninstalled_dtable): Use 'void' as argument. + * objc-private/selector.h: New. + 2010-12-15 Nicola Pero * objc/message.h (objc_super): When using the modern API, do not