Commit 49fa5460 authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Fix abort on unaligned LDR of DiscRecord_ZoneSpare.

Looks like a typo because there's a valid ASSERT above, and an LSR#16 below.

Version 3.48. Tagged as 'FileCore-3_48'
parent a4d790ff
...@@ -11,13 +11,13 @@ ...@@ -11,13 +11,13 @@
GBLS Module_HelpVersion GBLS Module_HelpVersion
GBLS Module_ComponentName GBLS Module_ComponentName
GBLS Module_ComponentPath GBLS Module_ComponentPath
Module_MajorVersion SETS "3.47" Module_MajorVersion SETS "3.48"
Module_Version SETA 347 Module_Version SETA 348
Module_MinorVersion SETS "" Module_MinorVersion SETS ""
Module_Date SETS "25 Nov 2011" Module_Date SETS "07 Jan 2012"
Module_ApplicationDate SETS "25-Nov-11" Module_ApplicationDate SETS "07-Jan-12"
Module_ComponentName SETS "FileCore" Module_ComponentName SETS "FileCore"
Module_ComponentPath SETS "castle/RiscOS/Sources/FileSys/FileCore" Module_ComponentPath SETS "castle/RiscOS/Sources/FileSys/FileCore"
Module_FullVersion SETS "3.47" Module_FullVersion SETS "3.48"
Module_HelpVersion SETS "3.47 (25 Nov 2011)" Module_HelpVersion SETS "3.48 (07 Jan 2012)"
END END
/* (3.47) /* (3.48)
* *
* This file is automatically maintained by srccommit, do not edit manually. * This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1. * Last processed by srccommit version: 1.1.
* *
*/ */
#define Module_MajorVersion_CMHG 3.47 #define Module_MajorVersion_CMHG 3.48
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 25 Nov 2011 #define Module_Date_CMHG 07 Jan 2012
#define Module_MajorVersion "3.47" #define Module_MajorVersion "3.48"
#define Module_Version 347 #define Module_Version 348
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "25 Nov 2011" #define Module_Date "07 Jan 2012"
#define Module_ApplicationDate "25-Nov-11" #define Module_ApplicationDate "07-Jan-12"
#define Module_ComponentName "FileCore" #define Module_ComponentName "FileCore"
#define Module_ComponentPath "castle/RiscOS/Sources/FileSys/FileCore" #define Module_ComponentPath "castle/RiscOS/Sources/FileSys/FileCore"
#define Module_FullVersion "3.47" #define Module_FullVersion "3.48"
#define Module_HelpVersion "3.47 (25 Nov 2011)" #define Module_HelpVersion "3.48 (07 Jan 2012)"
#define Module_LibraryVersionInfo "3:47" #define Module_LibraryVersionInfo "3:48"
...@@ -3611,7 +3611,7 @@ DoVerify ROUT ...@@ -3611,7 +3611,7 @@ DoVerify ROUT
; If bad block is last in zone skip ZoneSpare into next zone ; If bad block is last in zone skip ZoneSpare into next zone
CMP R11, R5 CMP R11, R5
ASSERT DiscRecord_ZoneSpare :MOD: 4 = 2 ASSERT DiscRecord_ZoneSpare :MOD: 4 = 2
LDRHS LR, [R10, #ZoneHead + DiscRecord_ZoneSpare] LDRHS LR, [R10, #ZoneHead + DiscRecord_ZoneSpare - 2]
ADDHS R11, R5, LR, LSR #16 ; Offset from R5 just in case R11 overhangs into the ZoneSpare ADDHS R11, R5, LR, LSR #16 ; Offset from R5 just in case R11 overhangs into the ZoneSpare
BL MapPtrToDiscAdd ;(R3,R10,R11->R0) disc add after defect BL MapPtrToDiscAdd ;(R3,R10,R11->R0) disc add after defect
......
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