From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 01 Aug 2006 10:28:24 +0100 (BST) Received: from nf-out-0910.google.com ([64.233.182.190]:5656 "EHLO nf-out-0910.google.com") by ftp.linux-mips.org with ESMTP id S8133520AbWHAJ2M (ORCPT ); Tue, 1 Aug 2006 10:28:12 +0100 Received: by nf-out-0910.google.com with SMTP id q29so210810nfc for ; Tue, 01 Aug 2006 02:28:12 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=rYzHTeHf3KbZcQIiBSxiuY1aFBpQv4O0vOZC5ydjXWSRGHSGAcl+6xMsNDIZU23SY0+pqnty+MSOigXm7i6rcVSUxEYXkzFTvhIMhcrisF0nabtqx1clmdQUNyjEjBVnI9H4xxNCE/Wm0egoD7zRSeXo4yJP5pbx2xgqanpd1Hs= Received: by 10.49.10.3 with SMTP id n3mr391243nfi; Tue, 01 Aug 2006 02:28:11 -0700 (PDT) Received: from spoutnik.innova-card.com ( [194.3.162.233]) by mx.gmail.com with ESMTP id m16sm695230nfc.2006.08.01.02.28.11; Tue, 01 Aug 2006 02:28:11 -0700 (PDT) Received: by spoutnik.innova-card.com (Postfix, from userid 500) id 4BE7A23F759; Tue, 1 Aug 2006 11:27:18 +0200 (CEST) From: Franck Bui-Huu To: anemo@mba.ocn.ne.jp Cc: ralf@linux-mips.org, linux-mips@linux-mips.org, Franck Bui-Huu Subject: [PATCH 1/7] Make get_frame_info() more readable. Date: Tue, 1 Aug 2006 11:27:11 +0200 Message-Id: <11544244383201-git-send-email-vagabon.xyz@gmail.com> X-Mailer: git-send-email 1.4.2.rc2 In-Reply-To: <11544244373398-git-send-email-vagabon.xyz@gmail.com> References: <11544244373398-git-send-email-vagabon.xyz@gmail.com> Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 12140 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: vagabon.xyz@gmail.com Precedence: bulk X-list: linux-mips Signed-off-by: Atsushi Nemoto Signed-off-by: Franck Bui-Huu --- arch/mips/kernel/process.c | 63 ++++++++++++++++++++++---------------------- 1 files changed, 32 insertions(+), 31 deletions(-) diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c index 8709a46..8d0e4fa 100644 --- a/arch/mips/kernel/process.c +++ b/arch/mips/kernel/process.c @@ -281,48 +281,49 @@ static struct mips_frame_info { } *schedule_frame, mfinfo[64]; static int mfinfo_num; +static inline int is_ra_save_ins(union mips_instruction *pc) +{ + /* sw / sd $ra, offset($sp) */ + return (pc->i_format.opcode == sw_op || pc->i_format.opcode == sd_op) && + pc->i_format.rs == 29 && + pc->i_format.rt == 31; +} + +static inline int is_jal_jalr_jr_ins(union mips_instruction *pc) +{ + return pc->j_format.opcode == jal_op || + (pc->r_format.opcode == spec_op && + (pc->r_format.func == jalr_op || pc->r_format.func == jr_op)); +} + +static inline int is_sp_move_ins(union mips_instruction *pc) +{ + /* addiu/daddiu sp,sp,-imm */ + return (pc->i_format.opcode == addiu_op || pc->i_format.opcode == daddiu_op) && \ + pc->i_format.rs == 29 && \ + pc->i_format.rt == 29; +} + static int get_frame_info(struct mips_frame_info *info) { - int i; - void *func = info->func; - union mips_instruction *ip = (union mips_instruction *)func; + union mips_instruction *ip = info->func; + int i, max_insns = + min(128UL, info->func_size / sizeof(union mips_instruction)); + info->pc_offset = -1; info->frame_size = 0; - for (i = 0; i < 128; i++, ip++) { - /* if jal, jalr, jr, stop. */ - if (ip->j_format.opcode == jal_op || - (ip->r_format.opcode == spec_op && - (ip->r_format.func == jalr_op || - ip->r_format.func == jr_op))) - break; - if (info->func_size && i >= info->func_size / 4) + for (i = 0; i < max_insns; i++, ip++) { + + if (is_jal_jalr_jr_ins(ip)) break; - if ( -#ifdef CONFIG_32BIT - ip->i_format.opcode == addiu_op && -#endif -#ifdef CONFIG_64BIT - ip->i_format.opcode == daddiu_op && -#endif - ip->i_format.rs == 29 && - ip->i_format.rt == 29) { - /* addiu/daddiu sp,sp,-imm */ + if (is_sp_move_ins(ip)) { if (info->frame_size) continue; info->frame_size = - ip->i_format.simmediate; } - if ( -#ifdef CONFIG_32BIT - ip->i_format.opcode == sw_op && -#endif -#ifdef CONFIG_64BIT - ip->i_format.opcode == sd_op && -#endif - ip->i_format.rs == 29 && - ip->i_format.rt == 31) { - /* sw / sd $ra, offset($sp) */ + if (is_ra_save_ins(ip)) { if (info->pc_offset != -1) continue; info->pc_offset = -- 1.4.2.rc2