Commit 4159700f 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 1.34. Tagged as 'Sound1-1_34'
parent 7daef786
......@@ -19,65 +19,16 @@
# ***********************************
# Date Name Description
# ---- ---- -----------
# 25-May-94 AMcC Created.
# 07-Mar-01 SNB Recreated
#
#
# 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 = Sound1
SOURCE = s.Sound1
TARGET = rm.${MACHINE}.Sound1
#
# Generic rules:
#
rom: ${TARGET}
@echo ${COMPONENT}: rom module built
export:
@echo ${COMPONENT}: export complete
install_rom: ${TARGET}
${CP} ${TARGET} ${INSTDIR}.${COMPONENT} ${CPFLAGS}
@echo ${COMPONENT}: rom module installed
clean:
${RM} ${TARGET}
${RM} s.TokHelpSrc
@echo ${COMPONENT}: cleaned
resources: resources-${CMDHELP}
@echo ${COMPONENT}: resource files copied
resources_common:
${MKDIR} ${RESDIR}.SoundChann
TokenCheck LocalRes:Messages
${CP} LocalRes:Messages ${RESDIR}.SoundChann.Messages ${CPFLAGS}
resources-None: resources_common
@
resources-: resources_common
TokenCheck LocalRes:CmdHelp
print LocalRes:CmdHelp { >> ${RESDIR}.SoundChann.Messages }
${TARGET}: ${SOURCE} s.TokHelpSrc
${MKDIR} rm.${MACHINE}
${AS} ${ASFLAGS} ${SOURCE}
COMPONENT = SoundChannels
TARGET = Sound1
HELPSRC = HelpSrc
TOKHELPSRC= ${TOKENSOURCE}
RESFSDIR = ${RESDIR}.SoundChann
s.TokHelpSrc: Hdr:Tokens HelpSrc
tokenise Hdr:Tokens HelpSrc $@
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 "1.33"
Module_Version SETA 133
GBLS Module_ApplicationDate2
GBLS Module_ApplicationDate4
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.34"
Module_Version SETA 134
Module_MinorVersion SETS ""
Module_Date SETS "08 Dec 1999"
Module_FullVersion SETS "1.33"
Module_Date SETS "16 Mar 2001"
Module_ApplicationDate2 SETS "16-Mar-01"
Module_ApplicationDate4 SETS "16-Mar-2001"
Module_ComponentName SETS "Sound1"
Module_ComponentPath SETS "RiscOS/Sources/HWSupport/Sound/Sound1"
Module_FullVersion SETS "1.34"
Module_HelpVersion SETS "1.34 (16 Mar 2001)"
END
/* (1.33)
/* (1.34)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 1.33
#define Module_MajorVersion_CMHG 1.34
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 08 Dec 1999
#define Module_Date_CMHG 16 Mar 2001
#define Module_MajorVersion "1.33"
#define Module_Version 133
#define Module_MajorVersion "1.34"
#define Module_Version 134
#define Module_MinorVersion ""
#define Module_Date "08 Dec 1999"
#define Module_Date "16 Mar 2001"
#define Module_FullVersion "1.33"
#define Module_ApplicationDate2 "16-Mar-01"
#define Module_ApplicationDate4 "16-Mar-2001"
#define Module_ComponentName "Sound1"
#define Module_ComponentPath "RiscOS/Sources/HWSupport/Sound/Sound1"
#define Module_FullVersion "1.34"
#define Module_HelpVersion "1.34 (16 Mar 2001)"
......@@ -118,7 +118,7 @@ WorkSpaceSize * :INDEX: @
SUBT Sound Channel Module Header
OPT OptPage
LEADR Module_LoadAddr
AREA |Sound1$$Code|, CODE, READONLY, PIC
Module_Base
DCD 0 ; NOT AN APPLICATION
......@@ -147,10 +147,7 @@ Module_Name
Help_String
DCB "SoundChannels"
DCB 9
DCB "$Module_MajorVersion ($Module_Date)"
[ Module_MinorVersion <> ""
DCB " $Module_MinorVersion"
]
DCB "$Module_HelpVersion"
DCB 0
Module_SWIDecodeBase
......@@ -226,7 +223,7 @@ ModuleFlags
; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
; In r0-r6 trashable
Volume_Code ENTRY
Volume_Code Entry
LDR wp, [r12]
MOV r1, r0
......@@ -432,7 +429,7 @@ Sound_Code ALTENTRY
; Out VSet and 0 for bad parameter error
SoundDefault_Code ENTRY "r0-r2"
SoundDefault_Code Entry "r0-r2"
LDR wp, [r12]
CMP r0, #0
......@@ -525,7 +522,7 @@ Sound_SWI_Code ROUT
BL Original_SWI_Code
Pull R14
MOV R10,#0
mrs AL,R10,CPSR ; NOP on pre-ARM6
MRS R10,CPSR ; NOP on pre-ARM6
TST R10,#2_11100 ; EQ if in 26-bit mode - C,V unaltered
MOVNE PC,R14 ; 32-bit exit: NZ corrupted, CV passed back
MOVVCS PC,R14 ; 26-bit exit: NZC preserved, V clear
......@@ -560,7 +557,7 @@ EndOfJumpTable
; Out r0 = old volume
SoundVol ENTRY
SoundVol Entry
LDR r11, =SoundLevel1Base
LDRB r10, [r11, #SoundLevel1MaxAmp]
......@@ -669,7 +666,7 @@ SoundTuning ROUT
; r10, r11 trashable
InstallVoice ENTRY
InstallVoice Entry
[ debug
DREG r0, "InstallVoice: r0 = ",cc
......@@ -820,7 +817,7 @@ NullVoice
; r1 = voice number
; Out: Preserve everything (especially flags) - well, only Z really
;
CheckAttachments ENTRY "r0-r5,r10"
CheckAttachments Entry "r0-r5,r10"
MOVEQ r5, #0
MOVNE r5, #1
MOV r3, #SoundPhysChannels ; start at last channel and work down to channel 1
......@@ -846,7 +843,7 @@ CheckAttachments ENTRY "r0-r5,r10"
; Out r0 is String Pointer - name of Last Voice (or error message)
; r1 is voice number de-allocated (0 for fail)
RemoveVoice ENTRY "r2-r3"
RemoveVoice Entry "r2-r3"
[ debug
DREG r1, "RemoveVoice: r1 = ",,Integer
......@@ -890,7 +887,7 @@ removevoice0
; In: r1 = voice number
; Out: Preserve everything (except flags)
;
CheckRemovals ENTRY "r0-r4,r10"
CheckRemovals Entry "r0-r4,r10"
MOV r3, #SoundPhysChannels ; start at last channel and work down to channel 1
MOV r4, r1
LDR r10, =SoundLevel1Base + SoundLevel1ChannelTable + SoundChannelVoiceIndexB - (1 :SHL: SoundChannelCBLSL)
......@@ -915,7 +912,7 @@ CheckRemovals ENTRY "r0-r4,r10"
; r1 is previous voice number allocated (0 for none/invalid)
; 0 indicates voice already allocated
AttachVoice ENTRY "r2, r5"
AttachVoice Entry "r2, r5"
LDR r11, =SoundLevel1Base + SoundLevel1VoiceTable
ADD r10, r11, #(SoundLevel1ChannelTable+SoundChannelVoiceIndexB)-SoundLevel1VoiceTable
......@@ -993,7 +990,7 @@ AttachVoice ENTRY "r2, r5"
; Out r0 preserved, or 0 for FAIL
AttachNamedVoice ENTRY "r1, r3-r5"
AttachNamedVoice Entry "r1, r3-r5"
CMP r0, #0 ; Ensure in 1..PhysChannels
CMPNE r0, #SoundPhysChannels+1
......@@ -1062,7 +1059,7 @@ AttachNamedVoice ENTRY "r1, r3-r5"
; R0,R1 are copy of OSWORD params
; r10, r11 trashable
SoundPacked ENTRY "r0-r6"
SoundPacked Entry "r0-r6"
MOV r3, r1, LSR #16 ; byte 7,8 to low R3
MOV r2, r1, LSL #16
......@@ -1611,7 +1608,7 @@ InitDone
LTORG
Initialise_Module ENTRY
Initialise_Module Entry
LDR r5, =SoundLevel1Base ; pointer to RAM SCCB page
......@@ -1727,7 +1724,7 @@ SoftStart ; Just relink to Level0
; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
; In r0-r6 trashable
Finalise_Module ENTRY
Finalise_Module Entry
LDR r12, [r12]
; OSS Free the array of local names (including the 0 excess entry)
......@@ -1774,7 +1771,7 @@ Intercept_Services ROUT
CMP r1, #Service_Reset
MOVNE pc, lr
UService
ENTRY "r0-r2" ; Flush out all channels
Entry "r0-r2" ; Flush out all channels
MOV r0, #SoundChannelForceFlush
MOV r1, #SoundPhysChannels-1 ; channel counter
LDR r2, =SoundLevel1Base + SoundLevel1ChannelTable + SoundChannelFlagsB
......@@ -1789,7 +1786,7 @@ UService
; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
lookup_r0 ENTRY r1-r7
lookup_r0 Entry r1-r7
BL open_messagefile
EXIT VS
MOV r1, r0
......@@ -1804,7 +1801,7 @@ lookup_r0 ENTRY r1-r7
EXIT
message_writes
ENTRY r0-r7
Entry r0-r7
SUB r0, lr, pc
ADD r0, pc, r0
SUB r0, r0, #4
......@@ -1836,7 +1833,7 @@ message_writes
BVC %B10
EXIT
CopyError ENTRY r1-r7
CopyError Entry r1-r7
BL open_messagefile
EXIT VS
ADR R1, MessageFile_Block
......@@ -1852,7 +1849,7 @@ message_filename
DCB "Resources:$.Resources.SoundChann.Messages", 0
ALIGN
open_messagefile ENTRY r0-r2
open_messagefile Entry r0-r2
LDR r0, MessageFile_Open
CMP r0, #0
EXIT NE
......
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