New ProDOS.FX media for AppleWin bug tracking

BASIC.FX/BASIC.S.XF.txt

@@ -67,11 +67,11 @@ BSX.MoveHead	sta BSX.TargetQTrack
 
 				inc						CC: C < T, ON next PH
 
-.1				and #6					move in : X = Ph(N)
+.1				jsr BSX.SeekPhOnY		move in : X = Ph(N)
-				ora BSX.Slotn0
+				
+				tya
 				tax
-				lda IO.D2.Ph0On,x
+				
-
 				pla
 
 				bcs .2					if CS, C > T, must move out

BIN/CC.S.F.txt

@@ -182,12 +182,12 @@ CC.F.CallRetV	sec
 				phx
 
 				>STYA ZPPtr2
-
+			>DEBUG
 				ror ZPPtr1+1			bRetV
 				bpl .20					no return value on stack
 	
 				ldy #SYM.Addr+1
-				lda (ZPSymBufPtr),y
+				lda (ZPLookupSymPtr),y
 				beq .20					SYS/LIB/FPU call, no ret value space
 				
 				jsr CC.SYM.GetSymSizeOfInAXC
@@ -217,7 +217,7 @@ CC.F.CallRetV	sec
 .1				>STYA ZPPtr2			save full T/Q for later
 
 				lda #SYM.Def
-				sta ZPSymSize
+				>STA.G CC.LookupSymPtr
 
 				jsr CC.F.GetTQ			get First Arg T/Q
 				beq .7					end of list, go check ending ')'
@@ -246,8 +246,10 @@ CC.F.CallRetV	sec
 				sta ZPPtr1				Add to byte count
 				bra .5
 
-.50				inc ZPSymSize
+.50				>LDA.G CC.LookupSymPtr
-				inc ZPSymSize
+				clc
+				adc #2
+				sta (pData),y
 
 .5				jsr CC.GetCharNB
 
@@ -423,12 +425,13 @@ CC.F.Call3		ldy #SYM.Addr+1
 				sec
 				rts
 *--------------------------------------
-CC.F.GetTQ		ldy ZPSymSize
+CC.F.GetTQ		>LDA.G CC.LookupSymPtr
+				tay
 
-CC.F.GetTQAtY	lda (ZPSymBufPtr),y
+CC.F.GetTQAtY	lda (ZPLookupSymPtr),y
 				pha
 				iny
-				lda (ZPSymBufPtr),y
+				lda (ZPLookupSymPtr),y
 				ply
 				rts
 *--------------------------------------

BIN/CC.S.SYM.txt

@@ -225,13 +225,16 @@ CC.SYM.Store	ldy ScopePtr
 				rts
 *--------------------------------------
 CC.SYM.Free		>LDA.G CC.hSymBuf
+				beq .8
+				
 				>SYSCALL FreeMem
 				bcs .99
 
 				>STZ.G CC.hSymBuf
-				rts
 				
-.99				>DEBUG
+.99				rts
+				
+.8				clc
 				rts
 *--------------------------------------
 CC.SYM.NewScope	ldy ScopePtr

BIN/CC.S.txt

@@ -1399,6 +1399,7 @@ CC.hSymBuf		.BS 1
 *--------------------------------------
 CC.hLookupSymBuf	.BS 1
 CC.LookupSymSize	.BS 2
+CC.LookupSymPtr		.BS 1
 *--------------------------------------
 CC.InFileArg	.BS 1
 CC.OutFileArg	.BS 1

LIB/LIBBLKDEV.S.D2.txt

@@ -115,10 +115,10 @@ D2.MoveHead.SEI	lda D2.CurrentQTrack
 				
 				inc						move out: X = Ph(N+1)
 				
-.1				and #6					move in : X = Ph(N)
+.1				jsr D2.SeekPhOnY		move in : X = Ph(N)
-				ora D2.Slotn0
+
+				tya
 				tax
-				lda IO.D2.Ph0On,x
 
 				pla
 				
@@ -167,12 +167,12 @@ D2.MoveHead.SEI	lda D2.CurrentQTrack
 				jsr D2.Wait25600usec
 
 				bcc .10
-				clc
 
 				lda IO.D2.Ph0Off,x
-
+				
 .10				lda IO.D2.Ph0Off,y
-
+				
+				clc
 				rts
 *--------------------------------------
 D2.SeekPhOnY	and #6

ProDOS.FX/ProDOS.S.XRW.txt

@@ -786,10 +786,10 @@ XRW.SeekYA		sta XRW.D2Trk-1,x		will be current track at the end
 				
 				inc						move out: X = Ph(N+1)
 				
-.1				and #6					move in : X = Ph(N)
+.1				jsr XRW.SeekPhOnY		move in : X = Ph(N)
-				ora A2L
+
-				tax
+				tya
-				lda IO.D2.Ph0On,x
+				tax				
 				
 				pla
 				
@@ -838,6 +838,7 @@ XRW.SeekYA		sta XRW.D2Trk-1,x		will be current track at the end
 				jsr XRW.Wait25600usec
 
 				bcc .10
+
 				clc						Exit wit CC (recalibrate)
 
 				lda IO.D2.Ph0Off,x

SHARED/X.BB.FX2.S.txt

@@ -271,10 +271,10 @@ BB.FX2.SeekReadD2
 				
 				inc
 
-.1				and #6					move in : X = Ph(N)				
+.1				jsr BB.FX2.SeekPhOnY	move in : X = Ph(N)				
-				ora ROM.D2.Slotn0
+				
+				tya
 				tax
-				lda IO.D2.Ph0On,x
 				
 				pla
 				
@@ -283,6 +283,7 @@ BB.FX2.SeekReadD2
 				inc						move in : Y = Ph(N+1)
 
 .2				jsr BB.FX2.SeekPhOnY	move out: Y = Ph(N)
+
 				bra .9					Ph ON to go to 0/4 or 2/4, then wait
 *--------------------------------------
 .3				bcs	.4					if CS, C > T, must move out