From 74bfb04dd69aeda56fd34bef96d8f7061515b99c Mon Sep 17 00:00:00 2001 From: Steven Hugg Date: Wed, 10 Jun 2020 10:25:42 -0500 Subject: [PATCH] cmoc: fixed error msgs, threed.c --- index.html | 1 + presets/vectrex/joystick.c | 55 ++++++++++ presets/vectrex/skeleton.cmoc | 20 ++++ presets/vectrex/skeleton.xasm6809 | 47 ++++++++ presets/vectrex/threed.c | 173 ++++++++++++++++++++++++++++++ src/platform/nes.ts | 4 + src/platform/vcs.ts | 2 +- src/platform/vectrex.ts | 2 + src/worker/workermain.ts | 7 +- 9 files changed, 307 insertions(+), 4 deletions(-) create mode 100644 presets/vectrex/joystick.c create mode 100644 presets/vectrex/skeleton.cmoc create mode 100644 presets/vectrex/skeleton.xasm6809 create mode 100644 presets/vectrex/threed.c diff --git a/index.html b/index.html index 923881e9..0e6c0127 100644 --- a/index.html +++ b/index.html @@ -175,6 +175,7 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
  • Sega Master System
  • Atari 7800
    • +
  • diff --git a/presets/vectrex/joystick.c b/presets/vectrex/joystick.c new file mode 100644 index 00000000..3b3f30da --- /dev/null +++ b/presets/vectrex/joystick.c @@ -0,0 +1,55 @@ + +#pragma vx_copyright "2020" +#pragma vx_title_pos -100, -80 +#pragma vx_title_size -8, 80 +#pragma vx_title "CONTROLS TEST" +#pragma vx_music vx_music_1 + +#include "vectrex.h" +#include "bios.h" + +// http://www.playvectrex.com/designit/chrissalo/joystick.htm + +const char rom_text[] = "JOYSTICKS:"; + +int main() +{ + char j1t[] = { '1', ':', '_', '_', '_', '_', 0x00 }; + char btn1[] = { '1', '2', '3', '4', 0x00 }; + char j2t[] = { '2', ':', '_', '_', '_', '_', 0x00 }; + char btn2[] = { '1', '2', '3', '4', 0x00 }; + + uint8_t i, j1, j2, btns; + + while(1) + { + wait_retrace(); + + j1 = read_joystick(1); + j2 = read_joystick(2); + btns = read_buttons(); // momentary + btns = *((byte*)0xc80f); // persistent + + for(i=0;i<4;i++) { + j1t[2+i] = (j1 & (1<x; + const sbyte* mval = &m->m[0][0]; + for (i=0; i<3; i++) { + int sum = 0; + sum += (int)*mval++ * v->x; + sum += (int)*mval++ * v->y; + sum += (int)*mval++ * v->z; + *result++ = sum; + } +} + +const sbyte sintbl[64] = { +0, 3, 6, 9, 12, 16, 19, 22, 25, 28, 31, 34, 37, 40, 43, 46, +49, 51, 54, 57, 60, 63, 65, 68, 71, 73, 76, 78, 81, 83, 85, 88, +90, 92, 94, 96, 98, 100, 102, 104, 106, 107, 109, 111, 112, 113, 115, 116, +117, 118, 120, 121, 122, 122, 123, 124, 125, 125, 126, 126, 126, 127, 127, 127, +}; + +sbyte isin(byte x0) { + byte x = x0; + if (x0 & 0x40) x = 127-x; + if (x0 & 0x80) { + return -sintbl[x-128]; + } else { + return sintbl[x]; + } +} + +sbyte icos(byte x) { + return isin(x+64); +} + +void mat_rotate(Matrix* m, byte axis, byte angle) { + sbyte sin = isin(angle); + sbyte cos = icos(angle); + mat_identity(m); + switch (axis) { + case 0: + m->m[1][1] = cos; + m->m[2][1] = sin; + m->m[1][2] = -sin; + m->m[2][2] = cos; + break; + case 1: + m->m[2][2] = cos; + m->m[0][2] = sin; + m->m[2][0] = -sin; + m->m[0][0] = cos; + break; + case 2: + m->m[0][0] = cos; + m->m[1][0] = sin; + m->m[0][1] = -sin; + m->m[1][1] = cos; + break; + } +} + +const Vector8 tetra_v[] = { {0,-86,86},{86,86,86},{-86,86,86},{0,0,-86} }; +const char tetra_e[] = { 0, 1, 2, 0, 3, 1, -1, 3, 2, -2 }; +const Wireframe tetra = { 4, tetra_v, tetra_e }; + +void xform_vertices(Vector16* dest, const Vector8* src, const Matrix* m, byte nv) { + byte i; + for (i=0; iedges; + byte bright = 0; + int x1 = 0; + int y1 = 0; + do { + sbyte i = *e++; + if (i == -1) + bright = 0; + else if (i == -2) + break; + else { + int x2,y2; + x2 = scrnverts[i].x >> 8; + y2 = scrnverts[i].y >> 8; + if (bright == 0) + move((char)(x2-x1), (char)(y2-y1)); + else + line((char)(x2-x1), (char)(y2-y1)); + x1 = x2; + y1 = y2; + } + bright = 2; + } while (1); +} + +void draw_wireframe_ortho(const Wireframe* wf, const Matrix* m) { + Vector16 scrnverts[16]; + xform_vertices(scrnverts, wf->verts, m, wf->numverts); + draw_wireframe(wf, scrnverts); +} + +/// + +word frame = 0; +Matrix m; + +int main() +{ + sbyte x,y; + mat_identity(&m); + while(1) + { + x = isin((byte)frame)>>1; + y = icos((byte)frame)>>1; + wait_retrace(); + intensity(0x1f); + // draw radar line + move(0,0); + line(x,y); + line(-x,-y); + // draw 3d shape + mat_rotate(&m, (byte)(frame>>8)&3, (byte)frame); + draw_wireframe_ortho(&tetra, &m); + frame++; + } + return 0; +} diff --git a/src/platform/nes.ts b/src/platform/nes.ts index c882e6bc..b9c24c4c 100644 --- a/src/platform/nes.ts +++ b/src/platform/nes.ts @@ -477,6 +477,10 @@ class JSNESPlatform extends Base6502Platform implements Platform, Probeable { {name:'APU Registers',start:0x4000,last:0x4020,size:0x2000,type:'io'}, {name:'Cartridge RAM',start:0x6000,size:0x2000,type:'ram'}, ] } }; + + showHelp(tool:string, ident:string) { + window.open("https://8bitworkshop.com/blog/platforms/nintendo-nes.md.html", "_help"); // TODO + } } /// MAME support diff --git a/src/platform/vcs.ts b/src/platform/vcs.ts index 7fad8526..c96e8625 100644 --- a/src/platform/vcs.ts +++ b/src/platform/vcs.ts @@ -303,7 +303,7 @@ class VCSPlatform extends BasePlatform { if (tool == 'bataribasic') window.open("help/bataribasic/manual.html", "_help"); else - window.open("https://alienbill.com/2600/101/docs/stella.html", "_help"); // TODO + window.open("https://8bitworkshop.com/blog/platforms/atari-2600-vcs.md.html", "_help"); // TODO } getMemoryMap = function() { return {main:[ diff --git a/src/platform/vectrex.ts b/src/platform/vectrex.ts index dc76db38..7303c1ad 100644 --- a/src/platform/vectrex.ts +++ b/src/platform/vectrex.ts @@ -17,6 +17,8 @@ import { NullProbe, Probeable, ProbeAll } from "../common/devices"; var VECTREX_PRESETS = [ { id: 'hello.xasm', name: 'Hello World (ASM)' }, { id: 'hello.c', name: 'Hello World (CMOC)' }, + { id: 'joystick.c', name: 'Joystick Test (CMOC)' }, + { id: 'threed.c', name: '3D Transformations (CMOC)' }, ] // TODO: player 2 diff --git a/src/worker/workermain.ts b/src/worker/workermain.ts index 997e23db..d8029ae1 100644 --- a/src/worker/workermain.ts +++ b/src/worker/workermain.ts @@ -2074,7 +2074,7 @@ function compileCMOC(step:BuildStep) { loadNative("cmoc"); var params = step.params; // stderr - var re_err1 = /^([^:]*):(\d+): (.+)$/; + var re_err1 = /^[/]*([^:]*):(\d+): (.+)$/; var errors : WorkerError[] = []; var errline = 0; function match_fn(s) { @@ -2217,7 +2217,7 @@ function linkLWLINK(step:BuildStep) { if (toks[0] == 'Symbol:') { let ident = toks[1]; let ofs = parseInt(toks[4], 16); - if (ident && ofs >= 0 && !ident.startsWith("l_")) { + if (ident && ofs >= 0 && !ident.startsWith("l_") && !/^L\d+$/.test(ident)) { symbolmap[ident] = ofs; } } @@ -2235,7 +2235,8 @@ function linkLWLINK(step:BuildStep) { // TODO var lstout = FS.readFile(fn, {encoding:'utf8'}); var asmlines = parseListing(lstout, /^([0-9A-F]+)\s+([0-9A-F]+)\s+[(]\s*(.+?)[)]:(\d+) (.*)/i, 4, 1, 2, 3); - var srclines = []; + // * Line //threed.c:117: init of variable e + var srclines = parseSourceLines(lstout, /Line .+?:(\d+)/i, /^([0-9A-F]{4})/i); putWorkFile(fn, lstout); // TODO: you have to get rid of all source lines to get asm listing listings[fn] = {