6502/8bitworkshop
1
0
Fork 0
mirror of https://github.com/sehugg/8bitworkshop.git synced 2025-04-06 17:39:40 +00:00
Code Issues Projects Releases Wiki Activity

rearranged menu, fixed tests

Browse Source
This commit is contained in:
Steven Hugg 2020-07-08 18:04:23 -05:00
parent a053be8e14
commit cf13779310
5 changed files with 83 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
index.html
View File

@ -210,15 +210,21 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
</ul>
</li>
<li class="dropdown dropdown-submenu">
<a tabindex="-1" href="#">MAME Emulators</a>
<ul class="dropdown-menu">
<li><a class="dropdown-item" href="?platform=vcs.mame">Atari 2600 (MAME)</a></li>
<li><a class="dropdown-item" href="?platform=nes.mame">NES (MAME)</a></li>
<li><a class="dropdown-item" href="?platform=coleco.mame">ColecoVision (MAME)</a></li>
<li><a class="dropdown-item" href="?platform=atari8-5200.mame">Atari 5200 (MAME)</a></li>
</ul>
</li>
<li class="dropdown dropdown-submenu">
<a tabindex="-1" href="#">Other</a>
<ul class="dropdown-menu">
<li><a class="dropdown-item" href="?platform=vcs.mame">Atari 2600 (MAME)</a></li>
<li><a class="dropdown-item" href="?platform=nes.mame">NES (MAME)</a></li>
<!--<li><a class="dropdown-item" href="?platform=coleco.mame">ColecoVision (MAME)</a></li>-->
<li><a class="dropdown-item" href="?platform=atari8-5200.mame">Atari 5200 (MAME)</a></li>
<li><a class="dropdown-item" href="?platform=vector-ataricolor">Atari Color Vector (6502)</a></li>
<li><a class="dropdown-item" href="?platform=markdown">Markdown</a></li>
<li><a class="dropdown-item" href="?platform=x86">x86 (FreeDOS)</a></li>
<li><a class="dropdown-item" href="?platform=zmachine">Z-Machine (Inform 6)</a></li>
<li><a class="dropdown-item" href="?platform=markdown">Markdown Text Editor</a></li>
</ul>
</li>
</ul>

6
package-lock.json generated
View File

@ -2145,9 +2145,9 @@
}
},
"node-fetch": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.5.0.tgz",
"integrity": "sha512-YuZKluhWGJwCcUu4RlZstdAxr8bFfOVHakc1mplwHkk8J+tqM1Y5yraYvIUpeX8aY7+crCwiELJq7Vl0o0LWXw==",
"version": "2.6.0",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
"integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==",
"dev": true
},
"normalize-path": {

4
src/common/baseplatform.ts
View File

@ -1114,6 +1114,10 @@ export abstract class BaseMachinePlatform<T extends Machine> extends BaseDebugPl
getRasterScanline() {
return isRaster(this.machine) && this.machine.getRasterY();
}
readAddress(addr : number) : number {
return this.machine.read(addr);
}
}
// TODO: move debug info into CPU?

93
test/cli/testplatforms.js
View File

