Commit d316b11b authored by Ben Avison's avatar Ben Avison

Now has a standalone build variant

Detail:
  Debugger now handles registering and deregistering its messages file with
  ResourceFS when you build a RAM (standalone) variant. This obsoletes the
  DbgMess module.
Admin:
  Tested briefly

Version 1.79. Tagged as 'Debugger-1_79'
parent 6cf22fc8
| Copyright 2001 Pace Micro Technology plc
| Copyright 2009 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.
......@@ -13,8 +13,4 @@
| limitations under the License.
|
Dir <Obey$Dir>
Copy LocalRes:Messages Resources.<Locale>.CombMsgs ~C~V
Print LocalRes:CmdHelp { >> Resources.<Locale>.CombMsgs }
CDir rm
ModGen rm.DbgMess DebuggerMessages "Debugger Msgs" 0.01 Resources.<Locale>.CombMsgs Resources.Debugger.Messages
Remove Resources.<Locale>.CombMsgs
amu_machine standalone
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.78"
Module_Version SETA 178
Module_MajorVersion SETS "1.79"
Module_Version SETA 179
Module_MinorVersion SETS ""
Module_Date SETS "16 Jun 2009"
Module_ApplicationDate SETS "16-Jun-09"
Module_Date SETS "26 Jun 2009"
Module_ApplicationDate SETS "26-Jun-09"
Module_ComponentName SETS "Debugger"
Module_ComponentPath SETS "castle/RiscOS/Sources/Programmer/Debugger"
Module_FullVersion SETS "1.78"
Module_HelpVersion SETS "1.78 (16 Jun 2009)"
Module_FullVersion SETS "1.79"
Module_HelpVersion SETS "1.79 (26 Jun 2009)"
END
/* (1.78)
/* (1.79)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.78
#define Module_MajorVersion_CMHG 1.79
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 16 Jun 2009
#define Module_Date_CMHG 26 Jun 2009
#define Module_MajorVersion "1.78"
#define Module_Version 178
#define Module_MajorVersion "1.79"
#define Module_Version 179
#define Module_MinorVersion ""
#define Module_Date "16 Jun 2009"
#define Module_Date "26 Jun 2009"
#define Module_ApplicationDate "16-Jun-09"
#define Module_ApplicationDate "26-Jun-09"
#define Module_ComponentName "Debugger"
#define Module_ComponentPath "castle/RiscOS/Sources/Programmer/Debugger"
#define Module_FullVersion "1.78"
#define Module_HelpVersion "1.78 (16 Jun 2009)"
#define Module_LibraryVersionInfo "1:78"
#define Module_FullVersion "1.79"
#define Module_HelpVersion "1.79 (26 Jun 2009)"
#define Module_LibraryVersionInfo "1:79"
......@@ -241,6 +241,7 @@
GET Hdr:Tokens
GET Hdr:MsgTrans
GET Hdr:FPEmulator
GET Hdr:ResourceFS
GET Hdr:CPU.FPA
GET Hdr:Debugger
......@@ -276,6 +277,11 @@ ARMv6 SETL False ; Don't do ARMv6 yet until complete
GBLL CirrusDSP
CirrusDSP SETL False
[ :LNOT: :DEF: standalone
GBLL standalone
standalone SETL False
]
; Continue not up to much
......@@ -628,6 +634,10 @@ Debug_Init Entry
BL create_codevar
BL init_codevar
[ standalone
BLVC declareresourcefsfiles
]
EXIT
; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
......@@ -637,16 +647,26 @@ Debug_Init Entry
Debug_ServiceTable
DCD 0
DCD Debug_ServiceBody - Module_BaseAddr
DCD Service_Reset
DCD Service_Reset ; &27
[ standalone
DCD Service_ResourceFSStarting ; &60
]
DCD 0
DCD Debug_ServiceTable - Module_BaseAddr
Debug_Service ROUT
MOV r0, r0
TEQ r1, #Service_Reset
[ standalone
TEQNE R1,#Service_ResourceFSStarting
]
MOVNE pc, lr
Debug_ServiceBody
[ standalone
TEQ R1,#Service_ResourceFSStarting
BEQ serviceresourcefsstarting
]
Entry "r0, r1"
LDR wp, [r12]
MOV r0, #ExceptionDumpArea ; Set exception dump area
......@@ -655,6 +675,19 @@ Debug_ServiceBody
STRVC r1, OldExceptionDumpArea
EXIT
[ standalone
; ResourceFS has been reloaded - redeclare resource files
; In R2 -> address to call
; R3 -> workspace for ResourceFS module
serviceresourcefsstarting
Push "R0,LR"
ADRL R0,resourcefsfiles
MOV LR,PC ; LR -> return address
MOV PC,R2 ; R2 -> address to call
Pull "R0,PC"
]
; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
; In r0-r6 trashable
......@@ -682,6 +715,11 @@ Debug_Die Entry
; SAR
BL destroy_codevar
[ standalone
ADRL R0,resourcefsfiles
SWI XResourceFS_DeregisterFiles ; ignore errors
]
CLRV
EXIT ; Don't refuse to die
......@@ -5713,6 +5751,20 @@ open_messagefile Entry r0-r2
LTORG
[ standalone
declareresourcefsfiles
Entry "r0"
ADR R0,resourcefsfiles
SWI XResourceFS_RegisterFiles ; ignore errors
CLRV
EXIT
resourcefsfiles
ResourceFile $MergedMsgs, Resources.Debugger.Messages
DCD 0
]
[ debug
InsertDebugRoutines
]
......
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