Skip to content

GitLab

Commit f17c069f authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Fix previously undiscovered 32bit incompatability in Display Manager 

Detail:
  s/Message - fix delete_scrap to use EntryS/EXITS macros to preserve PSR instead of Pull "r0,pc",,^
Admin:
  Tested on rev C2 beagleboard.


Version 0.40. Tagged as 'Display-0_40'
parent 6934bac6
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 20 deletions
VersionASM
View file @ f17c069f
...@@ -11,13 +11,13 @@ ...@@ -11,13 +11,13 @@
GBLS Module_HelpVersion GBLS Module_HelpVersion
GBLS Module_ComponentName GBLS Module_ComponentName
GBLS Module_ComponentPath GBLS Module_ComponentPath
Module_MajorVersion SETS "0.39" Module_MajorVersion SETS "0.40"
Module_Version SETA 39 Module_Version SETA 40
Module_MinorVersion SETS "" Module_MinorVersion SETS ""
Module_Date SETS "12 Oct 2008" Module_Date SETS "13 May 2009"
Module_ApplicationDate SETS "12-Oct-08" Module_ApplicationDate SETS "13-May-09"
Module_ComponentName SETS "Display" Module_ComponentName SETS "Display"
Module_ComponentPath SETS "RiscOS/Sources/Video/UserI/Display" Module_ComponentPath SETS "castle/RiscOS/Sources/Video/UserI/Display"
Module_FullVersion SETS "0.39" Module_FullVersion SETS "0.40"
Module_HelpVersion SETS "0.39 (12 Oct 2008)" Module_HelpVersion SETS "0.40 (13 May 2009)"
END END
VersionNum
View file @ f17c069f
/* (0.39) /* (0.40)
* *
* This file is automatically maintained by srccommit, do not edit manually. * This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1. * Last processed by srccommit version: 1.1.
* *
*/ */
#define Module_MajorVersion_CMHG 0.39 #define Module_MajorVersion_CMHG 0.40
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 12 Oct 2008 #define Module_Date_CMHG 13 May 2009
#define Module_MajorVersion "0.39" #define Module_MajorVersion "0.40"
#define Module_Version 39 #define Module_Version 40
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "12 Oct 2008" #define Module_Date "13 May 2009"
#define Module_ApplicationDate "12-Oct-08" #define Module_ApplicationDate "13-May-09"
#define Module_ComponentName "Display" #define Module_ComponentName "Display"
#define Module_ComponentPath "RiscOS/Sources/Video/UserI/Display" #define Module_ComponentPath "castle/RiscOS/Sources/Video/UserI/Display"
#define Module_FullVersion "0.39" #define Module_FullVersion "0.40"
#define Module_HelpVersion "0.39 (12 Oct 2008)" #define Module_HelpVersion "0.40 (13 May 2009)"
#define Module_LibraryVersionInfo "0:39" #define Module_LibraryVersionInfo "0:40"
s/Message
View file @ f17c069f
...@@ -195,14 +195,14 @@ msg_dataload ...@@ -195,14 +195,14 @@ msg_dataload
EXIT EXIT
delete_scrap delete_scrap
Push "r0,lr" EntryS "r0"
LDR lr, scrap_ref LDR lr, scrap_ref
TEQ r6, lr ; If loading scrap file then TEQ r6, lr ; If loading scrap file then
MOVEQ lr, #-1 ; clear scrap ref MOVEQ lr, #-1 ; clear scrap ref
STREQ lr, scrap_ref STREQ lr, scrap_ref
ADREQ r0, deletescrap ; and delete scrap file we used. ADREQ r0, deletescrap ; and delete scrap file we used.
SWIEQ XOS_CLI SWIEQ XOS_CLI
Pull "r0,pc",,^ EXITS
msg_datasave msg_datasave
......
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