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

Proper implementation of firmware control port as used by seabios and kvm-unit-test

Browse source
This commit is contained in:
copy 2017-03-23 13:03:12 -05:00
parent 8906f448e9
commit c520ea4549
2 changed files with 40 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/const.js
View file

@ -301,6 +301,11 @@ var MSR_PKG_C2_RESIDENCY = 0x60D;
/** @const */ var TSR_LDT = 0x60;
/** @const */ var FW_CFG_SIGNATURE = 0x00;
/** @const */ var FW_CFG_RAM_SIZE = 0x03;
/** @const */ var FW_CFG_NB_CPUS = 0x05;
/** @const */
var PREFIX_MASK_REP = 0b11000;
/** @const */

38
src/cpu.js
View file

@ -234,6 +234,9 @@ function CPU()
// debug registers
this.dreg = new Int32Array(8);
/** @type {number} */
this.fw_value = 0;
// dynamic instruction translator
this.translator = undefined;
@ -318,6 +321,7 @@ CPU.prototype.get_state = function()
state[60] = this.devices.pic;
state[61] = this.a20_enabled;
state[62] = this.fw_value;
return state;
};
@ -386,6 +390,7 @@ CPU.prototype.set_state = function(state)
this.devices.pic = state[60];
this.a20_enabled = state[61];
this.fw_value = state[62];
this.mem16 = new Uint16Array(this.mem8.buffer, this.mem8.byteOffset, this.mem8.length >> 1);
this.mem32s = new Int32Array(this.mem8.buffer, this.mem8.byteOffset, this.mem8.length >> 2);
@ -539,6 +544,8 @@ CPU.prototype.reset = function()
{
this.devices.virtio.reset();
}
this.fw_value = 0;
};
/** @export */
@ -602,8 +609,34 @@ CPU.prototype.init = function(settings, device_bus)
io.register_read(0x511, this, function()
{
// qemu config port (used by seabios)
return 0;
// bios config port (used by seabios and kvm-unit-test)
let result = this.fw_value & 0xFF;
this.fw_value >>>= 8;
return result;
});
io.register_write(0x510, this, undefined, function(value)
{
dbg_log("bios config port, index=" + h(value));
if(value === FW_CFG_SIGNATURE)
{
// We could pretend to be QEMU here to control certain options in
// seabios, but for now this isn't needed
this.fw_value = 0xfab0fab0|0;
}
else if(value === FW_CFG_RAM_SIZE)
{
this.fw_value = this.memory_size;
}
else if(value === FW_CFG_NB_CPUS)
{
this.fw_value = 1;
}
else
{
dbg_assert(false, "Unimplemented fw index: " + h(value));
this.fw_value = 0;
}
});
if(DEBUG)
@ -794,7 +827,6 @@ CPU.prototype.load_bios = function()
addr &= 0xFFFFF;
this.mem8[addr] = value;
}.bind(this));
};
CPU.prototype.do_run = function()