Apple-2-Tools/apple2js
1
0
Fork 0
mirror of https://github.com/whscullin/apple2js.git synced 2024-01-12 14:14:38 +00:00
Code Issues Projects Releases Wiki Activity

Small cleanup and fixes.

Browse Source
This commit is contained in:
Will Scullin 2020-01-02 10:57:26 -08:00
parent 398ed17c79
commit 506dfc52de
No known key found for this signature in database
GPG Key ID: 9092A5C0A673416B
4 changed files with 9 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/canvas.js
View File

@ -181,14 +181,13 @@ export function LoresPage(page, charset, e, context)
},
_end: function() { return (0x04 * _page) + 0x03; },
_read: function(page, off, bank) {
var addr = (page << 8) | off,
base = addr - 0x400 * _page;
var addr = (page << 8) | off, base = addr & 0x3FF;
return _buffer[bank][base];
},
_write: function(page, off, val, bank) {
var addr = (page << 8) | off,
base = addr - 0x400 * _page,
base = addr & 0x3FF,
fore, back;
if (_buffer[bank][base] == val && !_refreshing) {
@ -629,18 +628,14 @@ export function HiresPage(page, context)
_end: function() { return (0x020 * _page) + 0x1f; },
_read: function(page, off, bank) {
var addr = (page << 8) | off, base = addr - 0x2000 * _page;
var addr = (page << 8) | off, base = addr & 0x1FFF;
return _buffer[bank][base];
},
_write: function(page, off, val, bank) {
var addr = (page << 8) | off, base = addr - 0x2000 * _page,
var addr = (page << 8) | off, base = addr & 0x1FFF,
idx, jdx;
if (addr < (0x2000 * _page) || addr >= (0x2000 * _page + 0x2000)) {
return;
}
if (_buffer[bank][base] == val && !_refreshing) {
return;
}

38
js/cards/langcard.js
View File

@ -44,40 +44,23 @@ export default function LanguageCard(io, rom) {
}
function _debug() {
/*eslint no-console: 0 */
// console.debug.apply(null, arguments);
// debug.apply(null, arguments);
}
_init();
var LOC = {
// Status
BSRBANK2: 0x11,
BSRREADRAM: 0x12,
// Bank 2
READBSR2: 0x80,
WRITEBSR2: 0x81,
OFFBSR2: 0x82,
READWRBSR2: 0x83,
// Shadow Bank 2
_READBSR2: 0x84,
_WRITEBSR2: 0x85,
_OFFBSR2: 0x86,
_READWRBSR2: 0x87,
// Bank 1
READBSR1: 0x88,
WRITEBSR1: 0x89,
OFFBSR1: 0x8a,
READWRBSR1: 0x8b,
// Shadow Bank 1
_READBSR1: 0x8c,
_WRITEBSR1: 0x8d,
_OFFBSR1: 0x8e,
_READWRBSR1: 0x8f
};
function _updateBanks() {
@ -101,9 +84,8 @@ export default function LanguageCard(io, rom) {
function _access(off, val) {
var readMode = val === undefined;
var result = 0;
switch (off) {
switch (off & 0x8B) {
case LOC.READBSR2: // 0xC080
case LOC._READBSR2: // 0xC084
_readbsr = true;
_writebsr = false;
_bsr2 = true;
@ -111,7 +93,6 @@ export default function LanguageCard(io, rom) {
_debug('Bank 2 Read');
break;
case LOC.WRITEBSR2: // 0xC081
case LOC._WRITEBSR2: // 0xC085
_readbsr = false;
if (readMode) {
_writebsr = _prewrite;
@ -121,7 +102,6 @@ export default function LanguageCard(io, rom) {
_debug('Bank 2 Write');
break;
case LOC.OFFBSR2: // 0xC082
case LOC._OFFBSR2: // 0xC086
_readbsr = false;
_writebsr = false;
_bsr2 = true;
@ -129,7 +109,6 @@ export default function LanguageCard(io, rom) {
_debug('Bank 2 Off');
break;
case LOC.READWRBSR2: // 0xC083
case LOC._READWRBSR2: // 0xC087
_readbsr = true;
if (readMode) {
_writebsr = _prewrite;
@ -140,7 +119,6 @@ export default function LanguageCard(io, rom) {
break;
case LOC.READBSR1: // 0xC088
case LOC._READBSR1: // 0xC08C
_readbsr = true;
_writebsr = false;
_bsr2 = false;
@ -148,7 +126,6 @@ export default function LanguageCard(io, rom) {
_debug('Bank 1 Read');
break;
case LOC.WRITEBSR1: // 0xC089
case LOC._WRITEBSR1: // 0xC08D
_readbsr = false;
if (readMode) {
_writebsr = _prewrite;
@ -158,7 +135,6 @@ export default function LanguageCard(io, rom) {
_debug('Bank 1 Write');
break;
case LOC.OFFBSR1: // 0xC08A
case LOC._OFFBSR1: // 0xC08E
_readbsr = false;
_writebsr = false;
_bsr2 = false;
@ -166,7 +142,6 @@ export default function LanguageCard(io, rom) {
_debug('Bank 1 Off');
break;
case LOC.READWRBSR1: // 0xC08B
case LOC._READWRBSR1: // 0xC08F
_readbsr = true;
if (readMode) {
_writebsr = _prewrite;
@ -175,15 +150,6 @@ export default function LanguageCard(io, rom) {
_prewrite = readMode;
_debug('Bank 1 Read/Write');
break;
case LOC.BSRBANK2:
result = _bsr2 ? 0x80 : 0x00;
_debug('Bank 2 Read ' + _bsr2);
break;
case LOC.BSRREADRAM:
result = _readbsr ? 0x80 : 0x00;
_debug('Bank SW RAM Read ' + _readbsr);
break;
default:
break;
}

2
js/main2e.js
View File

@ -83,7 +83,7 @@ var slinky = new RAMFactor(io, 1024 * 1024);
var disk2 = new DiskII(io, driveLights);
var clock = new Thunderclock(io);
initUI(apple2, disk2, enhanced);
initUI(apple2, disk2, options.e);
io.setSlot(1, parallel);
io.setSlot(2, slinky);

4
js/mmu.js
View File

@ -128,8 +128,7 @@ export default function MMU(cpu, vm, lores1, lores2, hires1, hires2, io, rom)
}
function _debug() {
/*eslint no-console: 0*/
// console.debug.apply(this, arguments);
// debug.apply(this, arguments);
}
function Switches() {
@ -411,6 +410,7 @@ export default function MMU(cpu, vm, lores1, lores2, hires1, hires2, io, rom)
if (val !== undefined) {
_80store = false;
_debug('80 Store Off');
vm.page(_page2 ? 2 : 1);
} else {
// Chain to io for keyboard
result = io.ioSwitch(off, val);