ethonion10/v86
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Idle when emulated CPU is idle in a hlt loop

Browse source
This commit is contained in:
copy 2014-06-22 19:10:35 +02:00
parent 5fb79787cf
commit 5842950cf2
1 changed files with 43 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/cpu.macro.js
View file

@ -292,7 +292,14 @@ v86.prototype.main_run = function()
this.running = true;
try {
this.do_run();
if(this.in_hlt)
{
this.hlt_loop();
}
else
{
this.do_run();
}
}
catch(e)
{
@ -769,6 +776,7 @@ if(typeof window !== "undefined")
{
window.__no_inline1 = v86.prototype.do_run;
window.__no_inline2 = v86.prototype.exception_cleanup;
window.__no_inline3 = v86.prototype.hlt_loop;
};
/**
@ -794,6 +802,35 @@ v86.prototype.cycle = function()
}
};
v86.prototype.hlt_loop = function()
{
var now = Date.now();
if(ENABLE_HPET)
{
this.devices.pit.timer(now, this.devices.hpet.legacy_mode);
this.devices.rtc.timer(now, this.devices.hpet.legacy_mode);
this.devices.hpet.timer(now);
}
else
{
this.devices.pit.timer(now, false);
this.devices.rtc.timer(now, false);
}
this.devices.vga.timer(now);
if(this.in_hlt)
{
var me = this;
setTimeout(function() { me.hlt_loop(); }, 0);
}
else
{
this.next_tick();
}
};
v86.prototype.cr0_changed = function(old_cr0)
{
//this.protected_mode = (this.cr0 & 1) === 1;
@ -1203,12 +1240,9 @@ v86.prototype.call_interrupt_vector = function(interrupt_nr, is_software_int, er
//}
if(this.in_hlt)
{
// return to the instruction following the hlt
this.instruction_pointer = this.instruction_pointer + 1 | 0;
this.in_hlt = false;
}
// we have to leave hlt_loop at some point, this is a
// good place to do it
this.in_hlt = false;
// This function could be called from 1) an INT instruction
// 2) an instruction that caused an exception 3) an external interrupt
@ -1683,11 +1717,9 @@ v86.prototype.hlt_op = function()
}
else
{
// infinite loop until an irq happens
// this is handled in call_interrupt_vector
this.instruction_pointer--;
// get out of here and into hlt_loop
this.in_hlt = true;
//throw MAGIC_CPU_EXCEPTION;
throw MAGIC_CPU_EXCEPTION;
}
};