Mercurial > hg > Members > kono > nitros9-code

changeset 1513:f0ac3e8debe9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rodney's improvements in rbf.asm
author boisy
date Sun, 18 Jan 2004 15:10:34 +0000
parents f3557a63b11c
children b7d6cb1df834
files level2/modules/rbf.asm level2/modules/rbf2.asm
diffstat 2 files changed, 50 insertions(+), 38 deletions(-) [+]
line wrap: on
line diff
--- a/level2/modules/rbf.asm	Sun Jan 18 15:08:52 2004 +0000
+++ b/level2/modules/rbf.asm	Sun Jan 18 15:10:34 2004 +0000
@@ -76,6 +76,9 @@
 *
 *          2003/04/21  Boisy G. Pitre
 * Folded RBF 30 comments into this version.
+*
+*  36      2003/05/01  Rodney V. Hamilton
+* Fix for LSN0 DD.TOT=0 lockout problem
 
          nam   RBF
          ttl   Random Block File Manager
@@ -94,7 +97,7 @@
          ENDC
 tylg     set   ty+lg
 atrv     set   ReEnt+rev
-edition  set   35
+edition  set   36
 
          org   $00
 size     equ   .
@@ -104,7 +107,7 @@
 name     fcs   /RBF/
          fcb   edition
 
-L0012    fcb   DRVMEM
+*L0012    fcb   DRVMEM
 
 
 ****************************
@@ -377,12 +380,23 @@
          sta   PD.SBL+2,y
          ldx   PD.DTB,y		get pointer to drive table
          lda   DD.TOT+2,x	get total # sectors on drive
+* resave nonzero DD.TOT here and recopy
+OpenFix  equ   *
          std   PD.SIZ+2,y	copy it to file size (B=0)
          sta   PD.SSZ+2,y	copy it to segment size as well
          ldd   DD.TOT,x
          std   PD.SIZ,y
          std   PD.SSZ,y
-         puls  pc,y		restore & return
+* BUG FIX: handle special case of DD.TOT=0 in LSN0 which blocks
+* all subsequent accesses.  NOTE: since we can only access LSN0
+* for any non-zero value, set DD.TOT=1 to avoid NOT READY error.
+         bne   OpenRet		MSW nonzero, OK
+         lda   DD.TOT+2,x	MSW=0, check LSB
+         bne   OpenRet		LSB nonzero, OK
+         inca			DD.TOT=0, make it 1
+         sta   DD.TOT+2,x	fix drive table
+         bra   OpenFix		and resave (B=0)
+OpenRet  puls  pc,y		restore & return
 
 Open1BB  lda   PD.MOD,y		get file mode
          lbsr  ChkAttrs		can user access file?
@@ -1520,11 +1534,11 @@
 Sst81E   ldu   PD.DEV,y		get pointer to device table
          stu   PD.DVT,y		copy it for user
          lda   PD.DRV,y		get drive #
-         ldb   >L0012,pcr	get sizeof drive tables
-* confusion reigns supreme here,
-* one source loaction says its number of drive tables,
-* and the next says its the size of the table! And a 3rd
-* says its D.TYP.
+         ldb   #DRVMEM		get sizeof drive tables
+* confusion reigns supreme here - NO MORE!
+* The data stored at L0012 *IS* the drive table sizeof.
+* MY question is why this RBF constant is stored as a variable.
+* Why would it need to be changed, and by who?
          mul   			calculate offset into drive tables
          addd  V$STAT,u		add start of static memory
          addd  #DRVBEG		add offset to drive tables
@@ -1539,7 +1553,6 @@
 Sst83F   lbsr  L1110		read in LSN0
          lbcs  L0915		error, return
          ldu   PD.BUF,y		get sector buffer pointer from the read-in sector
-
 * otherwise use the pointer from PD.DTB
          ldd   DD.DSK,u		get disk ID
          std   PD.DSK,y		put it in path descriptor
--- a/level2/modules/rbf2.asm	Sun Jan 18 15:08:52 2004 +0000
+++ b/level2/modules/rbf2.asm	Sun Jan 18 15:10:34 2004 +0000
@@ -315,7 +315,7 @@
          IFNE  H6309
          ldw   #DIR.SZ		get size of directory entry (name & LSN of FD)
          ELSE
-         ldd   #DIR.SZ
+         ldd   #DIR.SZ		A = 0 so clear loop passes once +BGP+
          ENDC
          bra   Creat174		clear it out
 
@@ -327,19 +327,19 @@
          ELSE
          clrb
          ENDC
-         lbsr  SSBits
+         lbsr  SSBits		+BGP+
 Creat174 pshs  u,x		preserve regs
          IFNE  H6309
          leax  <Creat170+3,pcr	point to NULL byte
-CreatL   tfm   x,u+		clear buffer
-         deca
-         bpl   CreatL
+CreatL   tfm   x,u+		clear buffer 
+         deca			+BGP+
+         bpl   CreatL		+BGP+
          ELSE
 l1       clr   ,u+
          decb
          bne   l1 
-         deca
-         bpl   l1
+         deca			+BGP+
+         bpl   l1		+BGP+
          ENDC
          puls  pc,u,x		restore & return
 
