Commit 35c64faa 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.15. Tagged as 'DragASprit-0_15'
parent d81a97d8
......@@ -19,54 +19,16 @@
# ***********************************
# Date Name Description
# ---- ---- -----------
# 25-May-94 AMcC Created.
# 14-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 = DragASprit
SOURCE = s.Gets
TARGET = rm.DragASprit
EXPORTS = ${EXP_HDR}.${COMPONENT}
#
# 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}
@echo ${COMPONENT}: cleaned
${TARGET}: ${SOURCE}
${AS} ${ASFLAGS} ${SOURCE}
COMPONENT = DragASprite
TARGET = DragASprit
HEADER1 = DragASprit
ROM_SOURCE = Gets.s
RESOURCES = no
${EXP_HDR}.${COMPONENT}: hdr.${COMPONENT}
${CP} hdr.${COMPONENT} $@ ${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.14"
Module_Version SETA 14
GBLS Module_ApplicationDate2
GBLS Module_ApplicationDate4
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "0.15"
Module_Version SETA 15
Module_MinorVersion SETS ""
Module_Date SETS "20 Apr 2000"
Module_FullVersion SETS "0.14"
Module_Date SETS "16 Mar 2001"
Module_ApplicationDate2 SETS "16-Mar-01"
Module_ApplicationDate4 SETS "16-Mar-2001"
Module_ComponentName SETS "DragASprit"
Module_ComponentPath SETS "RiscOS/Sources/Desktop/DragASprit"
Module_FullVersion SETS "0.15"
Module_HelpVersion SETS "0.15 (16 Mar 2001)"
END
/* (0.14)
/* (0.15)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 0.14
#define Module_MajorVersion_CMHG 0.15
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 20 Apr 2000
#define Module_Date_CMHG 16 Mar 2001
#define Module_MajorVersion "0.14"
#define Module_Version 14
#define Module_MajorVersion "0.15"
#define Module_Version 15
#define Module_MinorVersion ""
#define Module_Date "20 Apr 2000"
#define Module_Date "16 Mar 2001"
#define Module_FullVersion "0.14"
#define Module_ApplicationDate2 "16-Mar-01"
#define Module_ApplicationDate4 "16-Mar-2001"
#define Module_ComponentName "DragASprit"
#define Module_ComponentPath "RiscOS/Sources/Desktop/DragASprit"
#define Module_FullVersion "0.15"
#define Module_HelpVersion "0.15 (16 Mar 2001)"
......@@ -16,7 +16,7 @@
; unplot:
; Plot the b/g sprite at the relevant location
UnPlot ENTRY "r0-r11"
UnPlot Entry "r0-r11"
BL DoBusinessToDest
[ debugdrag
......@@ -38,7 +38,7 @@ UnPlot ENTRY "r0-r11"
; plot:
; Grab the b/g sprite at the required location
; Plot the f/g sprite at the required location
Plot ENTRY "r0-r11"
Plot Entry "r0-r11"
MOV lr, #0
STRB lr, FirstMoveIsPlot
......@@ -85,7 +85,7 @@ Plot ENTRY "r0-r11"
; Swap bg0 and bg1
;
Move
ENTRY "r0-r7" , 8*4
Entry "r0-r7" , 8*4
; If first action is move then it must be plot instead
LDRB lr, FirstMoveIsPlot
......@@ -220,7 +220,7 @@ Move
;
; Out sprite bg gotten
;
Getbg0 ENTRY "r0-r7"
Getbg0 Entry "r0-r7"
[ debugdrag
DLINE "Getbg0"
......@@ -338,7 +338,7 @@ Getbg0 ENTRY "r0-r7"
;
; Out sprite bg gotten
;
Getbg1 ENTRY "r0-r7"
Getbg1 Entry "r0-r7"
[ debugdrag
DLINE "Getbg1 ",cc
......@@ -400,7 +400,7 @@ Getbg1 ENTRY "r0-r7"
;
; Out r0-r3 are the graphics window
;
GetGWindow ENTRY "r4-r7", 6*4
GetGWindow Entry "r4-r7", 6*4
ADR r0, GWindGetBlock
MOV r1, sp
SWI XOS_ReadVduVariables
......@@ -448,7 +448,7 @@ GWindGetBlock
;
; Out r0-r3 are the gwindow to set for the whole screen
;
GetScreenGWindow ENTRY "r4",2*4
GetScreenGWindow Entry "r4",2*4
; Get the graphics origin
ADR r0, GOrgGetBlock
MOV r1, sp
......@@ -504,7 +504,7 @@ GOrgGetBlock
;
; Out The GWindow set
;
SetGWindow ENTRY "r6-r7"
SetGWindow Entry "r6-r7"
[ debuggwindow
DREG r0, "Setting GWindow ",cc
DREG r1, ",",cc
......@@ -540,7 +540,7 @@ SetGWindow ENTRY "r6-r7"
;
; Out r0-r3 Restore output parameters
;
SwitchOutputToSprite ENTRY
SwitchOutputToSprite Entry
LDR r0, =SpriteReason_SwitchOutputToSprite + &100
ADRL r2, bg_name
MOV r3, #0 ; No save area
......@@ -555,7 +555,7 @@ SwitchOutputToSprite ENTRY
;
; Out r0-r3 sorted and rounded to pixels
;
DoBusinessToDest ENTRY "r0-r5"
DoBusinessToDest Entry "r0-r5"
; Get the EigFactors
MOV r0, #-1
......@@ -611,7 +611,7 @@ DoBusinessToDest ENTRY "r0-r5"
;
; Out r4-r7 sorted and rounded to pixels
;
DoBusinessToSource ENTRY "r0-r3"
DoBusinessToSource Entry "r0-r3"
SortRegs r4,r6
SortRegs r5,r7
......
......@@ -12,6 +12,9 @@
; See the License for the specific language governing permissions and
; limitations under the License.
;
AREA |DragASprite$$Code|, CODE, READONLY, PIC
GET Hdr:ListOpts
GET Hdr:Macros
GET Hdr:System
......@@ -30,14 +33,13 @@
GET VersionASM
GET s.DebugOpts
GET s.Support
GET s.StartUp
GET s.Drag
GET DebugOpts.s
GET Support.s
GET StartUp.s
GET Drag.s
[ debugany
InsertDebugRoutines
]
END
......@@ -85,7 +85,7 @@ tx_block # 16
spr_dragbox # 16 ; Box to use for sprite dragging calculations
StartUp_frame_size * :INDEX: @
StartUp ENTRY "r0-r8", StartUp_frame_size
StartUp Entry "r0-r8", StartUp_frame_size
[ debugstart
DLINE "StartUp started"
DREG r0, "Flags ",cc
......@@ -829,7 +829,7 @@ FinishStartingDrag
;
; Out r5-r8 = parent box
;
GetParentBox ENTRY "r0-r4"
GetParentBox Entry "r0-r4"
TestAFlag r0, BoundTo, Screen, r14
BEQ %FT10
TestAFlag r0, BoundTo, Window, r14
......@@ -987,7 +987,7 @@ setcolallset DCB 18,0,128+63,23,17,3,&c0,0,0,0,0,0,0
;
; Out r3 = size of sprite (multiple of words)
;
ByteSizeOfSprite ENTRY "r0,r1,r2,r5"
ByteSizeOfSprite Entry "r0,r1,r2,r5"
; Convert x-OS units to pixels per row
MOV r0, #-1
......@@ -1042,7 +1042,7 @@ ByteSizeOfSprite ENTRY "r0,r1,r2,r5"
;
; Out (r0,r1) OS unit size of sprite
;
CoordSizeOfSprite ENTRY "r2-r6"
CoordSizeOfSprite Entry "r2-r6"
MOV r0, #SpriteReason_ReadSpriteSize
BL DoSpriteOp
MOVVC r0, r6
......@@ -1067,7 +1067,7 @@ CoordSizeOfSprite ENTRY "r2-r6"
; Out r2 = Y factor
; r5 = X factor
;
PixToOSUnitFactors ENTRY "r1"
PixToOSUnitFactors Entry "r1"
MOVVC r1, #VduExt_XEigFactor
SWIVC XOS_ReadModeVariable
MOVVC r5, r2
......@@ -1092,7 +1092,7 @@ PixToOSUnitFactors ENTRY "r1"
;
; Out Sprite area RMA claimed and initialised
;
MakeSpriteArea ENTRY "r0,r1,r2"
MakeSpriteArea Entry "r0,r1,r2"
MOV r0, #ModHandReason_Claim
SWI XOS_Module
STRVS r0, [sp]
......@@ -1127,7 +1127,7 @@ MakeSpriteArea ENTRY "r0,r1,r2"
; other - user sprite area
; r2 = Sprite name
;
DoSpriteOp ENTRY
DoSpriteOp Entry
TEQ r1, #1
BEQ %FT50
TEQ r1, #0
......@@ -1142,7 +1142,7 @@ DoSpriteOp ENTRY
;
; Junk all allocated sprite areas (should call after drag finished)
;
Done ENTRY "r0,r1,r2"
Done Entry "r0,r1,r2"
[ debugstart
DLINE "Done start"
......@@ -1183,7 +1183,7 @@ Done ENTRY "r0,r1,r2"
;
; Out block freed
;
CheckedRMAFree ENTRY "r0,r2"
CheckedRMAFree Entry "r0,r2"
LDR r2, [r1]
TEQ r2, #Nowt
EXIT EQ
......
......@@ -98,7 +98,7 @@ Support_Init
MOV r2, #0
Pull "pc"
Support_Die ENTRY
Support_Die Entry
LDR r12, [r12]
BL Done
EXIT
......
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