ehmry/genode
ehmry/genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vbox: don't enforce instruction emulation after recall event

Browse Source 
Fixes #1284
This commit is contained in:
Christian Prochaska 2014-11-11 13:16:52 +01:00 committed by Christian Helmuth
parent bc4eab430a
commit cb51d67c8d
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
repos/ports/src/virtualbox/nova/vcpu.h
View File

@ -131,6 +131,8 @@ class Vcpu_handler : public Vmm::Vcpu_dispatcher<pthread>
void * _stack_reply; void * _stack_reply;
jmp_buf _env; jmp_buf _env;
bool _last_exit_was_recall;
void switch_to_hw() void switch_to_hw()
{ {
unsigned long value; unsigned long value;
@ -171,9 +173,11 @@ class Vcpu_handler : public Vmm::Vcpu_dispatcher<pthread>
} }
/* are we forced to go back to emulation mode ? */ /* are we forced to go back to emulation mode ? */
if (!continue_hw_accelerated(utcb)) if (!continue_hw_accelerated(utcb)) {
_last_exit_was_recall = true;
/* go back to emulation mode */ /* go back to emulation mode */
_fpu_save_and_longjmp(); _fpu_save_and_longjmp();
}
/* check whether we have to request irq injection window */ /* check whether we have to request irq injection window */
utcb->mtd = Nova::Mtd::FPU; utcb->mtd = Nova::Mtd::FPU;
@ -695,6 +699,8 @@ class Vcpu_handler : public Vmm::Vcpu_dispatcher<pthread>
_current_vm = pVM; _current_vm = pVM;
_current_vcpu = pVCpu; _current_vcpu = pVCpu;
_last_exit_was_recall = false;
/* switch to hardware accelerated mode */ /* switch to hardware accelerated mode */
switch_to_hw(); switch_to_hw();
@ -735,7 +741,7 @@ class Vcpu_handler : public Vmm::Vcpu_dispatcher<pthread>
next_utcb.mtd |= Mtd::STA; next_utcb.mtd |= Mtd::STA;
} }
return VINF_EM_RAW_EMULATE_INSTR; return _last_exit_was_recall ? VINF_SUCCESS : VINF_EM_RAW_EMULATE_INSTR;
} }
}; };