Commit 0657bcd2 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.72 or later.
  Requires BuildSys 3.09 or later.
  Requires Env 0.65 or later.

Version 0.37. Tagged as 'Display-0_37'
parent 38cc13c6
......@@ -19,51 +19,16 @@
# ***********************************
# Date Name Description
# ---- ---- -----------
# 25-May-94 AMcC Created.
# 23-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 = Display
SOURCE = s.GetAll
TARGET = rm.Display
#
# 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}
@echo ${COMPONENT}: cleaned
COMPONENT = DisplayManager
TARGET = Display
ROM_SOURCE = GetAll.s
resources:
${MKDIR} ${RESDIR}.${COMPONENT}
${CP} Resources.${LOCALE}.Messages ${RESDIR}.${COMPONENT}.Messages ${CPFLAGS}
${CP} Resources.${LOCALE}.Templates ${RESDIR}.${COMPONENT}.Templates ${CPFLAGS}
@echo ${COMPONENT}: resource files copied
RESOURCEEXTRA = resources_templates
${TARGET}: ${SOURCE}
${AS} ${ASFLAGS} ${SOURCE}
include StdTools
include AAsmModule
# Dynamic dependencies:
......@@ -14,3 +14,4 @@
|
Dir <Obey$Dir>
amu_machine clean
stripdepnd Makefile
; > Version
;---------------------------------------------------------------------------
; Change history.
;
; 03-Jun-93 0.00 SMC Created.
; 08-Jul-93 0.12 SMC First non-development version under source control.
; 12-Jul-93 0.13 SMC Grey out colour menu items which are not possible at all.
; 13-Jul-93 0.14 SMC Modes specified by number should give "Unknown" frame rate.
; 13-Jul-93 0.15 SMC Do the best we can on click on OK (even if frame rate unknown).
; 16-Jul-93 0.16 SMC Sorted out build structure.
; 03-Sep-93 0.17 SMC Don't return error from *WimpMode, use our own.
; Return error if non-text file dragged to our icon/window.
; Issue Message_PaletteChange like Palette util did (keep world happy).
; 09-Sep-93 0.18 SMC Changed name to Display Manager.
; Don't issue Message_PaletteChange after all, it's not necessary.
; Template changes and button action changes for style guide compliance.
; Frame rate widgets moved off visible area of mode change dialogue
; (thought to be too technical for ordinary users).
; Internationalised *Desktop_DisplayManager help and syntax.
; 08-Oct-93 0.19 SMC Currently selected menu items now ticked.
; Don't use modes with no mode name.
; 12-Nov-93 0.20 SMC Removed ptr_menu from template validation strings.
; If resolution unknown on colour selection then start with highest.
; Made pop-up menus style guide compliant.
; 10-Dec-93 0.21 SMC Now uses K instead of T in mode selection strings.
; Fix register corruption in pollword non-zero handler.
; Change name of sprite from "screen" to "display".
; Don't close window if changing mode gives an error.
; Display monitor name in window title bar.
; 14-Dec-93 0.22 SMC Position window base at top of icon bar.
; 10-Jan-94 0.23 AG Move Help and Syntax messages for Desktop_DisplayManager to global file.
; 21-Jan-94 0.24 SMC Adjust on Mode window OK box now leaves menu and dialogue open.
; Allow modes not in resolution menu to be changed to.
; Rationalised stepping down and up through mode list.
; Added compile option to split the resolution menu into sections
; based on pixel shape.
; Fixed module header because help/syntax moved to Global.
; Open menus are updated on mode/palette change (get ticks right).
; 21-Jan-94 0.25 SMC Stopped icon bar menu being redisplayed after mode change.
; 04-Feb-94 0.26 SMC Invalidate ColourTrans cache and force redraw whole screen if palette
; has changed on Service_WimpPalette/Service_CalibrationChanged.
; 17-Feb-94 0.27 SMC Leave items in colour menu shaded if not supported by any modes
; in resolution menu.
; If colours changed in resolution which is not on resolution menu then
; allow non-menu modes in stepping down.
; 18-Feb-94 0.28 SMC Small mod to building colours menu.
; 03-Aug-94 0.29 SMC Fixed MED-03376: menu building broken if last (or only) mode was unnamed.
; 30-Aug-94 0.30 AMcC Look for Resources in Resources.Display rather than Resources.Modes
; 28-Oct-94 0.31 SMC Added message tokenisation support.
; 21-Dec-94 0.32 SMC Changed to correct format for version string.
; 11-Jan-95 0.33 SMC Improved wording of invalid mode error.
; 29-May-97 0.34 KJB Stopped responding to Service_MessageFileClosed. Responding to this
; allowed instant response to resource changes while actually running,
; but the code had the disadvantage that mode selections in progress
; were lost when this service call happens. Thanks to ShareFS, files
; pop in and out of ResourceFS a lot, causing a lot of service calls.
; Hence this behaviour was more of a hindrance than a help. Especially
; as territories are only normally loaded outside the desktop.
; 15-Apr-98 0.35 MJS Ursula service format.
; 12-May-00 0.36 KJB 32-bit compatible.
;
GBLA Version
GBLS VString
GBLS Date
; REMEMBER TO UPDATE VERSION IN MESSAGES FILE
Version SETA 036 ; 000
VString SETS "0.36" ; "0.00"
Date SETS "12 May 2000" ; "Development"
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
GBLS Module_ApplicationDate2
GBLS Module_ApplicationDate4
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "0.37"
Module_Version SETA 37
Module_MinorVersion SETS ""
Module_Date SETS "23 Mar 2001"
Module_ApplicationDate2 SETS "23-Mar-01"
Module_ApplicationDate4 SETS "23-Mar-2001"
Module_ComponentName SETS "Display"
Module_ComponentPath SETS "RiscOS/Sources/Video/UserI/Display"
Module_FullVersion SETS "0.37"
Module_HelpVersion SETS "0.37 (23 Mar 2001)"
END
/* (0.37)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 0.37
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 23 Mar 2001
#define Module_MajorVersion "0.37"
#define Module_Version 37
#define Module_MinorVersion ""
#define Module_Date "23 Mar 2001"
#define Module_ApplicationDate2 "23-Mar-01"
#define Module_ApplicationDate4 "23-Mar-2001"
#define Module_ComponentName "Display"
#define Module_ComponentPath "RiscOS/Sources/Video/UserI/Display"
#define Module_FullVersion "0.37"
#define Module_HelpVersion "0.37 (23 Mar 2001)"
......@@ -14,12 +14,6 @@
;
; > Sources.GetAll
;---------------------------------------------------------------------------
; Module template.
;---------------------------------------------------------------------------
Module_BaseAddr
;---------------------------------------------------------------------------
; Get the headers.
;
......@@ -47,7 +41,7 @@ Module_BaseAddr
GET Hdr:ScrModes
GET Hdr:ColourTran
GET Version
GET VersionASM
;---------------------------------------------------------------------------
; Define global variables.
......@@ -64,8 +58,10 @@ win SETD false
msg SETD false
icon SETD false
[ :LNOT: :DEF: standalone
GBLL standalone
standalone SETL false
]
GBLL Medusa
Medusa SETL true
......@@ -96,16 +92,16 @@ GetResFiles SETS "GET Sources.ResFiles"
GetResFiles SETS ""
]
GET s.Front
GET s.Errors
GET s.Module
GET s.Icon
GET s.Window
GET s.Menu
GET s.Message
GET s.Mouse
GET s.Mode
GET s.MsgTrans
GET Front.s
GET Errors.s
GET Module.s
GET Icon.s
GET Window.s
GET Menu.s
GET Message.s
GET Mouse.s
GET Mode.s
GET MsgTrans.s
$GetResFiles
END
......@@ -43,7 +43,7 @@ ic_info_version * 3
; Make icon bar icon.
;
Icon_Init
ENTRY "r1-r6"
Entry "r1-r6"
MOV r0, #SpriteReason_ReadSpriteSize
ADR r2, icon_block+4 ; r2 -> sprite name
......@@ -88,7 +88,7 @@ Icon_Init
; Set icon state given parameters.
;
Icon_SetState
ENTRY "r0-r3"
Entry "r0-r3"
MOV r1, sp
SWI XWimp_SetIconState
......@@ -103,7 +103,7 @@ Icon_SetState
; Get the WIMP to update the window icons.
;
Icon_Refresh
ENTRY "r0-r3"
Entry "r0-r3"
Debug icon,"Icon_Refresh"
......
......@@ -70,9 +70,9 @@ menu_rateflags
;
Menu_Init
[ NewShading
ENTRY "r1-r5"
Entry "r1-r5"
|
ENTRY "r1-r3"
Entry "r1-r3"
]
Debug menu,"Menu_Init"
......@@ -182,9 +182,9 @@ Menu_Init
Menu_Resolution
ROUT
[ SortOnPixelShape
ENTRY "r1-r10"
Entry "r1-r10"
|
ENTRY "r1-r9"
Entry "r1-r9"
]
Debug menu,"Menu_Resolution"
......@@ -273,7 +273,7 @@ Menu_Resolution
;
Menu_Rate
ROUT
ENTRY "r1-r8"
Entry "r1-r8"
Debug menu,"Menu_Rate"
......@@ -371,7 +371,7 @@ menu_hz DCB "Hz",0
;
Menu_Show
ROUT
ENTRY "r1"
Entry "r1"
Debug menu,"Menu_Show",r1,r2,r3
......@@ -443,7 +443,7 @@ Menu_Show
; Invert the tick bit for the specified menu item.
;
Menu_ChangeTick
ENTRY "r0"
Entry "r0"
Debug menu,"Menu_ChangeTick",r0,r1
......@@ -467,7 +467,7 @@ Menu_ChangeTick
; Untick menu item.
;
Menu_RemoveTick
ENTRY
Entry
TEQ r1, #0
LDRNEB r0, menu_tick
......@@ -486,7 +486,7 @@ Menu_RemoveTick
; The Wimp has informed us of a menu selection.
;
Menu_Selection
ENTRY "r1,r2"
Entry "r1,r2"
Debug menu,"Menu_Selection"
......@@ -529,7 +529,7 @@ Menu_Selection
;
Menu_Decode
ROUT
ENTRY "r1-r6"
Entry "r1-r6"
Debug menu,"Menu_Decode"
......@@ -599,7 +599,7 @@ Menu_Decode
; Find the menu item for the given class.
;
Menu_ClassToResolution
ENTRY "r1,r2"
Entry "r1,r2"
LDR lr, mode_classlist
ADD lr, lr, r0, LSL #2 ; lr = pointer to class list entry
......@@ -627,7 +627,7 @@ Menu_ClassToResolution
; Find the class for the given resolution menu item.
;
Menu_ResolutionToClass
ENTRY
Entry
LDR lr, mode_menulist
LDR lr, [lr, r4, LSL #2]
......
......@@ -25,7 +25,7 @@
;
Message_Received
Message_Recorded
ENTRY "r1-r6"
Entry "r1-r6"
LDR r0, [r1, #ms_action]
......@@ -260,7 +260,7 @@ deletescrap DCB "%Delete <Wimp$Scrap>",0
; is then sent to the appropriate task.
;
Message_SendAck
ENTRY "r1,r2"
Entry "r1,r2"
LDR r2, [r1, #ms_taskhandle]
LDR lr, [r1, #ms_myref]
......
......@@ -23,7 +23,7 @@
; appropriately.
;
Mode_Init
ENTRY "r1-r6"
Entry "r1-r6"
Debug mode,"Mode_Init"
......@@ -49,7 +49,7 @@ Mode_Init
; Return the current mode specifier.
;
Mode_GetCurrent
ENTRY "r1"
Entry "r1"
Debug mode,"Mode_GetCurrent"
......@@ -78,7 +78,7 @@ Mode_GetCurrent
; Get information about given mode.
;
Mode_GetInfo
ENTRY "r1,r2"
Entry "r1,r2"
Debug mode,"Mode_GetInfo: mode =",r2
......@@ -123,7 +123,7 @@ Mode_GetInfo
;
Mode_TestPalette
ROUT
ENTRY "r2-r4,r8,r9"
Entry "r2-r4,r8,r9"
Debug mode,"Mode_TestPalette: depth =",r5
......@@ -209,7 +209,7 @@ freepalettemem
Push "r0,lr"
|
Push "r0,r4,lr"
mrs ,r4, CPSR
SavePSR r4
]
ADR lr, user_data
TEQ r2, lr ; If it's not the user area then free it.
......@@ -218,7 +218,7 @@ freepalettemem
[ No32bitCode
Pull "r0,pc",,^
|
msr ,CPSR_f, r4 ; Preserve error if there is one.
RestPSR r4,,f ; Preserve error if there is one.
Pull "r0,r4,pc"
]
......@@ -242,7 +242,7 @@ freepalettemem
;
Mode_SetSelection
ROUT
ENTRY "r3-r7"
Entry "r3-r7"
Debug mode,"Mode_SetSelection"
......@@ -301,7 +301,7 @@ log2bpp_to_colouritem DCB mo_co_mono,mo_co_grey4,mo_co_colour16,mo_co_colo
;
Mode_SetWindowIcons
ROUT
ENTRY "r1-r4"
Entry "r1-r4"
Debug mode,"Mode_SetWindowIcons",r2
......@@ -409,7 +409,7 @@ close_bracket DCB "Hz)",0
;
Mode_SetModeString
ROUT
ENTRY "r1-r6"
Entry "r1-r6"
Debug mode,"Mode_SetModeString: flags,mode =",r1,r2
......@@ -509,7 +509,7 @@ log2bpp_to_colours
; The Wimp has informed us of a key press.
;
Mode_KeyPressed
ENTRY "r1"
Entry "r1"
LDR r0, [r1] ; r0 = window handle
LDR lr, mode_handle
......@@ -538,7 +538,7 @@ Mode_KeyPressed
; Pass the string in the mode dialogue box to *WimpMode.
;
Mode_WimpCommand
ENTRY "r1,r2"
Entry "r1,r2"
ADR r0, command_wimpmode ; Build *WimpMode command.
ADR r1, user_data
......@@ -577,7 +577,7 @@ command_wimpmode
;
Mode_GetTable
ROUT
ENTRY "r1-r7"
Entry "r1-r7"
Debug mode,"Mode_GetTable"
......@@ -854,7 +854,7 @@ dummy_end
;
Mode_SortList
ROUT
ENTRY "r1-r5"
Entry "r1-r5"
Debug mode,"Mode_SortList"
......@@ -981,7 +981,7 @@ Mode_SortList
; square pixels.
;
Mode_PixelShape
ENTRY "r0-r3"
Entry "r0-r3"
BL Mode_BuildSpecifier
MOV r0, r2
......@@ -1010,7 +1010,7 @@ Mode_PixelShape
; Given the mode descriptor, build a valid mode specifier.
;
Mode_BuildSpecifier
ENTRY "r0,r1,r3-r5"
Entry "r0,r1,r3-r5"
ASSERT mode_desc_yres = mode_desc_xres + 4
ASSERT mode_desc_depth = mode_desc_yres + 4
......@@ -1056,7 +1056,7 @@ Mode_BuildSpecifier
;
Mode_FindSubClass
ROUT
ENTRY "r1,r3,r4,r7-r10"
Entry "r1,r3,r4,r7-r10"
Debug mode,"Mode_FindSubClass ",r3,r4
......@@ -1169,7 +1169,7 @@ colours_to_log2bpp
;
Mode_ChangeMode
ROUT
ENTRY "r1-r6"
Entry "r1-r6"
Debug mode,"Mode_ChangeMode"
......@@ -1213,7 +1213,7 @@ Mode_ChangeMode
; Load the named mode file using *LoadModeFile.
;
Mode_LoadFile
ENTRY "r1,r2"
Entry "r1,r2"
Debug mode,"Mode_LoadFile"
......
......@@ -13,7 +13,8 @@
; limitations under the License.
;
; > Sources.Module
LEADR Module_LoadAddr
AREA |DisplayManager$$Code|, CODE, READONLY, PIC
Module_BaseAddr
ASSERT (.=Module_BaseAddr)
......@@ -60,7 +61,7 @@ Desktop_DisplayManager_Syntax
Mod_Title DCB "DisplayManager",0
Mod_Helpstr DCB "DisplayManager",9
Mod_Version DCB "$VString ($Date)",0
Mod_Version DCB "$Module_HelpVersion", 0
ALIGN
[ :LNOT: No32bitCode
......@@ -74,7 +75,7 @@ Mod_Flags
;
Desktop_DisplayManager_Code
ROUT
ENTRY
Entry
LDR lr, [r12]
CMP lr, #0 ; If not had Service_StartWimp or couldn't get workspace then
......@@ -105,7 +106,7 @@ Desktop_DisplayManager_Code
; Module initialisation.
;
Mod_Init
ENTRY "r1-r4"
Entry "r1-r4"
[ standalone
Debug mod,"Mod_Init"
......@@ -218,7 +219,7 @@ UService
svc_messagefileclosed
ENTRY "r0"
Entry "r0"
Debug mod,"svc_messagefileclosed",r0
LDR lr, task_handle ; Make sure we are a task.
TEQ lr, #0
......@@ -242,7 +243,7 @@ svc_messagefileclosed
] ; MessageChanging
svc_reset
ENTRY "r0-r3"
Entry "r0-r3"
Debug mod,"Service_Reset"
......@@ -260,7 +261,7 @@ svc_reset
svc_startwimp
ENTRY "r2,r3"
Entry "r2,r3"
LDR r2, [r12]
TEQ r2, #0
......@@ -289,7 +290,7 @@ svc_startwimp
svc_startedwimp
ENTRY
Entry
Debug mod,"Service_StartedWimp"
......@@ -302,7 +303,7 @@ svc_startedwimp
svc_wimppalette
ENTRY "r0-r3"
Entry "r0-r3"
Debug mod,"svc_wimppalette"
LDR lr, task_handle ; Make sure we are a task.
......@@ -337,7 +338,7 @@ svc_wimppalette
scanpalette
ENTRY "r0-r4",80
Entry "r0-r4",80
MOV r1, sp ; Dump new palette into stack frame.
SWI XWimp_ReadPalette
......@@ -359,7 +360,7 @@ scanpalette
svc_modechange
ENTRY
Entry
Debug mod,"svc_modechange"
LDR lr, task_handle ; Make sure we are a task.
TEQ lr, #0
......@@ -370,7 +371,7 @@ svc_modechange
svc_modefilechanged
ENTRY "r0"
Entry "r0"
Debug mod,"svc_modefilechanged"
LDR lr, task_handle ; Make sure we are a task.
TEQ lr, #0
......@@ -384,7 +385,7 @@ svc_modefilechanged
[ standalone
svc_resourcefsstarting
ENTRY "r0"
Entry "r0"
ADRL r0, resourcefs_files
MOV lr, pc
MOV pc, r2
......@@ -396,7 +397,7 @@ svc_resourcefsstarting
; Killing the module.
;
Mod_Die
ENTRY "r0-r3"
Entry "r0-r3"
LDR r12, [r12]
BL Mod_ShutDown
......@@ -599,7 +600,7 @@ banner
; Report the given error using the given flags.
;
Mod_ReportError
ENTRY "r0-r3",max_banner_size ; Save regs and get local stack frame.
Entry "r0-r3",max_banner_size ; Save regs and get local stack frame.
Debug mod,"Mod_ReportError"