Commit 474d5435 authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

Remove some macros which are now kernel-only

Detail:
  hdr/Macros - BYTEWS, LDROSB, STROSB & VDWS macros are now located in the kernel sources, to help keep kernel workspace private and to allow them to adapt properly to zero page relocation
Admin:
  Latest kernel sources required in order for ROM builds to function.
  This change will break the Interlace module, but everything else should hopefully be fine.


Version 1.86. Tagged as 'HdrSrc-1_86'
parent 74700c34
/* (1.85)
/* (1.86)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.85
#define Module_MajorVersion_CMHG 1.86
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 22 Jun 2011
#define Module_Date_CMHG 07 Aug 2011
#define Module_MajorVersion "1.85"
#define Module_Version 185
#define Module_MajorVersion "1.86"
#define Module_Version 186
#define Module_MinorVersion ""
#define Module_Date "22 Jun 2011"
#define Module_Date "07 Aug 2011"
#define Module_ApplicationDate "22-Jun-11"
#define Module_ApplicationDate "07-Aug-11"
#define Module_ComponentName "HdrSrc"
#define Module_ComponentPath "castle/RiscOS/Sources/Programmer/HdrSrc"
#define Module_FullVersion "1.85"
#define Module_HelpVersion "1.85 (22 Jun 2011)"
#define Module_LibraryVersionInfo "1:85"
#define Module_FullVersion "1.86"
#define Module_HelpVersion "1.86 (07 Aug 2011)"
#define Module_LibraryVersionInfo "1:86"
......@@ -101,7 +101,6 @@ OldOpt SETA {OPT}
;$label BADDR $reg, $dest, $cond Same as ADDR
; BlankLineInSWIFile
;$label Byte $value, $count Add a byte of workspace
; BYTEWS $reg Get pointer to OsbyteVars
;$label CallAVector $cond Call a vector
;$label ChkKernelVersion Call OS_ReadSysInfo(1) to stop modules from being soft loaded on 2.00.
;$n Chunk $v,$c,$s,$o Create a SWI chunk
......@@ -128,7 +127,6 @@ OldOpt SETA {OPT}
; JumpAddress $reg,$destination,$forward Set a viable (BAL to) return address
;$label LD $reg,$var,$cc Load byte or word
;$label LDHA $dest, $array, $index, $temp, $cond Load unsigned halfword from array: LDRH $dest, [$array, $index, LSL #1]
;$label LDROSB $reg, $var, $cond Load OSByte variable
;$label LDSHA $dest, $array, $index, $temp, $cond, $teq0 Load signed halfword from array, with optional TEQ $dest, #0
;$label LDW $dest, $addr, $temp1, $temp2 Load word from unknown alignment
;$label LowerCase $reg, $wrk, $nowarning Lowercase A-Z and top-bit set chars
......@@ -148,13 +146,11 @@ OldOpt SETA {OPT}
;$label STASH $reglist, $cond, $hat Push registers onto the stack
;$label STRIM $string Output an immediate string
;$Answer StringContains $string,$substring Assembly-time INSTR function
;$label STROSB $reg, $var, $temp, $cond Store an OSByte variable
;$label Swap $ra, $rb, $cc Swap two registers
; TerminateFile
;$label uk_LowerCase $reg, $wrk Lowercase A-Z ONLY
;$label uk_UpperCase $reg, $wrk Uppercase A-Z ONLY
;$label UpperCase $reg, $wrk, $nowarning Uppercase a-z & top bit set chars
; VDWS $reg Get pointer to VduDriverWorkSpace
;$label Word $value, $count Add word to workspace
;$label WRLN $string WriteLn a string
;$label wsaddr $reg, $object, $cc ???
......@@ -473,21 +469,6 @@ $label # ($value)
]
MEND
; **************************************
; *** BYTEWS - Point to OsbyteVars ***
; **************************************
MACRO
$label BYTEWS $reg
$label
Immediate OsbyteVars
[ immediate
MOV $reg, #OsbyteVars
|
MOV $reg, #(OsbyteVars :AND: &FF)
ORR $reg, $reg, #(OsbyteVars :AND: :NOT: &FF)
]
MEND
; *********************
; *** CallAVector ***
; *********************
......@@ -1095,15 +1076,6 @@ $label
]
MEND
; ***************************************
; *** LDROSB - Load Osbyte variable ***
; ***************************************
MACRO
$label LDROSB $reg, $var, $cond
$label MOV$cond $reg, #0
LDR$cond.B $reg, [$reg, #OsbyteVars+$var-OSBYTEFirstVar]
MEND
; ***************************************************
; *** LDSHA - Load signed halfword from array ***
; *** This macro essentially implements: ***
......@@ -1456,15 +1428,6 @@ $Answer StringContains "$temp","$substring"
]
MEND
; ****************************************
; *** STROSB - Store Osbyte variable ***
; ****************************************
MACRO
$label STROSB $reg, $var, $temp, $cond
$label MOV$cond $temp, #0
STR$cond.B $reg, [$temp, #OsbyteVars+$var-OSBYTEFirstVar]
MEND
; ***********************************
; *** Swap - Swap two registers ***
; ***********************************
......@@ -1530,22 +1493,6 @@ $label CMP $reg, #"a"
! 0, "Use the Territory Manager for any International-aware code."
MEND
; ****************************************************
; *** VDWS - Point to our new VduDriverWorkSpace ***
; ****************************************************
MACRO
$label VDWS $reg
$label
[ AssemblingArthur :LOR: Module
MOV $reg, #VduDriverWorkSpace
|
! 0, "This is a real waste if using Hdr.NewSpace"
MOV $reg, #(VduDriverWorkSpace :AND: &FF000000)
ORR $reg, $reg, #(VduDriverWorkSpace :AND: &00FF0000)
ORR $reg, $reg, #(VduDriverWorkSpace :AND: &0000FFFF)
]
MEND
; ***************************************************************
; *** VoidTypesUntil - Skip over some file type allocations ***
; ***************************************************************
......
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