Bring Cortex kernel branch in line with HAL branch

Detail:
  Makefile - Now uses ${PERL} for running perl
  s/Kernel - Now uses correct "Bad OS_PlatformFeatures reason code" error number
  s/MemInfo - Updated list of OS_Memory 9 controllers
Admin:
  OMAP3 ROM compiles OK; untested at runtime


Version 5.35, 4.79.2.98.2.43. Tagged as 'Kernel-5_35-4_79_2_98_2_43'

Makefile

@@ -38,6 +38,7 @@ LD      = link
 CP      = copy
 RM      = remove
 WIPE    = -wipe
+PERL    = do <Perl$Dir>.perl
 CCFLAGS = -c -depend !Depend -IC:
 ASFLAGS = -depend !Depend ${THROWBACK} -Stamp -quit -To $@ -From
 ARMASMFLAGS = -depend !Depend -g ${THROWBACK}
@@ -181,11 +182,11 @@ ${EXP_HDR}.GPIODevice: hdr.GPIODevice
 	
 ${C_EXP_HDR}.RISCOS: hdr.RISCOS
 	${MKDIR} ${C_EXP_HDR}
-	perl Build:Hdr2H hdr.RISCOS $@
+	${PERL} Build:Hdr2H hdr.RISCOS $@
 
 ${C_EXP_HDR}.HALEntries: hdr.HALEntries
 	${MKDIR} ${C_EXP_HDR}
-	perl Build:Hdr2H hdr.HALEntries $@
+	${PERL} Build:Hdr2H hdr.HALEntries $@
 
 ${C_EXP_HDR}.HALDevice: o.Global.h.HALDevice h.HALDevice
 	${CP} h.HALDevice $@ ${CPFLAGS}
@@ -193,16 +194,16 @@ ${C_EXP_HDR}.HALDevice: o.Global.h.HALDevice h.HALDevice
 
 ${C_EXP_HDR}.OSEntries: hdr.OSEntries
 	${MKDIR} ${C_EXP_HDR}
-	perl Build:Hdr2H hdr.OSEntries $@
+	${PERL} Build:Hdr2H hdr.OSEntries $@
 
 ${C_EXP_HDR}.Variables: hdr.Variables
 	${MKDIR} ${C_EXP_HDR}
-	perl Build:Hdr2H hdr.Variables $@
+	${PERL} Build:Hdr2H hdr.Variables $@
 
 o.Global.h.HALDevice: hdr.HALDevice
 	${MKDIR} o.Global.h
 	dir o
-	perl Build:Hdr2H ^.hdr.HALDevice Global.h.HALDevice
+	${PERL} Build:Hdr2H ^.hdr.HALDevice Global.h.HALDevice
 	back
 
 BBETYPE = kernel

VersionASM

@@ -13,11 +13,11 @@
                         GBLS    Module_ComponentPath
 Module_MajorVersion     SETS    "5.35"
 Module_Version          SETA    535
-Module_MinorVersion     SETS    "4.79.2.98.2.42"
-Module_Date             SETS    "31 Jul 2011"
-Module_ApplicationDate  SETS    "31-Jul-11"
+Module_MinorVersion     SETS    "4.79.2.98.2.43"
+Module_Date             SETS    "01 Aug 2011"
+Module_ApplicationDate  SETS    "01-Aug-11"
 Module_ComponentName    SETS    "Kernel"
 Module_ComponentPath    SETS    "castle/RiscOS/Sources/Kernel"
-Module_FullVersion      SETS    "5.35 (4.79.2.98.2.42)"
-Module_HelpVersion      SETS    "5.35 (31 Jul 2011) 4.79.2.98.2.42"
+Module_FullVersion      SETS    "5.35 (4.79.2.98.2.43)"
+Module_HelpVersion      SETS    "5.35 (01 Aug 2011) 4.79.2.98.2.43"
                         END

VersionNum

@@ -5,19 +5,19 @@
  *
  */
 #define Module_MajorVersion_CMHG        5.35
-#define Module_MinorVersion_CMHG        4.79.2.98.2.42
-#define Module_Date_CMHG                31 Jul 2011
+#define Module_MinorVersion_CMHG        4.79.2.98.2.43
+#define Module_Date_CMHG                01 Aug 2011
 
 #define Module_MajorVersion             "5.35"
 #define Module_Version                  535
-#define Module_MinorVersion             "4.79.2.98.2.42"
-#define Module_Date                     "31 Jul 2011"
+#define Module_MinorVersion             "4.79.2.98.2.43"
+#define Module_Date                     "01 Aug 2011"
 
-#define Module_ApplicationDate          "31-Jul-11"
+#define Module_ApplicationDate          "01-Aug-11"
 
 #define Module_ComponentName            "Kernel"
 #define Module_ComponentPath            "castle/RiscOS/Sources/Kernel"
 
-#define Module_FullVersion              "5.35 (4.79.2.98.2.42)"
-#define Module_HelpVersion              "5.35 (31 Jul 2011) 4.79.2.98.2.42"
+#define Module_FullVersion              "5.35 (4.79.2.98.2.43)"
+#define Module_HelpVersion              "5.35 (01 Aug 2011) 4.79.2.98.2.43"
 #define Module_LibraryVersionInfo       "5:35"

s/Kernel

@@ -1563,6 +1563,7 @@ PlatFeatSWI ROUT
         BNE     %FT50                   ;No, so send out a service call
 
         ;Ok, it's the 'code_features' reason code.
+        ASSERT  ZeroPage = 0
         LDR     r0,[r0, #ProcessorFlags]
         TST     r0, #CPUFlag_InterruptDelay
         ADRNE   r1, platfeat_irqinsert  ;Yep, so point R1 to the delay routine
@@ -1592,7 +1593,7 @@ platfeat_irqinsert
   ]
 
 75      ;Get here if the service call isn't claimed.
-        ADR     R0,platfeaterror
+        ADR     R0, ErrorBlock_BadPlatReas
     [ International
         Push    "lr"
         BL      TranslateError
@@ -1600,14 +1601,7 @@ platfeat_irqinsert
     ]
         B       SLVK_SetV
 
-platfeaterror
-        &       0
-    [ International
-        =       "BadPlatReas", 0
-    |
-        =       "Unknown OS_PlatformFeatures reason code", 0
-    ]
-        ALIGN
+        MakeErrorBlock BadPlatReas
   ]
 
 ; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

s/MemInfo

@@ -784,6 +784,12 @@ MemoryAmounts   ROUT
 ;                               3 = VIDC20
 ;                               4 = S space (IOMD,podules,NICs,blah blah)
 ;                               5 = Extension ROM(s)
+;                               6 = Tube ULA
+;                               7-31 = Reserved (for us)
+;                               32 = Primary ROM
+;                               33 = IOMD
+;                               34 = FDC37C665/SMC37C665/82C710/SuperIO/whatever
+;                               35+ = Reserved (for ROL)
 ;
 ;       Out:    r1 = controller base address or 0 if not present
 ;