Merge pull request #4379 from cimarronm/debugger-fixes

Debugger fixes
joncampbell123 · Jul 25, 2023 · 4df8ee1 · 4df8ee1
2 parents 78897bc + eec82ed
commit 4df8ee1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -47,6 +47,8 @@ Next
     builds) (maron2000)
   - Fix day of week detection (INT 21h function 0x2Ah). (maron2000)
   - Refine KEYB and CHCP command (maron2000)
+  - Fix disassembly for far jmp/call decoding (cimarronm)
+  - Fix memory limits on expand-down segment descriptors (cimarronm)
   - Bump tinyfiledialog to ver 3.13.3 (maron2000)
 2023.05.01
   - IMGMAKE will choose LBA partition types for 2GB or larger disk

diff --git a/src/debug/debug.cpp b/src/debug/debug.cpp
@@ -391,7 +391,8 @@ uint64_t LinMakeProt(uint16_t selector, uint32_t offset)
 
     if (cpu.gdt.GetDescriptor(selector,desc)) {
         if (selector >= 8 && desc.Type() != 0) {
-            if (offset <= desc.GetLimit())
+            if ( (!desc.GetExpandDown() && offset <= desc.GetLimit()) ||
+                 ( desc.GetExpandDown() && offset >  desc.GetLimit()) )
                 return desc.GetBase()+(uint64_t)offset;
         }
     }

diff --git a/src/debug/debug_disasm.cpp b/src/debug/debug_disasm.cpp
@@ -1046,7 +1046,7 @@ static void percent(char type, char subtype)
 
   switch (type) {
   case 'A':                          /* direct address */
-       outhex(subtype, extend, 0, addrsize, 0);
+       outhex(subtype, extend, 0, opsize, 0);
        break;
 
   case 'C':                          /* reg(r/m) picks control reg */