Commit 78392a1c authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Fix VMSAv6 prefetch abort handler to work with zero page relocation

Detail:
  s/VMSAv6 - Prefetch abort handler address now looked up as ZeroPage-relative
Admin:
  Untested, but same fix as on RPi branch


Version 5.35, 4.79.2.156. Tagged as 'Kernel-5_35-4_79_2_156'
parent a64fa3d3
......@@ -13,11 +13,11 @@
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.35"
Module_Version SETA 535
Module_MinorVersion SETS "4.79.2.155"
Module_Date SETS "26 Jun 2012"
Module_ApplicationDate SETS "26-Jun-12"
Module_MinorVersion SETS "4.79.2.156"
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.155)"
Module_HelpVersion SETS "5.35 (26 Jun 2012) 4.79.2.155"
Module_FullVersion SETS "5.35 (4.79.2.156)"
Module_HelpVersion SETS "5.35 (27 Jun 2012) 4.79.2.156"
END
......@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
#define Module_MinorVersion_CMHG 4.79.2.155
#define Module_Date_CMHG 26 Jun 2012
#define Module_MinorVersion_CMHG 4.79.2.156
#define Module_Date_CMHG 27 Jun 2012
#define Module_MajorVersion "5.35"
#define Module_Version 535
#define Module_MinorVersion "4.79.2.155"
#define Module_Date "26 Jun 2012"
#define Module_MinorVersion "4.79.2.156"
#define Module_Date "27 Jun 2012"
#define Module_ApplicationDate "26-Jun-12"
#define Module_ApplicationDate "27-Jun-12"
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
#define Module_FullVersion "5.35 (4.79.2.155)"
#define Module_HelpVersion "5.35 (26 Jun 2012) 4.79.2.155"
#define Module_FullVersion "5.35 (4.79.2.156)"
#define Module_HelpVersion "5.35 (27 Jun 2012) 4.79.2.156"
#define Module_LibraryVersionInfo "5:35"
......@@ -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"
......
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