Apple-2-Tools
/
apple2js
mirror of https://github.com/whscullin/apple2js.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update tests, fill out 65C02 opcodes.

This commit is contained in:
Will Scullin 2017-12-20 09:07:09 -08:00
parent de4f1fc2d8
commit 44557b90ad
4 changed files with 10298 additions and 1916 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3831
js/6502test.js
View File

File diff suppressed because it is too large Load Diff

8223
js/65C02test.js Normal file
View File

File diff suppressed because it is too large Load Diff

98
js/cpu6502.js
View File

@ -579,6 +579,26 @@ function CPU6502(options)
ar = testNZ(ar ^ readFn());
}
/* Reset Bit */
function rmb(b) {
var bit = (0x1 << b) ^ 0xFF;
var addr = readBytePC();
var val = readByte(addr);
val &= bit;
writeByte(addr, val);
}
/* Set Bit */
function smb(b) {
var bit = 0x1 << b;
var addr = readBytePC();
var val = readByte(addr);
val |= bit;
writeByte(addr, val);
}
/* Test and Reset Bits */
function trb(readAddrFn) {
var addr = readAddrFn(),
@ -650,6 +670,24 @@ function CPU6502(options)
}
}
/* WDC 65C02 branches */
function bbr(b) {
var val = readZeroPage()
var off = readBytePC(); // changes pc
if (((1 << b) & val) === 0) {
pc += off > 127 ? off - 256 : off;
}
}
function bbs(b) {
var val = readZeroPage() // ZP
var off = readBytePC(); // changes pc
if (((1 << b) & val) !== 0) {
pc += off > 127 ? off - 256 : off;
}
}
/* Transfers and stack */
function tax() { testNZ(xr = ar); }
@ -959,7 +997,7 @@ function CPU6502(options)
// SEC
0x38: ['SEC', set, flags.C, modes.implied, 2],
// SED
// SED
0xF8: ['SED', set, flags.D, modes.implied, 2],
// SEI
@ -1014,6 +1052,25 @@ function CPU6502(options)
'JMP', jmp, readAddrAbsoluteXIndirect, modes.absoluteXIndirect, 6
],
// BBR/BBS
0x0F: ['BBR0', bbr, 0, modes.zp_relative, 5],
0x1F: ['BBR1', bbr, 1, modes.zp_relative, 5],
0x2F: ['BBR2', bbr, 2, modes.zp_relative, 5],
0x3F: ['BBR3', bbr, 3, modes.zp_relative, 5],
0x4F: ['BBR4', bbr, 4, modes.zp_relative, 5],
0x5F: ['BBR5', bbr, 5, modes.zp_relative, 5],
0x6F: ['BBR6', bbr, 6, modes.zp_relative, 5],
0x7F: ['BBR7', bbr, 7, modes.zp_relative, 5],
0x8F: ['BBS0', bbs, 0, modes.zp_relative, 5],
0x9F: ['BBS1', bbs, 1, modes.zp_relative, 5],
0xAF: ['BBS2', bbs, 2, modes.zp_relative, 5],
0xBF: ['BBS3', bbs, 3, modes.zp_relative, 5],
0xCF: ['BBS4', bbs, 4, modes.zp_relative, 5],
0xDF: ['BBS5', bbs, 5, modes.zp_relative, 5],
0xEF: ['BBS6', bbs, 6, modes.zp_relative, 5],
0xFF: ['BBS7', bbs, 7, modes.zp_relative, 5],
// BRA
0x80: ['BRA', brc, 0, modes.relative, 2],
@ -1045,6 +1102,26 @@ function CPU6502(options)
// PLY
0x7A: ['PLY', ply, null, modes.implied, 4],
// RMB/SMB
0x07: ['RMB0', rmb, 0, modes.zp, 5],
0x17: ['RMB1', rmb, 1, modes.zp, 5],
0x27: ['RMB2', rmb, 2, modes.zp, 5],
0x37: ['RMB3', rmb, 3, modes.zp, 5],
0x47: ['RMB4', rmb, 4, modes.zp, 5],
0x57: ['RMB5', rmb, 5, modes.zp, 5],
0x67: ['RMB6', rmb, 6, modes.zp, 5],
0x77: ['RMB7', rmb, 7, modes.zp, 5],
0x87: ['SMB0', smb, 0, modes.zp, 5],
0x97: ['SMB1', smb, 1, modes.zp, 5],
0xA7: ['SMB2', smb, 2, modes.zp, 5],
0xB7: ['SMB3', smb, 3, modes.zp, 5],
0xC7: ['SMB4', smb, 4, modes.zp, 5],
0xD7: ['SMB5', smb, 5, modes.zp, 5],
0xE7: ['SMB6', smb, 6, modes.zp, 5],
0xF7: ['SMB7', smb, 7, modes.zp, 5],
// STZ
0x64: ['STZ', stz, writeZeroPage, modes.zeroPage, 3],
0x74: ['STZ', stz, writeZeroPageX, modes.zeroPageX, 4],
@ -1108,6 +1185,8 @@ function CPU6502(options)
}
function dumpArgs(addr, m, symbols) {
var val;
var off;
function toHexOrSymbol(v, n) {
if (symbols && symbols[v]) {
return symbols[v];
@ -1130,7 +1209,7 @@ function CPU6502(options)
break;
case modes.relative:
{
var off = readByte(addr, true);
off = readByte(addr, true);
if (off > 127) {
off -= 256;
}
@ -1168,6 +1247,17 @@ function CPU6502(options)
case modes.absoluteXIndirect:
result = '(' + toHexOrSymbol(readWord(addr, true), 4) + ',X)';
break;
case modes.zp_relative:
{
val = readByte(addr, true);
off = readByte(addr, true);
if (off > 127) {
off -= 256;
}
addr += off + 1;
result = val + ',', toHexOrSymbol(addr, 4) + ' (' + off + ')';
}
break;
default:
break;
}
@ -1289,6 +1379,10 @@ function CPU6502(options)
pc = readWord(loc.NMI);
},
getPC: function () {
return pc;
},
setPC: function(_pc) {
pc = _pc;
},

62
test.html Normal file
View File

@ -0,0 +1,62 @@
<!DOCTYPE html>
<html>
<head>
<title>Test</title>
</head>
<body>
<script src="js/util.js"></script>
<script src="js/cpu6502.js"></script>
<script src="js/6502test.js"></script>
<script src="js/65C02test.js"></script>
<script>
var SYMBOLS = {};
var cpu;
var trace = [];
var lastPC = 0;
var done = false;
function traceCB() {
var pc = cpu.getPC()
done = lastPC == pc
lastPC = pc
var line = cpu.dumpRegisters() + ' ' + cpu.dumpPC(undefined, SYMBOLS);
trace.push(line);
if (trace.length > 1000) {
trace.shift();
}
}
function test6502() {
cpu = new CPU6502();
var test = new Test6502();
cpu.addPageHandler(test);
cpu.setPC(0x400);
do {
cpu.stepCyclesDebug(1000, traceCB);
} while (!done)
if (lastPC == 0x3469) {
window.alert("6502 Success!")
} else {
window.alert("Failed! " + toHex(lastPC))
}
}
function test65C02() {
cpu = new CPU6502({'65C02': true});
var test = new Test65C02();
cpu.addPageHandler(test);
cpu.setPC(0x400);
do {
cpu.stepCyclesDebug(1000, traceCB);
} while (!done)
if (lastPC == 0x24f1) {
window.alert("65C02 Success!")
} else {
window.alert("Failed! " + toHex(lastPC))
}
}
</script>
<button onclick="test6502()">Test 6502</button>
<button onclick="test65C02()">Test 65C02</button>
</body>
</html>