Commit 22f99bdd authored by Ben Avison's avatar Ben Avison

Cross-compile version of HdrSrc

Detail:
  Mostly a question of changing directory separators and removing reliance
  upon path variables and system variable expansion. One day, when all
  components use the shared makefiles (or at least use the necessary -pd and
  -i switches to objasm), we will be able to switch over to using this
  version for all builds. In the meantime, I have created a new branch for
  the HdrSrc component, called XCompile, to store these changes. The downside
  is the fact that we'll now have to maintain unrelated changes on both
  branches until they can be merged.
Admin:
  Tested by cross-assembling the BASIC module.

Version 2.46, 4.247.2.1. Tagged as 'HdrSrc-2_46-4_247_2_1'
parent a7cfad09
# Copyright 2014 Castle Technology Ltd
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Makefile for Global Assembler Header files
#
#
# Paths
#
GLOBALDIR = ${HDRDIR}/Global
include StdTools
#
# Program specific options:
#
COMPONENT = HdrSrc
EXPORTS = \
${GLOBALDIR}/APCS/${APCS} \
${GLOBALDIR}/APCS/Common \
${GLOBALDIR}/AUN \
${GLOBALDIR}/CMOS \
${GLOBALDIR}/Countries \
${GLOBALDIR}/CPU/Arch \
${GLOBALDIR}/CPU/ARM600 \
${GLOBALDIR}/CPU/FPA \
${GLOBALDIR}/CPU/Generic26 \
${GLOBALDIR}/CPU/Generic32 \
${GLOBALDIR}/DDVMacros \
${GLOBALDIR}/Debug \
${GLOBALDIR}/Devices \
${GLOBALDIR}/DevNos \
${GLOBALDIR}/DrawObj \
${GLOBALDIR}/ExtraLong \
${GLOBALDIR}/FDC/FDC711 \
${GLOBALDIR}/FileTypes \
${GLOBALDIR}/FSNumbers \
${GLOBALDIR}/GraphicsV \
${GLOBALDIR}/HALSize/${HALSIZE} \
${GLOBALDIR}/Heap \
${GLOBALDIR}/ImageSize/${IMAGESIZE} \
${GLOBALDIR}/IO/GenericIO \
${GLOBALDIR}/IO/IOC \
${GLOBALDIR}/IO/IOC-A1 \
${GLOBALDIR}/IO/IOEB \
${GLOBALDIR}/IO/IOMD \
${GLOBALDIR}/IO/IOMDL \
${GLOBALDIR}/Keyboard \
${GLOBALDIR}/ListOpts \
${GLOBALDIR}/MEMM/ARM600 \
${GLOBALDIR}/MEMM/MEMC1 \
${GLOBALDIR}/MEMM/VMSAv6 \
${GLOBALDIR}/Machine/${MACHINE} \
${GLOBALDIR}/Machine/All32 \
${GLOBALDIR}/Machine/Machine \
${GLOBALDIR}/Macros \
${GLOBALDIR}/Messages \
${GLOBALDIR}/NdrDebug \
${GLOBALDIR}/NewErrors \
${GLOBALDIR}/OsBytes \
${GLOBALDIR}/OsWords \
${GLOBALDIR}/PaletteV \
${GLOBALDIR}/PDriverReg \
${GLOBALDIR}/PDumperReg \
${GLOBALDIR}/PoduleReg \
${GLOBALDIR}/Pointer \
${GLOBALDIR}/Proc \
${GLOBALDIR}/Services \
${GLOBALDIR}/Sprite \
${GLOBALDIR}/Symbols \
${GLOBALDIR}/System \
${GLOBALDIR}/SWIs \
${GLOBALDIR}/Tokens \
${GLOBALDIR}/UpCall \
${GLOBALDIR}/UserIF/${USERIF} \
${GLOBALDIR}/UserIF/UserIF \
${GLOBALDIR}/VIDC/VIDC1a \
${GLOBALDIR}/VIDC/VIDC20 \
${CEXPORTDIR}/Global/AUN.h \
${CEXPORTDIR}/Global/CMOS.h \
${CEXPORTDIR}/Global/Countries.h \
${CEXPORTDIR}/Global/Devices.h \
${CEXPORTDIR}/Global/DevNos.h \
${CEXPORTDIR}/Global/DrawObj.h \
${CEXPORTDIR}/Global/EnvNumbers.h \
${CEXPORTDIR}/Global/FileTypes.h \
${CEXPORTDIR}/Global/FreewayReg.h \
${CEXPORTDIR}/Global/FSNumbers.h \
${CEXPORTDIR}/Global/GraphicsV.h \
${CEXPORTDIR}/Global/Heap.h \
${CEXPORTDIR}/Global/Keyboard.h \
${CEXPORTDIR}/Global/NewErrors.h \
${CEXPORTDIR}/Global/OsBytes.h \
${CEXPORTDIR}/Global/OsWords.h \
${CEXPORTDIR}/Global/PaletteV.h \
${CEXPORTDIR}/Global/PDriverReg.h \
${CEXPORTDIR}/Global/PDumperReg.h \
${CEXPORTDIR}/Global/PoduleReg.h \
${CEXPORTDIR}/Global/Pointer.h \
${CEXPORTDIR}/Global/Services.h \
${CEXPORTDIR}/Global/Sprite.h \
${CEXPORTDIR}/Global/SWIs.h \
${CEXPORTDIR}/Global/UpCall.h \
${CEXPORTDIR}/Global/Tokens.h \
${CEXPORTDIR}/Global/IOCtl.h \
${CEXPORTDIR}/Global/IO/GenericIO.h \
${CEXPORTDIR}/Global/IO/IOMD.h \
INSTALLS = \
${APCSEXPORTDIR}/Hdr/APCS/APCS-32 \
${APCSEXPORTDIR}/Hdr/APCS/APCS-R \
${APCSEXPORTDIR}/Hdr/APCS/Common \
${APCSEXPORTDIR}/Hdr/CPU/Generic26 \
${APCSEXPORTDIR}/Hdr/CPU/Generic32 \
${APCSEXPORTDIR}/Hdr/ListOpts \
#
# Generic rules:
#
export: Dirs ${EXPORTS} ${OPTIONS}
@echo ${COMPONENT}: export complete
Dirs:
${MKDIR} ${GLOBALDIR}
${MKDIR} ${HDRDIR}/Interface
${MKDIR} ${HDRDIR}/Interface2
${MKDIR} ${GLOBALDIR}/APCS
${MKDIR} ${GLOBALDIR}/CPU
${MKDIR} ${GLOBALDIR}/FDC
${MKDIR} ${GLOBALDIR}/HALSize
${MKDIR} ${GLOBALDIR}/IO
${MKDIR} ${GLOBALDIR}/ImageSize
${MKDIR} ${GLOBALDIR}/Machine
${MKDIR} ${GLOBALDIR}/MEMM
${MKDIR} ${GLOBALDIR}/UserIF
${MKDIR} ${GLOBALDIR}/VIDC
${MKDIR} ${CEXPORTDIR}/Global
${MKDIR} ${CEXPORTDIR}/Global/IO
${MKDIR} ${CEXPORTDIR}/Interface
${MKDIR} ${LIBDIR}
install: install_Dirs ${INSTALLS}
install_Dirs:
${MKDIR} ${APCSEXPORTDIR}/Hdr/APCS
${MKDIR} ${APCSEXPORTDIR}/Hdr/CPU
clean:
@echo ${COMPONENT}: nothing to clean
#
# Rules for installing:
#
${APCSEXPORTDIR}/Hdr/APCS/APCS-32: hdr/APCS/APCS-32; ${CP} hdr/APCS/APCS-32 $@ ${CPFLAGS}
${APCSEXPORTDIR}/Hdr/APCS/APCS-R: hdr/APCS/APCS-R; ${CP} hdr/APCS/APCS-R $@ ${CPFLAGS}
${APCSEXPORTDIR}/Hdr/APCS/Common: hdr/APCS/Common; ${CP} hdr/APCS/Common $@ ${CPFLAGS}
${APCSEXPORTDIR}/Hdr/CPU/Generic26: hdr/CPU/Generic26; ${CP} hdr/CPU/Generic26 $@ ${CPFLAGS}
${APCSEXPORTDIR}/Hdr/CPU/Generic32: hdr/CPU/Generic32; ${CP} hdr/CPU/Generic32 $@ ${CPFLAGS}
${APCSEXPORTDIR}/Hdr/ListOpts: hdr/ListOpts; ${CP} hdr/ListOpts $@ ${CPFLAGS}
#
# Special rule for exporting all ImageSize, Machine and UserIF files.
# Trigger by invoking the export with OPTIONS=ALL.
#
ALL: ${GLOBALDIR}/Machine/Machine ${GLOBALDIR}/UserIF/UserIF ${GLOBALDIR}/HALSize/${HALSIZE} ${GLOBALDIR}/ImageSize/${IMAGESIZE} ${GLOBALDIR}/APCS/${APCS}
${CP} hdr/Machine ${GLOBALDIR}/Machine ${CPFLAGS}
${CP} hdr/UserIF ${GLOBALDIR}/UserIF ${CPFLAGS}
${CP} hdr/HALSize ${GLOBALDIR}/HALSize ${CPFLAGS}
${CP} hdr/ImageSize ${GLOBALDIR}/ImageSize ${CPFLAGS}
${CP} hdr/APCS ${GLOBALDIR}/APCS ${CPFLAGS}
#
# Rules for exporting:
#
# Registration headers:
${GLOBALDIR}/AUN: hdr/AUN; ${CP} hdr/AUN $@ ${CPFLAGS}
${GLOBALDIR}/Countries: hdr/Countries; ${CP} hdr/Countries $@ ${CPFLAGS}
${GLOBALDIR}/Devices: hdr/Devices; ${CP} hdr/Devices $@ ${CPFLAGS}
${GLOBALDIR}/DevNos: hdr/DevNos; ${CP} hdr/DevNos $@ ${CPFLAGS}
${GLOBALDIR}/DrawObj: hdr/DrawObj; ${CP} hdr/DrawObj $@ ${CPFLAGS}
${GLOBALDIR}/FileTypes: hdr/FileTypes; ${CP} hdr/FileTypes $@ ${CPFLAGS}
${GLOBALDIR}/FSNumbers: hdr/FSNumbers; ${CP} hdr/FSNumbers $@ ${CPFLAGS}
${GLOBALDIR}/GraphicsV: hdr/GraphicsV; ${CP} hdr/GraphicsV $@ ${CPFLAGS}
${GLOBALDIR}/Keyboard: hdr/Keyboard; ${CP} hdr/Keyboard $@ ${CPFLAGS}
${GLOBALDIR}/Messages: hdr/Messages; ${CP} hdr/Messages $@ ${CPFLAGS}
${GLOBALDIR}/NewErrors: hdr/NewErrors; ${CP} hdr/NewErrors $@ ${CPFLAGS}
${GLOBALDIR}/OsBytes: hdr/OsBytes; ${CP} hdr/OsBytes $@ ${CPFLAGS}
${GLOBALDIR}/OsWords: hdr/OsWords; ${CP} hdr/OsWords $@ ${CPFLAGS}
${GLOBALDIR}/PaletteV: hdr/PaletteV; ${CP} hdr/PaletteV $@ ${CPFLAGS}
${GLOBALDIR}/PDriverReg: hdr/PDriverReg; ${CP} hdr/PDriverReg $@ ${CPFLAGS}
${GLOBALDIR}/PDumperReg: hdr/PDumperReg; ${CP} hdr/PDumperReg $@ ${CPFLAGS}
${GLOBALDIR}/PoduleReg: hdr/PoduleReg; ${CP} hdr/PoduleReg $@ ${CPFLAGS}
${GLOBALDIR}/Pointer: hdr/Pointer; ${CP} hdr/Pointer $@ ${CPFLAGS}
${GLOBALDIR}/Services: hdr/Services; ${CP} hdr/Services $@ ${CPFLAGS}
${GLOBALDIR}/SWIs: hdr/SWIs; ${CP} hdr/SWIs $@ ${CPFLAGS}
${GLOBALDIR}/UpCall: hdr/UpCall; ${CP} hdr/UpCall $@ ${CPFLAGS}
# The C versions of registration headers:
${CEXPORTDIR}/Global/AUN.h: hdr/AUN; ${HDR2H} hdr/AUN $@
${CEXPORTDIR}/Global/Countries.h: hdr/Countries; ${HDR2H} hdr/Countries $@
${CEXPORTDIR}/Global/Devices.h: hdr/Devices; ${HDR2H} hdr/Devices $@
${CEXPORTDIR}/Global/DevNos.h: hdr/DevNos; ${HDR2H} hdr/DevNos $@
${CEXPORTDIR}/Global/DrawObj.h: hdr/DrawObj; ${HDR2H} hdr/DrawObj $@
${CEXPORTDIR}/Global/EnvNumbers.h: hdr/EnvNumbers; ${HDR2H} hdr/EnvNumbers $@
${CEXPORTDIR}/Global/FileTypes.h: hdr/FileTypes; ${HDR2H} hdr/FileTypes $@
${CEXPORTDIR}/Global/FreewayReg.h: hdr/FreewayReg; ${HDR2H} hdr/FreewayReg $@
${CEXPORTDIR}/Global/FSNumbers.h: hdr/FSNumbers; ${HDR2H} hdr/FSNumbers $@
${CEXPORTDIR}/Global/GraphicsV.h: hdr/GraphicsV; ${HDR2H} hdr/GraphicsV $@
${CEXPORTDIR}/Global/Keyboard.h: hdr/Keyboard; ${HDR2H} hdr/Keyboard $@
${CEXPORTDIR}/Global/Messages.h: hdr/Messages; ${HDR2H} hdr/Messages $@
${CEXPORTDIR}/Global/NewErrors.h: hdr/NewErrors; ${HDR2H} hdr/NewErrors $@
# NewErrors still has a few problems. Partial support is there.
${CEXPORTDIR}/Global/OsBytes.h: hdr/OsBytes; ${HDR2H} hdr/OsBytes $@
${CEXPORTDIR}/Global/OsWords.h: hdr/OsWords; ${HDR2H} hdr/OsWords $@
${CEXPORTDIR}/Global/PaletteV.h: hdr/PaletteV; ${HDR2H} hdr/PaletteV $@
${CEXPORTDIR}/Global/PDriverReg.h: hdr/PDriverReg; ${HDR2H} hdr/PDriverReg $@
${CEXPORTDIR}/Global/PDumperReg.h: hdr/PDumperReg; ${HDR2H} hdr/PDumperReg $@
${CEXPORTDIR}/Global/PoduleReg.h: hdr/PoduleReg; ${HDR2H} hdr/PoduleReg $@
${CEXPORTDIR}/Global/Pointer.h: hdr/Pointer; ${HDR2H} hdr/Pointer $@
${CEXPORTDIR}/Global/Services.h: hdr/Services; ${HDR2H} hdr/Services $@
${CEXPORTDIR}/Global/SWIs.h: hdr/SWIs; ${HDR2H} hdr/SWIs $@
${CEXPORTDIR}/Global/UpCall.h: hdr/UpCall; ${HDR2H} hdr/UpCall $@
# The C versions of local header files.
# Files which don't work yet:
# No files remaining which do not work at all.
# Files which work with some warnings (which indicate incorrect constants have been declared)
# Sprite
# Files which have no equivalent.
# DDVMacros Debug ExtraLong ListOpts Macros NdrDebug Proc Symbols
${CEXPORTDIR}/Global/Heap.h: hdr/Heap; ${HDR2H} hdr/Heap $@
${CEXPORTDIR}/Global/Sprite.h: hdr/Sprite; ${HDR2H} hdr/Sprite $@
${CEXPORTDIR}/Global/Tokens.h: hdr/Tokens; ${HDR2H} hdr/Tokens $@
${CEXPORTDIR}/Global/CMOS.h: hdr/CMOS; ${HDR2H} hdr/CMOS $@
${CEXPORTDIR}/Global/IO/GenericIO.h: hdr/IO/GenericIO; ${HDR2H} hdr/IO/GenericIO $@
${CEXPORTDIR}/Global/IO/IOMD.h: hdr/IO/IOMD; ${HDR2H} hdr/IO/IOMD $@
# C headers:
${CEXPORTDIR}/Global/IOCtl.h: h/IOCtl; ${CP} h/IOCtl $@ ${CPFLAGS}
# Machine.UI.hardware specific headers:
${GLOBALDIR}/Machine/${MACHINE}: hdr/Machine/${MACHINE}; ${CP} hdr/Machine/${MACHINE} $@ ${CPFLAGS}
${GLOBALDIR}/Machine/All32: hdr/Machine/All32; ${CP} hdr/Machine/All32 $@ ${CPFLAGS}
${GLOBALDIR}/Machine/Machine: hdr/Machine/Machine; ${CP} hdr/Machine/Machine $@ ${CPFLAGS}
${GLOBALDIR}/HALSize/${HALSIZE}: hdr/HALSize/${HALSIZE}; ${CP} hdr/HALSize/${HALSIZE} $@ ${CPFLAGS}
${GLOBALDIR}/ImageSize/${IMAGESIZE}: hdr/ImageSize/${IMAGESIZE}; ${CP} hdr/ImageSize/${IMAGESIZE} $@ ${CPFLAGS}
${GLOBALDIR}/APCS/${APCS}: hdr/APCS/${APCS}; ${CP} hdr/APCS/${APCS} $@ ${CPFLAGS}
${GLOBALDIR}/APCS/Common: hdr/APCS/Common; ${CP} hdr/APCS/Common $@ ${CPFLAGS}
${GLOBALDIR}/CPU/Arch: hdr/CPU/Arch; ${CP} hdr/CPU/Arch $@ ${CPFLAGS}
${GLOBALDIR}/CPU/ARM600: hdr/CPU/ARM600; ${CP} hdr/CPU/ARM600 $@ ${CPFLAGS}
${GLOBALDIR}/CPU/FPA: hdr/CPU/FPA; ${CP} hdr/CPU/FPA $@ ${CPFLAGS}
${GLOBALDIR}/CPU/Generic26: hdr/CPU/Generic26; ${CP} hdr/CPU/Generic26 $@ ${CPFLAGS}
${GLOBALDIR}/CPU/Generic32: hdr/CPU/Generic32; ${CP} hdr/CPU/Generic32 $@ ${CPFLAGS}
${GLOBALDIR}/FDC/FDC711: hdr/FDC/FDC711; ${CP} hdr/FDC/FDC711 $@ ${CPFLAGS}
${GLOBALDIR}/IO/GenericIO: hdr/IO/GenericIO; ${CP} hdr/IO/GenericIO $@ ${CPFLAGS}
${GLOBALDIR}/IO/IOC: hdr/IO/IOC; ${CP} hdr/IO/IOC $@ ${CPFLAGS}
${GLOBALDIR}/IO/IOC-A1: hdr/IO/IOC-A1; ${CP} hdr/IO/IOC-A1 $@ ${CPFLAGS}
${GLOBALDIR}/IO/IOEB: hdr/IO/IOEB; ${CP} hdr/IO/IOEB $@ ${CPFLAGS}
${GLOBALDIR}/IO/IOMD: hdr/IO/IOMD; ${CP} hdr/IO/IOMD $@ ${CPFLAGS}
${GLOBALDIR}/IO/IOMDL: hdr/IO/IOMDL; ${CP} hdr/IO/IOMDL $@ ${CPFLAGS}
${GLOBALDIR}/MEMM/ARM600: hdr/MEMM/ARM600; ${CP} hdr/MEMM/ARM600 $@ ${CPFLAGS}
${GLOBALDIR}/MEMM/MEMC1: hdr/MEMM/MEMC1; ${CP} hdr/MEMM/MEMC1 $@ ${CPFLAGS}
${GLOBALDIR}/MEMM/VMSAv6: hdr/MEMM/VMSAv6; ${CP} hdr/MEMM/VMSAv6 $@ ${CPFLAGS}
${GLOBALDIR}/VIDC/VIDC1a: hdr/VIDC/VIDC1a; ${CP} hdr/VIDC/VIDC1a $@ ${CPFLAGS}
${GLOBALDIR}/VIDC/VIDC20: hdr/VIDC/VIDC20; ${CP} hdr/VIDC/VIDC20 $@ ${CPFLAGS}
# User interface specific headers:
${GLOBALDIR}/UserIF/${USERIF}: hdr/UserIF/${USERIF}; ${CP} hdr/UserIF/${USERIF} $@ ${CPFLAGS}
${GLOBALDIR}/UserIF/UserIF: hdr/UserIF/UserIF; ${CP} hdr/UserIF/UserIF $@ ${CPFLAGS}
# Macros:
${GLOBALDIR}/DDVMacros: hdr/DDVMacros; ${CP} hdr/DDVMacros $@ ${CPFLAGS}
${GLOBALDIR}/Debug: hdr/Debug; ${CP} hdr/Debug $@ ${CPFLAGS}
${GLOBALDIR}/ExtraLong: hdr/ExtraLong; ${CP} hdr/ExtraLong $@ ${CPFLAGS}
${GLOBALDIR}/Macros: hdr/Macros; ${CP} hdr/Macros $@ ${CPFLAGS}
${GLOBALDIR}/NdrDebug: hdr/NdrDebug; ${CP} hdr/NdrDebug $@ ${CPFLAGS}
${GLOBALDIR}/Proc: hdr/Proc; ${CP} hdr/Proc $@ ${CPFLAGS}
# The rest:
${GLOBALDIR}/CMOS: hdr/CMOS; ${CP} hdr/CMOS $@ ${CPFLAGS}
${GLOBALDIR}/Heap: hdr/Heap; ${CP} hdr/Heap $@ ${CPFLAGS}
${GLOBALDIR}/ListOpts: hdr/ListOpts; ${CP} hdr/ListOpts $@ ${CPFLAGS}
${GLOBALDIR}/Sprite: hdr/Sprite; ${CP} hdr/Sprite $@ ${CPFLAGS}
${GLOBALDIR}/Symbols: hdr/Symbols; ${CP} hdr/Symbols $@ ${CPFLAGS}
${GLOBALDIR}/System: hdr/System; ${CP} hdr/System $@ ${CPFLAGS}
${GLOBALDIR}/Tokens: hdr/Tokens; ${CP} hdr/Tokens $@ ${CPFLAGS}
......@@ -5,12 +5,12 @@
*
*/
#define Module_MajorVersion_CMHG 2.46
#define Module_MinorVersion_CMHG
#define Module_MinorVersion_CMHG 4.247.2.1
#define Module_Date_CMHG 24 Sep 2014
#define Module_MajorVersion "2.46"
#define Module_Version 246
#define Module_MinorVersion ""
#define Module_MinorVersion "4.247.2.1"
#define Module_Date "24 Sep 2014"
#define Module_ApplicationDate "24-Sep-14"
......@@ -18,6 +18,6 @@
#define Module_ComponentName "HdrSrc"
#define Module_ComponentPath "castle/RiscOS/Sources/Programmer/HdrSrc"
#define Module_FullVersion "2.46"
#define Module_HelpVersion "2.46 (24 Sep 2014)"
#define Module_FullVersion "2.46 (4.247.2.1)"
#define Module_HelpVersion "2.46 (24 Sep 2014) 4.247.2.1"
#define Module_LibraryVersionInfo "2:46"
......@@ -17,6 +17,6 @@
GBLS APCS_Type
APCS_Type SETS "APCS-32"
GET Hdr:APCS.Common
GET APCS/Common
END
......@@ -23,6 +23,6 @@ APCS_Type SETS "APCS-R"
]
]
GET Hdr:APCS.Common
GET APCS/Common
END
......@@ -146,7 +146,7 @@ OldOpt SETA {OPT}
GBLL Included_Hdr_CPU_Arch
Included_Hdr_CPU_Arch SETL {TRUE}
GET Hdr:Machine.<Machine>
GET Machine/$Machine
; MRS/MSR and USR32, IRQ32, FIQ32, SVC32, ABT and UND modes
MchFlg_v3 * 2_00000000000000000000000000000001
......
......@@ -32,7 +32,7 @@ Included_Hdr_CPU_Generic26 SETL {TRUE}
; 05-Nov-99 KBracey Keep an eye on No26bitCode flag
[ :LNOT: :DEF: Included_Hdr_Machine_Machine
GET Hdr:Machine.<Machine>
GET Machine/$Machine
]
; Standard register names
......
......@@ -31,7 +31,7 @@ Included_Hdr_CPU_Generic32 SETL {TRUE}
; 32-bit versions of Generic26 macros created.
[ :LNOT: :DEF: Included_Hdr_Machine_Machine
GET Hdr:Machine.<Machine>
GET Machine/$Machine
]
; 32-bit PSR transfer macros
......
......@@ -25,7 +25,7 @@ OldOpt SETA {OPT}
; ---- ---- -----------
; 13-Jul-93 JRoach Created
GET Hdr:IO.IOC
GET IO/IOC
; It's an IOC world with...
......
......@@ -25,7 +25,7 @@ OldOpt SETA {OPT}
; ---- ---- -----------
; 13-Jul-93 JRoach Created
GET Hdr:IO.IOC
GET IO/IOC
; It's an IOC world with...
......
......@@ -25,7 +25,7 @@ OldOpt SETA {OPT}
; ---- ---- -----------
; 13-Jul-93 JRoach Created
GET Hdr:IO.IOC
GET IO/IOC
; Control register bits
......
......@@ -17,6 +17,6 @@
GBLS Machine
Machine SETS "32"
GET Hdr:Machine.Machine
GET Machine/Machine
END
......@@ -17,6 +17,6 @@
GBLS Machine
Machine SETS "ARM11ZF"
GET Hdr:Machine.Machine
GET Machine/Machine
END
......@@ -17,6 +17,6 @@
GBLS Machine
Machine SETS "All"
GET Hdr:Machine.Machine
GET Machine/Machine
END
......@@ -17,6 +17,6 @@
GBLS Machine
Machine SETS "All32"
GET Hdr:Machine.Machine
GET Machine/Machine
END
......@@ -17,6 +17,6 @@
GBLS Machine
Machine SETS "Archimedes"
GET Hdr:Machine.Machine
GET Machine/Machine
END
......@@ -17,6 +17,6 @@
GBLS Machine
Machine SETS "CortexA8"
GET Hdr:Machine.Machine
GET Machine/Machine
END
......@@ -17,6 +17,6 @@
GBLS Machine
Machine SETS "CortexA9"
GET Hdr:Machine.Machine
GET Machine/Machine
END
......@@ -17,6 +17,6 @@
GBLS Machine
Machine SETS "Falcon"
GET Hdr:Machine.Machine
GET Machine/Machine
END
......@@ -17,6 +17,6 @@
GBLS Machine
Machine SETS "IOMD"
GET Hdr:Machine.Machine
GET Machine/Machine
END
......@@ -17,6 +17,6 @@
GBLS Machine
Machine SETS "Lazarus"
GET Hdr:Machine.Machine
GET Machine/Machine
END
......@@ -105,26 +105,26 @@ StrongARM_MSR_bug SETL M_All :LOR: M_All32 :LOR: M_IOMD
GBLS CPU_Type
CPU_Type SETS "ARM600"
GBLS GetCPU
GetCPU SETS ("GET Hdr:CPU." :CC: "$CPU_Type")
GetCPU SETS ("GET CPU/" :CC: "$CPU_Type")
; IO type (non generic interrupt masks, some IO locations)
GBLS IO_Type
IO_Type SETS "IOMD"
GBLS GetIO
GetIO SETS ("GET Hdr:IO." :CC: "$IO_Type")
GetIO SETS ("GET IO/" :CC: "$IO_Type")
; Video controller - does the sound too
GBLS VIDC_Type
VIDC_Type SETS "VIDC20"
GBLS GetVIDC
GetVIDC SETS "GET Hdr:VIDC." :CC: VIDC_Type
GetVIDC SETS "GET VIDC/" :CC: VIDC_Type
; Memory controller, excluding memory management stuff. This
; one deals with memory speeds and DMA
GBLS MEMC_Type
MEMC_Type SETS "IOMD"
GBLS GetMEMC
GetMEMC SETS "GET Hdr:IO." :CC: MEMC_Type
GetMEMC SETS "GET IO/" :CC: MEMC_Type
GBLS MEMM_Type
[ M_CortexA8 :LOR: M_CortexA9 :LOR: M_ARM11ZF
......@@ -133,13 +133,13 @@ MEMM_Type SETS "VMSAv6"
MEMM_Type SETS "ARM600"
]
GBLS GetMEMM
GetMEMM SETS "GET Hdr:MEMM." :CC: MEMM_Type
GetMEMM SETS "GET MEMM/" :CC: MEMM_Type
; Floppy controller
GBLS FDC_Type
FDC_Type SETS "FDC711"
GBLS GetFDC
GetFDC SETS "GET Hdr:FDC." :CC: FDC_Type
GetFDC SETS "GET FDC/" :CC: FDC_Type
; Keyboard style
GBLS Keyboard_Type
......
......@@ -17,6 +17,6 @@
GBLS Machine
Machine SETS "Morris"
GET Hdr:Machine.Machine
GET Machine/Machine
END
......@@ -17,6 +17,6 @@
GBLS Machine
Machine SETS "Omega"
GET Hdr:Machine.Machine
GET Machine/Machine
END
......@@ -17,6 +17,6 @@
GBLS Machine
Machine SETS "Peregrine"
GET Hdr:Machine.Machine
GET Machine/Machine
END
......@@ -17,6 +17,6 @@
GBLS Machine
Machine SETS "STB3"
GET Hdr:Machine.Machine
GET Machine/Machine
END
......@@ -17,6 +17,6 @@
GBLS Machine
Machine SETS "STB400"
GET Hdr:Machine.Machine
GET Machine/Machine
END
......@@ -17,6 +17,6 @@
GBLS Machine
Machine SETS "STB5"
GET Hdr:Machine.Machine
GET Machine/Machine
END
......@@ -17,6 +17,6 @@
GBLS Machine
Machine SETS "Tungsten"
GET Hdr:Machine.Machine
GET Machine/Machine
END
......@@ -28,7 +28,7 @@ Proc_Debug SETL {FALSE}
GBLS Proc_GetMachine
[ :LNOT: :DEF: Included_Hdr_Machine_Machine
Proc_GetMachine SETS "GET Hdr:Machine.<Machine>"
Proc_GetMachine SETS "GET Machine/$Machine"
|
Proc_GetMachine SETS ""
]
......@@ -36,7 +36,7 @@ Proc_GetMachine SETS ""
GBLS Proc_GetCPU26
[ :LNOT: :DEF: Included_Hdr_CPU_Generic26
Proc_GetCPU26 SETS "GET Hdr:CPU.Generic26"
Proc_GetCPU26 SETS "GET CPU/Generic26"
|
Proc_GetCPU26 SETS ""
]
......@@ -44,7 +44,7 @@ Proc_GetCPU26 SETS ""
GBLS Proc_GetCPU32
[ :LNOT: :DEF: Included_Hdr_CPU_Generic32
Proc_GetCPU32 SETS "GET Hdr:CPU.Generic32"
Proc_GetCPU32 SETS "GET CPU/Generic32"
|
Proc_GetCPU32 SETS ""
]
......
......@@ -14,11 +14,11 @@
;
TTL Fake Hdr:System
GET Hdr:SWIs
GET Hdr:CPU.Arch
GET Hdr:CPU.Generic26
GET Hdr:CPU.Generic32
GET Hdr:IO.GenericIO
GET Hdr:RISCOS
GET SWIs
GET CPU/Arch
GET CPU/Generic26
GET CPU/Generic32
GET IO/GenericIO
GET RISCOS
END
......@@ -17,6 +17,6 @@
GBLS UserIF
UserIF SETS "Iyonix"
GET Hdr:UserIF.UserIF
GET UserIF/UserIF
END
......@@ -17,6 +17,6 @@
GBLS UserIF
UserIF SETS "Lazarus"
GET Hdr:UserIF.UserIF
GET UserIF/UserIF
END
......@@ -17,6 +17,6 @@
GBLS UserIF
UserIF SETS "Morris4"
GET Hdr:UserIF.UserIF
GET UserIF/UserIF
END
......@@ -17,6 +17,6 @@
GBLS UserIF
UserIF SETS "NC2"
GET Hdr:UserIF.UserIF
GET UserIF/UserIF
END
......@@ -17,7 +17,7 @@
GBLS UserIF
UserIF SETS "Raspberry"
GET Hdr:UserIF.UserIF
GET UserIF/UserIF
END
......@@ -17,6 +17,6 @@
GBLS UserIF
UserIF SETS "STB22"
GET Hdr:UserIF.UserIF
GET UserIF/UserIF
END
......@@ -17,6 +17,6 @@
GBLS UserIF
UserIF SETS "STB3"
GET Hdr:UserIF.UserIF
GET UserIF/UserIF
END
......@@ -17,6 +17,6 @@
GBLS UserIF
UserIF SETS "STB400"
GET Hdr:UserIF.UserIF
GET UserIF/UserIF
END
......@@ -17,7 +17,7 @@
GBLS UserIF
UserIF SETS "Sovereign"
GET Hdr:UserIF.UserIF
GET UserIF/UserIF
END
......@@ -17,6 +17,6 @@
GBLS UserIF
UserIF SETS "Ursula"
GET Hdr:UserIF.UserIF
GET UserIF/UserIF
END
#!/bin/bash
# A script to simplify building a single component.
# Syntax: mk.sh [target] [environment]
# For more flexibility, use make directly.
TARGET=all
[[ "$1" =~ (clean|export|install) ]] && TARGET=$1 && shift
[ -z "$1" ] || BUILD=$1 && shift
[ -n "$BUILD" ] || BUILD=ROOL/Disc
cd $(dirname $0)
# Two ways of doing the same thing
if [ -n "$BUILDUSINGSUBSHELL" ]; then
HERE=`pwd`
cd ../../../../..
Env/$BUILD.sh "cd $HERE && make $TARGET -I\$MAKEFILEDIR --no-print-directory"
else
pushd ../../../../.. > /dev/null
source Env/$BUILD.sh
popd > /dev/null
make $TARGET -I$MAKEFILEDIR --no-print-directory
fi
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