diff --git a/VersionASM b/VersionASM index 57b399fdba92fbfa911d1d4da49a76d4fda5757d..472a3ec377b5ae82460ca83dd4283771fa263fa2 100644 --- 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.11" +Module_MinorVersion SETS "4.79.2.147.2.12" Module_Date SETS "27 Jun 2012" Module_ApplicationDate SETS "27-Jun-12" Module_ComponentName SETS "Kernel" Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel" -Module_FullVersion SETS "5.35 (4.79.2.147.2.11)" -Module_HelpVersion SETS "5.35 (27 Jun 2012) 4.79.2.147.2.11" +Module_FullVersion SETS "5.35 (4.79.2.147.2.12)" +Module_HelpVersion SETS "5.35 (27 Jun 2012) 4.79.2.147.2.12" END diff --git a/VersionNum b/VersionNum index 818fb288e3f7fccd2f3b2c35b4bedf981941ad8f..3ba72b3fb1e58d787281fd52da5da650058547ce 100644 --- a/VersionNum +++ b/VersionNum @@ -5,12 +5,12 @@ * */ #define Module_MajorVersion_CMHG 5.35 -#define Module_MinorVersion_CMHG 4.79.2.147.2.11 +#define Module_MinorVersion_CMHG 4.79.2.147.2.12 #define Module_Date_CMHG 27 Jun 2012 #define Module_MajorVersion "5.35" #define Module_Version 535 -#define Module_MinorVersion "4.79.2.147.2.11" +#define Module_MinorVersion "4.79.2.147.2.12" #define Module_Date "27 Jun 2012" #define Module_ApplicationDate "27-Jun-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.11)" -#define Module_HelpVersion "5.35 (27 Jun 2012) 4.79.2.147.2.11" +#define Module_FullVersion "5.35 (4.79.2.147.2.12)" +#define Module_HelpVersion "5.35 (27 Jun 2012) 4.79.2.147.2.12" #define Module_LibraryVersionInfo "5:35" diff --git a/s/VMSAv6 b/s/VMSAv6 index 3ddf8b562e70a4f076a3ca7061aaa6a6e128b536..a3d9938185725f1d3c6f9437267d4e9f09403cd4 100644 --- a/s/VMSAv6 +++ b/s/VMSAv6 @@ -452,7 +452,7 @@ PAbPreVeneer ROUT Pull "r0-r7, lr", NE ; restore regs and SUBNES pc, lr_abort, #4 ; restart aborting instruction if fixed up LDR lr, [sp, #8*4] ; (not a lazy abort) restore lr - LDR r0, =PAbHan ; we want to jump to PAb handler, in abort mode + LDR r0, =ZeroPage+PAbHan ; we want to jump to PAb handler, in abort mode LDR r0, [r0] STR r0, [sp, #8*4] Pull "r0-r7, pc"