Commit cc5b363d authored by Jeffrey Lee's avatar Jeffrey Lee

Fix objasm 4 warnings. Fix breakclr <addr> when addr is >=64M

Detail:
  s/Debugger - Tweaked a few LDM/STM instructions to fix some objasm 4 warnings. Disabled some 26bit code in 32bit configs to avoid more warnings. Fix BreakClr to work on 32bit systems if the breakpoint address is >=64M.
Admin:
  Tested on rev A2 BB-xM


Version 1.83. Tagged as 'Debugger-1_83'
parent dd8ac1d9
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.82"
Module_Version SETA 182
Module_MajorVersion SETS "1.83"
Module_Version SETA 183
Module_MinorVersion SETS ""
Module_Date SETS "04 Aug 2011"
Module_ApplicationDate SETS "04-Aug-11"
Module_Date SETS "24 Sep 2011"
Module_ApplicationDate SETS "24-Sep-11"
Module_ComponentName SETS "Debugger"
Module_ComponentPath SETS "castle/RiscOS/Sources/Programmer/Debugger"
Module_FullVersion SETS "1.82"
Module_HelpVersion SETS "1.82 (04 Aug 2011)"
Module_FullVersion SETS "1.83"
Module_HelpVersion SETS "1.83 (24 Sep 2011)"
END
/* (1.82)
/* (1.83)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 1.82
#define Module_MajorVersion_CMHG 1.83
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 04 Aug 2011
#define Module_Date_CMHG 24 Sep 2011
#define Module_MajorVersion "1.82"
#define Module_Version 182
#define Module_MajorVersion "1.83"
#define Module_Version 183
#define Module_MinorVersion ""
#define Module_Date "04 Aug 2011"
#define Module_Date "24 Sep 2011"
#define Module_ApplicationDate "04-Aug-11"
#define Module_ApplicationDate "24-Sep-11"
#define Module_ComponentName "Debugger"
#define Module_ComponentPath "castle/RiscOS/Sources/Programmer/Debugger"
#define Module_FullVersion "1.82"
#define Module_HelpVersion "1.82 (04 Aug 2011)"
#define Module_LibraryVersionInfo "1:82"
#define Module_FullVersion "1.83"
#define Module_HelpVersion "1.83 (24 Sep 2011)"
#define Module_LibraryVersionInfo "1:83"
......@@ -297,7 +297,7 @@ standalone SETL False
nbreakpoints * 16
BreakCodeStart # nbreakpoints*8 ; Breakpoint entry code segments
# 4*5 ; Save other registers before JMP
# 4*6 ; Save other registers before JMP
BreakCodeEnd # 0 ; End of copied area
; Areas accessed pc relative by relocated breakpoint code
......@@ -860,12 +860,12 @@ swi01
; +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
checkreg
STMFD R13!,{R14}
Entry
LDR R14,Mistake
CMPS R14,#Potential_Banked
CMP R14,#Potential_Banked
MOVEQ R14,#Mistake_Banked
STR R14,Mistake
LDMFD R13!,{R15}
EXIT
; In r0 = instruction to disassemble
......@@ -4801,7 +4801,9 @@ BreakClr_Code Entry "r6-r11"
BLVS CopyError
EXIT VS
BIC r7, r7, #ARM_CC_Mask ; Can only set at word address in 64M
LDRB r4, SysIs32bit
TEQ r4, #0
BICEQ r7, r7, #ARM_CC_Mask ; Can only set at word address in 64M
ADR r4, Breaklist
MOV r3, #(nbreakpoints-1)*8
......@@ -5032,6 +5034,7 @@ Continue_Code Entry "r6-r11"
90 ; Nice simple continuation. r0 -> register state to continue with
[ :LNOT: No26bitCode
LDRB r14, SysIs32bit
TEQ r14, #0
BNE Continue32
......@@ -5050,6 +5053,7 @@ Continue_Code Entry "r6-r11"
NOP
LDR r14_svc, [r14_svc, #15*4]
MOVS pc, r14_svc ; Jump to instruction in right mode
]
Continue32
......@@ -5357,7 +5361,8 @@ count SETA count + 1
ClaimBreak
STR r14, TrapStore_ROM ; Save id of breakpoint
ADR r14, Registers_ROM
STMIA r14, {r0-r13} ; Save registers 0 to 13 in dump area
STMIA r14, {r0-r12} ; Save registers 0 to 13 in dump area
STR r13, [r14, #13*4] ; R13 saved seperately due to STM {sp} deprecation :(
LDR wp, r12Store_ROM
LDR pc, JumpStore_ROM ; Jump to debugger with correct wp
......
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