Commit 6e8b54a0 authored by Stewart Brodie's avatar Stewart Brodie
Browse files

32-bit compatible.

  Merged Ursula branch.
Admin:
  Built.

Version 1.11. Tagged as 'SpriteUtil-1_11'
parent 0508ff90
......@@ -14,3 +14,4 @@
|
Dir <Obey$Dir>
amu_machine clean
stripdepnd Makefile
SUBT > <wini>arm.SpriteUtil.Version
GBLS Version
Version SETS "1.10"
GBLS CurrentDate
CurrentDate SETS "28 Oct 1994"
END
;
; This file is automatically maintained by srccommit, do not edit manually.
;
GBLS Module_MajorVersion
GBLA Module_Version
GBLS Module_MinorVersion
GBLS Module_Date
GBLS Module_FullVersion
Module_MajorVersion SETS "1.11"
Module_Version SETA 111
Module_MinorVersion SETS ""
Module_Date SETS "06 Jun 2000"
Module_FullVersion SETS "1.11"
END
/* (1.11)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 1.11
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 06 Jun 2000
#define Module_MajorVersion "1.11"
#define Module_Version 111
#define Module_MinorVersion ""
#define Module_Date "06 Jun 2000"
#define Module_FullVersion "1.11"
......@@ -48,9 +48,9 @@ sprite_util_die ROUT
TEQ r0, #0
ADRNE r0, message_file_block
SWINE XMessageTrans_CloseFile
MOV r0, #0
SUBS r0, r0, r0 ; clear V
STR r0, message_file_open
MOVS pc, r6 ; Don't refuse to die
MOV pc, r6 ; Don't refuse to die
; OSS Print a GS Transed string with no parameters from the Messages file
......
......@@ -49,19 +49,7 @@
GET Hdr:MsgTrans
GET Hdr:Sprite
GET Version
GBLL old_sinfo_code
old_sinfo_code SETL {FALSE} ; If true uses the old non international *SInfo code
[ old_sinfo_code
; OSS Only needed now if the old SInfo code is assembled in
LF * 10
CR * 13
]
GET VersionASM
LEADR Module_LoadAddr
......@@ -84,6 +72,9 @@ Module_BaseAddr
|
DCD 0
]
[ :LNOT: No32bitCode
DCD SpriteUtils_Flags - Module_BaseAddr
]
SpriteUtils_HC_Table ; Name Max Min
......@@ -111,12 +102,16 @@ SpriteUtils_Title
SpriteUtils_HelpStr
DCB "SpriteUtils"
DCB 9
DCB "$Version ($CurrentDate)", 0
DCB "$Module_MajorVersion ($Module_Date)", 0
GET s.TokHelpSrc
ALIGN
[ :LNOT: No32bitCode
SpriteUtils_Flags DCD ModuleFlag_32bit
]
; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
; In r0-r6 trashable
......@@ -272,8 +267,6 @@ NoSpriteMemoryBlock
= "NoSpMem",0
ALIGN
[ :LNOT:old_sinfo_code
; OSS This is a completely new implementation of SInfoCod10 for internationalisation.
SInfo_Cod10
......@@ -311,61 +304,6 @@ Message_SInfo
DCB "SInfo",0
ALIGN
|
; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
; OSS This is the old version of SInfo_Cod10, left in commented out in case I screwed up on the new version
SInfo_Cod10
SWI XOS_WriteS
= "Sprite status",LF,CR," ",0
ALIGN
ADDVC r0, r2, #16 ; 4 word gap at end of area
MOVVC r0, r0, LSR #10 ; Sprite area size in Kbytes
BLVC PrintR0Decimal
EXIT VS
SWI XOS_WriteS
= " Kbytes sprite workspace",LF,CR," ",0 ; Never 1Kbyte!
ALIGN
SUBVC r0, r2, r5
BLVC PrintR0Decimal
EXIT VS
SWI XOS_WriteS
= " byte(s) free",LF,CR," ",0
ALIGN
MOVVC r0, r3
BLVC PrintR0Decimal
EXIT VS
SWI XOS_WriteS
= " sprite(s) defined",LF,CR,0
ALIGN
EXIT
; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
; In r0 = number to print, left justified. OSS Still commented out
; Number gets printed in a field of 4 if possible
; Out r0 corrupt
PrintR0Decimal ENTRY "r1, r2"
SUB sp, sp, #20 ; Leave 20 bytes as a buffer (more than
; enough)
MOV r1, sp
MOV r2, #20
SWI XOS_ConvertInteger4
SWIVC XOS_Write0
ADD sp, sp, #20 ; Balance the stack
EXIT
; OSS End of commented out old code
; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
]
; .............................................................................
; In r0-r6 trashable
......
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