Merge pull request #3 from dschmenk/master

Merge latest upstream changes

src/libsrc/dgr.pla

@@ -206,9 +206,8 @@ export asm dgrBLT(buff, x, y, width, height, src)
 	CLC
 	ADC	ESTKL+2,X	; WIDTH
 	STA	SRCL
-	LDA	SRCH
-	ADC	#$00
-	STA	SRCH
+	BCC	+++
+	INC	SRCH
 	BNE	+++
 +	AND	#$FE
 	TAY
@@ -268,12 +267,10 @@ asm _dgrSetPix
 end
 asm _dgrSetEvnEvn
 	; EVEN PIXEL
-	LDA	$2000,X
-	AND	#$0F
-	STA	TMP
 	JSR	$0100		; LDA AUX (DST),Y
+	EOR	$2000,X
 	AND	#$F0
-	ORA	TMP
+	EOR	$2000,X
 	STA	$C005		; WRITE AUX MEM
 	STA	(GBASE),Y
 	STA	$C004		; WRITE MAIN MEM
@@ -281,12 +278,10 @@ asm _dgrSetEvnEvn
 end
 asm _dgrSetEvnOdd
 	; ODD PIXEL
-+	LDA	$1000,X
-	AND	#$0F
-	STA	TMP
-	LDA	(GBASE),Y
++	LDA	(GBASE),Y
+	EOR	$1000,X
 	AND	#$F0
-	ORA	TMP
+	EOR	$1000,X
 	STA	(GBASE),Y
 	RTS
 	; ODD ROW
@@ -296,12 +291,10 @@ asm _dgrSetEvnOdd
 end
 asm _dgrSetOddEvn
 	; EVEN PIXEL
-	LDA	$2000,X
-	AND	#$F0
-	STA	TMP
 	JSR	$0100		; LDA AUX (DST),Y
+	EOR	$2000,X
 	AND	#$0F
-	ORA	TMP
+	EOR	$2000,X
 	STA	$C005		; WRITE AUX MEM
 	STA	(GBASE),Y
 	STA	$C004		; WRITE MAIN MEM
@@ -309,12 +302,10 @@ asm _dgrSetOddEvn
 end
 asm _dgrSetOddOdd
 	; ODD PIXEL
-+++	LDA	$1000,X
-	AND	#$F0
-	STA	TMP
-	LDA	(GBASE),Y
++++	LDA	(GBASE),Y
+	EOR	$1000,X
 	AND	#$0F
-	ORA	TMP
+	EOR	$1000,X
 	STA	(GBASE),Y
 	RTS
 end
@@ -358,9 +349,8 @@ export asm dgrTile(buff, x, y, src)
 	LDA	SRCL		; SKIP TO NEXT ROW
 	ADC	#$07		; CARRY = 1
 	STA	SRCL
-	LDA	SRCH
-	ADC	#$00
-	STA	SRCH
+	BCC	+++
+	INC	SRCH
 	BNE	+++
 +	AND	#$FE
 	TAY

src/samplesrc/test.pla

@@ -143,5 +143,6 @@ putln
 puti(mystruc)
 putln
 puts(@constr); puti(constval); putln
+puts("Signed byte constant:"); puti(-3); putln
 puts("Hello from in-line string!\$7F\n")
 done

src/toolsrc/codegen.c

@@ -540,10 +540,12 @@ void emit_codetag(int tag)
 }
 void emit_const(int cval)
 {
-    if (cval == 0)
+    if (cval == 0x0000)
         printf("\t%s\t$00\t\t\t; ZERO\n", DB);
-    else if (cval > 0 && cval < 256)
+    else if ((cval & 0xFF00) == 0x0000)
         printf("\t%s\t$2A,$%02X\t\t\t; CB\t%d\n", DB, cval, cval);
+    else if ((cval & 0xFF00) == 0xFF00)
+        printf("\t%s\t$5E,$%02X\t\t\t; CFFB\t%d\n", DB, cval&0xFF, cval);
     else
         printf("\t%s\t$2C,$%02X,$%02X\t\t; CW\t%d\n", DB, cval&0xFF,(cval>>8)&0xFF, cval);
 }

src/vmsrc/plvm.c

@@ -776,7 +776,9 @@ void interp(code *ip)
                 fp += PLA;
             case 0x5C: // RET : IP = TOFP
                 return;
