Commit 3bd0b704 authored by Ben Avison's avatar Ben Avison
Browse files

Fix for alignment exception on ARMv7

Detail:
  The Density field in the disc record is a byte at a non-word-aligned address
  but it was being loaded here with an LDR instruction. There is actually a
  pre-existing bug here, since the code at lines 904-905 would only have been
  executed on earlier CPUs if SectorSize, SecsPerTrk and Heads were all zero
  too. This would correspond to an implausibly small hard disc, so arguably
  this part of the branch should perhaps be removed altogether?
Admin:
  Untested at ROOL.
  Submission from Willi Theiß [comments above are my own - BA]

Version 3.40. Tagged as 'FileCore-3_40'
parent 82f55aab
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "3.39"
Module_Version SETA 339
Module_MajorVersion SETS "3.40"
Module_Version SETA 340
Module_MinorVersion SETS ""
Module_Date SETS "04 Aug 2011"
Module_ApplicationDate SETS "04-Aug-11"
Module_Date SETS "12 Sep 2011"
Module_ApplicationDate SETS "12-Sep-11"
Module_ComponentName SETS "FileCore"
Module_ComponentPath SETS "castle/RiscOS/Sources/FileSys/FileCore"
Module_FullVersion SETS "3.39"
Module_HelpVersion SETS "3.39 (04 Aug 2011)"
Module_FullVersion SETS "3.40"
Module_HelpVersion SETS "3.40 (12 Sep 2011)"
END
/* (3.39)
/* (3.40)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 3.39
#define Module_MajorVersion_CMHG 3.40
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 04 Aug 2011
#define Module_Date_CMHG 12 Sep 2011
#define Module_MajorVersion "3.39"
#define Module_Version 339
#define Module_MajorVersion "3.40"
#define Module_Version 340
#define Module_MinorVersion ""
#define Module_Date "04 Aug 2011"
#define Module_Date "12 Sep 2011"
#define Module_ApplicationDate "04-Aug-11"
#define Module_ApplicationDate "12-Sep-11"
#define Module_ComponentName "FileCore"
#define Module_ComponentPath "castle/RiscOS/Sources/FileSys/FileCore"
#define Module_FullVersion "3.39"
#define Module_HelpVersion "3.39 (04 Aug 2011)"
#define Module_LibraryVersionInfo "3:39"
#define Module_FullVersion "3.40"
#define Module_HelpVersion "3.40 (12 Sep 2011)"
#define Module_LibraryVersionInfo "3:40"
......@@ -893,7 +893,7 @@ LayoutFreeSpaceMap ROUT
LDRB r0, [r5, #Zones]
TEQ r0, #1
]
LDREQ lr, [r5, #Density]
LDREQB lr, [r5, #Density]
TEQEQ lr, #0
BNE %FT45
......
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