Some fixes: INSTR startpos, MEMORY 2's complement, ATN with DEG, BIN$ without padding; delay in hopper2.js

Author: benchmarko

CpcVm.js

@@ -417,6 +417,14 @@ CpcVm.prototype = {
 		return n;
 	},
 
+	vmRound2Complement: function (n, err) {
+		n = this.vmInRangeRound(n, -32768, 65535, err);
+		if (n < 0) {
+			n += 65536;
+		}
+		return n;
+	},
+
 	vmDetermineVarType: function (sVarType) { // also used in controller
 		var sType = (sVarType.length > 1) ? sVarType.charAt(1) : this.oVariables.getVarType(sVarType.charAt(0));
 
@@ -900,17 +908,18 @@ CpcVm.prototype = {
 
 	atn: function (n) {
 		this.vmAssertNumber(n, "ATN");
-		return Math.atan((this.bDeg) ? Utils.toRadians(n) : n);
+		n = Math.atan(n);
+		return this.bDeg ? Utils.toDegrees(n) : n;
 	},
 
 	auto: function () {
 		this.vmNotImplemented("AUTO");
 	},
 
 	bin$: function (n, iPad) {
-		n = this.vmInRangeRound(n, -32768, 65535, "BIN$");
+		n = this.vmRound2Complement(n, "BIN$");
 		iPad = this.vmInRangeRound(iPad || 0, 0, 16, "BIN$");
-		return n.toString(2).padStart(iPad || 16, "0");
+		return n.toString(2).padStart(iPad, "0");
 	},
 
 	border: function (iInk1, iInk2) { // ink2 optional
@@ -962,10 +971,7 @@ CpcVm.prototype = {
 
 	call: function (iAddr) { // eslint-disable-line complexity
 		// varargs (adr + parameters)
-		iAddr = this.vmInRangeRound(iAddr, -32768, 65535, "CALL");
-		if (iAddr < 0) { // 2nd complement of 16 bit address?
-			iAddr += 65536;
-		}
+		iAddr = this.vmRound2Complement(iAddr, "CALL");
 		switch (iAddr) {
 		case 0xbb00: // KM Initialize (ROM &19E0)
 			this.oKeyboard.resetCpcKeysExpansions();
@@ -1635,7 +1641,7 @@ CpcVm.prototype = {
 	},
 
 	hex$: function (n, iPad) {
-		n = this.vmInRangeRound(n, -32768, 65535, "HEX$");
+		n = this.vmRound2Complement(n, "HEX$");
 		iPad = this.vmInRangeRound(iPad || 0, 0, 16, "HEX$");
 		return n.toString(16).toUpperCase().padStart(iPad, "0");
 	},
@@ -1680,13 +1686,16 @@ CpcVm.prototype = {
 	},
 
 	inp: function (iPort) {
-		var iByte = 255;
+		var byte;
 
-		iPort = this.vmInRangeRound(iPort, -32768, 65535, "INP");
-		if (iPort < 0) { // 2nd complement of 16 bit address?
-			iPort += 65536;
-		}
-		return iByte;
+		iPort = this.vmRound2Complement(iPort, "INP"); // 2nd complement of 16 bit address
+		// eslint-disable-next-line no-bitwise
+		byte = (iPort & 0xff);
+
+		// eslint-disable-next-line no-bitwise
+		byte |= 0xff; // we return always the same 0xff
+
+		return byte;
 	},
 
 	vmSetInputValues: function (aInputValues) {
@@ -1860,8 +1869,8 @@ CpcVm.prototype = {
 			return p1.indexOf(p2) + 1;
 		}
 		p1 = this.vmInRangeRound(p1, 1, 255, "INSTR"); // p1=startpos
-		this.vmAssertString(p2, "INSTR");
-		return p2.indexOf(p3, p1) + 1; // p2=string, p3=search string
+		this.vmAssertString(p3, "INSTR");
+		return p2.indexOf(p3, p1 - 1) + 1; // p2=string, p3=search string
 	},
 
 	"int": function (n) {
@@ -2019,10 +2028,7 @@ CpcVm.prototype = {
 
 		sName = this.vmAdaptFilename(sName, "LOAD");
 		if (iStart !== undefined) {
-			iStart = this.vmInRangeRound(iStart, -32768, 65535, "LOAD");
-			if (iStart < 0) { // 2nd complement of 16 bit address
-				iStart += 65536;
-			}
+			iStart = this.vmRound2Complement(iStart, "LOAD");
 		}
 		this.closein();
 		oInFile.bOpen = true;
@@ -2092,7 +2098,7 @@ CpcVm.prototype = {
 	},
 
 	memory: function (n) {
-		n = this.vmInRangeRound(n, -32768, 65535, "MEMORY");
+		n = this.vmRound2Complement(n, "MEMORY");
 
 		if (n < this.iMinHimem || n > this.iMinCharHimem) {
 			throw this.vmComposeError(Error(), 7, "MEMORY " + n); // Memory full
@@ -2338,10 +2344,7 @@ CpcVm.prototype = {
 	out: function (iPort, iByte) {
 		var iPortHigh;
 
-		iPort = this.vmInRangeRound(iPort, -32768, 65535, "OUT");
-		if (iPort < 0) { // 2nd complement of 16 bit address?
-			iPort += 65536;
-		}
+		iPort = this.vmRound2Complement(iPort, "OUT");
 		iByte = this.vmInRangeRound(iByte, 0, 255, "OUT");
 		iPortHigh = iPort >> 8; // eslint-disable-line no-bitwise
 
@@ -2387,10 +2390,7 @@ CpcVm.prototype = {
 	peek: function (iAddr) {
 		var iByte, iPage;
 
-		iAddr = this.vmInRangeRound(iAddr, -32768, 65535, "PEEK");
-		if (iAddr < 0) { // 2nd complement of 16 bit address
-			iAddr += 65536;
-		}
+		iAddr = this.vmRound2Complement(iAddr, "PEEK");
 		// check two higher bits of 16 bit address to get 16K page
 		iPage = iAddr >> 14; // eslint-disable-line no-bitwise
 		if (iPage === this.iScreenPage) { // screen memory page?
@@ -2440,10 +2440,7 @@ CpcVm.prototype = {
 	poke: function (iAddr, iByte) {
 		var iPage;
 
-		iAddr = this.vmInRangeRound(iAddr, -32768, 65535, "POKE address");
-		if (iAddr < 0) { // 2nd complement of 16 bit address?
-			iAddr += 65536;
-		}
+		iAddr = this.vmRound2Complement(iAddr, "POKE address");
 		iByte = this.vmInRangeRound(iByte, 0, 255, "POKE byte");
 
 		// check two higher bits of 16 bit address to get 16K page
@@ -3148,21 +3145,11 @@ CpcVm.prototype = {
 		}
 
 		if (sType === "B") { // binary
-			iStart = this.vmInRangeRound(iStart, -32768, 65535, "SAVE");
-			if (iStart < 0) { // 2nd complement of 16 bit address
-				iStart += 65536;
-			}
-
-			iLength = this.vmInRangeRound(iLength, -32768, 65535, "SAVE");
-			if (iLength < 0) {
-				iLength += 65536;
-			}
+			iStart = this.vmRound2Complement(iStart, "SAVE");
+			iLength = this.vmRound2Complement(iLength, "SAVE");
 
 			if (iEntry !== undefined) {
-				iEntry = this.vmInRangeRound(iEntry, -32768, 65535, "SAVE");
-				if (iEntry < 0) {
-					iEntry += 65536;
-				}
+				iEntry = this.vmRound2Complement(iEntry, "SAVE");
 			}
 			aFileData = [];
 			for (i = 0; i < iLength; i += 1) {
@@ -3555,10 +3542,7 @@ CpcVm.prototype = {
 	},
 
 	wait: function (iPort, iMask, iInv) { // optional iInv
-		iPort = this.vmInRangeRound(iPort, -32768, 65535, "WAIT");
-		if (iPort < 0) { // 2nd complement of 16 bit address
-			iPort += 65536;
-		}
+		iPort = this.vmRound2Complement(iPort, "WAIT");
 		iMask = this.vmInRangeRound(iMask, 0, 255, "WAIT");
 		if (iInv !== undefined) {
 			iInv = this.vmInRangeRound(iInv, 0, 255, "WAIT");
@@ -3567,8 +3551,6 @@ CpcVm.prototype = {
 			if (iMask === 1) {
 				this.frame();
 			}
-		} else if (iPort === 0) {
-			debugger; // Testing
 		}
 	},
 

README.md

@@ -9,7 +9,8 @@ CPCBasic Links:
 [Source code](https://github.com/benchmarko/CPCBasic/),
 [HTML Readme](https://github.com/benchmarko/CPCBasic/#readme),
 
-There is also a TypeScript implementation of CPCBasic:
+Please note:
+CpcBasic gets only bug fixes. Active development goes on with CpcBasicTS, the TypeScript implementation of CPCBasic:
 [CPCBasicTS Demo](https://benchmarko.github.io/CPCBasicTS/?example=cpcbasic),
 [CPCBasicTS Source](https://github.com/benchmarko/CPCBasicTS/)
 

cpcbasic.html

@@ -4,7 +4,7 @@
 <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <link rel="stylesheet" href="cpcbasic.css" />
-<title id="title">CPC Basic v0.10.5</title>
+<title id="title">CPC Basic v0.10.6</title>
 </head>
 
 <body id="pageBody">

examples/games/hopper2.js

@@ -47,7 +47,7 @@ cpcBasic.addItem("", function () { /*
 620 RUN
 998 CALL &BB18:STOP
 999 REM Steuerung
-1000 j=0:j=JOY(0):IF j=0 THEN 1000
+1000 c.t!=time+40:while time<c.t!:call &bd19:wend:j=0:j=JOY(0):IF j=0 THEN 1000
 1005 IF j=16 THEN RETURN
 1010 IF j AND 8 THEN IF s1<br THEN s1=s1+1:RETURN
 1020 IF j AND 4 THEN IF s1>0 THEN s1=s1-1:RETURN

examples/test/testpage.js

@@ -102,7 +102,20 @@ cpcBasic.addItem("", function () { /*
 1000 IF ERR<>13 THEN PRINT"err=";ERR;"erl=";ERL:ERROR 33 ELSE RESUME 1010
 1010 ON ERROR GOTO 0
 1020 '
-1030 'cls#0: a=2: cls #(a*3)
+1021 PRINT "ATN"
+1022 RAD:a=INT(ATN(1)*100000000)/100000000:IF a<>0.78539816 THEN ERROR 33
+1023 DEG:a=INT(ATN(1)*100000000)/100000000:RAD:IF STR$(a)<>" 45" THEN ERROR 33
+1024 DEG:a=INT(ATN(TAN(45))*100000000)/100000000:RAD:IF STR$(a)<>" 45" THEN ERROR 33
+1025 '
+1026 PRINT "BIN$"
+1027 b$=BIN$(0):IF b$<>"0" THEN ERROR 33
+1029 b$=BIN$(255):IF b$<>"11111111" THEN ERROR 33
+1030 b$=BIN$(255,10):IF b$<>"0011111111" THEN ERROR 33
+1031 b$=BIN$(170,6):IF b$<>"10101010" THEN ERROR 33
+1032 b$=BIN$(32767,16):IF b$<>"0111111111111111" THEN ERROR 33
+1033 b$=BIN$(65535):IF b$<>"1111111111111111" THEN ERROR 33
+1034 '
+1039 'cls#0: a=2: cls #(a*3)
 1040 PRINT"COPYCHR$"
 1050 PRINT"Detect char 143 with matching pen"
 1060 PRINT CHR$(143);"#";:PAPER 1
@@ -253,6 +266,7 @@ cpcBasic.addItem("", function () { /*
 2510 PRINT"INSTR"
 2520 a=INSTR("Amstrad", "m"):IF a<>2 THEN ERROR 33
 2530 a=INSTR("Amstrad", "sr"):IF a<>0 THEN ERROR 33
+2532 a=INSTR(6,"amstrad", "a"):IF a<>6 THEN ERROR 33
 2540 PRINT"MID$"
 2550 a$="abcd":b$=mid$(a$,2):IF b$<>"bcd" THEN ERROR 33
 2560 a$="abcd":b$=mid$(a$,2,2):IF b$<>"bc" THEN ERROR 33
@@ -387,6 +401,10 @@ cpcBasic.addItem("", function () { /*
 3850 PRINT"DATA and RESTORE"
 3860 RESTORE 3870: READ s$,t$: IF s$+t$<>"1" THEN ERROR 33
 3870 DATA 1,
+3871 '
+3872 PRINT "TAN"
+3873 RAD:a=INT(TAN(0.7853981635)*100000000)/100000000:IF a<>1 THEN ERROR 33
+3874 DEG:a=INT(TAN(45)*100000000+0.00000001)/100000000:RAD:IF a<>1 THEN ERROR 33
 3880 '
 3890 PRINT"OPENIN and LINE INPUT #9"
 3900 t$="testpage.dat":PRINT"OPENIN ";t$;" with characters 33..255"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cpcbasic",
-  "version": "0.10.5",
+  "version": "0.10.6",
   "description": "# CPCBasic - Run CPC BASIC in a Browser",
   "main": "cpcbasic.js",
   "directories": {