VM cleanup

src/vmsrc/plvm01.s

@@ -10,6 +10,14 @@ SELFMODIFY  =   1
 ;* VM ZERO PAGE LOCATIONS
 ;*
     !SOURCE "vmsrc/plvmzp.inc"
+DROP    =   $EF
+NEXTOP  =   $F0
+FETCHOP =   NEXTOP+3
+IP      =   FETCHOP+1
+IPL     =   IP
+IPH     =   IPL+1
+OPIDX   =   FETCHOP+6
+OPPAGE  =   OPIDX+1
 ;*
 ;* INTERPRETER INSTRUCTION POINTER INCREMENT MACRO
 ;*
@@ -401,7 +409,7 @@ ZERO    DEX
     STA ESTKH,X
     JMP NEXTOP
 CFFB    LDA #$FF
-    !BYTE $2C	; BIT $00A9 - effectively skips LDA #$00, no harm in reading this address
+    !BYTE $2C   ; BIT $00A9 - effectively skips LDA #$00, no harm in reading this address
 CB  LDA #$00
     DEX
     STA ESTKH,X
@@ -443,15 +451,15 @@ CS  DEX
 ;* LOAD VALUE FROM ADDRESS TAG
 ;*
 !IF SELFMODIFY {
-LB	LDA	ESTKL,X
-	STA	LBLDA+1
-	LDA	ESTKH,X
-	STA	LBLDA+2
-LBLDA	LDA   $FFFF
-	STA	ESTKL,X
-    LDA	#$00
-	STA	ESTKH,X
-	JMP 	NEXTOP
+LB  LDA ESTKL,X
+    STA LBLDA+1
+    LDA ESTKH,X
+    STA LBLDA+2
+LBLDA   LDA   $FFFF
+    STA ESTKL,X
+    LDA #$00
+    STA ESTKH,X
+    JMP     NEXTOP
 } ELSE {
 LB  LDA ESTKL,X
     STA TMPL
@@ -521,18 +529,18 @@ LLW     +INC_IP
 ;* LOAD VALUE FROM ABSOLUTE ADDRESS
 ;*
 !IF SELFMODIFY {
-LAB	+INC_IP
-	LDA	(IP),Y
-	STA	LABLDA+1
-	+INC_IP
-	LDA	(IP),Y
-	STA	LABLDA+2
-LABLDA	LDA	$FFFF
-	DEX
-	STA	ESTKL,X
+LAB +INC_IP
+    LDA (IP),Y
+    STA LABLDA+1
+    +INC_IP
+    LDA (IP),Y
+    STA LABLDA+2
+LABLDA  LDA $FFFF
+    DEX
+    STA ESTKL,X
     LDA #$00
-	STA	ESTKH,X
-	JMP	NEXTOP
+    STA ESTKH,X
+    JMP NEXTOP
 } ELSE {
 LAB     +INC_IP
     LDA (IP),Y
@@ -569,16 +577,16 @@ LAW     +INC_IP
 ;* STORE VALUE TO ADDRESS
 ;*
 !IF SELFMODIFY {
-SB	LDA	ESTKL,X
-	STA	SBSTA+1
-	LDA	ESTKH,X
-	STA	SBSTA+2
-	LDA	ESTKL+1,X
-SBSTA	STA	$FFFF
-	INX
-;	INX
-;	JMP	NEXTOP
-	JMP	DROP
+SB  LDA ESTKL,X
+    STA SBSTA+1
+    LDA ESTKH,X
+    STA SBSTA+2
+    LDA ESTKL+1,X
+SBSTA   STA $FFFF
+    INX
+;   INX
+;   JMP NEXTOP
+    JMP DROP
 } ELSE {
 SB  LDA ESTKL,X
     STA TMPL
@@ -662,17 +670,17 @@ DLW     +INC_IP
 ;* STORE VALUE TO ABSOLUTE ADDRESS
 ;*
 !IF SELFMODIFY {
-SAB	+INC_IP
-	LDA	(IP),Y
-	STA	SABSTA+1
-	+INC_IP
-	LDA	(IP),Y
-	STA	SABSTA+2
-	LDA	ESTKL,X
-SABSTA	STA	$FFFF
-;	INX
-;	JMP	NEXTOP
-	JMP	DROP
+SAB +INC_IP
+    LDA (IP),Y
+    STA SABSTA+1
+    +INC_IP
+    LDA (IP),Y
+    STA SABSTA+2
+    LDA ESTKL,X
+SABSTA  STA $FFFF
+;   INX
+;   JMP NEXTOP
+    JMP DROP
 } ELSE {
 SAB     +INC_IP
     LDA (IP),Y
@@ -710,15 +718,15 @@ SAW     +INC_IP
 ;* STORE VALUE TO ABSOLUTE ADDRESS WITHOUT POPPING STACK
 ;*
 !IF SELFMODIFY {
-DAB	+INC_IP
-	LDA	(IP),Y
-	STA	DABSTA+1
-	+INC_IP
-	LDA	(IP),Y
-	STA	DABSTA+2
-	LDA	ESTKL,X
-DABSTA	STA	$FFFF
-	JMP	NEXTOP
+DAB +INC_IP
+    LDA (IP),Y
+    STA DABSTA+1
+    +INC_IP
+    LDA (IP),Y
+    STA DABSTA+2
+    LDA ESTKL,X
+DABSTA  STA $FFFF
+    JMP NEXTOP
 } ELSE {
 DAB     +INC_IP
     LDA (IP),Y
@@ -982,7 +990,7 @@ VMINIT  LDY #$10        ; INSTALL PAGE 0 FETCHOP ROUTINE
         LDX #ESTKSZ/2   ; INIT EVAL STACK INDEX
     JMP A1CMD
 PAGE0   =   *
-        !PSEUDOPC   $00EF {
+        !PSEUDOPC   DROP {
 ;*
 ;* INTERP BYTECODE INNER LOOP
 ;*

src/vmsrc/plvm03.s

@@ -11,6 +11,14 @@ SELFMODIFY  =   1
 ;
 MEMBANK =       $FFEF
         !SOURCE "vmsrc/plvmzp.inc"
+DROP    =       $EF
+NEXTOP  =       $F0
+FETCHOP =       NEXTOP+3
+IP      =       FETCHOP+1
+IPL     =       IP
+IPH     =       IPL+1
+OPIDX   =       FETCHOP+6
+OPPAGE  =       OPIDX+1
 ;
 ; XPAGE ADDRESSES
 ;
@@ -98,7 +106,7 @@ SEGREQ  !BYTE   4
         !BYTE   $10
         !BYTE   $00
 PAGE0   =       *
-        !PSEUDOPC       $00EF {
+        !PSEUDOPC       DROP {
 ;*
 ;* INTERP BYTECODE INNER LOOP
 ;*
@@ -604,7 +612,7 @@ LB      LDA     ESTKL,X
         STA     LBLDA+1
         LDA     ESTKH,X
         STA     LBLDA+2
-LBLDA	LDA     $FFFF
+LBLDA   LDA     $FFFF
         STA     ESTKL,X
         LDA     #$00
         STA     ESTKH,X
@@ -684,7 +692,7 @@ LAB     +INC_IP
         +INC_IP
         LDA     (IP),Y
         STA     LABLDA+2
-LABLDA	LDA      $FFFF
+LABLDA  LDA      $FFFF
         DEX
         STA     ESTKL,X
         LDA     #$00

src/vmsrc/plvmzp.inc

@@ -3,39 +3,31 @@
 ;*                 VM ZERO PAGE LOCATIONS
 ;*
 ;**********************************************************
-SRC	    =	$06
-SRCL    =	SRC
-SRCH    =	SRC+1
-DST     =	SRC+2
-DSTL    =	DST
-DSTH    =	DST+1
-ESTKSZ  =	$20
-XSTK    =	$A0
-XSTKL   =	XSTK
-XSTKH   =	XSTK+ESTKSZ/2
-ESTK    =	$C0
-ESTKL   =	ESTK
-ESTKH   =	ESTK+ESTKSZ/2
-VMZP    =	ESTK+ESTKSZ
+SRC     =   $06
+SRCL    =   SRC
+SRCH    =   SRC+1
+DST     =   SRC+2
+DSTL    =   DST
+DSTH    =   DST+1
+ESTKSZ  =   $20
+XSTK    =   $A0
+XSTKL   =   XSTK
+XSTKH   =   XSTK+ESTKSZ/2
+ESTK    =   $C0
+ESTKL   =   ESTK
+ESTKH   =   ESTK+ESTKSZ/2
+VMZP    =   ESTK+ESTKSZ
 ESP     =   VMZP
-DVSIGN  =	VMZP
-IFP     =	ESP+1
-IFPL    =	IFP
-IFPH    =	IFP+1
-PP      =	IFP+2
-PPL     =	PP
-PPH     =	PP+1
-IPY     =	PP+2
-TMP     =	IPY+1
-TMPL    =	TMP
-TMPH    =	TMP+1
-NPARMS  =	TMPL
-FRMSZ   =	TMPH
-DROP    =	$EF
-NEXTOP  =	$F0
-FETCHOP	=	NEXTOP+3
-IP      =	FETCHOP+1
-IPL     =	IP
-IPH     =	IPL+1
-OPIDX   =	FETCHOP+6
-OPPAGE  =	OPIDX+1
+DVSIGN  =   VMZP
+IFP     =   ESP+1
+IFPL    =   IFP
+IFPH    =   IFP+1
+PP      =   IFP+2
+PPL     =   PP
+PPH     =   PP+1
+IPY     =   PP+2
+TMP     =   IPY+1
+TMPL    =   TMP
+TMPH    =   TMP+1
+NPARMS  =   TMPL
+FRMSZ   =   TMPH