@ -49,6 +49,9 @@ var _atari7800 = require('gen/platform/atari7800.js');
var _coleco = require('gen/platform/coleco.js');
var _sms = require('gen/platform/sms.js');
var _c64 = require('gen/platform/c64.js');
var _vectrex = require('gen/platform/vectrex.js');
var _zx = require('gen/platform/zx.js');
//
@ -114,11 +117,11 @@ global.Mousetrap = function() {
//
function testPlatform(platid, romname, maxframes, callback) {
var emudiv = document.getElementById('emulator');
async function testPlatform(platid, romname, maxframes, callback) {
var platform = new emu.PLATFORMS[platid](emudiv);
await platform.start();
var emudiv = document.getElementById('emulator');
var rec = new recorder.StateRecorderImpl(platform);
platform.start();
assert.ok(platform.saveState()); // can save before ROM load?
var rom = fs.readFileSync('./test/roms/' + platid + '/' + romname);
rom = new Uint8Array(rom);
@ -140,8 +143,7 @@ function testPlatform(platid, romname, maxframes, callback) {
}
// test replay feature
platform.pause();
if (maxframes > 120*60)
maxframes = 120*60;
maxframes = Math.min(maxframes, rec.maxCheckpoints * rec.checkpointInterval);
assert.equal(maxframes, rec.numFrames());
var state1 = platform.saveState();
platform.loadState(state1);
@ -180,8 +182,8 @@ function testPlatform(platid, romname, maxframes, callback) {
describe('Platform Replay', () => {
it('Should run apple2', () => {
var platform = testPlatform('apple2', 'cosmic.c.rom', 72, (platform, frameno) => {
it('Should run apple2', async () => {
var platform = await testPlatform('apple2', 'cosmic.c.rom', 72, (platform, frameno) => {
if (frameno == 62) {
keycallback(32, 32, 128); // space bar
}
@ -189,13 +191,13 @@ describe('Platform Replay', () => {
assert.equal(platform.saveState().kbdlatch, 0x20); // strobe cleared
});
it('Should run > 120 secs', () => {
var platform = testPlatform('apple2', 'mandel.c.rom', 122*60, (platform, frameno) => {
it('Should run > 120 secs', async () => {
var platform = await testPlatform('apple2', 'mandel.c.rom', 122*60, (platform, frameno) => {
});
});
it('Should run vcs', () => {
var platform = testPlatform('vcs', 'brickgame.rom', 72, (platform, frameno) => {
it('Should run vcs', async () => {
var platform = await testPlatform('vcs', 'brickgame.rom', 72, (platform, frameno) => {
if (frameno == 62) {
var cstate = platform.saveControlsState();
cstate.SA = 0xff ^ 0x40; // stick left
@ -206,8 +208,8 @@ describe('Platform Replay', () => {
assert.equal(60, platform.readAddress(0x80)); // player x pos
});
it('Should run nes', () => {
var platform = testPlatform('nes', 'shoot2.c.rom', 72, (platform, frameno) => {
it('Should run nes', async () => {
var platform = await testPlatform('nes', 'shoot2.c.rom', 72, (platform, frameno) => {
if (frameno == 62) {
keycallback(Keys.VK_LEFT.c, Keys.VK_LEFT.c, 1);
}
@ -215,16 +217,16 @@ describe('Platform Replay', () => {
assert.equal(120-10, platform.readAddress(0x41d)); // player x pos
});
it('Should run vicdual', () => {
var platform = testPlatform('vicdual', 'snake1.c.rom', 72, (platform, frameno) => {
it('Should run vicdual', async () => {
var platform = await testPlatform('vicdual', 'snake1.c.rom', 72, (platform, frameno) => {
if (frameno == 62) {
keycallback(Keys.VK_DOWN.c, Keys.VK_DOWN.c, 1);
}
});
});
it('Should run mw8080bw', () => {
var platform = testPlatform('mw8080bw', 'game2.c.rom', 72, (platform, frameno) => {
it('Should run mw8080bw', async () => {
var platform = await testPlatform('mw8080bw', 'game2.c.rom', 72, (platform, frameno) => {
if (frameno == 62) {
keycallback(Keys.VK_LEFT.c, Keys.VK_LEFT.c, 1);
}
@ -232,8 +234,8 @@ describe('Platform Replay', () => {
assert.equal(96-9*2, platform.readAddress(0x2006)); // player x pos
});
it('Should run galaxian', () => {
var platform = testPlatform('galaxian-scramble', 'shoot2.c.rom', 72, (platform, frameno) => {
it('Should run galaxian', async () => {
var platform = await testPlatform('galaxian-scramble', 'shoot2.c.rom', 72, (platform, frameno) => {
if (frameno == 62) {
keycallback(Keys.VK_LEFT.c, Keys.VK_LEFT.c, 1);
}
@ -241,60 +243,60 @@ describe('Platform Replay', () => {
assert.equal(112-10, platform.readAddress(0x4074)); // player x pos
});
it('Should run vector', () => {
var platform = testPlatform('vector-z80color', 'game.c.rom', 72, (platform, frameno) => {
it('Should run vector', async () => {
var platform = await testPlatform('vector-z80color', 'game.c.rom', 72, (platform, frameno) => {
if (frameno == 62) {
keycallback(Keys.VK_UP.c, Keys.VK_UP.c, 1);
}
});
});
/*
it('Should run williams 6809', () => {
var platform = testPlatform('williams', 'vidfill.asm.rom', 72, (platform, frameno) => {
it('Should run williams 6809', async () => {
var platform = await testPlatform('williams', 'vidfill.asm.rom', 72, (platform, frameno) => {
if (frameno == 62) {
keycallback(Keys.VK_LEFT.c, Keys.VK_LEFT.c, 1);
}
});
});
*/
it('Should run williams-z80', () => {
var platform = testPlatform('williams-z80', 'game1.c.rom', 72, (platform, frameno) => {
it('Should run williams-z80', async () => {
var platform = await testPlatform('williams-z80', 'game1.c.rom', 72, (platform, frameno) => {
if (frameno == 62) {
keycallback(Keys.VK_LEFT.c, Keys.VK_LEFT.c, 1);
}
});
});
it('Should run sound_williams', () => {
var platform = testPlatform('sound_williams-z80', 'swave.c.rom', 72, (platform, frameno) => {
it('Should run sound_williams', async () => {
var platform = await testPlatform('sound_williams-z80', 'swave.c.rom', 72, (platform, frameno) => {
if (frameno == 60) {
keycallback(Keys.VK_2.c, Keys.VK_2.c, 1);
}
});
});
it('Should run astrocade', () => {
var platform = testPlatform('astrocade', 'cosmic.c.rom', 92, (platform, frameno) => {
it('Should run astrocade', async () => {
var platform = await testPlatform('astrocade', 'cosmic.c.rom', 92, (platform, frameno) => {
if (frameno == 62) {
keycallback(Keys.VK_SPACE.c, Keys.VK_SPACE.c, 1);
}
});
});
it('Should run coleco', () => {
var platform = testPlatform('coleco', 'shoot.c.rom', 92, (platform, frameno) => {
it('Should run coleco', async () => {
var platform = await testPlatform('coleco', 'shoot.c.rom', 92, (platform, frameno) => {
if (frameno == 62) {
keycallback(Keys.VK_SPACE.c, Keys.VK_SPACE.c, 1);
}
});
});
it('Should run sms-sg1000-libcv', () => {
var platform = testPlatform('sms-sg1000-libcv', 'shoot.c.rom', 92, (platform, frameno) => {
it('Should run sms-sg1000-libcv', async () => {
var platform = await testPlatform('sms-sg1000-libcv', 'shoot.c.rom', 92, (platform, frameno) => {
if (frameno == 62) {
keycallback(Keys.VK_SPACE.c, Keys.VK_SPACE.c, 1);
}
});
});
it('Should run atari7800', () => {
var platform = testPlatform('atari7800', 'sprites.dasm.rom', 92, (platform, frameno) => {
it('Should run atari7800', async () => {
var platform = await testPlatform('atari7800', 'sprites.dasm.rom', 92, (platform, frameno) => {
if (frameno == 62) {
keycallback(Keys.VK_DOWN.c, Keys.VK_DOWN.c, 1);
}
@ -302,14 +304,25 @@ describe('Platform Replay', () => {
assert.equal(0x1800, platform.saveState().maria.dll);
assert.equal(39, platform.readAddress(0x81)); // player y pos
});
/* TODO
it('Should run c64', () => {
var platform = testPlatform('c64', 'sprites.dasm.rom', 92, (platform, frameno) => {
it('Should run vectrex', async () => {
var platform = await testPlatform('vectrex', 'joystick.c.rom', 92, (platform, frameno) => {
if (frameno == 62) {
keycallback(Keys.VK_DOWN.c, Keys.VK_DOWN.c, 1);
}
});
assert.equal(39, platform.readAddress(0x81)); // player y pos
});
*/
it('Should run c64', async () => {
await testPlatform('c64', 'climber.c.rom', 92, (platform, frameno) => {
if (frameno == 62) {
keycallback(Keys.VK_DOWN.c, Keys.VK_DOWN.c, 1);
}
});
});
it('Should run zx spectrum', async () => {
await testPlatform('zx', 'cosmic.c.rom', 92, (platform, frameno) => {
if (frameno == 62) {
keycallback(Keys.VK_LEFT.c, Keys.VK_LEFT.c, 1);
}
});
});
});

13
test/cli/workertestutils.js
View File

@ -30,7 +30,7 @@ function Blob(blob) {
//console.log(new Error().stack);
return b;
}
this.asArrayBuffer = function() {
this.arrayBuffer = this.asArrayBuffer = function() {
var buf = new ArrayBuffer(blob.length);
var arr = new Uint8Array(buf);
for (var i=0; i<blob.length; i++)
@ -109,3 +109,14 @@ global.localStorage = {
}
};
global.fetch = function(path) {
return new Promise( (resolve, reject) => {
try {
var bin = fs.readFileSync(path, {encoding:'binary'});
var response = new Blob(bin);
resolve(response);
} catch (e) {
reject(e);
}
});
}