Retro/pcjs
Watch
1
0
Fork
You've already forked pcjs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Setting the stage for a resource status update mechanism

Browse source
This commit is contained in:
Jeff Parsons 2017-06-27 16:01:00 -07:00 • committed by Jeff Parsons
commit 2cb0be42f0
36 changed files with 872 additions and 773 deletions
Download patch file Download diff file Expand all files Collapse all files

26
modules/pcx86/lib/rom.js
View file

@ -85,7 +85,6 @@ class ROM extends Component {
* Most ROMs are not aliased, in which case the 'alias' property should have the default value of null.
*/
this.addrAlias = parmsROM['alias'];
this.sFilePath = parmsROM['file'];
/*
* The 'notify' property can now (as of v1.18.2) contain an array of parameters that the notified
@ -107,10 +106,12 @@ class ROM extends Component {
this.idNotify = this.idNotify.substr(0, i);
}
}
if (this.sFilePath) {
var sFileURL = this.sFilePath;
var sFileName = Str.getBaseName(sFileURL);
if (DEBUG) this.log('load("' + sFileURL + '")');
this.sFileURL = this.sFilePath = parmsROM['file'];
if (this.sFileURL) {
var sFileName = Str.getBaseName(this.sFileURL);
if (DEBUG) this.log('load("' + this.sFileURL + '")');
/*
* If the selected ROM file has a ".json" extension, then we assume it's pre-converted
* JSON-encoded ROM data, so we load it as-is; ditto for ROM files with a ".hex" extension.
@ -118,12 +119,8 @@ class ROM extends Component {
*/
var sFileExt = Str.getExtension(sFileName);
if (sFileExt != DumpAPI.FORMAT.JSON && sFileExt != DumpAPI.FORMAT.HEX) {
sFileURL = Web.getHost() + DumpAPI.ENDPOINT + '?' + DumpAPI.QUERY.FILE + '=' + this.sFilePath + '&' + DumpAPI.QUERY.FORMAT + '=' + DumpAPI.FORMAT.BYTES + '&' + DumpAPI.QUERY.DECIMAL + '=true';
this.sFileURL = Web.getHost() + DumpAPI.ENDPOINT + '?' + DumpAPI.QUERY.FILE + '=' + this.sFilePath + '&' + DumpAPI.QUERY.FORMAT + '=' + DumpAPI.FORMAT.BYTES + '&' + DumpAPI.QUERY.DECIMAL + '=true';
}
var rom = this;
Web.getResource(sFileURL, null, true, function(sURL, sResponse, nErrorCode) {
rom.doneLoad(sURL, sResponse, nErrorCode);
});
}
}
@ -138,10 +135,17 @@ class ROM extends Component {
*/
initBus(cmp, bus, cpu, dbg)
{
var rom = this;
this.cmp = cmp;
this.bus = bus;
this.cpu = cpu;
this.dbg = dbg;
this.copyROM();
if (this.sFileURL) {
this.cmp.setResourceStatus(this.sFileURL);
Web.getResource(this.sFileURL, null, true, function(sURL, sResponse, nErrorCode) {
rom.doneLoad(sURL, sResponse, nErrorCode);
});
}
}
/**