6502
/
8bitworkshop
mirror of https://github.com/sehugg/8bitworkshop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

generate z80 cpu on demand like we used to, fix test b/c global.z80 is global

This commit is contained in:
Steven Hugg 2019-05-16 23:44:19 -04:00
parent b5d0c2410b
commit 3ebfd784a6
8 changed files with 21 additions and 15356 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
embed.html
View File

@ -44,7 +44,7 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
<script src="jquery/jquery-3.4.1.min.js"></script>
<script src="javatari.js/release/javatari/javatari.js"></script>
<script src="src/cpu/z80fast.js"></script>
<script src="src/cpu/z80.js"></script>
<script src="jsnes/dist/jsnes.min.js"></script>
<script src="src/cpu/6809.js"></script>
<script src="FileSaver.js/FileSaver.min.js"></script>

2
index.html
View File

@ -408,7 +408,7 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
<script src="javatari.js/src/main/Javatari.js"></script>
<script src="javatari.js/temp/javatari.part.concat.js"></script>
-->
<script src="src/cpu/z80fast.js"></script>
<script src="src/cpu/z80.js"></script>
<script src="jsnes/dist/jsnes.min.js"></script>
<script src="src/cpu/6809.js"></script>
<!--<script src="jsnes/lib/dynamicaudio-min.js" type="text/javascript" charset="utf-8"></script>-->

5
src/baseplatform.ts
View File

@ -5,7 +5,7 @@ import { CodeAnalyzer } from "./analysis";
import { disassemble6502 } from "./cpu/disasm6502";
import { disassembleZ80 } from "./cpu/disasmz80";
declare var Z80_fast, jt, CPU6809;
declare var buildZ80, jt, CPU6809;
export interface OpcodeMetadata {
minCycles: number;
@ -517,7 +517,8 @@ export abstract class BaseZ80Platform extends BaseDebugPlatform {
newCPU(membus : MemoryBus, iobus : MemoryBus) {
this.probe = new BusProbe(membus);
this._cpu = Z80_fast({
var z80opts = {};
this._cpu = buildZ80(z80opts)({
display: {},
memory: this.probe,
ioBus: iobus

15331
src/cpu/z80fast.js
View File

File diff suppressed because it is too large Load Diff

2
src/emu.ts
View File

@ -3,7 +3,7 @@
import { hex, clamp } from "./util";
// external modules
declare var jt, Javatari, Z80_fast, CPU6809;
declare var jt, Javatari;
declare var Mousetrap;
// Emulator classes

6
test/cli/testplatforms.js
View File

@ -6,7 +6,7 @@ var PNG = require('pngjs').PNG;
const jsdom = require('jsdom');
const { JSDOM } = jsdom;
const { window } = new JSDOM();
//const { window } = new JSDOM();
const dom = new JSDOM(`<!DOCTYPE html><div id="emulator"><div id="javatari-screen"></div></div>`);
global.window = dom.window;
@ -14,10 +14,10 @@ global.document = dom.window.document;
dom.window.Audio = null;
global.Image = function() { }
global['$'] = require("jquery/jquery-2.2.3.min.js");
global.includeInThisContext('src/cpu/z80fast.js');
includeInThisContext('src/cpu/z80.js');
global['buildZ80'] = global.window.buildZ80;
includeInThisContext("javatari.js/release/javatari/javatari.js");
Javatari.AUTO_START = false;
includeInThisContext('src/cpu/z80fast.js');
includeInThisContext('tss/js/Log.js');
//global.Log = require('tss/js/Log.js').Log;
includeInThisContext('tss/js/tss/PsgDeviceChannel.js');

27
test/cli/z80/z80test.js
View File

@ -1,17 +1,8 @@
"use strict";
if (true) {
global.window = global;
require('../../../src/cpu/z80.js');
var _global = window;
_global.buildZ80({
applyContention: true
});
} else {
var wtu = require('../workertestutils.js');
global.includeInThisContext('src/cpu/z80fast.js');
var _global = {Z80:Z80_fast};
}
var wtu = require('../workertestutils.js');
includeInThisContext('src/cpu/z80.js');
if (!global.buildZ80) global.buildZ80 = global.window.buildZ80;
var Memory = function(dump) {
var self = {};
@ -99,7 +90,7 @@ function runTest(input, expected) {
var memory = Memory(dump);
var ioBus = IOBus();
var z80 = _global.Z80({
var z80 = global.Z80({
display: {},
memory: memory,
ioBus: ioBus
@ -208,7 +199,7 @@ assert(testsIn.length == testsExpected.length);
function benchmark(cycles) {
var memory = Memory(function() { });
var ioBus = IOBus();
var z80 = _global.Z80({
var z80 = global.Z80({
display: {},
memory: memory,
ioBus: ioBus
@ -223,7 +214,11 @@ function benchmark(cycles) {
if (global.describe) {
describe('Z80 CPU', function() {
it('should execute test cases', function() {
global.buildZ80({
applyContention: true
});
global.Z80 = global.window.Z80;
it('should execute Z80 test cases', function() {
for (var iter=0; iter<testsIn.length; iter++) {
var fn = function(index, input, expected) {
var output = runTest(input);
@ -231,7 +226,7 @@ if (global.describe) {
}.call(this, iter, testsIn[iter], testsExpected[iter]);
}
});
it('should run 1M cycles', function() {
it('should run Z80 1M cycles', function() {
benchmark(1164770);
});
});

2
testemu.html
View File

@ -30,7 +30,7 @@
<script src="jquery/jquery-3.4.1.min.js"></script>
<script src="javatari.js/release/javatari/javatari.js"></script>
<script src="src/cpu/z80fast.js"></script>
<script src="src/cpu/z80.js"></script>
<script src="jsnes/jsnes.min.js"></script>
<script src="localForage/dist/localforage.nopromises.js"></script>