Int21h get current directory (#387)

* Fix Test - Because DS isn't part of the REGS struct, the assumption is it is set prior to the call - Added Assert to check the value being saved * Fixes - Fixed to Match Documentation (DS:DI vs. DS:SI) * Fixed missing closing parin when in debug
mbbsemu · Jan 30, 2021 · bb40eb3 · bb40eb3
1 parent 9601b6b
commit bb40eb3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/MBBSEmu.Tests/ExportedModules/Majorbbs/intdos_Tests.cs b/MBBSEmu.Tests/ExportedModules/Majorbbs/intdos_Tests.cs
@@ -297,8 +297,8 @@ public void intdos_0x47_GetCurrentDirectory_Test()
             var testRegisters = new CpuRegisters {AH = 0x47};
 
             var dirPointer = mbbsEmuMemoryCore.AllocateVariable("DIR-POINTER", 10);
-            testRegisters.DS = dirPointer.Segment;
-            testRegisters.SI = dirPointer.Offset;
+            mbbsEmuCpuRegisters.DS = dirPointer.Segment;
+            testRegisters.DI = dirPointer.Offset;
 
             //Allocate some memory to hold the test data
             var testRegistersArrayData = testRegisters.ToRegs();
@@ -316,8 +316,9 @@ public void intdos_0x47_GetCurrentDirectory_Test()
             //Verify Results
             Assert.Equal(0, testRegisters.AX);
             Assert.Equal(0, testRegisters.DL);
-            Assert.Equal(4096, testRegisters.DS);
-            Assert.Equal(40238, testRegisters.SI);
+            Assert.Equal(dirPointer.Segment, mbbsEmuCpuRegisters.DS);
+            Assert.Equal(dirPointer.Offset, testRegisters.DI);
+            Assert.Equal("BBSV6\\", Encoding.ASCII.GetString(mbbsEmuMemoryCore.GetString(testRegisters.DS, testRegisters.DI, true)));
         }
 
         [Fact]

diff --git a/MBBSEmu/DOS/Interrupts/Int21h.cs b/MBBSEmu/DOS/Interrupts/Int21h.cs
@@ -240,7 +240,7 @@ DOS 2+ - GET CURRENT DIRECTORY
                             AX = error code
                             Note: the returned path does not include the initial backslash
                          */
-                        _memory.SetArray(_registers.DS, _registers.SI, Encoding.ASCII.GetBytes("BBSV6\\\0"));
+                        _memory.SetArray(_registers.DS, _registers.DI, Encoding.ASCII.GetBytes("BBSV6\\\0"));
                         _registers.AX = 0;
                         _registers.DL = 0;
                         _registers.F = _registers.F.ClearFlag((ushort)EnumFlags.CF);

diff --git a/MBBSEmu/HostProcess/ExportedModules/ExportedModuleBase.cs b/MBBSEmu/HostProcess/ExportedModules/ExportedModuleBase.cs
@@ -720,7 +720,7 @@ private protected ReadOnlySpan<byte> ProcessTextVariables(ReadOnlySpan<byte> out
                         var resultRegisters = Module.Execute(variableEntryPoint, ChannelNumber, true, true, null, 0xF100);
                         var variableData = Module.Memory.GetString(resultRegisters.DX, resultRegisters.AX, true);
 #if DEBUG
-                        _logger.Debug(($"({Module.ModuleIdentifier}) Processing Text Variable {textVariableName} ({variableEntryPoint}): {BitConverter.ToString(variableData.ToArray()).Replace("-", " ")}");
+                        _logger.Debug(($"({Module.ModuleIdentifier}) Processing Text Variable {textVariableName} ({variableEntryPoint}): {BitConverter.ToString(variableData.ToArray()).Replace("-", " ")}"));
 #endif
                         newOutputBuffer.Write(variableData);
                         break;