Merged across the bugfix from the HAL branch, revision Kernel-5_35-4_79_2_148

Version 5.35, 4.79.2.147.2.4. Tagged as 'Kernel-5_35-4_79_2_147_2_4'

Merged across the bugfix from the HAL branch, revision Kernel-5_35-4_79_2_148
Version 5.35, 4.79.2.147.2.4. Tagged as 'Kernel-5_35-4_79_2_147_2_4'
65b2059f · Ben Avison · b87046cf · 65b2059f · 65b2059f · 65b2059f
Commit 65b2059f authored 12 years ago by Ben Avison
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 8 deletions

VersionASM VersionASM +3 -3

VersionNum VersionNum +4 -4

s/Kernel s/Kernel +1 -1

No files found.
--- a/VersionASM
+++ b/VersionASM
@@ -13,11 +13,11 @@
                        GBLS    Module_ComponentPath
 Module_MajorVersion     SETS    "5.35"
 Module_Version          SETA    535
-Module_MinorVersion     SETS    "4.79.2.147.2.3"
+Module_MinorVersion     SETS    "4.79.2.147.2.4"
 Module_Date             SETS    "18 May 2012"
 Module_ApplicationDate  SETS    "18-May-12"
 Module_ComponentName    SETS    "Kernel"
 Module_ComponentPath    SETS    "castle/RiscOS/Sources/Kernel"
-Module_FullVersion      SETS    "5.35 (4.79.2.147.2.3)"
-Module_HelpVersion      SETS    "5.35 (18 May 2012) 4.79.2.147.2.3"
+Module_FullVersion      SETS    "5.35 (4.79.2.147.2.4)"
+Module_HelpVersion      SETS    "5.35 (18 May 2012) 4.79.2.147.2.4"
                        END
--- a/VersionNum
+++ b/VersionNum
@@ -5,12 +5,12 @@
 *
 */
 #define Module_MajorVersion_CMHG        5.35
-#define Module_MinorVersion_CMHG        4.79.2.147.2.3
+#define Module_MinorVersion_CMHG        4.79.2.147.2.4
 #define Module_Date_CMHG                18 May 2012

 #define Module_MajorVersion             "5.35"
 #define Module_Version                  535
-#define Module_MinorVersion             "4.79.2.147.2.3"
+#define Module_MinorVersion             "4.79.2.147.2.4"
 #define Module_Date                     "18 May 2012"

 #define Module_ApplicationDate          "18-May-12"
@@ -18,6 +18,6 @@
 #define Module_ComponentName            "Kernel"
 #define Module_ComponentPath            "castle/RiscOS/Sources/Kernel"

-#define Module_FullVersion              "5.35 (4.79.2.147.2.3)"
-#define Module_HelpVersion              "5.35 (18 May 2012) 4.79.2.147.2.3"
+#define Module_FullVersion              "5.35 (4.79.2.147.2.4)"
+#define Module_HelpVersion              "5.35 (18 May 2012) 4.79.2.147.2.4"
 #define Module_LibraryVersionInfo       "5:35"
--- a/s/Kernel
+++ b/s/Kernel
@@ -1512,7 +1512,7 @@ NoIrqVecSwiDespatch ROUT
        ORR     r11, r11, r14           ; add in CCs
      |
        MOV     r14, r14, LSR #28
-        BIC     r11, r11, #I32_bit      ; enable IRQs
+        ORR     r11, r11, #I32_bit      ; disable IRQs
        BFI     r11, r14, #28, #4       ; add in caller's CCs
      ]
        MSR     CPSR_cf, r11            ; and set it all up