Skip to content

GitLab

Commit d184c5b5 authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Fix VMSAv6 prefetch abort handler to work with zero page relocation (and get it right this time) 

Detail:
  s/VMSAv6 - Prefetch abort handler address now looked up as ZeroPage-relative
Admin:
  Tested on Raspberry Pi with high processor vectors
  Previous commit was a harmless, unintentional merge from HAL branch to RPi branch due to folder mixup


Version 5.35, 4.79.2.147.2.12. Tagged as 'Kernel-5_35-4_79_2_147_2_12'
parent bd172cc5
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
VersionASM
View file @ d184c5b5
......@@ -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
VersionNum
View file @ d184c5b5
......@@ -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"
s/VMSAv6
View file @ d184c5b5
......@@ -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