6502/8bitworkshop
1
0 Fork 0
mirror of https://github.com/sehugg/8bitworkshop.git synced 2026-10-25 15:05:25 +00:00
Code Issues Projects Releases Wiki Activity

mcr: tweaks

Browse Source
This commit is contained in:
Steven Hugg committed 2026-03-13 08:53:52 +01:00
1 parent ebcae078c7
commit d4442bd07f
2 files changed
+40 -44
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/machine/mcr.ts
+38 -43
View File
@@ -18,7 +18,7 @@ const MCR2_CYCLES_PER_LINE = Math.floor(MCR2_CPU_FREQ / (MCR2_NUM_TOTAL_SCANLINE
const MCR2_TILE_COLS = 32;
const MCR2_TILE_ROWS = 30;
const MCR2_TILE_SIZE = 16;
const MCR2_TILE_SIZE = 8; // double-pixels for BG
const INITIAL_WATCHDOG = 16;
@@ -47,11 +47,11 @@ const MCR2_KEYCODE_MAP = makeKeycodeMap([
// ROM blob layout
const ROM_PROGRAM_START = 0x0;
const ROM_PROGRAM_SIZE = 0xC000;
const ROM_BG_GFX_START = 0xC000;
const ROM_PROGRAM_SIZE = 0xE000;
const ROM_BG_GFX_START = ROM_PROGRAM_SIZE;
const ROM_BG_GFX_SIZE = 0x4000; // 16KB background tiles (2 bitplanes × 8KB)
const ROM_SPR_GFX_START = 0x12000;
const ROM_SPR_GFX_SIZE = 2 * 0x8000; // 32KB sprites (4 bitplanes × 8KB)
const ROM_SPR_GFX_START = ROM_BG_GFX_START + ROM_BG_GFX_SIZE;
const ROM_SPR_GFX_SIZE = 0x8000; // 32KB sprites (4 bitplanes × 8KB)
const SSIO_ROM_SIZE = 0x4000;
const ROM_TOTAL_SIZE = ROM_PROGRAM_SIZE + ROM_BG_GFX_SIZE + ROM_SPR_GFX_SIZE + SSIO_ROM_SIZE;
@@ -98,9 +98,9 @@ export class MCR2Machine extends BasicScanlineMachine {
// Main CPU memory read
read = newAddressDecoder([
[0x0000, 0xBFFF, 0xFFFF, (a) => { return this.rom ? this.rom[a] : 0; }],
[0xC000, 0xDFFF, 0x7FF, (a) => { return this.ram[a]; }],
[0xE000, 0xE7FF, 0x1FF, (a) => { return this.sprram[a]; }],
[0x0000, 0xDFFF, 0xFFFF, (a) => { return this.rom ? this.rom[a] : 0; }],
[0xE000, 0xE7FF, 0x7FF, (a) => { return this.ram[a]; }],
[0xE800, 0xEFFF, 0x1FF, (a) => { return this.sprram[a]; }],
[0xF000, 0xF7FF, 0x7FF, (a) => { return this.vram[a]; }],
[0xF800, 0xFFFF, 0x7F, (a) => { return this.palram[a]; }],
]);
@@ -111,8 +111,8 @@ export class MCR2Machine extends BasicScanlineMachine {
// Main CPU memory write
write = newAddressDecoder([
[0xC000, 0xDFFF, 0x7FF, (a, v) => { this.ram[a] = v; }],
[0xE000, 0xE7FF, 0x1FF, (a, v) => { this.sprram[a] = v; }],
[0xE000, 0xE7FF, 0x7FF, (a, v) => { this.ram[a] = v; }],
[0xE800, 0xEFFF, 0x1FF, (a, v) => { this.sprram[a] = v; }],
[0xF000, 0xF7FF, 0x7FF, (a, v) => { this.vram[a] = v; }],
[0xF800, 0xFFFF, 0x7F, (a, v) => {
this.palram[a] = v;
@@ -181,25 +181,29 @@ export class MCR2Machine extends BasicScanlineMachine {
if (sl >= MCR2_NUM_VISIBLE_SCANLINES) return;
let pixofs = sl * MCR2_CANVAS_WIDTH;
let tileRow = Math.floor(sl / MCR2_TILE_SIZE);
let tileY = sl % MCR2_TILE_SIZE;
// Draw background tiles
if (tileRow < MCR2_TILE_ROWS) {
for (let tileCol = 0; tileCol < MCR2_TILE_COLS; tileCol++) {
let vramOfs = (tileRow * MCR2_TILE_COLS + tileCol) * 2;
let byte0 = this.vram[vramOfs];
let byte1 = this.vram[vramOfs + 1];
if ((sl & 1) == 0) {
sl >>= 1;
let tileRow = Math.floor(sl / MCR2_TILE_SIZE);
let tileY = sl % MCR2_TILE_SIZE;
// 91490 tile format
let tileCode = byte0 | ((byte1 & 0x03) << 8);
let tilePalette = (byte1 >> 4) & 0x03;
let flipX = (byte1 & 0x04) != 0;
let flipY = (byte1 & 0x08) != 0;
// Draw background tiles
if (tileRow < MCR2_TILE_ROWS) {
for (let tileCol = 0; tileCol < MCR2_TILE_COLS; tileCol++) {
let vramOfs = (tileRow * MCR2_TILE_COLS + tileCol) * 2;
let byte0 = this.vram[vramOfs];
let byte1 = this.vram[vramOfs + 1];
let ty = flipY ? (15 - tileY) : tileY;
let pixX = tileCol * MCR2_TILE_SIZE;
this.drawTileLine(pixofs + pixX, tileCode, ty, tilePalette, flipX);
// 91490 tile format
let tileCode = byte0 | ((byte1 & 0x03) << 8);
let tilePalette = (byte1 >> 4) & 0x03;
let flipX = (byte1 & 0x04) != 0;
let flipY = (byte1 & 0x08) != 0;
let ty = flipY ? (15 - tileY) : tileY;
let pixX = tileCol * MCR2_TILE_SIZE * 2;
this.drawTileLine(pixofs + pixX, tileCode, ty, tilePalette, flipX);
}
}
}
@@ -212,31 +216,22 @@ export class MCR2Machine extends BasicScanlineMachine {
let gfxBase = ROM_BG_GFX_START;
let halfSize = ROM_BG_GFX_SIZE / 2; // 8KB per bitplane
// Tile layout: 32 bytes per tile per bitplane
// Left 8 pixels in bytes 0-15 (one byte per row), right 8 pixels in bytes 16-31
// Tile layout: 8 bytes per tile per bitplane
let tileOfs = tileCode * 32;
let leftByteOfs = tileOfs + (row < 8 ? row : row); // rows 0-15
let rightByteOfs = tileOfs + 16 + (row < 8 ? row : row);
let byteOfs = tileOfs + (row < 8 ? row : row); // rows 0-15
let p0L = this.rom[gfxBase + leftByteOfs] || 0;
let p1L = this.rom[gfxBase + halfSize + leftByteOfs] || 0;
let p0R = this.rom[gfxBase + rightByteOfs] || 0;
let p1R = this.rom[gfxBase + halfSize + rightByteOfs] || 0;
let p0L = this.rom[gfxBase + byteOfs] || 0;
let p1L = this.rom[gfxBase + halfSize + byteOfs] || 0;
let colorBase = palette * 4;
// Draw 16 pixels (left 8 + right 8)
for (let x = 0; x < 8; x++) {
let bit = 7 - x;
let srcX = flipX ? (15 - x) : x;
let srcX = flipX ? (14 - x * 2) : x * 2;
let color = ((p0L >> bit) & 1) | (((p1L >> bit) & 1) << 1);
this.pixels[outOfs + srcX] = this.palette[colorBase + color];
}
for (let x = 0; x < 8; x++) {
let bit = 7 - x;
let srcX = flipX ? (7 - x) : (8 + x);
let color = ((p0R >> bit) & 1) | (((p1R >> bit) & 1) << 1);
this.pixels[outOfs + srcX] = this.palette[colorBase + color];
this.pixels[outOfs + srcX] = this.pixels[outOfs + srcX + 512]
= this.pixels[outOfs + srcX + 1] = this.pixels[outOfs + srcX + 513]
= this.palette[colorBase + color];
}
}
src/worker/platforms.ts
+2 -1
View File
@@ -383,10 +383,11 @@ export var PLATFORM_PARAMS = {
'mcr': {
arch: 'z80',
code_start: 0x0,
rom_size: 0xe000,
rom_size: 0xe000 + 0x4000 + 0x8000,
data_start: 0xe000,
data_size: 0x800,
stack_end: 0xe800,
// TODO: IHX can't handle > 64 KB, so ihx2sms looks for segments in a certain order
},
};