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

Implement state restoration for sb16 and new dma

Browse source
This commit is contained in:
Ernest Wong 2017-11-20 09:43:02 +13:00 committed by Fabian
parent a218381dc7
commit cb704b9563
4 changed files with 138 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/cpu.js
View file

@ -325,15 +325,16 @@ CPU.prototype.get_state = function()
state[58] = this.devices.pit;
state[59] = this.devices.net;
state[60] = this.devices.pic;
state[61] = this.devices.sb16;
state[61] = this.a20_enabled;
state[62] = this.fw_value;
state[62] = this.a20_enabled;
state[63] = this.fw_value;
state[63] = this.devices.ioapic;
state[64] = this.devices.ioapic;
state[64] = this.tss_size_32;
state[65] = this.tss_size_32;
state[65] = this.reg_mmxs;
state[66] = this.reg_mmxs;
return state;
};
@ -400,15 +401,16 @@ CPU.prototype.set_state = function(state)
this.devices.pit = state[58];
this.devices.net = state[59];
this.devices.pic = state[60];
this.devices.sb16 = state[61];
this.a20_enabled = state[61];
this.fw_value = state[62];
this.a20_enabled = state[62];
this.fw_value = state[63];
this.devices.ioapic = state[63];
this.devices.ioapic = state[64];
this.tss_size_32 = state[64];
this.tss_size_32 = state[65];
this.reg_mmxs = state[65];
this.reg_mmxs = state[66];
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);

18
src/dma.js
View file

@ -111,17 +111,29 @@ function DMA(cpu)
DMA.prototype.get_state = function()
{
return [
this.channel_page,
this.channel_pagehi,
this.channel_addr,
this.channel_addr_init,
this.channel_count,
this.channel_count_init,
this.channel_mask,
this.channel_mode,
this.lsb_msb_flipflop,
];
};
DMA.prototype.set_state = function(state)
{
this.channel_addr = state[0];
this.channel_count = state[1];
this.lsb_msb_flipflop = state[2];
this.channel_page = state[0];
this.channel_pagehi = state[1];
this.channel_addr = state[2];
this.channel_addr_init = state[3];
this.channel_count = state[4];
this.channel_count_init = state[5];
this.channel_mask = state[6];
this.channel_mode = state[7];
this.lsb_msb_flipflop = state[8];
};
DMA.prototype.port_count_write = function(channel, data_byte)

111
src/sb16.js
View file

@ -104,6 +104,8 @@ function SB16(cpu, bus)
this.irq = SB_IRQ;
this.irq_triggered = new Uint8Array(0x10);
this.audio_samplerate = 48000;
// http://homepages.cae.wisc.edu/~brodskye/sb16doc/sb16doc.html#DSPPorts
cpu.io.register_read(0x220, this, this.port2x0_read);
@ -145,7 +147,6 @@ function SB16(cpu, bus)
cpu.io.register_write(0x330, this, this.port3x0_write);
cpu.io.register_write(0x331, this, this.port3x1_write);
this.audio_samplerate = 48000;
bus.register("speaker-samplerate", function(rate)
{
this.audio_samplerate = rate;
@ -209,6 +210,114 @@ SB16.prototype.reset_dsp = function()
this.asp_registers[9] = 0xF8;
}
SB16.prototype.get_state = function()
{
var state = [];
// state[ 0] = this.write_buffer ;
// state[ 1] = this.read_buffer ;
state[ 2] = this.read_buffer_lastvalue ;
state[ 3] = this.command ;
state[ 4] = this.command_size ;
state[ 5] = this.mixer_current_address ;
state[ 6] = this.mixer_unhandled_registers ;
state[ 7] = this.dummy_speaker_enabled ;
state[ 8] = this.test_register ;
state[ 9] = this.dsp_highspeed ;
state[10] = this.dsp_stereo ;
state[11] = this.dsp_16bit ;
state[12] = this.dsp_signed ;
// state[13] = this.dac_buffer ;
state[14] = this.dac_rate_ratio ;
state[15] = this.dma_sample_count ;
state[16] = this.dma_bytes_count ;
state[17] = this.dma_bytes_left ;
state[18] = this.dma_bytes_block ;
state[19] = this.dma_irq ;
state[20] = this.dma_channel ;
state[21] = this.dma_channel_8bit ;
state[22] = this.dma_channel_16bit ;
state[23] = this.dma_autoinit ;
state[24] = this.dma_buffer_uint8 ;
state[25] = this.sampling_rate ;
state[26] = this.bytes_per_sample ;
state[27] = this.e2_value ;
state[28] = this.e2_count ;
state[29] = this.asp_registers ;
// state[30] = this.mpu_read_buffer ;
state[31] = this.mpu_read_buffer_last_value;
state[32] = this.irq ;
state[33] = this.irq_triggered ;
state[34] = this.audio_samplerate ;
return state;
};
SB16.prototype.set_state = function(state)
{
// this.write_buffer = state[ 0];
// this.read_buffer = state[ 1];
this.read_buffer_lastvalue = state[ 2];
this.command = state[ 3];
this.command_size = state[ 4];
this.mixer_current_address = state[ 5];
this.mixer_unhandled_registers = state[ 6];
this.dummy_speaker_enabled = state[ 7];
this.test_register = state[ 8];
this.dsp_highspeed = state[ 9];
this.dsp_stereo = state[10];
this.dsp_16bit = state[11];
this.dsp_signed = state[12];
// this.dac_buffer = state[13];
this.dac_rate_ratio = state[14];
this.dma_sample_count = state[15];
this.dma_bytes_count = state[16];
this.dma_bytes_left = state[17];
this.dma_bytes_block = state[18];
this.dma_irq = state[19];
this.dma_channel = state[20];
this.dma_channel_8bit = state[21];
this.dma_channel_16bit = state[22];
this.dma_autoinit = state[23];
this.dma_buffer_uint8 = state[24];
this.sampling_rate = state[25];
this.bytes_per_sample = state[26];
this.e2_value = state[27];
this.e2_count = state[28];
this.asp_registers = state[29];
// this.mpu_read_buffer = state[30];
this.mpu_read_buffer_last_value = state[31];
this.irq = state[32];
this.irq_triggered = state[33];
this.audio_samplerate = state[34];
this.dma_buffer = this.dma_buffer_uint8.buffer;
this.dma_buffer_int8 = new Int8Array(this.dma_buffer);
this.dma_buffer_int16 = new Int16Array(this.dma_buffer);
this.dma_buffer_uint16 = new Uint16Array(this.dma_buffer);
this.dma_syncbuffer = new SyncBuffer(this.dma_buffer);
};
//

2
src/state.js
View file

@ -1,7 +1,7 @@
"use strict";
/** @const */
var STATE_VERSION = 3;
var STATE_VERSION = 4;
/** @const */
var STATE_MAGIC = 0x86768676|0;