Commit d806dc31 authored by Stewart Brodie's avatar Stewart Brodie
Browse files

Merged Ursula branch.

Detail:
  Moved to srccommit, merged changes from Ursula branch.
Admin:
  Built.

Version 0.58. Tagged as 'TaskWindow-0_58'
parent 88caf6a9
; > Version
GBLA Version
GBLS VString
GBLS Date
Version SETA 056
VString SETS "0.56"
Date SETS "17 Jan 1997"
END
......@@ -6,9 +6,9 @@
GBLS Module_MinorVersion
GBLS Module_Date
GBLS Module_FullVersion
Module_MajorVersion SETS "0.57"
Module_Version SETA 57
Module_MajorVersion SETS "0.58"
Module_Version SETA 58
Module_MinorVersion SETS ""
Module_Date SETS "01 Dec 1999"
Module_FullVersion SETS "0.57"
Module_FullVersion SETS "0.58"
END
/* (0.57)
/* (0.58)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 0.57
#define Module_MajorVersion_CMHG 0.58
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 01 Dec 1999
#define Module_MajorVersion "0.57"
#define Module_Version 57
#define Module_MajorVersion "0.58"
#define Module_Version 58
#define Module_MinorVersion ""
#define Module_Date "01 Dec 1999"
#define Module_FullVersion "0.57"
#define Module_FullVersion "0.58"
......@@ -83,7 +83,10 @@
GET Hdr:MsgTrans
GET Hdr:FPEmulator
GET Version
GET VersionASM
GBLA Version
Version SETA Module_Version
GBLL CheckBufferPointers
CheckBufferPointers SETL {FALSE}
......@@ -308,9 +311,6 @@ ESend * 17
ESendRec * 18
EAck * 19
;
; Module service codes
;
Module_Memory * &11
;
TaskWindow_SWIBase EQU &43380
; *********************** Module code starts here *****************************
......@@ -346,7 +346,7 @@ Code_HelpString
[ :LEN: ModuleHelpName < 8
DCB TAB
]
DCB "$VString ($Date)"
DCB "$Module_MajorVersion ($Module_Date)"
DCB 0
ALIGN
......@@ -870,7 +870,29 @@ MyWord
; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
ServiceTable
DCD 0 ; flags
DCD Code_UServiceEntry - Code_ModuleBase
DCD Service_Memory
[ DoingSwi
DCD Service_Reset
]
DCD Service_WimpCloseDown
DCD Service_WimpReportError
DCD 0 ; terminator
DCD ServiceTable - Code_ModuleBase ; table anchor
;
Code_ServiceEntry ROUT
MOV r0, r0 ; magic intruction
TEQ r1, #Service_Memory
[ DoingSwi
TEQNE r1, #Service_Reset
]
TEQNE r1, #Service_WimpCloseDown
TEQNE r1, #Service_WimpReportError
MOVNES PC, LR
;
Code_UServiceEntry
;
; Entry:- r1 = service number
; r2 = CAO if r1 = &11 (Memory)
......@@ -894,18 +916,16 @@ Code_ServiceEntry ROUT
TEQ r1, #Service_Reset
BEQ svc_reset
]
TEQ r1, #Module_Memory
MOVNES pc, r14
;else fall through to handle Service_Memory
LDR r1, FirstWord
TEQ r1, #0 ; Are we active?
MOVEQ r1, #Module_Memory
MOVEQ r1, #Service_Memory
MOVEQS pc, r14 ; Return if not
CMP r0, #-64*&100000 ; check for Wimp's magic value
ADREQL r1, Code_ModuleBase ; we don't require memory otherwise
CMPEQ r2, r1 ; Is it us?
MOVNE r1, #Module_Memory
MOVNE r1, #Service_Memory
MOVEQ r1, #0
MOVS pc, r14 ; Return if not
10
......@@ -2283,7 +2303,7 @@ Code_NewCommand
SWI OS_WriteN
ADR r0, ReadLineBuffer
MOV r1, #&100 ; Max length
MOV r1, #1024 ; Max length (changed for Ursula, was 256)
MOV r2, #" " ; Lowest character
MOV r3, #&FF ; Highest
SWI XOS_ReadLine ; Read
......@@ -5298,7 +5318,7 @@ MyDomain Word
WHILE ((:INDEX: @) :MOD: 16) <> 0
# 4
WEND
ReadLineBuffer Word 65
ReadLineBuffer Word 257 ; changed for Ursula (was 65)
InkeyCount Word
Moribund Word ; Task to be killed at some appropriate time
Suspended Word ; Task inactive at the moment, waiting
......
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