From: Aurelien Jarno <aurelien@aurel32.net>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [5220] SH4: sleep instruction bug fix
Date: Mon, 15 Sep 2008 06:42:30 +0000 [thread overview]
Message-ID: <E1Kf7n4-0002xZ-KV@cvs.savannah.gnu.org> (raw)
Revision: 5220
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5220
Author: aurel32
Date: 2008-09-15 06:42:30 +0000 (Mon, 15 Sep 2008)
Log Message:
-----------
SH4: sleep instruction bug fix
fix a bug on 'sleep' instruction, which have caused halt of idle task.
As i386 'hlt' instruction does, it should save PC before sleep.
(Shin-ichiro KAWASAKI)
Modified Paths:
--------------
trunk/target-sh4/helper.h
trunk/target-sh4/op_helper.c
trunk/target-sh4/translate.c
Modified: trunk/target-sh4/helper.h
===================================================================
--- trunk/target-sh4/helper.h 2008-09-14 19:16:21 UTC (rev 5219)
+++ trunk/target-sh4/helper.h 2008-09-15 06:42:30 UTC (rev 5220)
@@ -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))
Modified: trunk/target-sh4/op_helper.c
===================================================================
--- trunk/target-sh4/op_helper.c 2008-09-14 19:16:21 UTC (rev 5219)
+++ trunk/target-sh4/op_helper.c 2008-09-15 06:42:30 UTC (rev 5220)
@@ -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();
}
Modified: trunk/target-sh4/translate.c
===================================================================
--- trunk/target-sh4/translate.c 2008-09-14 19:16:21 UTC (rev 5219)
+++ trunk/target-sh4/translate.c 2008-09-15 06:42:30 UTC (rev 5220)
@@ -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;
reply other threads:[~2008-09-15 6:42 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1Kf7n4-0002xZ-KV@cvs.savannah.gnu.org \
--to=aurelien@aurel32.net \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).