From 3853f9a86a6c37864dc73cc85bde81c6f89edf4a Mon Sep 17 00:00:00 2001
From: Steven Hugg <hugg@fasterlight.com>
Date: Tue, 6 Sep 2022 13:53:45 -0500
Subject: [PATCH] vic20: added cart support, fixed bugs

---
 presets/vic20/hellocart.dasm |  16 +++++++++
 presets/vic20/siegegame.c    |   1 +
 res/c64.wasm                 | Bin 107652 -> 107655 bytes
 res/vic20.wasm               | Bin 87545 -> 88311 bytes
 src/machine/vic20.ts         |  67 ++++++++++++++++++++---------------
 src/platform/vic20.ts        |   9 +++--
 6 files changed, 62 insertions(+), 31 deletions(-)
 create mode 100644 presets/vic20/hellocart.dasm

diff --git a/presets/vic20/hellocart.dasm b/presets/vic20/hellocart.dasm
new file mode 100644
index 00000000..b95d6f9c
--- /dev/null
+++ b/presets/vic20/hellocart.dasm
@@ -0,0 +1,16 @@
+ processor 6502
+ 
+ org $a000-2	; so we can write the ...
+ .word $a000	; cartridge 2-byte header
+ .word Start	; start vector
+ .word Start	; RESTORE vector
+ .byte $41, $30, $c3, $c2, $cd ; "A0CBM"
+  
+Start:
+ lda $9004
+WaitLine;
+ cmp $9004
+ beq WaitLine
+ sta $900f
+ jmp Start
+ 
diff --git a/presets/vic20/siegegame.c b/presets/vic20/siegegame.c
index 8c3014fc..756d6936 100644
--- a/presets/vic20/siegegame.c
+++ b/presets/vic20/siegegame.c
@@ -205,6 +205,7 @@ void declare_winner(byte winner) {
 void play_round() {
   reset_players();
   clrscr();
+  bgcolor(COLOR_BLUE);
   textcolor(COLOR_WHITE);
   draw_playfield();
   while (1) {
diff --git a/res/c64.wasm b/res/c64.wasm
index 12cbb44d7afd2d1b23d6ad9c71134ab6a494bf7e..98d16f4ee1741f7d67feff9c3bd4c5b8e0e74622 100755
GIT binary patch
delta 50
zcmV-20L}k|$p(kX2C#_?0ltHZ47Z950YiWRy|>Pc0r~|G0;fR`c0vCEaY2B9fWQH_
I)RF<P5d-BEIRF3v

delta 47
zcmV+~0MP%3$p(bU2C#_?0lR~W47Z950YiWRy0^}Z0r~|D3qk+?193rsfPlyVx7U&Z
Fuo2cH6V?C#

diff --git a/res/vic20.wasm b/res/vic20.wasm
index c6ec2fc8d5f1cf1251439d37b20a46ba35415329..34d9f1aa69c029fc752168e92fd111488875187b 100755
GIT binary patch
delta 1612
zcmY*ZU1%It6u#%)J2N{oJLy`}hL{@9Ohf-LL?4VLnz(l{rr2Pcp9ckDZB3}1(A31O
z^r^eBYY7;%VWH!j@u>v`BYg<?6x%-dB2<a!lOXu0P@jxNT+g|?sX7C5@0@e)Ip_P%
zIrq;`oj<;CuJz|+wF=cYRCVpparFVLuAS*tj^nIdJ~*SbkU|0kL0)Lz@kOMC0B`_6
zN)Vb>PdE-JrKA*sj2$3z>DsSS+9eIi?c+*%^xAJ_^`JYubqbpPf!+&e-hAu);(Yns
ze5E`$fA-S3^4k~BFIMK4#rw^lgYWeZnX}sbGMt;d0J<uRD8?gU?)gWgh@~u=ZQdn7
zLIfi#C{v>s62(GoTCJ9Mk~9hh>U3C&Jt0aqZI-(pzx8VVy$7JPpIjILz1i!*;xpCj
zq4cWG6%;0yA`}J^D3OzoTTj$uAKUwCJq{=jDAjgUy;NJ5Q@V(Lsm2dBkj-j;3)0|J
zU!14EgI7DsI{J+`B+0=4Bz_*kw!>QHj>7(<%6RXZ9krC2jVDt=g37eKrSxebN`<S9
zI3Rlh1UHiG!y@$dlnN`)3lXAEzWq2)I#XOgKf5#vFYY1eW=Ev_-J7Dyz8-~RBYx@l
z$_>+kcb)^$P95tBCk8gLEm6mykpu+2ez~4RjHvdPS8rgD-FpGLC*uG^j2d)=akD0l
z+J07QNXTn7TBl-;y#Xoa3q!=CHMA_Y_4PQ<sI#Fl*w>{Eq=_7sTXTd=XVYVFcvKUw
z!rc9ZvX>~1$c;JFkGKR>7{Qj50tTr1Vj$AP2D#4v8#?=B42o6F#in-oRWpx?gPPkx
znC*^0k8=!kIJ!G5$qt3AvLrP>lFgu?Hrln3Y2tNktTNH)vPJA#7b;D1ZM8<v%Dn}v
z;Lc;uE_x<cSw@XHR+~a)nJcM{s)WOmQX-g=6>@n*h<1^Qmj$aMsu3($Ng0~~o0@t!
z3yE&lqW)v#f`)+VY>4A6u}m!=c7{dKIW9u2P(RHR@O%DnRhS?h0>Q>PYfA^kL}#X?
zS-;(XVky?`V>y}tStN4ENvH9ri9BLh^7)T|zt^Y~r~53b@yJSU+V8rRhp{H#lp^pf
zqG}Fy<tC{QX-bz+a{}$qv7~vRbnU1zAXIj$wXNa9sn)h`bc*9K71;bX>f3LCQCpV2
z1Ewhw^h0<L^>B*!sfM<Pwt=zJDb>8*)qjecm8fHrowf;t;}Wg_UphcNU_=bIC`T1t
zJqWQ<+&i-HI{hiCQ=%evjPh9}!p(^y%sl$qXA%@SAQ#f)Um?C=P`KtRF%bc8J@Zs&
zmos;uv-QpG-ECmLv0H&afy$5Z{bl5d2*T{<44mx&qJZXQ;U(MEbX&xdl9E|G3q9HW
zBIH13W)==)`wZ;OF3y6Po(4wr-xs0F6CjnV9hZkImr@wML+nDAhh1rq?Rs~0chdk0
MM+t3yJ_|3yKfSP7c>n+a

delta 1074
zcmY*YO=}cE5Ur}7uie=-t42W-t(l0%FT{gUqKWB2gW^REBnX00f`<tRi9vG84DJ{L
zL2wN?N4-c6qC_I(CPDoHf*!nh5X6&sHHx@a&qkwtnCX7+QC0n_`r9-6`(yj=c26Zq
zg2^y7b{$oBaJF%!U0IgZnC!S<+dx2w<#Gk=l2wAL4S;ANA`yZue-|tZl~P0iBDPTE
z<P=|}Y)2Tui{+54#@Ea0L;L;3b2wMJ=fAVQHSF2B_x_0Ai<D3w!>KCFEmRIJKC0aQ
zfp)&n#cs5huDN*qaB|BfCvm12v==khc7_-=o6QH!9reKD);_5RB?*I3x}xe)`jF0B
zee6Z4S)8$vrN2NJKEE|6%c)~}m8`Ru1->9V|3kbA`mKOzKG1`kFOqg|>J>E>>xKPs
zCjpagx?}MnfT%W|1trllFwTc-!sq`AB|~lIIDpTdr1OHZ$aUW+d-=;AJlRHaT7lSn
zH^fZ&re54T>_tas=5-Tq9772mVNu~S)VY*}Rq>!cDc5dYlk0)07xV(gT&^7q%dPu~
z`dk&HGU%k`kx*%jL+X;PKq~*)i@Q6OSOxm^C&?~Vbkf2ItM!f)3L1>k=Mwu_P|1f+
zU|*u7Q^LIYVi^}gi`Cfzc()3uQzjf+CXwAmqGO=MAhCWgngamgUk$~fv#Ke`P_b<k
zfn9`9ap<;a#ZG}cMI>#-E!bv9dlTcV*fq4SO^lm9D6J;^E|QYuMq~&Y?*?eKNGupF
zIG>G2KixW4GOiRh${}NOUl|v}WLzz_=}gKpJZU<Um<f`BDh_`@gB8KnbO!SK38zph
z-lHHO#wXG9x36F-TF!dX`A}?E#wn^@64F!^sw((qis*<k9-B$P+F}2*JU#PBNYm-1
z7ZD!cxb7pO`U6!V9~i`|M~H1LHjnlf{g5dQP!gboHj~?Iwv9>0q+i9{7Pg2djQN*A
a+_s*iUt*L&BuyMpzGVobrKdx927d#LP5GGs

diff --git a/src/machine/vic20.ts b/src/machine/vic20.ts
index 2e7d6c40..465ba4f3 100644
--- a/src/machine/vic20.ts
+++ b/src/machine/vic20.ts
@@ -1,6 +1,10 @@
 
 //// WASM Machine
 
+// http://www.zimmers.net/anonftp/pub/cbm/documents/chipdata/VIC-I.txt
+// http://www.zimmers.net/anonftp/pub/cbm/maps/Vic20.MemoryMap.txt
+// http://sleepingelephant.com/denial/wiki/index.php/Autostart
+
 import { Machine } from "../common/baseplatform";
 import { Probeable, TrapCondition } from "../common/devices";
 import { KeyFlags } from "../common/emu";
@@ -10,7 +14,7 @@ import { BaseWASMMachine } from "../common/wasmplatform";
 export class VIC20_WASMMachine extends BaseWASMMachine implements Machine, Probeable {
 
   numTotalScanlines = 312;
-  cpuCyclesPerLine = 63;
+  cpuCyclesPerLine = 71;
   videoOffsetBytes = -24 * 4;
 
   prgstart : number;
@@ -30,42 +34,47 @@ export class VIC20_WASMMachine extends BaseWASMMachine implements Machine, Probe
     }
     // load rom
     if (this.romptr && this.romlen) {
+      let rom = this.romarr;
       this.exports.machine_load_rom(this.sys, this.romptr, this.romlen);
-      this.prgstart = this.romarr[0] + (this.romarr[1]<<8); // get load address
-      // look for BASIC program start
-      if (this.prgstart == 0x1001) {
-        this.prgstart = this.romarr[2] + (this.romarr[3]<<8) + 2; // point to after BASIC program
-        console.log("prgstart", hex(this.prgstart));
-      }
-      // is program loaded into RAM?
-      if (this.prgstart < 0x8000) {
-        // advance BIOS a few frames
-        this.exports.machine_exec(this.sys, 400000);
-        // type in command (SYS 2061)
-        var cmd = "SYS "+this.prgstart+"\r";
-        console.log(cmd);
-        for (var i=0; i<cmd.length; i++) {
-          var key = cmd.charCodeAt(i);
-          this.exports.machine_exec(this.sys, 20000);
-          this.exports.machine_exec(this.sys, 20000);
-          this.exports.machine_key_down(this.sys, key);
-          this.exports.machine_exec(this.sys, 20000);
-          this.exports.machine_exec(this.sys, 20000);
-          this.exports.machine_key_up(this.sys, key);
+      let iscart = rom[4+2]==0x41 && rom[5+2]==0x30 && rom[6+2]==0xC3 && rom[7+2]==0xC2 && rom[8+2]==0xCD;
+      if (!iscart) {
+        this.prgstart = rom[0] + (rom[1]<<8); // get load address
+        // look for BASIC program start
+        if (this.prgstart == 0x1001) {
+          this.prgstart = rom[2] + (rom[3]<<8) + 2; // point to after BASIC program
+          console.log("prgstart", hex(this.prgstart));
         }
-        // advance clock until program starts
-        for (var i=0; i<10000 && this.getPC() != this.prgstart; i++) {
-          //this.exports.machine_tick(this.sys);
+        // is program loaded into RAM?
+        if (this.prgstart < 0x8000) {
+          // advance BIOS a few frames
+          this.exports.machine_exec(this.sys, 500000);
+          // type in command (SYS 2061)
+          var cmd = "SYS "+this.prgstart+"\r";
+          console.log(cmd);
+          for (var i=0; i<cmd.length; i++) {
+            var key = cmd.charCodeAt(i);
+            this.exports.machine_exec(this.sys, 10000);
+            this.exports.machine_exec(this.sys, 10000);
+            this.exports.machine_key_down(this.sys, key);
+            this.exports.machine_exec(this.sys, 10000);
+            this.exports.machine_exec(this.sys, 10000);
+            this.exports.machine_key_up(this.sys, key);
+          }
+          // advance clock until program starts
+          for (var i=0; i<10000 && this.getPC() != this.prgstart; i++) {
+            this.exports.machine_tick(this.sys);
+          }
         }
       } else {
         // get out of reset
-        this.exports.machine_exec(this.sys, 100);
+        //this.exports.machine_exec(this.sys, 100);
         // wait until cartridge start
         // TODO: detect ROM cartridge
-        var warmstart = this.romarr[0x4] + this.romarr[0x5]*256;
-        for (var i=0; i<150000 && this.getPC() != warmstart; i++) {
+        var warmstart = this.romarr[0x2+2] + this.romarr[0x3+2]*256;
+        for (var i=0; i<10000 && this.getPC() != warmstart; i++) {
           this.exports.machine_tick(this.sys);
         }
+        console.log('cart', i, hex(warmstart));
       }
       // TODO: shouldn't we return here @ start of frame?
       // and stop probing
@@ -74,7 +83,7 @@ export class VIC20_WASMMachine extends BaseWASMMachine implements Machine, Probe
   advanceFrame(trap: TrapCondition) : number {
     // TODO: does this sync with VSYNC?
     var scanline = this.getRasterY();
-    var clocks = Math.floor((this.numTotalScanlines - scanline) * 19656 / this.numTotalScanlines);
+    var clocks = Math.floor((this.numTotalScanlines - scanline) * 22152 / this.numTotalScanlines);
     var probing = this.probe != null;
     if (probing) this.exports.machine_reset_probe_buffer();
     clocks = super.advanceFrameClock(trap, clocks);
diff --git a/src/platform/vic20.ts b/src/platform/vic20.ts
index fbaf03c9..701afe94 100644
--- a/src/platform/vic20.ts
+++ b/src/platform/vic20.ts
@@ -6,18 +6,23 @@ import { BaseMAME6502Platform } from "../common/mameplatform";
 
 const VIC20_PRESETS = [
   {id:'hello.dasm', name:'Hello World (ASM)'},
+  {id:'hellocart.dasm', name:'Hello Cartridge (ASM)'},
   {id:'siegegame.c', name:'Siege Game (C)'},
 ];
 
 const VIC20_MEMORY_MAP = { main:[
   {name:'RAM',          start:0x0000,size:0x0400,type:'ram'},
   {name:'RAM',          start:0x1000,size:0x1000,type:'ram'},
-  {name:'Cartridge ROM',start:0x8000,size:0x2000,type:'rom'},
-  {name:'BASIC ROM',    start:0xc000,size:0x2000,type:'rom'},
+  {name:'BLK1 Cart ROM',start:0x2000,size:0x2000,type:'rom'},
+  {name:'BLK2 Cart ROM',start:0x4000,size:0x2000,type:'rom'},
+  {name:'BLK3 Cart ROM',start:0x6000,size:0x2000,type:'rom'},
+  {name:'Character ROM',start:0x8000,size:0x1000,type:'rom'},
   {name:'I/O 1',        start:0x9000,size:0x0400,type:'io'},
   {name:'Color RAM',    start:0x9400,size:0x0400,type:'io'},
   {name:'I/O 2',        start:0x9800,size:0x0400,type:'io'},
   {name:'I/O 3',        start:0x9c00,size:0x0400,type:'io'},
+  {name:'BLK5 Autostart',start:0xa000,size:0x2000,type:'rom'},
+  {name:'BASIC ROM',    start:0xc000,size:0x2000,type:'rom'},
   {name:'KERNAL ROM',   start:0xe000,size:0x2000,type:'rom'},
 ] }