ConsoleView.cpp: fc command; Processor.cpp minor change.

nzeemin · May 13, 2021 · 516cb97 · 516cb97
1 parent 94b283b
commit 516cb97
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 6 deletions.
diff --git a/emulator/ConsoleView.cpp b/emulator/ConsoleView.cpp
@@ -530,6 +530,7 @@ void ConsoleView_ShowHelp()
             _T("  bc         Remove all breakpoints for the current processor\r\n")
             _T("  u          Save memory dump to file memdumpXPU.bin\r\n")
             _T("  udl        Save display list dump to file displaylist.txt\r\n")
+            _T("  fcXXXXXX XXXXXX  Calculate floating number for the two octal words\r\n")
 #if !defined(PRODUCT)
             _T("  t          Tracing on/off to trace.log file\r\n")
             _T("  tXXXXXX    Set tracing flags\r\n")
@@ -861,6 +862,43 @@ void ConsoleView_DoConsoleCommand()
         else
             ConsoleView_Print(MESSAGE_UNKNOWN_COMMAND);
         break;
+    case _T('f'):
+        if (command[1] == 0)
+            ConsoleView_Print(MESSAGE_UNKNOWN_COMMAND);
+        else if (command[1] == _T('c'))
+        {
+            unsigned short O1, O2;
+            if (2 != _stscanf(command + 2, _T("%ho %ho"), &O1, &O2))
+                ConsoleView_Print(MESSAGE_WRONG_VALUE);
+            else
+            {
+                unsigned long mant = ((((unsigned long)O1 << 16) | O2) & 0x7FFFFFL) | 0x800000L;
+                short exp = (O1 >> 7) & 0xFF; exp -= 128;
+                ConsoleView_PrintFormat(_T("exp: %hi, mant: 0x%lx\r\n"), exp, mant);
+                unsigned long scmant = 0x800000L;
+                long double sres = 0.5;
+                long double res = 0.0;
+                while (scmant != 0)
+                {
+                    if ((scmant & mant) != 0) res += sres;
+                    scmant >>= 1; sres /= 2;
+                }
+                while (exp != 0)
+                {
+                    if (exp < 0)
+                    {
+                        res /= 2; exp++;
+                    }
+                    else
+                    {
+                        res *= 2; exp--;
+                    }
+                }
+                if ((O1 & 0x8000) != 0) res = -res;
+                ConsoleView_PrintFormat(_T("%Lg\r\n"), res);
+            }
+        }
+        break;
 #if !defined(PRODUCT)
     case _T('t'):
         if (command[1] == _T('c'))  // "tc" -- clear trace log

diff --git a/emulator/emubase/Processor.cpp b/emulator/emubase/Processor.cpp
@@ -538,13 +538,11 @@ void CProcessor::MemoryError()
 
 //////////////////////////////////////////////////////////////////////
 
-
-static void TraceInstruction(CProcessor* pProc, uint16_t address)
-{
 #if defined(PRODUCT)
-    UNREFERENCED_PARAMETER(pProc);
-    UNREFERENCED_PARAMETER(address);
+static void TraceInstruction(CProcessor* /*pProc*/, uint16_t /*address*/) {}
 #else
+static void TraceInstruction(CProcessor* pProc, uint16_t address)
+{
     CMemoryController* pMemCtl = pProc->GetMemoryController();
     bool okHaltMode = pProc->IsHaltMode();
     uint16_t memory[4];
@@ -564,8 +562,8 @@ static void TraceInstruction(CProcessor* pProc, uint16_t address)
     _sntprintf(buffer, sizeof(buffer) / sizeof(TCHAR) - 1, _T("%s\t%s\t%s\t%s\r\n"), pProc->GetName(), bufaddr, instr, args);
 
     DebugLog(buffer);
-#endif
 }
+#endif
 
 void CProcessor::FetchInstruction()
 {