Commit 438c1b47 authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Trim out some local definitions, use header files instead

Use Push/Pull macros for stack operations.
Unix-ify path names in assembler files.

Version 0.89. Tagged as 'DOSFS-0_89'
parent 0a026da4
/* (0.88)
/* (0.89)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.88
#define Module_MajorVersion_CMHG 0.89
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 13 Apr 2012
#define Module_Date_CMHG 14 Apr 2012
#define Module_MajorVersion "0.88"
#define Module_Version 88
#define Module_MajorVersion "0.89"
#define Module_Version 89
#define Module_MinorVersion ""
#define Module_Date "13 Apr 2012"
#define Module_Date "14 Apr 2012"
#define Module_ApplicationDate "13-Apr-12"
#define Module_ApplicationDate "14-Apr-12"
#define Module_ComponentName "DOSFS"
#define Module_ComponentPath "castle/RiscOS/Sources/FileSys/ImageFS/DOSFS"
#define Module_FullVersion "0.88"
#define Module_HelpVersion "0.88 (13 Apr 2012)"
#define Module_LibraryVersionInfo "0:88"
#define Module_FullVersion "0.89"
#define Module_HelpVersion "0.89 (14 Apr 2012)"
#define Module_LibraryVersionInfo "0:89"
......@@ -35,6 +35,7 @@
#include <ctype.h>
#include "kernel.h"
#include "swis.h"
#include "Interface/MimeMap.h"
#include "debuglib/debuglib.h"
#include "ASCII.h"
......@@ -52,12 +53,6 @@
#include "ADFSshape.h"
#include "Statics.h"
#define MimeMap_Translate 0x50B00
#define MMM_TYPE_RISCOS 0
#define MMM_TYPE_RISCOS_STRING 1
#define MMM_TYPE_MIME 2
#define MMM_TYPE_DOT_EXTN 3
#define ReadOnlyMapsLocked 1
/* JRS 9/3/92 map DOS ReadOnly bit to RISC OS Locked bit only.
* This is to fix problem with FilerAction setting access 0 to force-delete.
......
......@@ -51,18 +51,17 @@ RMAalloc SETL {TRUE}
EXPORT |DOSFS_File|
EXPORT |DOSFS_Func|
GET "Hdr:listopts"
GET "Hdr:macros"
GET "Hdr:system"
GET "Hdr:modhand"
GET "Hdr:wimp"
GET "Hdr:hostfs"
GET "Hdr:Debug"
GET "hdr:NDRDebug"
GET "Hdr:DDVMacros"
GET "Hdr:APCS.<APCS>"
GET "Hdr:CPU.Arch"
GET "s.MFSmacros"
GET Hdr:ListOpts
GET Hdr:Macros
GET Hdr:System
GET Hdr:ModHand
GET Hdr:HostFS
GET Hdr:Debug
GET hdr:NdrDebug
GET Hdr:DDVMacros
GET Hdr:APCS.<APCS>
GET Hdr:CPU.Arch
GET MFSmacros.s
; -------------------------------------------------------------------
; Select level of debugging
......@@ -924,10 +923,10 @@ DOS_notsupported
; Called when a "Ccall" will fail due to insufficient stack.
DOS_not_enough_stack
[ No26bitCode
LDMFD sp!,{lk}
Pull "lk"
MSR CPSR_cxsf,lk
]
LDMFD sp!,{sl,fp,lk} ; recover entry registers
Pull "sl,fp,lk" ; recover entry registers
MOV a1,#nostack ; There should be no stacked state at this point
Ccall |global_error| ; now,just for fun,we'll call Ccall again
[ No26bitCode
......
......@@ -55,10 +55,10 @@ free_stack * &00000400 ; 1K minimum stack size
MACRO
$label Ccall $address,$pushnumber,$pushstack
$label
STMFD sp!,{sl,fp,lk} ; preserve entry state
Push "sl,fp,lk" ; preserve entry state
[ No26bitCode
MRS lk,CPSR
STMFD sp!,{lk}
Push "lk"
]
MOV sl,sp,LSR #20 ; sl = MByte boundary below sp
MOV sl,sl,LSL #20 ; sl = real stack limit
......@@ -76,7 +76,7 @@ $label
; stack items if the user has requested so
[ ("$pushnumber" <> "")
[ ("$pushstack" <> "") :LAND: ($pushnumber <> 0)
STMFD sp!,{$pushstack}
Push "$pushstack"
]
]
BL $address
......@@ -102,12 +102,12 @@ $label
STMIA sl,{v4,v5} ; and restore stack-limit contents
[ No26bitCode
LDMFD sp!,{lk}
Pull "lk"
ORREQ lk,lk,#Vbit
MSR CPSR_cxsf,lk
LDMFD sp!,{sl,fp,lk} ; recover entry state
Pull "sl,fp,lk" ; recover entry state
|
LDMFD sp!,{sl,fp,lk} ; recover entry state
Pull "sl,fp,lk" ; recover entry state
SETV EQ
CLRV NE ; exit with V reflecting error state
]
......
......@@ -12,56 +12,45 @@
; See the License for the specific language governing permissions and
; limitations under the License.
;
r0 RN 0
r1 RN 1
r2 RN 2
r3 RN 3
r4 RN 4
r5 RN 5
r6 RN 6
r7 RN 7
r8 RN 8
r9 RN 9
r10 RN 10
r11 RN 11
r12 RN 12
sp RN 13
lr RN 14
pc RN 15
XMessageTrans_ErrorLookup EQU &61506
MessageTrans_ErrorLookup EQU &41506
IMPORT |_clib_initialisemodule|
IMPORT |_clib_initialisemodule|
EXPORT |_dosfs_initialisemodule|
EXPORT |_dosfs_initialisemodule|
GET Hdr:ListOpts
GET Hdr:Macros
GET Hdr:System
GET Hdr:MsgTrans
GET Hdr:FSNumbers
GET Hdr:NewErrors
AREA |C$$Code|, CODE, READONLY
AREA |C$$Code|, CODE, READONLY
|_dosfs_initialisemodule|
ADR r7, |_dosfs_initialisemodule|
LDR r8, |_dosfs_initialisemodule_adcon|
CMP r7, r8
BEQ |_clib_initialisemodule|
ADR r0, module_ramload_error
MOV r1, #0
MOV r2, #0
ADR r4, titlestr
MOV r5, #0
MOV r6, #0
MOV r7, #0
SWI XMessageTrans_ErrorLookup
LDMIA sp!, {r7-r11, pc}
ADR r7, |_dosfs_initialisemodule|
LDR r8, |_dosfs_initialisemodule_adcon|
CMP r7, r8
BEQ |_clib_initialisemodule|
ADR r0, module_ramload_error
MOV r1, #0
MOV r2, #0
ADR r4, titlestr
MOV r5, #0
MOV r6, #0
MOV r7, #0
SWI XMessageTrans_ErrorLookup
Pull "r7-r11, pc"
|_dosfs_initialisemodule_adcon|
DCD |_dosfs_initialisemodule|
DCD |_dosfs_initialisemodule|
module_ramload_error
DCD &800e0a
DCB "RAMLoadC", 0
ALIGN
DCD ErrorBase_CSharedLibrary + 10 ; See 'RISC_OSLib/modulewrap.s'
DCB "RAMLoadC", 0
ALIGN
titlestr DCB "DOSFS", 0
ALIGN
titlestr
DCB "DOSFS", 0
ALIGN
END
END
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