Fix debugger fa-command, fix crash if statefile without FPU is loaded and then FPU...

diff --git a/debug.cpp b/debug.cpp
index e25e71e93e77f837179062c45233a4f9f1eaf37e..d6f40cc3bfaeae5965bc5a04d00305be47c6cae8 100644 (file)
--- a/debug.cpp
+++ b/debug.cpp
@@ -5069,7 +5069,7 @@ static void find_ea (TCHAR **inptr)
                        dea = 0xffffffff;
                        m68k_disasm_ea (addr, NULL, 1, &sea, &dea, 0xffffffff);
                        if (ea == sea || ea == dea) {
-                               m68k_disasm (addr, NULL, 1, 0xffffffff);
+                               m68k_disasm (addr, NULL, 0xffffffff, 1);
                                hits++;
                                if (hits > 100) {
                                        console_out_f (_T("Too many hits. End addr = %08X\n"), addr);

diff --git a/newcpu.cpp b/newcpu.cpp
index ddbf43237a8195c43fce3e907a9e03141981109f..967ebfea1a485d9b7589cc58bd116835bb16b5d8 100644 (file)
--- a/newcpu.cpp
+++ b/newcpu.cpp
@@ -7410,7 +7410,7 @@ void m68k_disasm_2 (TCHAR *buf, int bufsize, uaecptr pc, uaecptr *nextpc, int cn
        if (!table68k)
                return;
        while (cnt-- > 0) {
-               TCHAR instrname[100], *ccpt;
+               TCHAR instrname[256], *ccpt;
                TCHAR segout[256], segname[256];
                int i;
                uae_u32 opcode;
@@ -8259,6 +8259,8 @@ static void fill_prefetch_quick (void)
 
 void restore_cpu_finish (void)
 {
+       if (!currprefs.fpu_model)
+               fpu_reset();
        init_m68k ();
        m68k_setpc_normal (regs.pc);
        doint ();