diff --git a/modules/pc8080/lib/chipset.js b/modules/pc8080/lib/chipset.js index 4b2a63544..1c1d9bec3 100644 --- a/modules/pc8080/lib/chipset.js +++ b/modules/pc8080/lib/chipset.js @@ -516,9 +516,9 @@ ChipSet.prototype.restore = function(data) return true; case ChipSet.VT100.MODEL: this.bBrightness = a[0]; - this.bFlagsBuffer = a[2]; - this.bDC012 = a[3]; - this.bDC011 = a[4]; + this.bFlagsBuffer = a[1]; + this.bDC012 = a[2]; + this.bDC011 = a[3]; a = data[1]; this.dNVRAddr = a[0]; // 20-bit address this.wNVRData = a[1]; // 14-bit word diff --git a/versions/pc8080/1.23.3/pc8080-dbg.js b/versions/pc8080/1.23.3/pc8080-dbg.js index 58183f67e..152276bc0 100644 --- a/versions/pc8080/1.23.3/pc8080-dbg.js +++ b/versions/pc8080/1.23.3/pc8080-dbg.js @@ -84,9 +84,10 @@ function(){Xc(this)||(G(this,O(this)),this.b-=6);this.b-=5},function(){var a=O(t this.b-=6);this.b-=5},function(){this.ia=J(this)&65535;this.b-=5},function(){var a=N(this);Xc(this)&&G(this,a);this.b-=10},function(){this.ta|=512;this.b-=4},function(){var a=N(this);Xc(this)&&(Q(this,this.N),G(this,a),this.b-=6);this.b-=11},Ed,function(){L(this,M(this));this.b-=7},function(){Q(this,this.N);G(this,56);this.b-=11}]; function S(a){w.call(this,"ChipSet",a,S,32768);var b=a.model;b&&!Fd[b]&&La("Unrecognized ChipSet model: "+b);this.B=Fd[b]||{};a.sound&&(this.ba=null,window&&(this.ba=window.AudioContext||window.webkitAudioContext),this.ba&&new this.ba);E(this)}$a(S); var T={xa:1978.1,ad:{ya:0,Vd:1,$d:16,ne:32,Be:64,ze:128,tb:14},Ta:{ya:1,Gc:1,Wc:2,Sc:4,Tc:16,Uc:32,Vc:64,tb:8},bd:{ya:2,Ud:3,Ke:4,Wd:8,ve:16,we:32,xe:64,Xd:128,tb:0},Fe:{ya:3},De:{ya:2,pe:7},He:{ya:3,Me:1,Ge:2,ye:4,he:8,Yd:16,Md:32},Ee:{ya:4},Ie:{ya:5,ae:1,be:2,ce:4,de:8,Ne:16}},U={xa:100,ab:{ya:66,Re:1,Qc:2,Rc:4,te:8,re:16,fc:32,ec:64,ke:128},Fc:{ya:66,INIT:0},Ia:{me:{ya:98},Qa:{Ec:0,Dc:1,Yc:2,ed:4,Jc:5,Xc:6,Zc:7},Jb:16383},Ic:{ya:162,INIT:0},Hc:{ya:194,INIT:0}},Fd={SI1978:T,VT100:U}; -S.prototype.ja=function(){return!1};S.prototype.Na=function(a,b,c,d){this.w=b;this.b=c;this.H=d;this.u=a;Cb(b,this,this.B.Pb);Gb(b,this,this.B.Qb)};S.prototype.za=function(a,b){if(!b)if(!a)this.reset();else if(!this.restore(a))return!1;return!0};S.prototype.Da=function(a){return a?this.save():!0};T.INIT=[[T.ad.tb,T.Ta.tb,T.bd.tb,0,0,0,0]];U.INIT=[[U.Fc.INIT,U.ab.Qc|U.ab.Rc,U.Ic.INIT,U.Hc.INIT],[0,0,0,0,Array(100)]];m=S.prototype;m.reset=function(){this.B.INIT&&!this.restore(this.B.INIT)&&this.ga("reset error")}; -m.save=function(){var a=new H(this);switch(this.B.xa){case T.xa:I(a,0,[this.ra,this.F,this.wa,this.O,this.Z,this.ma,this.na]);break;case U.xa:I(a,0,[this.da,this.J,this.fa,this.ea]),I(a,1,[this.M,this.A,this.K,this.Y,this.I])}return a.data()}; -m.restore=function(a){var b;if(a&&(b=a[0])&&b.length)switch(this.B.xa){case T.xa:return this.ra=b[0],this.F=b[1],this.wa=b[2],this.O=b[3],this.Z=b[4],this.ma=b[5],this.na=b[6],!0;case U.xa:return this.da=b[0],this.J=b[2],this.fa=b[3],this.ea=b[4],b=a[1],this.M=b[0],this.A=b[1],this.K=b[2],this.Y=b[3],this.I=b[4],!0}return!1};m.start=function(){};m.stop=function(){};function Gd(a,b,c){a.F&=~b;c&&(a.F|=b)}m.qd=function(a,b){var c=this.ra;D(this,a,null,b,"STATUS0",c,!0);return c}; +S.prototype.ja=function(){return!1};S.prototype.Na=function(a,b,c,d){this.w=b;this.b=c;this.H=d;this.u=a;Cb(b,this,this.B.Pb);Gb(b,this,this.B.Qb)};S.prototype.za=function(a,b){if(!b)if(!a)this.reset();else if(!this.restore(a))return!1;return!0};S.prototype.Da=function(a){return a?this.save():!0};T.INIT=[[T.ad.tb,T.Ta.tb,T.bd.tb,0,0,0,0]]; +U.INIT=[[U.Fc.INIT,U.ab.Qc|U.ab.Rc,U.Ic.INIT,U.Hc.INIT],[0,0,0,0,[11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11776,11784,11918,11776,11856,11824,11840,11808,11776,12E3,12E3,11857,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]]];m=S.prototype; +m.reset=function(){this.B.INIT&&!this.restore(this.B.INIT)&&this.ga("reset error")};m.save=function(){var a=new H(this);switch(this.B.xa){case T.xa:I(a,0,[this.ra,this.F,this.wa,this.O,this.Z,this.ma,this.na]);break;case U.xa:I(a,0,[this.da,this.J,this.fa,this.ea]),I(a,1,[this.M,this.A,this.K,this.Y,this.I])}return a.data()}; +m.restore=function(a){var b;if(a&&(b=a[0])&&b.length)switch(this.B.xa){case T.xa:return this.ra=b[0],this.F=b[1],this.wa=b[2],this.O=b[3],this.Z=b[4],this.ma=b[5],this.na=b[6],!0;case U.xa:return this.da=b[0],this.J=b[1],this.fa=b[2],this.ea=b[3],b=a[1],this.M=b[0],this.A=b[1],this.K=b[2],this.Y=b[3],this.I=b[4],!0}return!1};m.start=function(){};m.stop=function(){};function Gd(a,b,c){a.F&=~b;c&&(a.F|=b)}m.qd=function(a,b){var c=this.ra;D(this,a,null,b,"STATUS0",c,!0);return c}; m.rd=function(a,b){var c=this.F;D(this,a,null,b,"STATUS1",c,!0);return c};m.sd=function(a,b){var c=this.wa;D(this,a,null,b,"STATUS2",c,!0);return c};m.pd=function(a,b){var c=this.O>>8-this.Z&255;D(this,a,null,b,"SHIFT.RESULT",c,!0);return c};m.Ad=function(a,b,c){D(this,a,b,c,"SHIFT.COUNT",null,!0);this.Z=b};m.Cd=function(a,b,c){D(this,a,b,c,"SOUND1",null,!0);this.ma=b};m.Bd=function(a,b,c){D(this,a,b,c,"SHIFT.DATA",null,!0);this.O=b<<8|this.O>>8}; m.Dd=function(a,b,c){D(this,a,b,c,"SOUND2",null,!0);this.na=b};m.Ed=function(a,b,c){D(this,a,b,c,"WATCHDOG",null,!0)};function Hd(a){var b=0,c=0,d=~a.M;for(a=0;10>a;a++)d&1&&(b=9-a),d>>=1;for(a=0;10>a;a++)d&1&&(c=9-a),d>>=1;return 10*b+c} m.td=function(a,b){var c=this.J,c=c&~U.ab.ec;if((pc(this.b)&64)<<1&&(c|=U.ab.ec,c!=this.J)){var d,e;d=this.K&1;e=this.K>>1&7;switch(e){case U.Ia.Qa.Zc:break;case U.Ia.Qa.Dc:this.M=this.M<<1|d;break;case U.Ia.Qa.Jc:d=Hd(this);this.I[d]=U.Ia.Jb;gb(this,"doNVRCommand(): erase data at addr "+r(d));break;case U.Ia.Qa.Ec:this.A=this.A<<1|d;break;case U.Ia.Qa.ed:d=Hd(this);e=this.A&U.Ia.Jb;this.I[d]=e;gb(this,"doNVRCommand(): write data "+r(e)+" to addr "+r(d));break;case U.Ia.Qa.Xc:d=Hd(this);e=this.I[d]; diff --git a/versions/pc8080/1.23.3/pc8080.js b/versions/pc8080/1.23.3/pc8080.js index 9c80c00bd..0263f2523 100644 --- a/versions/pc8080/1.23.3/pc8080.js +++ b/versions/pc8080/1.23.3/pc8080.js @@ -75,9 +75,10 @@ I(this,Mb(this));Nb(this,a);this.a-=5},function(){var a=P(this);Pb(this)&&(R(thi C(this,a),this.a-=6);this.a-=11},function(){R(this,Jb(this)&255|this.b<<8);this.a-=11},function(){this.b=Vb(this,M(this));this.a-=7},function(){R(this,this.s);C(this,48);this.a-=11},function(){this.u&128&&(C(this,Q(this)),this.a-=6);this.a-=5},function(){this.B=H(this)&65535;this.a-=5},function(){var a=P(this);this.u&128&&C(this,a);this.a-=10},function(){this.H|=512;this.a-=4},function(){var a=P(this);this.u&128&&(R(this,this.s),C(this,a),this.a-=6);this.a-=11},ac,function(){L(this,M(this));this.a-= 7},function(){R(this,this.s);C(this,56);this.a-=11}];function T(a){v.call(this,"ChipSet",a,T);var b=a.model;b&&!bc[b]&&va("Unrecognized ChipSet model: "+b);this.c=bc[b]||{};a.sound&&(this.B=null,window&&(this.B=window.AudioContext||window.webkitAudioContext),this.B&&new this.B);A(this)}x(T); var U={V:1978.1,nc:{W:0,fd:1,ld:16,zd:32,Nd:64,Ld:128,Ba:14},ma:{W:1,Ub:1,jc:2,fc:4,gc:16,hc:32,ic:64,Ba:8},oc:{W:2,ed:3,Xd:4,gd:8,Hd:16,Id:32,Jd:64,hd:128,Ba:0},Rd:{W:3},Pd:{W:2,Bd:7},Td:{W:3,Zd:1,Sd:2,Kd:4,td:8,jd:16,Xc:32},Qd:{W:4},Ud:{W:5,md:1,nd:2,od:4,pd:8,$d:16}},V={V:100,ta:{W:66,de:1,dc:2,ec:4,Fd:8,Dd:16,tb:32,sb:64,wd:128},Tb:{W:66,INIT:0},da:{yd:{W:98},ra:{Sb:0,Rb:1,lc:2,rc:4,Xb:5,kc:6,Vd:7},Pa:16383},Wb:{W:162,INIT:0},Vb:{W:194,INIT:0}},bc={SI1978:U,VT100:V};T.prototype.R=function(){return!1}; -T.prototype.ia=function(a,b,c,d){this.m=b;this.a=c;this.K=d;this.A=a;Za(b,this,this.c.Ya);$a(b,this,this.c.Za)};T.prototype.X=function(a,b){if(!b)if(!a)this.reset();else if(!this.restore(a))return!1;return!0};T.prototype.ba=function(a){return a?this.save():!0};U.INIT=[[U.nc.Ba,U.ma.Ba,U.oc.Ba,0,0,0,0]];V.INIT=[[V.Tb.INIT,V.ta.dc|V.ta.ec,V.Wb.INIT,V.Vb.INIT],[0,0,0,0,Array(100)]];l=T.prototype;l.reset=function(){this.c.INIT&&!this.restore(this.c.INIT)&&this.J("reset error")}; -l.save=function(){var a=new D(this);switch(this.c.V){case U.V:F(a,0,[this.O,this.f,this.U,this.s,this.v,this.L,this.N]);break;case V.V:F(a,0,[this.F,this.i,this.H,this.G]),F(a,1,[this.o,this.b,this.l,this.u,this.h])}return a.data()}; -l.restore=function(a){var b;if(a&&(b=a[0])&&b.length)switch(this.c.V){case U.V:return this.O=b[0],this.f=b[1],this.U=b[2],this.s=b[3],this.v=b[4],this.L=b[5],this.N=b[6],!0;case V.V:return this.F=b[0],this.i=b[2],this.H=b[3],this.G=b[4],b=a[1],this.o=b[0],this.b=b[1],this.l=b[2],this.u=b[3],this.h=b[4],!0}return!1};l.start=function(){};l.stop=function(){};function cc(a,b,c){a.f&=~b;c&&(a.f|=b)}l.Ac=function(){return this.O};l.Bc=function(){return this.f};l.Cc=function(){return this.U}; +T.prototype.ia=function(a,b,c,d){this.m=b;this.a=c;this.K=d;this.A=a;Za(b,this,this.c.Ya);$a(b,this,this.c.Za)};T.prototype.X=function(a,b){if(!b)if(!a)this.reset();else if(!this.restore(a))return!1;return!0};T.prototype.ba=function(a){return a?this.save():!0};U.INIT=[[U.nc.Ba,U.ma.Ba,U.oc.Ba,0,0,0,0]]; +V.INIT=[[V.Tb.INIT,V.ta.dc|V.ta.ec,V.Wb.INIT,V.Vb.INIT],[0,0,0,0,[11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11904,11776,11784,11918,11776,11856,11824,11840,11808,11776,12E3,12E3,11857,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]]];l=T.prototype; +l.reset=function(){this.c.INIT&&!this.restore(this.c.INIT)&&this.J("reset error")};l.save=function(){var a=new D(this);switch(this.c.V){case U.V:F(a,0,[this.O,this.f,this.U,this.s,this.v,this.L,this.N]);break;case V.V:F(a,0,[this.F,this.i,this.H,this.G]),F(a,1,[this.o,this.b,this.l,this.u,this.h])}return a.data()}; +l.restore=function(a){var b;if(a&&(b=a[0])&&b.length)switch(this.c.V){case U.V:return this.O=b[0],this.f=b[1],this.U=b[2],this.s=b[3],this.v=b[4],this.L=b[5],this.N=b[6],!0;case V.V:return this.F=b[0],this.i=b[1],this.H=b[2],this.G=b[3],b=a[1],this.o=b[0],this.b=b[1],this.l=b[2],this.u=b[3],this.h=b[4],!0}return!1};l.start=function(){};l.stop=function(){};function cc(a,b,c){a.f&=~b;c&&(a.f|=b)}l.Ac=function(){return this.O};l.Bc=function(){return this.f};l.Cc=function(){return this.U}; l.zc=function(){return this.s>>8-this.v&255};l.Jc=function(a,b){this.v=b};l.Lc=function(a,b){this.L=b};l.Kc=function(a,b){this.s=b<<8|this.s>>8};l.Mc=function(a,b){this.N=b};l.Nc=function(){};function dc(a){var b=0,c=0,d=~a.o;for(a=0;10>a;a++)d&1&&(b=9-a),d>>=1;for(a=0;10>a;a++)d&1&&(c=9-a),d>>=1;return 10*b+c} l.Dc=function(){var a=this.i,a=a&~V.ta.sb;if((zb(this.a)&64)<<1&&(a|=V.ta.sb,a!=this.i)){var b,c;b=this.l&1;switch(this.l>>1&7){case V.da.ra.Rb:this.o=this.o<<1|b;break;case V.da.ra.Xb:b=dc(this);this.h[b]=V.da.Pa;break;case V.da.ra.Sb:this.b=this.b<<1|b;break;case V.da.ra.rc:b=dc(this);c=this.b&V.da.Pa;this.h[b]=c;break;case V.da.ra.kc:b=dc(this);c=this.h[b];null==c&&(c=V.da.Pa);this.b=c;break;case V.da.ra.lc:this.b<<=1,this.u=this.b&V.da.Pa+1}}a&=~V.ta.tb;this.u&&(a|=V.ta.tb);return this.i=a}; l.Oc=function(a,b){this.F=b};l.Rc=function(a,b){this.l=b};l.Qc=function(a,b){this.H=b};l.Pc=function(a,b){this.G=b};U.Ya={0:T.prototype.Ac,1:T.prototype.Bc,2:T.prototype.Cc,3:T.prototype.zc};U.Za={2:T.prototype.Jc,3:T.prototype.Lc,4:T.prototype.Kc,5:T.prototype.Mc,6:T.prototype.Nc};V.Ya={66:T.prototype.Dc};V.Za={66:T.prototype.Oc,98:T.prototype.Rc,162:T.prototype.Qc,194:T.prototype.Pc};ta(function(){for(var a=z(document,"pc8080","chipset"),b=0;b