@@ -541,8 +541,8 @@
 Rt100Mem pshs  b,cc		preserve error status
          ldu   PD.BUF,y		get sector buffer pointer
          beq   RtMem2CF		none, skip ahead
-         lbsr  SSize
-*         ldd   #$0100		get size of sector buffer
+         lbsr  SSize		+BGP+
+*         ldd   #$0100		get size of sector buffer -BGP-
          os9   F$SRtMem		return the memory to system
          ldx   PD.Exten,y	get path extension pointer
          beq   RtMem2CF		none, return
@@ -691,8 +691,8 @@
 Del358   ldb   PD.FD,y		get LSN of file descriptor
          ldx   PD.FD+1,y
          pshs  u,x,b		preserve 'em
-         bsr   SSize
-*         ldd   #$0100		allocate a temporary sector buffer
+         bsr   SSize		+BGP+
+*         ldd   #$0100		allocate a temporary sector buffer -BGP-
          os9   F$SRqMem
          bcc   Del36C		got it, skip ahead
          IFNE  H6309
@@ -708,18 +708,18 @@
          IFNE  H6309
          ldw   #$0100
 DelCpy   tfm   x+,u+		copy the sector
-         deca
-         bne   DelCpy
+         deca			+BGP+
+         bne   DelCpy		+BGP+
          ELSE
          clrb
-         pshs  a
+         pshs  a		+BGP+
 DelLoop  lda   ,x+
          sta   ,u+
          decb
          bne   DelLoop
-         dec   ,s
-         bne   DelLoop
-         puls  a
+         dec   ,s		+BGP+
+         bne   DelLoop		+BGP+
+         puls  a		+BGP+
          ENDC
          ldd   $03,s
 Del37A   std   $03,s		save buffer pointer to U on stack
@@ -802,8 +802,8 @@
 Del3EF   pshs  b,cc		preserve rror status & code if any (WP bug fix - raises stack offsets+2)
          ldu   $05,s		get temporary sector buffer pointer (this was a 3)
          beq   Del3F5		didn't allocate one, skip ahead (different, new label! no mem to return)
-         lbsr  SSize
-*         ldd   #$0100		get size of it
+         lbsr  SSize		+BGP+
+*         ldd   #$0100		get size of it -BGP-
          os9   F$SRtMem		return the memory back to the system
 Del3F5   puls  b,cc		restore error status & code (WP bug fix)
 Del3F9   leas  5,s		purge stack
@@ -1175,7 +1175,7 @@
 GetStat  ldb   R$B,u		get function code
          beq   Gst5FF		it's SS.Opt, go process
 
-* SS.OPT
+* SS.Opt
 * Entry A=path number
 *       B=$00
 *       X=address to put 32 byte packet
@@ -1215,12 +1215,12 @@
          ENDC
 Gst5FF   rts   			return
 
-* SS.POS
+* SS.Pos
 * Entry A=path num
 *       B=$05
 * Exit  X=msw of pos
 *       U=lsw of pos
-Gst600   cmpb  #SS.POS		is it SS.Pos?
+Gst600   cmpb  #SS.Pos		is it SS.Pos?
          bne   Gst60D		no, keep checking
          IFNE  H6309
 * use 2 LDD, STD, same size as ldq/std/stw, PD.CP+2 <$0F, we can use short n,R
@@ -1288,9 +1288,9 @@
 *        B = errcode
 *
 SetStat  ldb   R$B,u		get function code
-* TODO: remove next line since SS.OPT is 0
-         cmpb  #SS.OPT		
-         bne   Sst659		not SS.OPT, skip ahead
+* TODO: remove next line since SS.Opt is 0
+         cmpb  #SS.Opt		
+         bne   Sst659		not SS.Opt, skip ahead
          ldx   R$X,u		get pointer to option packet
          leax  $02,x		skip device type and drive #
          leau  PD.STP,y		get pointer to start of data
@@ -1500,8 +1500,8 @@
 * Entry: U=caller's stack reg. ptr
 *        Y=Path dsc. ptr
 FindFile 
-         lbsr  SSize
-*         ldd   #$0100		get size of sector
+         lbsr  SSize		+BGP+
+*         ldd   #$0100		get size of sector -BGP-
 * Note, following line is stb PD.SMF,y in v30!
          stb   PD.FST,y		clear state flags??
          os9   F$SRqMem		request a 256 byte sector buffer
@@ -1542,7 +1542,7 @@
 Sst7FB   anda  #$7F		strip high bit
          cmpa  #PENTIR		entire device flag?
          beq   Sst81E		yes, go process
-         lda   #PDELIm		place delimiter as last char
+         lda   #PDELIM		place delimiter as last char
          sta   ,s
          leax  -$01,x		bump path pointer back 1
          lda   PD.MOD,y		get file mode
@@ -1712,7 +1712,6 @@
 L0942    ldb   PD.CP+3,y	get current byte pointer
          addb  #DIR.SZ		add in diretory entry size
          stb   PD.CP+3,y	save it back
-
          bcc   L0957		didn't wrap, skip ahead (need new sector)
          lbsr  L1237		check for sector flush
          inc   PD.CP+2,y