Commit d2d75ad1 authored by John Ballance's avatar John Ballance

Added module name and offset to *ShowRegs command

Detail:
  *Showregs now indicated module name and offset if address is
  in a module
Admin:
  (highlight level of testing that has taken place)
  (bugfix number if appropriate)


Version 1.88. Tagged as 'Debugger-1_88'
parent 8d473fbe
......@@ -85,6 +85,9 @@ M50:Bad breakpoint
M65:Unpredictable instruction
M75:Half-word at &
M76:Double-word at &
M95:Not in a module
M96:At offset
M97: in module
F00:infinity
F01:quiet NaN
......
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.87"
Module_Version SETA 187
Module_MajorVersion SETS "1.88"
Module_Version SETA 188
Module_MinorVersion SETS ""
Module_Date SETS "24 Oct 2014"
Module_ApplicationDate SETS "24-Oct-14"
Module_Date SETS "21 Jan 2015"
Module_ApplicationDate SETS "21-Jan-15"
Module_ComponentName SETS "Debugger"
Module_ComponentPath SETS "castle/RiscOS/Sources/Programmer/Debugger"
Module_FullVersion SETS "1.87"
Module_HelpVersion SETS "1.87 (24 Oct 2014)"
Module_FullVersion SETS "1.88"
Module_HelpVersion SETS "1.88 (21 Jan 2015)"
END
/* (1.87)
/* (1.88)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.87
#define Module_MajorVersion_CMHG 1.88
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 24 Oct 2014
#define Module_Date_CMHG 21 Jan 2015
#define Module_MajorVersion "1.87"
#define Module_Version 187
#define Module_MajorVersion "1.88"
#define Module_Version 188
#define Module_MinorVersion ""
#define Module_Date "24 Oct 2014"
#define Module_Date "21 Jan 2015"
#define Module_ApplicationDate "24-Oct-14"
#define Module_ApplicationDate "21-Jan-15"
#define Module_ComponentName "Debugger"
#define Module_ComponentPath "castle/RiscOS/Sources/Programmer/Debugger"
#define Module_FullVersion "1.87"
#define Module_HelpVersion "1.87 (24 Oct 2014)"
#define Module_LibraryVersionInfo "1:87"
#define Module_FullVersion "1.88"
#define Module_HelpVersion "1.88 (21 Jan 2015)"
#define Module_LibraryVersionInfo "1:88"
......@@ -23,6 +23,7 @@
; Kevin Bracey (ARMv4+5, Thumb, fixes/enhancements, 32-bit)
; Steve Revill (Slight changes to ADR and SWI disassembly)
; Ben Avison (halfword, doubleword and unaligned word support)
; John Ballance (module location added to showregs command output)
; 1.18 SKS Fixed disassembly of #xx,yy operands
; 1.19 SKS Fixed disassembly of LSR #32, ASR #32
......@@ -3582,8 +3583,11 @@ ShowRegs_Code_Common Entry "r6-r11"
BL message_writes
DCB "M14", 0 ; " PSR = "
BLVC DisplayHexWord
SWIVC XOS_NewLine
; display module title if available
BLVC ModuleWhere
EXIT
ShowRegs_Mode_26
......@@ -3627,9 +3631,48 @@ ShowRegs_Mode_26
BLVC DoFlagBit
SWIVC XOS_NewLine
EXIT
; display module title if available
BLVC ModuleWhere
EXIT
; wp already setup
ModuleWhere
Entry "r0 - r3, r10"
adr r10, Registers
ldr r10, [r10, #15<<2] ; get PC
mov r1, #0
mov r2, #0
MW1
mov r0, #ModHandReason_GetNames
swi XOS_Module
bvs MW2
subs r0, r10, r3 ; check address still ahead of us
blt MW2 ; no .. gone too far
ldr r4, [r3,#-4] ; get module rma length
cmp r0, r4 ; check if in this module
bgt MW1 ; no.. still ahead of us
; got the module address
BL message_writes
DCB "M96", 0 ; "At offset "
ALIGN
mov r10, r0 ; offset
bl DisplayHexWord
BL message_writes
DCB "M97", 0 ; " in module "
ALIGN
ldr r0, [r3, #16] ; module name pointer
add r0, r0, r3
swi XOS_Write0
b MW3
; not in a module
MW2
BL message_writes
DCB "M95", 0 ; "Not in a module"
ALIGN
MW3
swi XOS_NewLine
EXIT
ARM_Modes
DCB "USR", 0
DCB "FIQ", 0
......
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