From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Kf6dz-0000hO-Kl for qemu-devel@nongnu.org; Mon, 15 Sep 2008 01:29:03 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Kf6dy-0000hC-2j for qemu-devel@nongnu.org; Mon, 15 Sep 2008 01:29:02 -0400 Received: from [199.232.76.173] (port=52382 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Kf6dx-0000h9-TL for qemu-devel@nongnu.org; Mon, 15 Sep 2008 01:29:01 -0400 Received: from vsmtp02.dti.ne.jp ([202.216.231.137]:61546) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Kf6dx-00067T-Kv for qemu-devel@nongnu.org; Mon, 15 Sep 2008 01:29:02 -0400 Received: from [192.168.1.21] (PPPa1372.e11.eacc.dti.ne.jp [124.255.91.108]) by vsmtp02.dti.ne.jp (3.11v) with ESMTP AUTH id m8F5Sv1H012535 for ; Mon, 15 Sep 2008 14:28:57 +0900 (JST) Message-ID: <48CDF295.4030703@juno.dti.ne.jp> Date: Mon, 15 Sep 2008 14:28:53 +0900 From: Shin-ichiro KAWASAKI MIME-Version: 1.0 Subject: [PATCH] [RESEND] SH4 : sleep instruction bug fix (was Re: [Qemu-devel] [PATCH] SH4: Serial controller improvement and sleep op bug fix) References: <48C3E662.1010204@juno.dti.ne.jp> <20080914165648.GE22422@volta.aurel32.net> In-Reply-To: <20080914165648.GE22422@volta.aurel32.net> Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Thank you for your response! Aurelien Jarno wrote: > On Sun, Sep 07, 2008 at 11:34:10PM +0900, Shin-ichiro KAWASAKI wrote: > > Next time could you please send two different patches, so that one patch > doesn't block the other. I see. I'll do so next time. Working with this patch, I'll resend twice to divide into sleep instruction part and serial part. >> Index: target-sh4/helper.h >> =================================================================== >> --- target-sh4/helper.h (revision 5132) >> +++ target-sh4/helper.h (working copy) >> @@ -6,7 +6,7 @@ >> DEF_HELPER(void, helper_raise_illegal_instruction, (void)) >> DEF_HELPER(void, helper_raise_slot_illegal_instruction, (void)) >> DEF_HELPER(void, helper_debug, (void)) >> -DEF_HELPER(void, helper_sleep, (void)) >> +DEF_HELPER(void, helper_sleep, (int32_t)) >> DEF_HELPER(void, helper_trapa, (uint32_t)) >> >> DEF_HELPER(uint32_t, helper_addv, (uint32_t, uint32_t)) >> Index: target-sh4/op_helper.c >> =================================================================== >> --- target-sh4/op_helper.c (revision 5132) >> +++ target-sh4/op_helper.c (working copy) >> @@ -94,10 +94,11 @@ >> cpu_loop_exit(); >> } >> >> -void helper_sleep(void) >> +void helper_sleep(int32_t next_pc) > > Given then env->pc is unsigned, I think it should be uint32_t instead of > int32_t here. Same in helper.h This is my mistake. Thanks for pointing it out. This mail is attached with new patch of sleep instruction part. Regards, Shin-ichiro KAWASAKI Index: trunk/target-sh4/helper.h =================================================================== --- trunk/target-sh4/helper.h (revision 5219) +++ trunk/target-sh4/helper.h (working copy) @@ -6,7 +6,7 @@ DEF_HELPER(void, helper_raise_illegal_instruction, (void)) DEF_HELPER(void, helper_raise_slot_illegal_instruction, (void)) DEF_HELPER(void, helper_debug, (void)) -DEF_HELPER(void, helper_sleep, (void)) +DEF_HELPER(void, helper_sleep, (uint32_t)) DEF_HELPER(void, helper_trapa, (uint32_t)) DEF_HELPER(uint32_t, helper_addv, (uint32_t, uint32_t)) Index: trunk/target-sh4/op_helper.c =================================================================== --- trunk/target-sh4/op_helper.c (revision 5219) +++ trunk/target-sh4/op_helper.c (working copy) @@ -94,10 +94,11 @@ cpu_loop_exit(); } -void helper_sleep(void) +void helper_sleep(uint32_t next_pc) { env->halted = 1; env->exception_index = EXCP_HLT; + env->pc = next_pc; cpu_loop_exit(); } Index: trunk/target-sh4/translate.c =================================================================== --- trunk/target-sh4/translate.c (revision 5219) +++ trunk/target-sh4/translate.c (working copy) @@ -505,7 +505,7 @@ return; case 0x001b: /* sleep */ if (ctx->memidx) { - tcg_gen_helper_0_0(helper_sleep); + tcg_gen_helper_0_1(helper_sleep, tcg_const_i32(ctx->pc + 2)); } else { tcg_gen_helper_0_0(helper_raise_illegal_instruction); ctx->bstate = BS_EXCP;