Commit 4b0d4bf7 authored by John Beranek's avatar John Beranek
Browse files

Macro changes

Detail:
  Replaced GRABS and GRAB with Pull, and STASH with Push.
Admin:
  Built.


Version 2.36. Tagged as 'CDFSDriver-2_36'
parent d2385f77
......@@ -11,14 +11,14 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "2.35"
Module_Version SETA 235
Module_MajorVersion SETS "2.36"
Module_Version SETA 236
Module_MinorVersion SETS ""
Module_Date SETS "30 Nov 2000"
Module_ApplicationDate2 SETS "30-Nov-00"
Module_ApplicationDate4 SETS "30-Nov-2000"
Module_Date SETS "07 Dec 2000"
Module_ApplicationDate2 SETS "07-Dec-00"
Module_ApplicationDate4 SETS "07-Dec-2000"
Module_ComponentName SETS "CDFSDriver"
Module_ComponentPath SETS "RiscOS/Sources/HWSupport/CD/CDFSDriver"
Module_FullVersion SETS "2.35"
Module_HelpVersion SETS "2.35 (30 Nov 2000)"
Module_FullVersion SETS "2.36"
Module_HelpVersion SETS "2.36 (07 Dec 2000)"
END
/* (2.35)
/* (2.36)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 2.35
#define Module_MajorVersion_CMHG 2.36
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 30 Nov 2000
#define Module_Date_CMHG 07 Dec 2000
#define Module_MajorVersion "2.35"
#define Module_Version 235
#define Module_MajorVersion "2.36"
#define Module_Version 236
#define Module_MinorVersion ""
#define Module_Date "30 Nov 2000"
#define Module_Date "07 Dec 2000"
#define Module_ApplicationDate2 "30-Nov-00"
#define Module_ApplicationDate4 "30-Nov-2000"
#define Module_ApplicationDate2 "07-Dec-00"
#define Module_ApplicationDate4 "07-Dec-2000"
#define Module_ComponentName "CDFSDriver"
#define Module_ComponentPath "RiscOS/Sources/HWSupport/CD/CDFSDriver"
#define Module_FullVersion "2.35"
#define Module_HelpVersion "2.35 (30 Nov 2000)"
#define Module_FullVersion "2.36"
#define Module_HelpVersion "2.36 (07 Dec 2000)"
......@@ -68,7 +68,7 @@ cd_bytecopy
; Any bytes to copy ?
;--------------------------
TEQ r3, #0
GRABS "r0-r11, pc", EQ
Pull "r0-r11, pc", EQ, ^
;--------------------------
......@@ -103,7 +103,7 @@ MovByt25
BGE MovByt25 ; do another 8 words
CMP r3, #-8 * 4 ; Quick test rather that chaining down
GRABS "r0-r11, pc", EQ ; finished
Pull "r0-r11, pc", EQ, ^ ; finished
MovByt30
......@@ -114,7 +114,7 @@ MovByt30
LDMIA r1!, { r0, r4 - r5, r14 } ; NB. Order ! (?)
STMIA r2!, { r0, r4 - r5, r14 }
GRABS "r0-r11, pc", EQ ; finished
Pull "r0-r11, pc", EQ, ^ ; finished
SUB r3, r3, #4 * 4
......@@ -127,7 +127,7 @@ MovByt40
LDMIA r1!, { r0, r14 } ; NB. Order ! (?)
STMIA r2!, { r0, r14 }
GRABS "r0-r11, pc", EQ ; finished
Pull "r0-r11, pc", EQ, ^ ; finished
SUB r3, r3, #2 * 4
......@@ -140,7 +140,7 @@ MovByt50
LDR r0, [ r1 ], #4
STR r0, [ r2 ], #4
GRABS "r0-r11, pc", EQ ; finished
Pull "r0-r11, pc", EQ, ^ ; finished
SUB r3, r3, #1 * 4
......@@ -148,7 +148,7 @@ MovByt50
MovByt60
ADDS r3, r3, #1*4 - 0*4 ; No more to do ?
GRABS "r0-r11, pc", EQ ; finished
Pull "r0-r11, pc", EQ, ^ ; finished
LDR r0, [ r1 ] ; store remaining 1,2 or 3 bytes
......@@ -161,7 +161,7 @@ MovByt70
SUBS r3, r3, #1
BGT MovByt70
GRABS "r0-r11, pc" ; finished
Pull "r0-r11, pc",,^ ; finished
......@@ -172,7 +172,7 @@ MovByt100
LDRB r0, [ r1 ], #1
STRB r0, [ r2 ], #1
SUBS r3, r3, #1
GRABS "r0-r11, pc", EQ ; finished
Pull "r0-r11, pc", EQ, ^ ; finished
TST r2, #3
BNE MovByt100
......@@ -236,7 +236,7 @@ MovByt225
BGE MovByt225 ; do another 8 words
CMP r3, #-8 * 4 ; Quick test
GRABS "r0-r11, pc", EQ
Pull "r0-r11, pc", EQ, ^
MovByt230
......@@ -258,7 +258,7 @@ MovByt230
STMIA r2!, { r0, r4 - r6 }
GRABS "r0-r11, pc", EQ
Pull "r0-r11, pc", EQ, ^
SUB r3, r3, #4*4
MOV r0, r14, LSR r12 ; keep r0 prepared
......@@ -278,7 +278,7 @@ MovByt240
STMIA r2!, { r0, r4 }
GRABS "r0-r11, pc", EQ
Pull "r0-r11, pc", EQ, ^
SUB r3, r3, #2*4
......@@ -295,7 +295,7 @@ MovByt250
STR r0, [ r2 ], #4
GRABS "r0-r11, pc", EQ
Pull "r0-r11, pc", EQ, ^
SUB r3, r3, #1*4
MOV r0, r14, LSR r12 ; keep r0 prepared
......@@ -304,7 +304,7 @@ MovByt250
MovByt260
ADDS r3, r3, #1*4 - 0*4
GRABS "r0-r11, pc", EQ
Pull "r0-r11, pc", EQ, ^
LDR r14, [ r1 ] ; store remaining 1..3 bytes
ORR r0, r0, r14, LSL r11
......@@ -317,7 +317,7 @@ MovByt270
SUBS r3, r3, #1
BGT MovByt270
GRABS "r0-r11, pc"
Pull "r0-r11, pc",,^
......
......@@ -77,7 +77,7 @@ cd_version ROUT
;
;-----------------------------------------------------------------------------------------------
GRAB "r0-r11, r14"
Pull "r0-r11, r14"
ADR r0, VersionMessage
BICS pc, r14, #Overflow_Flag
......@@ -95,7 +95,7 @@ cd_lasterror ROUT
;
;-----------------------------------------------------------------------------------------------
GRAB "r0-r11, r14"
Pull "r0-r11, r14"
LDR r0, LastErrorNumber
BICS pc, r14, #Overflow_Flag
......@@ -137,7 +137,7 @@ cd_readdata ROUT
; r9 = card number
; r10 = lun
STASH "r0-r4"
Push "r0-r4"
Debug "cd_readdata",NL
......@@ -199,9 +199,9 @@ cd_readdata ROUT
SWIVC XSCSI_Op
GRAB "r1-r5"
Pull "r1-r5"
GRABS "r0-r11, pc", VC
Pull "r0-r11, pc", VC, ^
LDR r6, [ r0 ]
......@@ -213,7 +213,7 @@ cd_readdata ROUT
;-----------------------------------------------
LDR r14, =Busy
TEQ r6, r14
STASH "r1-r5", EQ
Push "r1-r5", EQ
SWIEQ XCD_StopDisc
LDMEQFD r13, { r0 - r4 }
BEQ %BT01
......@@ -243,7 +243,7 @@ cd_seekto ROUT
;-----------------------------------------------------------------------------------------------
STASH "r0-r1"
Push "r0-r1"
Debug "cd_seekto",NL
......@@ -295,9 +295,9 @@ cd_seekto ROUT
SWIVC XSCSI_Op
GRAB "r1-r2"
Pull "r1-r2"
GRABS "r0-r11, pc", VC
Pull "r0-r11, pc", VC, ^
;-----------------------------------------------
; If the error is 'Busy' because playing audio
......@@ -306,7 +306,7 @@ cd_seekto ROUT
LDR r14, =Busy
LDR r6, [ r0 ]
TEQ r6, r14
STASH "r1-r2", EQ
Push "r1-r2", EQ
SWIEQ XCD_StopDisc
LDMEQFD r13, { r0 - r1 }
BEQ %BT01
......@@ -352,7 +352,7 @@ cd_inquiry ROUT
BVS error_handler
GRABS "r0-r11, pc"
Pull "r0-r11, pc",, ^
;-----------------------------------------------------------------------------------------------
cd_discused ROUT
......@@ -422,7 +422,7 @@ cd_discused ROUT
TEQ r0, #MSFFormat
STRNE r2, [ r1 ]
GRABS "r0-r11, pc", NE
Pull "r0-r11, pc", NE, ^
......@@ -440,7 +440,7 @@ cd_discused ROUT
; save the important bits in the users area
STR r1, [ r3 ]
GRABS "r0-r11, pc"
Pull "r0-r11, pc",, ^
;-----------------------------------------------------------------------------------------------
cd_driveready ROUT
......@@ -468,7 +468,7 @@ cd_driveready ROUT
SWI XSCSI_Op
GRAB "r0-r11, r14", VC
Pull "r0-r11, r14", VC
MOVVC r0, #0
BICVCS pc, r14, #Overflow_Flag
......@@ -483,7 +483,7 @@ cd_driveready ROUT
BEQ error_handler
;------------------------------------------
GRAB "r0-r11, r14"
Pull "r0-r11, r14"
MOV r0, #1
BICS pc, r14, #Overflow_Flag
......@@ -514,7 +514,7 @@ cd_stopdisc ROUT
BVS error_handler
GRABS "r0-r11, pc"
Pull "r0-r11, pc",, ^
;-----------------------------------------------------------------------------------------------
......@@ -543,7 +543,7 @@ cd_opendrawer ROUT
SWI XSCSI_Op
GRABS "r0-r11, pc", VC
Pull "r0-r11, pc", VC, ^
;--------------------------------------------------
; If Illegal Request then the drawer must be locked
......@@ -572,7 +572,7 @@ cd_converttolba ROUT
STR r1, [ r13, #4 ]
GRABS "r0-r11, pc"
Pull "r0-r11, pc",, ^
;-----------------------------------------------------------------------------------------------
......@@ -592,7 +592,7 @@ cd_converttomsf ROUT
STR r1, [ r13, #4 ]
GRABS "r0-r11, pc"
Pull "r0-r11, pc",, ^
;-----------------------------------------------------------------------------------------------
......@@ -624,7 +624,7 @@ cd_drivestatus ROUT
; Everything OK
;---------------
GRAB "r0-r11, r14", VC
Pull "r0-r11, r14", VC
MOVVC r0, #1
BICVCS pc, r14, #Overflow_Flag
......@@ -637,7 +637,7 @@ cd_drivestatus ROUT
LDR r14, =NotReady
SUBS r14, r1, r14
SUBNES r14, r14, #&201d0 - NotReady ; Unknown error
GRAB "r0-r11, r14", EQ
Pull "r0-r11, r14", EQ
MOVEQ r0, #4
BICEQS pc, r14, #Overflow_Flag
......@@ -646,14 +646,14 @@ cd_drivestatus ROUT
TEQ r1, r14
LDRNE r14, =NoSense
TEQNE r1, r14
GRAB "r0-r11, r14", EQ
Pull "r0-r11, r14", EQ
MOVEQ r0, #2
BICEQS pc, r14, #Overflow_Flag
; No drive - unavailable
LDR r14, =TimeoutSelection
TEQ r1, r14
GRAB "r0-r11, r14", EQ
Pull "r0-r11, r14", EQ
MOVEQ r0, #8
BICEQS pc, r14, #Overflow_Flag
......@@ -691,7 +691,7 @@ cd_control ROUT
BVS error_handler
GRABS "r0-r11, pc"
Pull "r0-r11, pc",, ^
;-----------------------------------------------------------------------------------------------
......@@ -717,7 +717,7 @@ cd_reset ROUT
BVS error_handler
GRABS "r0-r11, pc"
Pull "r0-r11, pc",, ^
;-----------------------------------------------------------------------------------------------
......@@ -758,7 +758,7 @@ cd_checkdrive ROUT
;-------------------------
GRAB "r0-r11, r14"
Pull "r0-r11, r14"
MOVVC r0, #0
MOVVS r0, #15
......@@ -896,7 +896,7 @@ RUDP_Repeat
; r4 = number of bytes from each block wanted
; r7 -> control block
STASH "r1 - r5"
Push "r1 - r5"
MOV r0, # LBAFormat
MOV r1, r4
......@@ -906,7 +906,7 @@ RUDP_Repeat
SWI XCD_ReadData
GRAB "r1 - r5"
Pull "r1 - r5"
BVS error_handler
......@@ -926,7 +926,7 @@ RUDP_Repeat
; r9 = number of bytes loaded
; r10 = byte offset in first block
STASH "r0-r4, r6-r8, r10"
Push "r0-r4, r6-r8, r10"
MOV r10, r6
MOV r6, r8
......@@ -971,7 +971,7 @@ RUDP_ShuffleBlocks
MOV r5, r2
GRAB "r0-r4, r6-r8, r10"
Pull "r0-r4, r6-r8, r10"
MOV r6, # 0
......@@ -1009,7 +1009,7 @@ RUDP_LastBlock
; Copy out last bytes
;------------------------------------------------------------------
STASH "r0-r4"
Push "r0-r4"
CLV
......@@ -1063,7 +1063,7 @@ RUDP_LastBlock
BLGT cd_bytecopyinternal
GRAB "r0-r4"
Pull "r0-r4"
SUBS r2, r2, r9
......@@ -1096,7 +1096,7 @@ RUDP_LastBlock
]
GRAB "r0-r11, r14"
Pull "r0-r11, r14"
BICS pc, r14, #Overflow_Flag
......@@ -1166,7 +1166,7 @@ cd_seekuserdata_plain ROUT
; Byte offset of less than 2048 means it must be in the first block
;-------------------------------------------------------------------
CMP r2, # USERDATA__MODE2FORM1
GRAB "r0-r11, r14", LT
Pull "r0-r11, r14", LT
BICLTS pc, r14, #Overflow_Flag
......@@ -1193,7 +1193,7 @@ cd_seekuserdata_plain ROUT
STR r1, [ r13, # 4*1 ]
STR r2, [ r13, # 4*2 ]
GRAB "r0-r11, r14"
Pull "r0-r11, r14"
BICS pc, r14, #Overflow_Flag
......
......@@ -49,13 +49,13 @@ ConvertToLBA ROUT
TEQ r0, #LBAFormat
MOVEQS pc, r14
STASH "r0, r2 - r5, r14"
Push "r0, r2 - r5, r14"
;--------------------------------------------------
; Check for allowable addressing mode
;--------------------------------------------------
CMP r0, #3
GRAB "r0, r2 - r5, r14", CS
Pull "r0, r2 - r5, r14", CS
addr r0, InvalidFormat, CS
ORRCSS pc, r14, #Overflow_Flag
......@@ -77,12 +77,12 @@ ChangeFromPBFormat
SUBS r1, r1, #( MaxNumberOfBlocks + 1 ) * 2
GRAB "r0, r2 - r5, r14", LT
Pull "r0, r2 - r5, r14", LT
addr r0, PhysicalBlockError, LT
ORRLTS pc, r14, #Overflow_Flag
GRABS "r0, r2 - r5, pc"
Pull "r0, r2 - r5, pc",, ^
;----------------------------------------------------------------------------------------------
......@@ -114,7 +114,7 @@ ChangeFromMSFFormat ; R1 = address, RETURNS R1 = address
;-----------------------------------------
CMP r4, #MaxNumberOfSeconds + 1
GRAB "r0, r2 - r5, r14", CS
Pull "r0, r2 - r5, r14", CS
addr r0, BadSeconds, CS
ORRCSS pc, r14, #Overflow_Flag
......@@ -123,7 +123,7 @@ ChangeFromMSFFormat ; R1 = address, RETURNS R1 = address
;-----------------------------------------
CMP r3, #MaxNumberOfBlocks + 1
GRAB "r0, r2 - r5, r14", CS
Pull "r0, r2 - r5, r14", CS
addr r0, BadBlocks, CS
ORRCSS pc, r14, #Overflow_Flag
......@@ -148,7 +148,7 @@ ChangeFromMSFFormat ; R1 = address, RETURNS R1 = address
;-----------------------------------------
GRABS "r0, r2 - r5, pc"
Pull "r0, r2 - r5, pc",, ^
;----------------------------------------------------------------------------------------------
......@@ -178,7 +178,7 @@ ConvertToMSF ROUT
TEQ r0, #MSFFormat
MOVEQS pc, r14
STASH "r0, r2 - r5, r14"
Push "r0, r2 - r5, r14"
;-----------------------------------------
......@@ -186,7 +186,7 @@ ConvertToMSF ROUT
;-----------------------------------------
CMP r0, #3
GRAB "r0, r2 - r5, r14", CS
Pull "r0, r2 - r5, r14", CS
addr r0, InvalidFormat, CS
ORRCSS pc, r14, #Overflow_Flag
......@@ -206,7 +206,7 @@ ConvertPBtoMSF
; address = address - 150 ( error if < 0 )
SUBS r1, r1, #( MaxNumberOfBlocks + 1 ) * 2
GRAB "r0, r2 - r5, r14", LT
Pull "r0, r2 - r5, r14", LT
addr r0, BadSeconds, LT
ORRLTS pc, r14, #Overflow_Flag
......@@ -249,7 +249,7 @@ ConvertLBAtoMSF
ORR r3, r3, r2, LSL #8
ORR r1, r3, r4, LSL #16
GRABS "r0, r2 - r5, pc"
Pull "r0, r2 - r5, pc",, ^
;----------------------------------------------------------------------------------------------
......
......@@ -145,15 +145,15 @@ cd_identify ROUT
STASH "r0, r1, r3, r4, r6, r7, r12"
Push "r0, r1, r3, r4, r6, r7, r12"
LDR r12, [ r2, r6, LSL #2 ]
;------------------------------------------
; Build a return address including PC flags
;------------------------------------------
ADR r14, back_from_identify
STASH pc
GRAB r11
Push pc
Pull r11
AND r11, r11, #255:ROL:26
ORR r14, r14, r11
......@@ -167,7 +167,7 @@ back_from_identify
; r2 = drive type or -1 if not recognized
GRAB "r0, r1, r3, r4, r6, r7, r12"
Pull "r0, r1, r3, r4, r6, r7, r12"
CMP r2, #-1
BEQ %BT02
......@@ -177,7 +177,7 @@ back_from_identify
;--------------------------------
ADD r12, r2, r6, LSL #2
GRAB "r0-r11, r14"
Pull "r0-r11, r14"
MOV r2, r12
BICS pc, r14, #Overflow_Flag
......@@ -188,7 +188,7 @@ cdb_inquiry = &12, 0, 0, 0, 36, 0
;----------------------------------------------------------------------------------------------
not_recognized
GRAB "r0-r11, r14"
Pull "r0-r11, r14"
MOV r2, #-1
BICS pc, r14, #Overflow_Flag
......
......@@ -127,7 +127,7 @@ SWIentry ROUT
SWIentry_after_wp
BIC r14, r14, #Overflow_Flag
STASH "r0-r11, r14"
Push "r0-r11, r14"
BIC r11, r11, #3:SHL:30
......@@ -137,14 +137,14 @@ SWIentry_after_wp
MVN r10, #I_bit
TSTP r10, pc
; STASH "r5, r11"
; Push "r5, r11"
; STRIM " SWI Number = "
; Display r11
; STRIM " Drive type = "
; LDR r5, [ r7, #12 ]
; Display r5
; SWI XOS_NewLine
; GRAB "r5, r11"
; Pull "r5, r11"
;---------------------------
; Check the SWI number
......@@ -227,13 +227,13 @@ SWIentry_after_wp
LDR r10, [ r10, r8 ]
; Make sure that there are this many sub-drivers
STASH r10
Push r10
LDRB r8, [ r10, #RCB_DRIVETYPES ]
AND r10, r14, #3
CMP r10, r8
GRAB r10
Pull r10
BGE driver_not_present_error
......@@ -307,10 +307,10 @@ SWIentry_after_wp
TEQNE r11, # DRIVER__SetAudioParms
BNE IDC_Go
STASH "r0, r14"
Push "r0, r14"
SWI XCD_Supported
TST r0, # SUPPORT__AUDIO_PARMS
GRAB "r0, r14"
Pull "r0, r14"
addr r0, swi_not_supported, EQ
BEQ error_handler_lookup
......@@ -360,12 +360,12 @@ UPR_jump
; Make up a new control block for the driver with its drive type
; Must be after calling the CD routines so that they can call other CD SWIs - see cd_seekto
STASH "r8, r9, r10, r14"
Push "r8, r9, r10, r14"
LDMIA r7, { r8, r9, r10, r14 }
AND r14, r14, #3
ADR r7, control_block
STMIA r7, { r8, r9, r10, r14 }