Commit c5569c81 authored by Jeffrey Lee's avatar Jeffrey Lee

Fix OS_Memory 0 "make temporarily uncacheable" not reporting errors

Detail:
  s/MemInfo - The wrapper around OS_Memory 0 introduced in Kernel-5_35-4_79_2_311 was preserving the wrong PSR field on exit, causing any error generated by the core code to be lost.
Admin:
  Tested on Iyonix
  Fixes *screensave saving mostly white pixels (address translation for "external" VRAM should have failed and caused ADFS to fall back to a bounce buffer)
  Is also likely to be the cause of https://www.riscosopen.org/forum/forums/5/topics/11713 (address translation should have failed for soft ROM)


Version 6.10. Tagged as 'Kernel-6_10'
parent 2736fc5f
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "6.09"
Module_Version SETA 609
Module_MajorVersion SETS "6.10"
Module_Version SETA 610
Module_MinorVersion SETS ""
Module_Date SETS "07 Jul 2018"
Module_ApplicationDate SETS "07-Jul-18"
Module_Date SETS "08 Jul 2018"
Module_ApplicationDate SETS "08-Jul-18"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
Module_FullVersion SETS "6.09"
Module_HelpVersion SETS "6.09 (07 Jul 2018)"
Module_FullVersion SETS "6.10"
Module_HelpVersion SETS "6.10 (08 Jul 2018)"
END
/* (6.09)
/* (6.10)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 6.09
#define Module_MajorVersion_CMHG 6.10
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 07 Jul 2018
#define Module_Date_CMHG 08 Jul 2018
#define Module_MajorVersion "6.09"
#define Module_Version 609
#define Module_MajorVersion "6.10"
#define Module_Version 610
#define Module_MinorVersion ""
#define Module_Date "07 Jul 2018"
#define Module_Date "08 Jul 2018"
#define Module_ApplicationDate "07-Jul-18"
#define Module_ApplicationDate "08-Jul-18"
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
#define Module_FullVersion "6.09"
#define Module_HelpVersion "6.09 (07 Jul 2018)"
#define Module_LibraryVersionInfo "6:9"
#define Module_FullVersion "6.10"
#define Module_HelpVersion "6.10 (08 Jul 2018)"
#define Module_LibraryVersionInfo "6:10"
......@@ -136,7 +136,7 @@ MemoryConvertFIQCheck ROUT
MRS r11, CPSR
MOV r1, #Service_ReleaseFIQ
SWI XOS_ServiceCall
MSR CPSR_c, r11
MSR CPSR_f, r11
EXIT
MemoryConvertNoFIQCheck ROUT
......
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