Commit 5f87c9e2 authored by Kevin Bracey's avatar Kevin Bracey
Browse files

Fixed and tidied *ShowFPRegs. In particular, will work with 26-bit

FPEmulators.

Version 1.71. Tagged as 'Debugger-1_71'
parent bde08062
......@@ -68,8 +68,8 @@ F02:signalling NaN
F03: S Exp J Fraction S Exp J Fraction
F04:System:
F06:Control:
F05: Enabled exceptions:
F07: Cumulative exceptions:
F05: Enabled exceptions:
F07: Cumulative exceptions:
FS00:Old FPE
FS01:FPE 400
......
......@@ -11,14 +11,14 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "1.70"
Module_Version SETA 170
Module_MajorVersion SETS "1.71"
Module_Version SETA 171
Module_MinorVersion SETS ""
Module_Date SETS "21 Mar 2001"
Module_ApplicationDate2 SETS "21-Mar-01"
Module_ApplicationDate4 SETS "21-Mar-2001"
Module_Date SETS "18 Apr 2001"
Module_ApplicationDate2 SETS "18-Apr-01"
Module_ApplicationDate4 SETS "18-Apr-2001"
Module_ComponentName SETS "Debugger"
Module_ComponentPath SETS "RiscOS/Sources/Programmer/Debugger"
Module_FullVersion SETS "1.70"
Module_HelpVersion SETS "1.70 (21 Mar 2001)"
Module_FullVersion SETS "1.71"
Module_HelpVersion SETS "1.71 (18 Apr 2001)"
END
/* (1.70)
/* (1.71)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 1.70
#define Module_MajorVersion_CMHG 1.71
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 21 Mar 2001
#define Module_Date_CMHG 18 Apr 2001
#define Module_MajorVersion "1.70"
#define Module_Version 170
#define Module_MajorVersion "1.71"
#define Module_Version 171
#define Module_MinorVersion ""
#define Module_Date "21 Mar 2001"
#define Module_Date "18 Apr 2001"
#define Module_ApplicationDate2 "21-Mar-01"
#define Module_ApplicationDate4 "21-Mar-2001"
#define Module_ApplicationDate2 "18-Apr-01"
#define Module_ApplicationDate4 "18-Apr-2001"
#define Module_ComponentName "Debugger"
#define Module_ComponentPath "RiscOS/Sources/Programmer/Debugger"
#define Module_FullVersion "1.70"
#define Module_HelpVersion "1.70 (21 Mar 2001)"
#define Module_FullVersion "1.71"
#define Module_HelpVersion "1.71 (18 Apr 2001)"
......@@ -206,6 +206,11 @@
; *MemoryI T now disassembles 24 instructions by default
; rather than 48.
; 1.67 KJB 15-Feb-01 QADD etc "corrected" to have operands in Rm,Rn order.
; 1.68 SAR 21-Mar-01 Unknown SWIs displayed as hex.
; 1.70 SAR 21-Mar-01 Wacky shift coding changed back to #0,24 to match
; ARM documentation.
; 1.71 KJB 18-Apr-01 Fixed and tidied *ShowFPRegs - in particular will work
; correctly with 26-bit FPEmulators.
;
; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
......
......@@ -456,7 +456,9 @@ ShowFPRegs_Code
Push "r1"
MOV r1, #0 ; no exceptions
WFS r1
SFMFD f0, 1, [sp]! ; and save F0
SUB sp, sp, #12
MOV r4, sp ; avoid use of sp to work with 26-bit FPEmulators
SFM f0, 1, [r4] ; and save F0
MOV r4, #0
ADD r11, r5, #4
......@@ -469,7 +471,7 @@ ShowFPRegs_Code
BEQ %FT12
SWI XOS_WriteS
DCB " ", 0
DCB " ", 0
ALIGN
12
SWIVC XOS_WriteI+"F"
......@@ -528,7 +530,7 @@ ShowFPRegs_Code
BEQ %FT15
SWI XOS_WriteS
DCB " ", 0
DCB " ", 0
B %FT16
15 SWI XOS_NewLine
......@@ -545,8 +547,10 @@ ShowFPRegs_Code
BVS ExitSFPR
LDFE f0, [r11], #12 ; get extended value from dump
STFP f0, [sp, #16] ; and convert to expanded packed decimal
LDR r3, [sp, #16] ; r3 := sign + exponent
SUB sp, sp, #12
MOV r3, sp
STFP f0, [r3] ; and convert to packed decimal
LDR r3, [sp], #4 ; r3 := sign + exponent
TST r3, #1:SHL:31
SWINE XOS_WriteI + "-"
MOVVC r10, r3, LSR #8
......@@ -556,9 +560,9 @@ ShowFPRegs_Code
MOVVC r10, r3
MOVVC r2, #4
BLVC DisplayHex
LDRVC r10, [sp, #20]
LDR r10, [sp], #4
BLVC DisplayHexWord
LDRVC r10, [sp, #24]
LDR r10, [sp], #4
BLVC DisplayHexWord
BVS ExitSFPR
......@@ -632,7 +636,9 @@ Exponent
SWIVC XOS_NewLine
ExitSFPR
LFMFD f0, 1, [sp]!
MOV r1, sp
LFM f0, 1, [r1]
ADD sp, sp, #12
Pull "r1"
WFS r1 ; restore FPSR
EXIT
......
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