Debugger register read updates.

diff --git a/debug.cpp b/debug.cpp
index 2161c04a4b96a42926873a7ea8ee4647b90a82a1..ec55eccc78dd240aef5c03c5a844bea3b341383c 100644 (file)
--- a/debug.cpp
+++ b/debug.cpp
@@ -635,6 +635,9 @@ static const TCHAR *debugregs[] = {
        _T("DTT1"),
        _T("BUSC"),
        _T("PCR"),
+       _T("FPIAR"),
+       _T("FPCR"),
+       _T("FPSR"),
        NULL
 };
 
@@ -711,62 +714,34 @@ static uae_u32 returnregx(int regid)
                case BREAKPOINT_REG_BUSC:
                return regs.buscr;
                case BREAKPOINT_REG_PCR:
+               return regs.pcr;
+               case BREAKPOINT_REG_FPIAR:
+               return regs.fpiar;
+               case BREAKPOINT_REG_FPCR:
                return regs.fpcr;
+               case BREAKPOINT_REG_FPSR:
+               return regs.fpsr;
        }
        return 0;
 }
 
-static int readregx (TCHAR **c, uae_u32 *valp)
+static int readregx(TCHAR **c, uae_u32 *valp)
 {
-       int i;
+       int idx;
        uae_u32 addr;
-       TCHAR *p = *c;
-       TCHAR tmp[10], *tp;
-       int extra = 0;
+       TCHAR *old = *c;
 
        addr = 0;
-       i = 0;
-       while (p[i]) {
-               tmp[i] = _totupper (p[i]);
-               if (i >= sizeof (tmp) / sizeof (TCHAR) - 1)
-                       break;
-               i++;
+       if (_totupper(**c) == 'R') {
+               (*c)++;
        }
-       tmp[i] = 0;
-       tp = tmp;
-       if (_totupper (tmp[0]) == 'R') {
-               tp = tmp + 1;
-               extra = 1;
-       }
-       if (!_tcsncmp (tp, _T("USP"), 3)) {
-               addr = regs.usp;
-               (*c) += 3;
-       } else if (!_tcsncmp (tp, _T("VBR"), 3)) {
-               addr = regs.vbr;
-               (*c) += 3;
-       } else if (!_tcsncmp (tp, _T("MSP"), 3)) {
-               addr = regs.msp;
-               (*c) += 3;
-       } else if (!_tcsncmp (tp, _T("ISP"), 3)) {
-               addr = regs.isp;
-               (*c) += 3;
-       } else if (!_tcsncmp (tp, _T("PC"), 2)) {
-               addr = regs.pc;
-               (*c) += 2;
-       } else if (tp[0] == 'A' || tp[0] == 'D') {
-               int reg = 0;
-               if (tp[0] == 'A')
-                       reg += 8;
-               reg += tp[1] - '0';
-               if (reg < 0 || reg > 15)
-                       return 0;
-               addr = regs.regs[reg];
-               (*c) += 2;
-       } else {
+       idx = getregidx(c);
+       if (idx < 0) {
+               *c = old;
                return 0;
        }
+       addr = returnregx(idx);
        *valp = addr;
-       (*c) += extra;
        return 1;
 }
 

diff --git a/include/debug.h b/include/debug.h
index 8fba926b46cec6e44d12fdb27dca4bd9409ef424..e5ce9e17caf7e5543f7504849ed1d88f60113b68 100644 (file)
--- a/include/debug.h
+++ b/include/debug.h
@@ -82,6 +82,7 @@ extern bool debug_trainer_event(int evt, int state);
 extern void debug_smc_clear(uaecptr addr, int size);
 
 #define BREAKPOINT_TOTAL 20
+
 #define BREAKPOINT_REG_Dx 0
 #define BREAKPOINT_REG_Ax 8
 #define BREAKPOINT_REG_PC 16
@@ -102,7 +103,10 @@ extern void debug_smc_clear(uaecptr addr, int size);
 #define BREAKPOINT_REG_DTT1 31
 #define BREAKPOINT_REG_BUSC 32
 #define BREAKPOINT_REG_PCR 33
-#define BREAKPOINT_REG_END 34
+#define BREAKPOINT_REG_FPIAR 34
+#define BREAKPOINT_REG_FPCR 35
+#define BREAKPOINT_REG_FPSR 36
+#define BREAKPOINT_REG_END 37
 
 #define BREAKPOINT_CMP_EQUAL 0
 #define BREAKPOINT_CMP_NEQUAL 1