Skip to content

GitLab

Commit 72731dd4 authored by John Ballance's avatar John Ballance
Browse files

reverse of mis-understood mod at VecSWIDespatch. mod only relevant at NoIRQ version 

Detail:
  (list files and functions that have changed)
Admin:
  (highlight level of testing that has taken place)
  (bugfix number if appropriate)


Version 5.35, 4.79.2.147.2.6. Tagged as 'Kernel-5_35-4_79_2_147_2_6'
parent f549c0ff
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 14 deletions
VersionASM
View file @ 72731dd4
......@@ -13,11 +13,11 @@
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.35"
Module_Version SETA 535
Module_MinorVersion SETS "4.79.2.147.2.5"
Module_Date SETS "20 May 2012"
Module_ApplicationDate SETS "20-May-12"
Module_MinorVersion SETS "4.79.2.147.2.6"
Module_Date SETS "21 May 2012"
Module_ApplicationDate SETS "21-May-12"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
Module_FullVersion SETS "5.35 (4.79.2.147.2.5)"
Module_HelpVersion SETS "5.35 (20 May 2012) 4.79.2.147.2.5"
Module_FullVersion SETS "5.35 (4.79.2.147.2.6)"
Module_HelpVersion SETS "5.35 (21 May 2012) 4.79.2.147.2.6"
END
VersionNum
View file @ 72731dd4
......@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
#define Module_MinorVersion_CMHG 4.79.2.147.2.5
#define Module_Date_CMHG 20 May 2012
#define Module_MinorVersion_CMHG 4.79.2.147.2.6
#define Module_Date_CMHG 21 May 2012
#define Module_MajorVersion "5.35"
#define Module_Version 535
#define Module_MinorVersion "4.79.2.147.2.5"
#define Module_Date "20 May 2012"
#define Module_MinorVersion "4.79.2.147.2.6"
#define Module_Date "21 May 2012"
#define Module_ApplicationDate "20-May-12"
#define Module_ApplicationDate "21-May-12"
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
#define Module_FullVersion "5.35 (4.79.2.147.2.5)"
#define Module_HelpVersion "5.35 (20 May 2012) 4.79.2.147.2.5"
#define Module_FullVersion "5.35 (4.79.2.147.2.6)"
#define Module_HelpVersion "5.35 (21 May 2012) 4.79.2.147.2.6"
#define Module_LibraryVersionInfo "5:35"
s/Kernel
View file @ 72731dd4
......@@ -1498,11 +1498,11 @@ VecSwiDespatch ROUT
[ NoARMT2
AND r14, r14, #&F0000000 ; extract caller's CCs
BIC r11, r11, #&F0000000 ; mask out ours
ORR r11, r11, #I32_bit ; disable IRQs (cf J Lee mod)
BIC r11, r11, #I32_bit ; enable IRQs
ORR r11, r11, r14 ; add in CCs
|
MOV r14, r14, LSR #28
ORR r11, r11, #I32_bit ; disable IRQs (cf J Lee mod)
BIC r11, r11, #I32_bit ; enable IRQs
BFI r11, r14, #28, #4 ; add in caller's CCs
]
MSR CPSR_cf, r11 ; and set it all up
......
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