Commit aad99cf6 authored by Ben Avison's avatar Ben Avison
Browse files

Support for high ROMs belatedly committed.

Version 0.24. Tagged as 'ResourceFS-0_24'
parent d38bee6c
......@@ -14,3 +14,4 @@
|
Dir <Obey$Dir>
amu_machine clean
stripdepnd
;
; This file is automatically maintained by srccommit, do not edit manually.
; Last processed by srccommit version: 1.68.
;
GBLS Module_MajorVersion
GBLA Module_Version
GBLS Module_MinorVersion
GBLS Module_Date
GBLS Module_FullVersion
GBLS Module_ApplicationDate2
GBLS Module_ApplicationDate4
GBLS Module_ApplicationDate
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "0.23"
Module_Version SETA 23
Module_MajorVersion SETS "0.24"
Module_Version SETA 24
Module_MinorVersion SETS ""
Module_Date SETS "10 Apr 2001"
Module_ApplicationDate2 SETS "10-Apr-01"
Module_ApplicationDate4 SETS "10-Apr-2001"
Module_Date SETS "19 Nov 2003"
Module_ApplicationDate SETS "19-Nov-03"
Module_ComponentName SETS "ResourceFS"
Module_ComponentPath SETS "RiscOS/Sources/FileSys/ResourceFS/ResourceFS"
Module_FullVersion SETS "0.23"
Module_HelpVersion SETS "0.23 (10 Apr 2001)"
Module_FullVersion SETS "0.24"
Module_HelpVersion SETS "0.24 (19 Nov 2003)"
END
/* (0.23)
/* (0.24)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.68.
*
*/
#define Module_MajorVersion_CMHG 0.23
#define Module_MajorVersion_CMHG 0.24
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 10 Apr 2001
#define Module_Date_CMHG 19 Nov 2003
#define Module_MajorVersion "0.23"
#define Module_Version 23
#define Module_MajorVersion "0.24"
#define Module_Version 24
#define Module_MinorVersion ""
#define Module_Date "10 Apr 2001"
#define Module_Date "19 Nov 2003"
#define Module_ApplicationDate2 "10-Apr-01"
#define Module_ApplicationDate4 "10-Apr-2001"
#define Module_ApplicationDate "19-Nov-03"
#define Module_ComponentName "ResourceFS"
#define Module_ComponentPath "RiscOS/Sources/FileSys/ResourceFS/ResourceFS"
#define Module_FullVersion "0.23"
#define Module_HelpVersion "0.23 (10 Apr 2001)"
#define Module_FullVersion "0.24"
#define Module_HelpVersion "0.24 (19 Nov 2003)"
#define Module_LibraryVersionInfo "0:24"
......@@ -579,7 +579,7 @@ JunkQuickIndexBlock Entry "r0,r2"
; Out - and quick index block constructed. Ignore exit V.
;
ConstructQuickIndexBlock Entry "r0-r5,r7-r9"
ConstructQuickIndexBlock Entry "r0-r9"
Debug quickindex,"ConstructQuickIndexBlock"
; Count the files in resourcefs
......@@ -619,12 +619,12 @@ ConstructQuickIndexBlock Entry "r0-r5,r7-r9"
SWI XOS_Module
BVS %FT90 ; drat!
MOV r7, r2 ; Things we're sorting
MOV r6, r2 ; Things we're sorting
; Construct the data unsorted
MOV r3, #0
ADD r4, r8, #4
MOV r5, r7
MOV r5, r6
ADR r0, ROMFSFileData - link_next
B %FT50
35
......@@ -651,7 +651,8 @@ ConstructQuickIndexBlock Entry "r0-r5,r7-r9"
ADD r1, r8, #4
ADR r2, QuickIndexCompare
MOV r3, r12
SWI XOS_HeapSort
MOV r7, #0
SWI XOS_HeapSort32
BVS %FT85 ; Drat drat drat drat!
Debug quickindex,"Heap sort completed"
......@@ -673,7 +674,7 @@ ConstructQuickIndexBlock Entry "r0-r5,r7-r9"
STR r8, QuickIndexBlock
; Junk the temporary array - error not important
MOV r2, r7
MOV r2, r6
MOV r0, #ModHandReason_Free
SWI XOS_Module
......@@ -681,7 +682,7 @@ ConstructQuickIndexBlock Entry "r0-r5,r7-r9"
85
; Error from OS_HeapSort - junk both arrays
MOV r2, r7
MOV r2, r6
MOV r0, #ModHandReason_Free
SWI XOS_Module
......@@ -1437,11 +1438,9 @@ compare_R10_R11 Entry "R1,R2"
|
TEQ R10, #0
TEQNE R11, #0
BNE %FT05
CMP PC, #0 ; PC always GT 0 (in 26-bit modes...)
EXIT
BEQ %FT30 ; jump if either filename null
]
05
DebugS fs,"compare_R10:",R10
DebugS fs,"compare_R11:",R11
......@@ -1465,6 +1464,10 @@ compare_R10_R11 Entry "R1,R2"
CMPNE R1, #&100000 ; LT <= filename1 shorter
EXIT
30 MOV R1, #1
CMP R1, #0 ; set GT
EXIT
;.....................................................................
; in: R1 -> wildcarded pathname
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment