Commit 0c76fb2a authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Push of LR+PC split out.

Version 1.70. Tagged as 'DDEUtils-1_70'
parent 64787600
...@@ -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 "1.69" Module_MajorVersion SETS "1.70"
Module_Version SETA 169 Module_Version SETA 170
Module_MinorVersion SETS "" Module_MinorVersion SETS ""
Module_Date SETS "17 Sep 2011" Module_Date SETS "05 Nov 2011"
Module_ApplicationDate SETS "17-Sep-11" Module_ApplicationDate SETS "05-Nov-11"
Module_ComponentName SETS "DDEUtils" Module_ComponentName SETS "DDEUtils"
Module_ComponentPath SETS "castle/RiscOS/Sources/Programmer/DDEUtils" Module_ComponentPath SETS "castle/RiscOS/Sources/Programmer/DDEUtils"
Module_FullVersion SETS "1.69" Module_FullVersion SETS "1.70"
Module_HelpVersion SETS "1.69 (17 Sep 2011)" Module_HelpVersion SETS "1.70 (05 Nov 2011)"
END END
/* (1.69) /* (1.70)
* *
* 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 1.69 #define Module_MajorVersion_CMHG 1.70
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 17 Sep 2011 #define Module_Date_CMHG 05 Nov 2011
#define Module_MajorVersion "1.69" #define Module_MajorVersion "1.70"
#define Module_Version 169 #define Module_Version 170
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "17 Sep 2011" #define Module_Date "05 Nov 2011"
#define Module_ApplicationDate "17-Sep-11" #define Module_ApplicationDate "05-Nov-11"
#define Module_ComponentName "DDEUtils" #define Module_ComponentName "DDEUtils"
#define Module_ComponentPath "castle/RiscOS/Sources/Programmer/DDEUtils" #define Module_ComponentPath "castle/RiscOS/Sources/Programmer/DDEUtils"
#define Module_FullVersion "1.69" #define Module_FullVersion "1.70"
#define Module_HelpVersion "1.69 (17 Sep 2011)" #define Module_HelpVersion "1.70 (05 Nov 2011)"
#define Module_LibraryVersionInfo "1:69" #define Module_LibraryVersionInfo "1:70"
...@@ -897,7 +897,9 @@ fscontrol_change_dir ...@@ -897,7 +897,9 @@ fscontrol_change_dir
copy_or_rename copy_or_rename
STMFD sp!, {r1, r2} STMFD sp!, {r1, r2}
STMFD sp!, {r8-r11, lr, pc} ; store PC+8 or PC+12 SUB sp, sp, #4 ; avoid storing LR + PC together
STMFD sp!, {r8-r11, lr}
STR pc, [sp, #5 * 4] ; store PC+8 or PC+12
B copy_or_rename1 B copy_or_rename1
NOP ; so that PC+8 is ok NOP ; so that PC+8 is ok
...@@ -929,7 +931,7 @@ copy_or_rename3 ...@@ -929,7 +931,7 @@ copy_or_rename3
MOV r1, r9 MOV r1, r9
MOVCC r2, r8 MOVCC r2, r8
MOVCC r1, r10 MOVCC r1, r10
LDMFD sp!, {r8, r9, r10, r11, lr} LDMFD sp!, {r8-r11, lr}
ADDCS sp, sp, #12 ADDCS sp, sp, #12
MOVCS pc, lr MOVCS pc, lr
TEQ pc, pc TEQ pc, pc
......
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