-            case 0x5E: // ???
+            case 0x5E: // CFFB : TOS = CONSTANTBYTE(IP) | 0xFF00
+                PUSH(BYTE_PTR(ip) | 0xFF00);
+                ip++;
                 break;
                 /*
                  * 0x60-0x6F

src/vmsrc/plvm01.s

@@ -115,7 +115,7 @@ OPTBL   !WORD   ZERO,ADD,SUB,MUL,DIV,MOD,INCR,DECR      ; 00 02 04 06 08 0A 0C 0
     !WORD   LNOT,LOR,LAND,LA,LLA,CB,CW,CS           ; 20 22 24 26 28 2A 2C 2E
     !WORD   DROP,DUP,PUSHEP,PULLEP,BRGT,BRLT,BREQ,BRNE      ; 30 32 34 36 38 3A 3C 3E
     !WORD   ISEQ,ISNE,ISGT,ISLT,ISGE,ISLE,BRFLS,BRTRU   ; 40 42 44 46 48 4A 4C 4E
-    !WORD   BRNCH,IBRNCH,CALL,ICAL,ENTER,LEAVE,RET,NEXTOP   ; 50 52 54 56 58 5A 5C 5E
+    !WORD   BRNCH,IBRNCH,CALL,ICAL,ENTER,LEAVE,RET,CFFB     ; 50 52 54 56 58 5A 5C 5E
     !WORD   LB,LW,LLB,LLW,LAB,LAW,DLB,DLW           ; 60 62 64 66 68 6A 6C 6E
     !WORD   SB,SW,SLB,SLW,SAB,SAW,DAB,DAW           ; 70 72 74 76 78 7A 7C 7E
 ;*
@@ -399,12 +399,14 @@ ZERO    DEX
     STA ESTKL,X
     STA ESTKH,X
     JMP NEXTOP
-CB  DEX
+CFFB    LDA #$FF
+    !BYTE $2C	; BIT $00A9 - effectively skips LDA #$00, no harm in reading this address
+CB  LDA #$00
+    DEX
+    STA ESTKH,X
     +INC_IP
     LDA (IP),Y
     STA ESTKL,X
-    LDA #$00
-    STA ESTKH,X
     JMP NEXTOP
 ;*
 ;* LOAD ADDRESS & LOAD CONSTANT WORD (SAME THING, WITH OR WITHOUT FIXUP)

src/vmsrc/plvm02.s

@@ -173,7 +173,7 @@ OPTBL	!WORD	ZERO,ADD,SUB,MUL,DIV,MOD,INCR,DECR		; 00 02 04 06 08 0A 0C 0E
 	!WORD	LNOT,LOR,LAND,LA,LLA,CB,CW,CS			; 20 22 24 26 28 2A 2C 2E
 	!WORD	DROP,DUP,PUSHEP,PULLEP,BRGT,BRLT,BREQ,BRNE	; 30 32 34 36 38 3A 3C 3E
 	!WORD	ISEQ,ISNE,ISGT,ISLT,ISGE,ISLE,BRFLS,BRTRU	; 40 42 44 46 48 4A 4C 4E
-	!WORD	BRNCH,IBRNCH,CALL,ICAL,ENTER,LEAVE,RET,NEXTOP	; 50 52 54 56 58 5A 5C 5E
+	!WORD	BRNCH,IBRNCH,CALL,ICAL,ENTER,LEAVE,RET,CFFB	; 50 52 54 56 58 5A 5C 5E
 	!WORD	LB,LW,LLB,LLW,LAB,LAW,DLB,DLW			; 60 62 64 66 68 6A 6C 6E
 	!WORD	SB,SW,SLB,SLW,SAB,SAW,DAB,DAW			; 70 72 74 76 78 7A 7C 7E
 ;*
@@ -731,12 +731,14 @@ ZERO	DEX
 	STA	ESTKL,X
 	STA	ESTKH,X
 	JMP	NEXTOP
-CB	DEX
+CFFB	LDA	#$FF
+    !BYTE $2C	; BIT $00A9 - effectively skips LDA #$00, no harm in reading this address
+CB	LDA	#$00
+	DEX
+	STA	ESTKH,X
 	+INC_IP
 	LDA	(IP),Y
 	STA	ESTKL,X
-	LDA	#$00
-	STA	ESTKH,X
 	JMP	NEXTOP
 ;*
 ;* LOAD ADDRESS & LOAD CONSTANT WORD (SAME THING, WITH OR WITHOUT FIXUP)

src/vmsrc/plvm03.s

@@ -220,7 +220,7 @@ OPTBL   !WORD   ZERO,ADD,SUB,MUL,DIV,MOD,INCR,DECR              ; 00 02 04 06 08
         !WORD   LNOT,LOR,LAND,LA,LLA,CB,CW,CS                   ; 20 22 24 26 28 2A 2C 2E
         !WORD   DROP,DUP,PUSHEP,PULLEP,BRGT,BRLT,BREQ,BRNE          ; 30 32 34 36 38 3A 3C 3E
         !WORD   ISEQ,ISNE,ISGT,ISLT,ISGE,ISLE,BRFLS,BRTRU       ; 40 42 44 46 48 4A 4C 4E
-        !WORD   BRNCH,IBRNCH,CALL,ICAL,ENTER,LEAVE,RET,NEXTOP   ; 50 52 54 56 58 5A 5C 5E
+        !WORD   BRNCH,IBRNCH,CALL,ICAL,ENTER,LEAVE,RET,CFFB     ; 50 52 54 56 58 5A 5C 5E
         !WORD   LB,LW,LLB,LLW,LAB,LAW,DLB,DLW                   ; 60 62 64 66 68 6A 6C 6E
         !WORD   SB,SW,SLB,SLW,SAB,SAW,DAB,DAW                   ; 70 72 74 76 78 7A 7C 7E
 ;*
@@ -507,12 +507,14 @@ ZERO    DEX
         STA     ESTKL,X
         STA     ESTKH,X
         JMP     NEXTOP
-CB      DEX
+CFFB    LDA     #$FF
+        !BYTE   $2C             ; BIT $00A9 - effectively skips LDA #$00, no harm in reading this address
+CB      LDA     #$00
+        DEX
+        STA     ESTKH,X
         +INC_IP
         LDA     (IP),Y
         STA     ESTKL,X
-        LDA     #$00
-        STA     ESTKH,X
         JMP     NEXTOP
 ;*
 ;* LOAD ADDRESS & LOAD CONSTANT WORD (SAME THING, WITH OR WITHOUT FIXUP)