From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org, aurelien@aurel32.net, blauwirbel@gmail.com, jan.kiszka@siemes.com, mtosatti@redhat.com Subject: [PATCH v3 uq/master 09/22] target-sh4: move intr_at_halt out of cpu_halted() Date: Mon, 28 Feb 2011 10:10:11 +0100 [thread overview] Message-ID: <1298884224-19734-10-git-send-email-pbonzini@redhat.com> (raw) In-Reply-To: <1298884224-19734-1-git-send-email-pbonzini@redhat.com> From: Aurelien Jarno <aurelien@aurel32.net> All targets except SH4 have the same cpu_halted() routine, and it has only one caller. It is therefore a good candidate for inlining. The difference is the handling of the intr_at_halt, which is necessary to ignore SR.BL when sleeping. Move intr_at_halt handling out of it, by setting this variable while executing the sleep instruction, and clearing it when the CPU has been woken-up by an interrupt, whatever the state of SR.BL. Also rename this variable in_sleep. Cc: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> --- target-sh4/cpu.h | 2 +- target-sh4/exec.h | 1 - target-sh4/helper.c | 4 ++-- target-sh4/op_helper.c | 1 + 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target-sh4/cpu.h b/target-sh4/cpu.h index 789d188..74ff97a 100644 --- a/target-sh4/cpu.h +++ b/target-sh4/cpu.h @@ -184,7 +184,7 @@ typedef struct CPUSH4State { uint32_t cvr; /* Cache Version Register */ void *intc_handle; - int intr_at_halt; /* SR_BL ignored during sleep */ + int in_sleep; /* SR_BL ignored during sleep */ memory_content *movcal_backup; memory_content **movcal_backup_tail; } CPUSH4State; diff --git a/target-sh4/exec.h b/target-sh4/exec.h index 2999c02..61bc121 100644 --- a/target-sh4/exec.h +++ b/target-sh4/exec.h @@ -37,7 +37,6 @@ static inline int cpu_halted(CPUState *env) { return 0; if (cpu_has_work(env)) { env->halted = 0; - env->intr_at_halt = 1; return 0; } return EXCP_HALTED; diff --git a/target-sh4/helper.c b/target-sh4/helper.c index d2038bd..8f36d31 100644 --- a/target-sh4/helper.c +++ b/target-sh4/helper.c @@ -90,11 +90,11 @@ void do_interrupt(CPUState * env) if (do_exp && env->exception_index != 0x1e0) { env->exception_index = 0x000; /* masked exception -> reset */ } - if (do_irq && !env->intr_at_halt) { + if (do_irq && !env->in_sleep) { return; /* masked */ } - env->intr_at_halt = 0; } + env->in_sleep = 0; if (do_irq) { irq_vector = sh_intc_get_pending_vector(env->intc_handle, diff --git a/target-sh4/op_helper.c b/target-sh4/op_helper.c index 30f9842..b8f4ca2 100644 --- a/target-sh4/op_helper.c +++ b/target-sh4/op_helper.c @@ -119,6 +119,7 @@ void helper_debug(void) void helper_sleep(uint32_t next_pc) { env->halted = 1; + env->in_sleep = 1; env->exception_index = EXCP_HLT; env->pc = next_pc; cpu_loop_exit(); -- 1.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Paolo Bonzini <pbonzini@redhat.com> To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, jan.kiszka@siemes.com, aurelien@aurel32.net, kvm@vger.kernel.org, mtosatti@redhat.com Subject: [Qemu-devel] [PATCH v3 uq/master 09/22] target-sh4: move intr_at_halt out of cpu_halted() Date: Mon, 28 Feb 2011 10:10:11 +0100 [thread overview] Message-ID: <1298884224-19734-10-git-send-email-pbonzini@redhat.com> (raw) In-Reply-To: <1298884224-19734-1-git-send-email-pbonzini@redhat.com> From: Aurelien Jarno <aurelien@aurel32.net> All targets except SH4 have the same cpu_halted() routine, and it has only one caller. It is therefore a good candidate for inlining. The difference is the handling of the intr_at_halt, which is necessary to ignore SR.BL when sleeping. Move intr_at_halt handling out of it, by setting this variable while executing the sleep instruction, and clearing it when the CPU has been woken-up by an interrupt, whatever the state of SR.BL. Also rename this variable in_sleep. Cc: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> --- target-sh4/cpu.h | 2 +- target-sh4/exec.h | 1 - target-sh4/helper.c | 4 ++-- target-sh4/op_helper.c | 1 + 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target-sh4/cpu.h b/target-sh4/cpu.h index 789d188..74ff97a 100644 --- a/target-sh4/cpu.h +++ b/target-sh4/cpu.h @@ -184,7 +184,7 @@ typedef struct CPUSH4State { uint32_t cvr; /* Cache Version Register */ void *intc_handle; - int intr_at_halt; /* SR_BL ignored during sleep */ + int in_sleep; /* SR_BL ignored during sleep */ memory_content *movcal_backup; memory_content **movcal_backup_tail; } CPUSH4State; diff --git a/target-sh4/exec.h b/target-sh4/exec.h index 2999c02..61bc121 100644 --- a/target-sh4/exec.h +++ b/target-sh4/exec.h @@ -37,7 +37,6 @@ static inline int cpu_halted(CPUState *env) { return 0; if (cpu_has_work(env)) { env->halted = 0; - env->intr_at_halt = 1; return 0; } return EXCP_HALTED; diff --git a/target-sh4/helper.c b/target-sh4/helper.c index d2038bd..8f36d31 100644 --- a/target-sh4/helper.c +++ b/target-sh4/helper.c @@ -90,11 +90,11 @@ void do_interrupt(CPUState * env) if (do_exp && env->exception_index != 0x1e0) { env->exception_index = 0x000; /* masked exception -> reset */ } - if (do_irq && !env->intr_at_halt) { + if (do_irq && !env->in_sleep) { return; /* masked */ } - env->intr_at_halt = 0; } + env->in_sleep = 0; if (do_irq) { irq_vector = sh_intc_get_pending_vector(env->intc_handle, diff --git a/target-sh4/op_helper.c b/target-sh4/op_helper.c index 30f9842..b8f4ca2 100644 --- a/target-sh4/op_helper.c +++ b/target-sh4/op_helper.c @@ -119,6 +119,7 @@ void helper_debug(void) void helper_sleep(uint32_t next_pc) { env->halted = 1; + env->in_sleep = 1; env->exception_index = EXCP_HLT; env->pc = next_pc; cpu_loop_exit(); -- 1.7.4
next prev parent reply other threads:[~2011-02-28 9:13 UTC|newest] Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-02-28 9:10 [PATCH v3 uq/master 00/22] Win32 iothread support Paolo Bonzini 2011-02-28 9:10 ` [Qemu-devel] " Paolo Bonzini 2011-02-28 9:10 ` [PATCH v3 uq/master 01/22] unlock iothread during WaitForMultipleObjects Paolo Bonzini 2011-02-28 9:10 ` [Qemu-devel] " Paolo Bonzini 2011-02-28 9:10 ` [PATCH v3 uq/master 02/22] implement win32 dynticks timer Paolo Bonzini 2011-02-28 9:10 ` [Qemu-devel] " Paolo Bonzini 2011-02-28 9:10 ` [PATCH v3 uq/master 03/22] use win32 timer queues Paolo Bonzini 2011-02-28 9:10 ` [Qemu-devel] " Paolo Bonzini 2011-02-28 9:10 ` [PATCH v3 uq/master 04/22] Refactor thread retrieval and check Paolo Bonzini 2011-02-28 9:10 ` [Qemu-devel] " Paolo Bonzini 2011-02-28 9:10 ` [PATCH v3 uq/master 05/22] add win32 qemu-thread implementation Paolo Bonzini 2011-02-28 9:10 ` [Qemu-devel] " Paolo Bonzini 2011-02-28 9:33 ` Stefan Hajnoczi 2011-02-28 9:33 ` [Qemu-devel] " Stefan Hajnoczi 2011-02-28 10:14 ` [PATCH v4 uq/master] " Paolo Bonzini 2011-02-28 10:14 ` [Qemu-devel] " Paolo Bonzini 2011-02-28 9:10 ` [PATCH v3 uq/master 06/22] include qemu-thread.h early Paolo Bonzini 2011-02-28 9:10 ` [Qemu-devel] " Paolo Bonzini 2011-02-28 9:10 ` [PATCH v3 uq/master 07/22] add assertions on the owner of a QemuMutex Paolo Bonzini 2011-02-28 9:10 ` [Qemu-devel] " Paolo Bonzini 2011-02-28 9:10 ` [PATCH v3 uq/master 08/22] remove CONFIG_THREAD Paolo Bonzini 2011-02-28 9:10 ` [Qemu-devel] " Paolo Bonzini 2011-02-28 9:10 ` Paolo Bonzini [this message] 2011-02-28 9:10 ` [Qemu-devel] [PATCH v3 uq/master 09/22] target-sh4: move intr_at_halt out of cpu_halted() Paolo Bonzini 2011-02-28 9:10 ` [PATCH v3 uq/master 10/22] inline cpu_halted into sole caller Paolo Bonzini 2011-02-28 9:10 ` [Qemu-devel] " Paolo Bonzini 2011-02-28 9:10 ` [PATCH v3 uq/master 11/22] always qemu_cpu_kick after unhalting a cpu Paolo Bonzini 2011-02-28 9:10 ` [Qemu-devel] " Paolo Bonzini 2011-02-28 9:10 ` [PATCH v3 uq/master 12/22] exit round-robin vcpu loop if cpu->stopped is true Paolo Bonzini 2011-02-28 9:10 ` [Qemu-devel] " Paolo Bonzini 2011-02-28 9:10 ` [PATCH v3 uq/master 13/22] always signal pause_cond after stopping a VCPU Paolo Bonzini 2011-02-28 9:10 ` [Qemu-devel] " Paolo Bonzini 2011-02-28 9:10 ` [PATCH v3 uq/master 14/22] do not use timedwait on qemu_halt_cond Paolo Bonzini 2011-02-28 9:10 ` [Qemu-devel] " Paolo Bonzini 2011-02-28 9:10 ` [PATCH v3 uq/master 15/22] do not use timedwait on qemu_system_cond Paolo Bonzini 2011-02-28 9:10 ` [Qemu-devel] " Paolo Bonzini 2011-02-28 9:10 ` [PATCH v3 uq/master 16/22] do not use timedwait on qemu_pause_cond Paolo Bonzini 2011-02-28 9:10 ` [Qemu-devel] " Paolo Bonzini 2011-02-28 9:10 ` [PATCH v3 uq/master 17/22] do not use timedwait on qemu_cpu_cond Paolo Bonzini 2011-02-28 9:10 ` [Qemu-devel] " Paolo Bonzini 2011-02-28 9:10 ` [PATCH v3 uq/master 18/22] iothread stops the vcpu thread via IPI Paolo Bonzini 2011-02-28 9:10 ` [Qemu-devel] " Paolo Bonzini 2011-02-28 9:10 ` [PATCH v3 uq/master 19/22] merge all signal initialization with qemu_signalfd_init, rename Paolo Bonzini 2011-02-28 9:10 ` [Qemu-devel] " Paolo Bonzini 2011-02-28 9:10 ` [PATCH v3 uq/master 20/22] provide dummy signal init functions for win32 Paolo Bonzini 2011-02-28 9:10 ` [Qemu-devel] " Paolo Bonzini 2011-02-28 9:10 ` [PATCH v3 uq/master 21/22] protect qemu_cpu_kick_self for Win32 Paolo Bonzini 2011-02-28 9:10 ` [Qemu-devel] " Paolo Bonzini 2011-02-28 9:10 ` [PATCH v3 uq/master 22/22] add Win32 IPI service Paolo Bonzini 2011-02-28 9:10 ` [Qemu-devel] " Paolo Bonzini 2011-02-28 9:16 ` [PATCH v3 uq/master 00/22] Win32 iothread support Avi Kivity 2011-02-28 9:16 ` [Qemu-devel] " Avi Kivity 2011-02-28 10:10 ` Paolo Bonzini 2011-02-28 10:10 ` [Qemu-devel] " Paolo Bonzini 2011-02-28 11:57 ` Jan Kiszka 2011-02-28 11:57 ` [Qemu-devel] " Jan Kiszka 2011-02-28 12:13 ` Avi Kivity 2011-02-28 12:13 ` [Qemu-devel] " Avi Kivity 2011-02-28 14:05 ` Paolo Bonzini 2011-02-28 14:05 ` [Qemu-devel] " Paolo Bonzini 2011-03-01 12:35 ` Avi Kivity 2011-03-01 12:35 ` [Qemu-devel] " Avi Kivity 2011-03-02 18:43 ` Marcelo Tosatti 2011-03-02 18:43 ` [Qemu-devel] " Marcelo Tosatti 2011-03-02 19:03 ` Jan Kiszka 2011-03-02 19:03 ` [Qemu-devel] " Jan Kiszka 2011-03-02 19:36 ` Marcelo Tosatti 2011-03-02 19:36 ` [Qemu-devel] " Marcelo Tosatti 2011-03-02 19:42 ` Marcelo Tosatti 2011-03-02 19:42 ` [Qemu-devel] " Marcelo Tosatti 2011-03-03 8:48 ` Avi Kivity 2011-03-03 8:48 ` [Qemu-devel] " Avi Kivity 2011-03-03 9:07 ` Jan Kiszka 2011-03-03 9:07 ` [Qemu-devel] " Jan Kiszka 2011-03-03 9:12 ` Avi Kivity 2011-03-03 9:12 ` [Qemu-devel] " Avi Kivity 2011-03-03 9:13 ` Paolo Bonzini 2011-03-03 9:13 ` [Qemu-devel] " Paolo Bonzini 2011-03-03 9:28 ` Avi Kivity 2011-03-03 9:28 ` [Qemu-devel] " Avi Kivity
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=1298884224-19734-10-git-send-email-pbonzini@redhat.com \ --to=pbonzini@redhat.com \ --cc=aurelien@aurel32.net \ --cc=blauwirbel@gmail.com \ --cc=jan.kiszka@siemes.com \ --cc=kvm@vger.kernel.org \ --cc=mtosatti@redhat.com \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.