diff --git a/images/apple/PLASMA2.2mg b/images/apple/PLASMA2.2mg index 8c9458c..bd2b01e 100644 Binary files a/images/apple/PLASMA2.2mg and b/images/apple/PLASMA2.2mg differ diff --git a/src/makefile b/src/makefile index b50330b..73206e5 100755 --- a/src/makefile +++ b/src/makefile @@ -199,11 +199,11 @@ $(PLVM01): vmsrc/apple/plvm01.s vmsrc/apple/a1cmd.a $(CMD): vmsrc/apple/cmd.pla vmsrc/apple/cmdstub.s $(PLVM02) $(PLASM) ./$(PLASM) -AOW vmsrc/apple/cmd.pla - acme --setpc 8192 -o $(CMD) vmsrc/apple/cmdstub.s + acme --setpc 8192 -o $(CMD) -l vmsrc/apple/cmd.sym vmsrc/apple/cmdstub.s $(CMDJIT): vmsrc/apple/cmdjit.pla vmsrc/apple/cmdjitstub.s $(PLVMJIT) $(PLASM) ./$(PLASM) -AOW vmsrc/apple/cmdjit.pla - acme --setpc 8192 -o $(CMDJIT) vmsrc/apple/cmdjitstub.s + acme --setpc 8192 -o $(CMDJIT) -l vmsrc/apple/cmdjit.sym vmsrc/apple/cmdjitstub.s $(SOSCMD): vmsrc/apple/soscmd.pla $(PLVM03) $(PLASM) ./$(PLASM) -AMOW vmsrc/apple/soscmd.pla diff --git a/src/vmsrc/apple/plvm802.s b/src/vmsrc/apple/plvm802.s index 4a81cff..0066317 100644 --- a/src/vmsrc/apple/plvm802.s +++ b/src/vmsrc/apple/plvm802.s @@ -288,13 +288,13 @@ DINTRP PHP TSX STX HWSP LDX #ESTKSZ/2 ; COPY ZERO PAGE EVAL STACK TO HW STACK - CMP ESP + CPX ESP BEQ + -- LDY ESTKH,X +- DEX + LDY ESTKH,X PHY LDY ESTKL,X PHY - DEX CPX ESP BNE - + LDX #>OPTBL @@ -488,13 +488,13 @@ _INTRPX +ACCMEM16 ; 16 BIT A/M TSX STX HWSP LDX #ESTKSZ/2 ; COPY ZERO PAGE EVAL STACK TO HW STACK - CMP ESP + CPX ESP BEQ + -- LDY ESTKH,X +- DEX + LDY ESTKH,X PHY LDY ESTKL,X PHY - DEX CPX ESP BNE - + STX ALTRDON @@ -1655,13 +1655,13 @@ EMUSTK STA TMP TSX STX HWSP LDX #ESTKSZ/2 ; COPY ZERO PAGE EVAL STACK TO HW STACK - CMP ESP + CPX ESP BEQ + -- LDY ESTKH,X +- DEX + LDY ESTKH,X PHY LDY ESTKL,X PHY - DEX CPX ESP BNE - + LDX #>OPTBL ; MAKE SURE WE'RE INDEXING THE RIGHT TABLE @@ -1723,13 +1723,13 @@ EMUSTKX STA TMP TSX STX HWSP LDX #ESTKSZ/2 ; COPY ZERO PAGE EVAL STACK TO HW STACK - CMP ESP + CPX ESP BEQ + -- LDY ESTKH,X +- DEX + LDY ESTKH,X PHY LDY ESTKL,X PHY - DEX CPX ESP BNE - + STX ALTRDON @@ -1759,7 +1759,7 @@ ENTER LDA IFP BEQ + ASL TAY -- PLA ; COPY PARAMS FROM STACK INTO FRAME +- PLA ; COPY PARAMS FROM STACK INTO FRAME DEY DEY STA (IFP),Y @@ -1772,8 +1772,7 @@ ENTER LDA IFP ;* ;* LEAVE FUNCTION ;* -LEAVE STX ALTRDOFF - INY ;+INC_IP +LEAVE INY ;+INC_IP LDA (IP),Y ; DEALLOCATE POOL + FRAME AND #$00FF TAY @@ -1781,6 +1780,7 @@ LEAVE STX ALTRDOFF ADC #$02 ; PREVIOUS IFP HIDDEN AT END OF FRAME ADC IFP STA PP + STX ALTRDOFF LDA (IFP),Y ; RESTORE PREVIOUS FRAME STA IFP RET STX ALTRDOFF