From a0865c742fe1bf0b69346aa5f90665fc301e0236 Mon Sep 17 00:00:00 2001 From: Richard Cornwell Date: Mon, 5 Mar 2018 10:51:46 -0500 Subject: [PATCH] Cleaned up typos. --- src/clock1.mac | 2 +- src/comcon.mac | 2 +- src/core1.mac | 2 +- src/dpdint.mac | 2 +- src/dskint.mac | 62 ++++++++++++++++++++++++++++---------------------------- 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/clock1.mac b/src/clock1.mac index d337313..67292ba 100644 --- a/src/clock1.mac +++ b/src/clock1.mac @@ -516,7 +516,7 @@ EXTERN PRJPRG MOVSI TAC1,JNA ;YES,JOB NUMBER ASSGINED BIT HRRZ TAC,ITEM ;SCAN DOWNWARD TDNN TAC1,JBTSTS(TAC) ;IS JNA BIT SET FOR THIS JOB? - SOJG TAC,-1 ;NO,KEEP LOOKING,FINISHED(TRUE IF THIS THE ONLY JOB + SOJG TAC,.-1 ;NO,KEEP LOOKING,FINISHED(TRUE IF THIS THE ONLY JOB MOVEM TAC,HIGHJB ;YES,STORE NEW HIGHEST JOB NUMBER ASSIGNED JRST ESTOP ;GO SET ERROR BIT ;ROUTINE TO STOP JOB, SET ERROR BIT AND PRINT MESSAGE diff --git a/src/comcon.mac b/src/comcon.mac index 7038b08..883f015 100644 --- a/src/comcon.mac +++ b/src/comcon.mac @@ -2833,7 +2833,7 @@ IOWBLT: MOVSI TAC,@TAC ;YES, KEEP THE ENTIRE IOWD DATA SUBI AC3,(TAC) ;AC3 POINTS TO TOP OF DATA READ IN-(N) BLT TAC1,@AC3 ;MOVE ONLY GOOD DATA DOWN JRST EXPND1 ;GO EXPAND THE GOOD DATA - SGDO1: MOVEI TAC,JOBDDT(PROG) ;MOVE EVERYTHING DOWN )MUST BE NON-COMPRESSED DSK FILE + SGDO1: MOVEI TAC,JOBDDT(PROG) ;MOVE EVERYTHING DOWN )MUST BE NON-COMPRESSED DSK FILE HRLI TAC,JOBSVD(TAC) ;OR CONVERT SAVE FILE SKIPGE JOBSV(JDAT) ;IS THIS CONVERT FILE(FIRST WORD IS IOWD)? HRLI TAC,JOBSDP(TAC) ;YES, ALSO SKIP OVER IOWD diff --git a/src/core1.mac b/src/core1.mac index 5e81986..f2b2dc9 100644 --- a/src/core1.mac +++ b/src/core1.mac @@ -442,7 +442,7 @@ IFN FTSWAP,< > IFE FTSWAP,< IFE FT2REL,< - SOSO (PDP) ;SET FOR ERROR RETURN AND GET BACK LO CORE + SOS (PDP) ;SET FOR ERROR RETURN AND GET BACK LO CORE > IFN FT2REL,< EXTERN FRECOR diff --git a/src/dpdint.mac b/src/dpdint.mac index 0882969..7b7fcab 100644 --- a/src/dpdint.mac +++ b/src/dpdint.mac @@ -230,5 +230,5 @@ DSKCON: 0 IOWRD: 0 DCBERR: 0 ACSAV: 0 -<> +> DPDEND: END diff --git a/src/dskint.mac b/src/dskint.mac index 2b3f239..cd914c2 100644 --- a/src/dskint.mac +++ b/src/dskint.mac @@ -47,8 +47,7 @@ DATERR=DPAR!CHDPAR ;DATA ERRORS. DEVERR=SRCHE!PSF!CHCPAR!OVR ;DEVICE ERRORS. SETERR=DDE!TSE!NRDY!NXMEM ;SOFTWARE-PREVENTABLE ERRORS. ALLERR=DATERR!DEVERR!SETERR!WRPE ;ALL POSSIBLE ERRORS. - -;CONO FORMAT FOR THE MODEL RC-10 DISK SYNCHRONIZER + ;CONO FORMAT FOR THE MODEL RC-10 DISK SYNCHRONIZER ;BITS 00 - 17 UNUSED ;BITS 18 - 19 SELECT DISK FOR SECTOR COUNTER READ-OUT A(SEE DATAI BITS 28-35) @@ -59,6 +58,7 @@ STPBIT=1B31 ;STOP -- IMMEDIATELY CEASE PRESENT I/O AND CLEAR THE CHANNEL. RESETB=1B32 ;RESET THE DONE FLAG (CORRESPONDING CONI BIT) TO CLEAR INTERRUPT ;BITS 33 - 35 PI CHANNEL SELECTION BITS + ;DATAI FORMAT FOR THE MODEL RC-10 DISK SYNCHRONIZER -- ;BITS 00 - 17 UNUSED @@ -67,6 +67,7 @@ RESETB=1B32 ;RESET THE DONE FLAG (CORRESPONDING CONI BIT) TO CLEAR INTERRUPT ;BITS 26 - 27 DISK SELECTED BY BITS 18-19 OF LAST CONO ;BITS 28 - 35 CURRENT SECTOR POSITION OF SELECTED DISK (FOR LATENCY OPTIMIZATION!) + ;DATAO FORMAT FOR THE MODEL RC-10 DISK SYNCHRONIZER -- ;BITS 00 - 17 DISK ADDRESS ELECTION @@ -80,8 +81,7 @@ WRBIT=1B26 ;SET MEANS WRITE ON DISK, RESET MEANS READ FROM DISK ;BITS 27 - 34 ;CORRESPONDING BITS OF INITIAL CHANNEL CONTROL ADDRESS, HENCE, ; THIS ADDRESS MUST BE EVEN AND IN THE FIRST 1K OF CORE MEMORY! ;BIT 35 ;WRITE EVEN PARITY DATA INTO MEMORY (DIAGNOSTICS ONLY!) - -;SUBROUTINE "DFWRT" IS CALLED TO START UP A WRITE ON THE DISK. + ;SUBROUTINE "DFWRT" IS CALLED TO START UP A WRITE ON THE DISK. ;CALLING SEQUENCE -- ; PUSHJ PDP,DFWRT @@ -100,7 +100,6 @@ DFWRT: CONSZ DSK,BUSYBT ;FOR SAFETY SAKE BE SURE THE DISK IS MOVEM TAC1,WRCHNL ;SET UP CHANNEL COMMAND SEQUENCE. SETZM WRCHNL+1 ;MAKE SURE NEXT COMMAND IS 0, SO CHANNEL ; WILL NOT WRITE ALL OVER DISK - IFN FTRCHK,< EXTERN SATM2 MOVEI TAC1,1(TAC1) ;CLEAR LH AND COMPARE WITH @@ -111,8 +110,8 @@ IFN FTRCHK,< ;WILL LOOP > MOVEI TAC1,WRCHNL - MOVEM TAC1,RCXIOC ;RCX10C IS MAGIC EVEN LOCATION IN FIRST 1K OF CORE. - PUSHJ PDP,CNVBLK ;CONVERT LOGICAL BLOCK NO. INTO PHYSICAL DISK ADDRESS. + MOVEM TAC1,RCXIOC ;RCXIOC IS MAGIC EVEN LOCATION IN FIRST 1K OF CORE. + PUSHJ PDP,CNVBLK ;CONVERT LOGICAL BLOCK NO. INTO PHYSICAL DISK ADDRESS. ORI TAC,WRBIT ;REQUEST WRITE (INSTEAD OF READ) DFWRTC: ORI TAC,RCXIOC MOVEM TAC,DFORDR ;SAVE RC-10 DATAO COMMAND @@ -131,8 +130,7 @@ DSKFDG: HRRZI TAC,DSKCHN ;THIS INSTRUCTION TEMPORARILY ALTERED DURING "ONCE". ; STORE THE CHANNEL CONTROL WORD. DATAO DSK,DFORDR ;START UP DISK AND DATA CHANNEL. POPJ PDP, ;SUBROUTINE EXIT.,......*** - -;SUBROUTINE "DFRED" IS CALLED TO START UP A READ FROM THE DISK. + ;SUBROUTINE "DFRED" IS CALLED TO START UP A READ FROM THE DISK. ;THE CALLING SEQUENCE, ENTRY CONDITIONS, AND EXIT CONDITIONS ARE EXACTLY ; SIMILAR TO THOSE FOR SUBROUTINE "DFWRT" ABOVE. @@ -147,29 +145,15 @@ IFN FTRCHK,< MOVEI TAC1,1(TAC1) ;CLEAR LH AND COMPARE WITH FIRST WORD AFFECTED CAIG TAC1,SATM2 ;COMPARE ABS CORE ADDRESS TO BEGINNING ;OF SAT TABLE-2 - HALT . ;HALT - DO NOT WRITE OUT MONITOR - CONTINUE - ;WILL LOOP + HALT . ;HALT - DO NOT WRITE OUT MONITOR,CONTINUE WILL LOOP > - MOVEI TAC,RDCHNL ; PLACE FROM WRITE CONTROL WORDS FOR - MOVEM TAC,RCXIOC ; BETTER FOOTPRINTS IN CASE OF A CRASH. + MOVEI TAC1,RDCHNL ; PLACE FROM WRITE CONTROL WORDS FOR + MOVEM TAC1,RCXIOC ; BETTER FOOTPRINTS IN CASE OF A CRASH. PUSHJ PDP,CNVBLK ;CONVERT LOGICAL BLOCK NUMBER TO PHYSICAL DISK ADDRESS. JRST DFWRTC ;REMAINDER OF THIS READ ROUTINE IS ; IDENTICAL TO WRITING. - -;A ROUTINE CALLED DURING SYSTEM INITIALIZATION TO BE SURE DISK IS READY, -; NOTE: THIS ROUTINE DESTROYS ACCUMULATOR TAC. + ;DISK INTERRUPTS COME HERE TO BE SERVICED -- -DISKUP: CONO DSK,ALLERR!RESETB ;CLEAR THE DISK SYNCHRONIZER. - CONSZ DSK,NRDY!PSF!BUSYBT!DONEFLG ;ANYTHING AMISS OR STUCK ? - JRST DISKUP ;IF SO, JUST HANGE HERE IN A LOOP. - DATAI DSK,TAC ;IS THE SECTOR COUNTER GOING ? - JUMPE TAC,.-1 ;IF NOT, JUST LOOP HERE. -;*** THIS LOOP ABOVE WILL OCCUR DURING INITIALIZATION IF THE DISK IS OFF-LINE. *** - HRRZI TAC,DSKBIT ;IF NOT, ENABLE DISK INTERRUPTS ON THE - CONO PI,2200(TAC) ; APPRORIATE PRIORITY INTERRUPT CHANNEL. - POPJ PDP, ;SUBROUTINE EXIT.....,*** - -;DISK INTERRUPTS COME HERE TO BE SERVICED -- DSKINT: CONSO DSK,@DSKCON ;*DID THE DISK SYNCHRONIZER CAUSE THE INTERRUPT ON JRST .-1 ;* THIS CHANNEL? IF NOT, GO TO THE NEXT DEVICE ON @@ -187,8 +171,9 @@ DSKINT: CONSO DSK,@DSKCON ;*DID THE DISK SYNCHRONIZER CAUSE THE INTERRUPT ON CONSZ DSK,WRPE ;* TRO IOS,IOIMPM ;* ;CLEAR OUT THE DISK SYNCHRONIZER AND LEAVE IT DETACHED FROM ITS INTERRUPT CHANNEL. + CONO DSK,ALLERR!RESETB - MOVE TAC,RCXCCW ;*PICK UP THE FINAL VALUE FO THE CHANNEL CONTROL WORD. + MOVE TAC,RCXCCW ;*PICK UP THE FINAL VALUE FO THE CHANNEL CONTROL WORD. CAMN TAC,RCXFIN ;*DOES IT AGREE WITH THE SAVED VALUE WE EXPECTED ? JRST DFINT ;*YES, EXIT TO THE DEVICE INDEPENDENT INTERRUPT ;* HANDLING ROUTINE IN "DSKSER"......... @@ -213,8 +198,24 @@ DSKNT1: SKIPE RCXCCW ;*MAYBE CHANNEL WAS TURNED OFF ? / POP PDP,ITEM ;* JRST DSKNT2 ;* - -;SUBROUTINE TO CONVERT LOGICAL BLOCK NUMBERS TO PHYSICAL DISK ADDRESSES + + + + + +;A ROUTINE CALLED DURING SYSTEM INITIALIZATION TO BE SURE DISK IS READY, +; NOTE: THIS ROUTINE DESTROYS ACCUMULATOR TAC. + +DISKUP: CONO DSK,ALLERR!RESETB ;CLEAR THE DISK SYNCHRONIZER. + CONSZ DSK,NRDY!PSF!BUSYBT!DONEFLG ;ANYTHING AMISS OR STUCK ? + JRST DISKUP ;IF SO, JUST HANGE HERE IN A LOOP. + DATAI DSK,TAC ;IS THE SECTOR COUNTER GOING ? + JUMPE TAC,.-1 ;IF NOT, JUST LOOP HERE. +;*** THIS LOOP ABOVE WILL OCCUR DURING INITIALIZATION IF THE DISK IS OFF-LINE. *** + HRRZI TAC,DSKBIT ;IF NOT, ENABLE DISK INTERRUPTS ON THE + CONO PI,2200(TAC) ; APPRORIATE PRIORITY INTERRUPT CHANNEL. + POPJ PDP, ;SUBROUTINE EXIT.....,*** + ;SUBROUTINE TO CONVERT LOGICAL BLOCK NUMBERS TO PHYSICAL DISK ADDRESSES ;CALLING SEQUENCE -- ; PUSHJ PDP,CNVBLK @@ -290,4 +291,3 @@ DFORDR: 0 ;ITS CORRESPONDING PHYSICAL DISK ADDRESS. > DSKEND: END - \ No newline at end of file -- 1.7.1