Commit 2593b13f authored by Stewart Brodie's avatar Stewart Brodie
Browse files

Updated build structure to use the shared AAsmModule makefile.

  Updated to build using objasm instead of aasm.
  Sources changed to be objasm-compatible.
Admin:
  Requires Library 0.71 or later.
  Requires BuildSys 3.06 or later.
  Requires Env 0.65 or later.

Version 0.24. Tagged as 'Filter-0_24'
parent 2c7cd5a9
......@@ -19,77 +19,14 @@
# ***********************************
# Date Name Description
# ---- ---- -----------
# 25-May-94 AMcC Created.
# 06-Mar-01 SNB Recreated
#
#
# Paths
#
EXP_HDR = <export$dir>
#
# Generic options:
#
MKDIR = cdir
AS = aasm
CP = copy
RM = remove
CCFLAGS = -c -depend !Depend -IC:
ASFLAGS = -depend !Depend -Stamp -quit -module -To $@ -From
CPFLAGS = ~cfr~v
#
# Program specific options:
#
COMPONENT = FilterMgr
SOURCE = s.FilterMgr
TARGET = rm.FilterMgr
EXPORTS = ${EXP_HDR}.Filter
MERGEDRESOURCE = MergedMsgs
#
# Generic rules:
#
rom: ${TARGET}
@echo ${COMPONENT}: rom module built
export: ${EXPORTS}
@echo ${COMPONENT}: export complete
install_rom: ${TARGET}
${CP} ${TARGET} ${INSTDIR}.${COMPONENT} ${CPFLAGS}
@echo ${COMPONENT}: rom module installed
clean:
${RM} ${TARGET}
${RM} ${MERGEDRESOURCE}
@echo ${COMPONENT}: cleaned
resources: resources-${CMDHELP}
@echo ${COMPONENT}: resource files copied
resources_common: ${MERGEDRESOURCE}
${MKDIR} ${RESDIR}.${COMPONENT}
TokenCheck LocalRes:Messages
${CP} LocalRes:Messages ${RESDIR}.${COMPONENT}.Messages ${CPFLAGS}
resources-None: resources_common
@
resources-: resources_common
TokenCheck LocalRes:CmdHelp
print LocalRes:CmdHelp { >> ${RESDIR}.${COMPONENT}.Messages }
${MERGEDRESOURCE}: LocalRes:Messages LocalRes:CmdHelp
TokenCheck LocalRes:Messages LocalRes:CmdHelp
${CP} LocalRes:Messages ${MERGEDRESOURCE} ${CPFLAGS}
print LocalRes:CmdHelp { >> ${MERGEDRESOURCE} }
${TARGET}: ${SOURCE} ${MERGEDRESOURCE}
${AS} ${ASFLAGS} ${SOURCE}
COMPONENT = FilterManager
TARGET = FilterMgr
HEADER1 = Filter
${EXP_HDR}.Filter: hdr.Filter
${CP} hdr.Filter $@ ${CPFLAGS}
include StdTools
include AAsmModule
# Dynamic dependencies:
......@@ -14,3 +14,4 @@
|
Dir <Obey$Dir>
amu_machine clean
stripdepnd Makefile
......@@ -6,9 +6,19 @@
GBLS Module_MinorVersion
GBLS Module_Date
GBLS Module_FullVersion
Module_MajorVersion SETS "0.23"
Module_Version SETA 23
GBLS Module_ApplicationDate2
GBLS Module_ApplicationDate4
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "0.24"
Module_Version SETA 24
Module_MinorVersion SETS ""
Module_Date SETS "02 Dec 1999"
Module_FullVersion SETS "0.23"
Module_Date SETS "16 Mar 2001"
Module_ApplicationDate2 SETS "16-Mar-01"
Module_ApplicationDate4 SETS "16-Mar-2001"
Module_ComponentName SETS "Filter"
Module_ComponentPath SETS "RiscOS/Sources/Desktop/Filter"
Module_FullVersion SETS "0.24"
Module_HelpVersion SETS "0.24 (16 Mar 2001)"
END
/* (0.23)
/* (0.24)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 0.23
#define Module_MajorVersion_CMHG 0.24
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 02 Dec 1999
#define Module_Date_CMHG 16 Mar 2001
#define Module_MajorVersion "0.23"
#define Module_Version 23
#define Module_MajorVersion "0.24"
#define Module_Version 24
#define Module_MinorVersion ""
#define Module_Date "02 Dec 1999"
#define Module_Date "16 Mar 2001"
#define Module_FullVersion "0.23"
#define Module_ApplicationDate2 "16-Mar-01"
#define Module_ApplicationDate4 "16-Mar-2001"
#define Module_ComponentName "Filter"
#define Module_ComponentPath "RiscOS/Sources/Desktop/Filter"
#define Module_FullVersion "0.24"
#define Module_HelpVersion "0.24 (16 Mar 2001)"
......@@ -31,6 +31,8 @@
;; Wish list
;;-----------------------------------------------------------------------------
AREA |FilterManager$$Code|, CODE, READONLY, PIC
Module_BaseAddr
GET Hdr:ListOpts
......@@ -63,15 +65,17 @@ Module_BaseAddr
GBLL hostvdu
GBLL debugxx
GBLL debugregister
GBLL standalone
[ :LNOT: :DEF: standalone
GBLL standalone
standalone SETL false ; Build-in Messages file and i/f to ResourceFS
]
debug SETL false ; ONLY FALSE IF NO DEBUGGING
hostvdu SETL true ; True to send debug to tube
debugxx SETL false ; General debugging.
debugregister SETL false ; Register/de-register
standalone SETL false ; Build-in Messages file and i/f to ResourceFS
wsptr RN R12
......
......@@ -13,7 +13,6 @@
; limitations under the License.
;
; > s.ModHead
LEADR Module_LoadAddr
ASSERT (.=Module_BaseAddr)
......@@ -39,12 +38,9 @@ MySWIBase * Module_SWISystemBase + FilterSWI * Module_SWIChunkSize
; ----------------------------------------------------------------------------------------------------------------------
Title DCB "FilterManager",0
Helpstr DCB "Filter Manager",9,"$Module_MajorVersion ($Module_Date)"
[ Module_MinorVersion <> ""
= " $Module_MinorVersion"
]
Helpstr DCB "Filter Manager",9,"$Module_HelpVersion"
[ standalone
= " (Stand alone)"
= " (Standalone)"
]
DCB 0
ALIGN
......@@ -599,7 +595,7 @@ Init
;;-----------------------------------------------------------------------------
servicecallback
ENTRY "R0-R1"
Entry "R0-R1"
MOV R1,#0 ; the callback has been granted, so flag as no longer pending
STR R1,callbackpending
......
......@@ -22,7 +22,7 @@
; Open our messages file.
;
MsgTrans_OpenFile
ENTRY "r1-r2"
Entry "r1-r2"
ADR r0, message_block
LDR lr, flags
......@@ -33,9 +33,9 @@ MsgTrans_OpenFile
MOV r2, #0
SWI XMessageTrans_OpenFile
ADRVS r0, message_block
ADRVS r1, message_file_name
MOVVS r2, #0
ADRVS r0, message_block
ADRVS r1, message_file_name
MOVVS r2, #0
SWIVS XMessageTrans_OpenFile
LDRVC lr, flags
......@@ -51,7 +51,7 @@ MsgTrans_OpenFile
; Close our messages file.
;
MsgTrans_CloseFile
ENTRY "r0,r1"
Entry "r0,r1"
ADR r0, message_block
LDR r1, flags
......@@ -72,7 +72,7 @@ MsgTrans_CloseFile
; Lookup an error in our messages file.
;
MsgTrans_ErrorLookup
ENTRY "r0-r2"
Entry "r0-r2"
CLRV
BL MsgTrans_OpenFile
......@@ -98,7 +98,7 @@ MsgTrans_ErrorLookup
; Look up the given token in our messages file.
;
MsgTrans_Lookup
ENTRY "r0"
Entry "r0"
CLRV
BL MsgTrans_OpenFile
......@@ -108,8 +108,8 @@ MsgTrans_Lookup
EXIT
message_file_name2
DCB "FilterManager:Messages",0
ALIGN
DCB "FilterManager:Messages",0
ALIGN
message_file_name
DCB "Resources:$.Resources.FilterMgr.Messages",0
......
......@@ -38,7 +38,6 @@ free_list
[ standalone
declareresourcefsfiles
FunctionEntry "r0"
Push "R0,LR"
ADR R0,resourcefsfiles
SWI XResourceFS_RegisterFiles ; ignore errors
......@@ -46,7 +45,7 @@ declareresourcefsfiles
Return "r0"
resourcefsfiles
ResourceFile MergedMsgs, Resources.FilterMgr.Messages
ResourceFile $MergedMsgs, Resources.FilterMgr.Messages
DCD 0
]
......
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