Commit 0bb39da8 authored by Stewart Brodie's avatar Stewart Brodie
Browse files

BBE changes.

Detail:
  Also a fix to the DRAM allocation in s/ARM600 to fix address masking.
Admin:
  Required by BBE.

Version 5.39. Tagged as 'Kernel-5_39'
parent dbc48c98
...@@ -92,6 +92,12 @@ resources-: resources_common ...@@ -92,6 +92,12 @@ resources-: resources_common
TokenCheck LocalRes:Messages TokenCheck LocalRes:Messages
print LocalRes:CmdHelp { >> ${RESDIR}.${COMPONENT}.Messages } print LocalRes:CmdHelp { >> ${RESDIR}.${COMPONENT}.Messages }
BBETYPE = kernel
bbe-kernel: bbe-generic-resources-get-alias
BBE_Export_Dir Resources.${LOCALE}.${USERIF}
BBE_Export_File Resources.${LOCALE}.Messages
BBE_Export_File Resources.${LOCALE}.CmdHelp
${TARGET}: ${SOURCE} s.TMOSHelp ${TARGET}: ${SOURCE} s.TMOSHelp
${MKDIR} rm.${MACHINE} ${MKDIR} rm.${MACHINE}
${AS} ${ASFLAGS} ${SOURCE} ${AS} ${ASFLAGS} ${SOURCE}
......
...@@ -11,14 +11,14 @@ ...@@ -11,14 +11,14 @@
GBLS Module_HelpVersion GBLS Module_HelpVersion
GBLS Module_ComponentName GBLS Module_ComponentName
GBLS Module_ComponentPath GBLS Module_ComponentPath
Module_MajorVersion SETS "5.38" Module_MajorVersion SETS "5.39"
Module_Version SETA 538 Module_Version SETA 539
Module_MinorVersion SETS "" Module_MinorVersion SETS ""
Module_Date SETS "21 Nov 2000" Module_Date SETS "05 Jan 2001"
Module_ApplicationDate2 SETS "21-Nov-00" Module_ApplicationDate2 SETS "05-Jan-01"
Module_ApplicationDate4 SETS "21-Nov-2000" Module_ApplicationDate4 SETS "05-Jan-2001"
Module_ComponentName SETS "Kernel" Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "RiscOS/Sources/Kernel" Module_ComponentPath SETS "RiscOS/Sources/Kernel"
Module_FullVersion SETS "5.38" Module_FullVersion SETS "5.39"
Module_HelpVersion SETS "5.38 (21 Nov 2000)" Module_HelpVersion SETS "5.39 (05 Jan 2001)"
END END
/* (5.38) /* (5.39)
* *
* This file is automatically maintained by srccommit, do not edit manually. * This file is automatically maintained by srccommit, do not edit manually.
* *
*/ */
#define Module_MajorVersion_CMHG 5.38 #define Module_MajorVersion_CMHG 5.39
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 21 Nov 2000 #define Module_Date_CMHG 05 Jan 2001
#define Module_MajorVersion "5.38" #define Module_MajorVersion "5.39"
#define Module_Version 538 #define Module_Version 539
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "21 Nov 2000" #define Module_Date "05 Jan 2001"
#define Module_ApplicationDate2 "21-Nov-00" #define Module_ApplicationDate2 "05-Jan-01"
#define Module_ApplicationDate4 "21-Nov-2000" #define Module_ApplicationDate4 "05-Jan-2001"
#define Module_ComponentName "Kernel" #define Module_ComponentName "Kernel"
#define Module_ComponentPath "RiscOS/Sources/Kernel" #define Module_ComponentPath "RiscOS/Sources/Kernel"
#define Module_FullVersion "5.38" #define Module_FullVersion "5.39"
#define Module_HelpVersion "5.38 (21 Nov 2000)" #define Module_HelpVersion "5.39 (05 Jan 2001)"
...@@ -1967,9 +1967,11 @@ Add_DRAM_bank ...@@ -1967,9 +1967,11 @@ Add_DRAM_bank
BLS %FT20 ; If start <= end, then block is not fragmented. BLS %FT20 ; If start <= end, then block is not fragmented.
CMP r2, r0 ; Check the size of the fragment before the image. CMP r2, r0 ; Check the size of the fragment before the image.
MOV r0, r1 ; Store old start address MOV r0, r1 ; Store old start address
SUB r1, r1, #1 ; last byte of image (definitely in block)
AND r1, r1, r7 ; Get the start of the block AND r1, r1, r7 ; Get the start of the block
BLNE Allocate_DRAM_fragment ; Allocate it if it's non-zero. BLNE Allocate_DRAM_fragment ; Allocate it if it's non-zero.
MOV r1, r0 ; Restore the old start of fragment MOV r1, r0 ; Restore the old start of fragment
SUB r0, r0, #1 ; last byte of image (definitely in block)
AND r0, r0, r7 ; Get the start of the block again. AND r0, r0, r7 ; Get the start of the block again.
ADD r2, r0, r8 ; End of next fragment is the end of the block. ADD r2, r0, r8 ; End of next fragment is the end of the block.
......
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