Nx bit support + minor fixes

.github/workflows/ci.yml

@@ -79,7 +79,7 @@ jobs:
         id: cache-nasmtests
         with:
           path: tests/nasm/build/
-          key: ${{ runner.os }}-nasmtests
+          key: ${{ runner.os }}-nasmtests-${{ hashFiles('gen/x86_table.js', 'tests/nasm/*.js', 'tests/nasm/*.asm', 'tests/nasm/*.inc', 'tests/nasm/gdb-extract-def') }}
 
       - name: Run nasmtests
         run: MAX_PARALLEL_TESTS=1 make nasmtests

src/cpu.js

@@ -207,6 +207,7 @@ export function CPU(bus, wm, stop_idling)
     this.dreg = view(Int32Array, memory, 684, 8);
 
     this.reg_pdpte = view(Int32Array, memory, 968, 8);
+    this.efer = view(Uint32Array, memory, 1280, 2);
 
     this.svga_dirty_bitmap_min_offset = view(Uint32Array, memory, 716, 1);
     this.svga_dirty_bitmap_max_offset = view(Uint32Array, memory, 720, 1);
@@ -570,6 +571,7 @@ CPU.prototype.get_state = function()
     state[89] = this.devices.vmware;
     state[90] = this.devices.parallel0;
     state[91] = this.devices.parallel1;
+    state[92] = this.efer;
 
     return state;
 };
@@ -687,6 +689,8 @@ CPU.prototype.set_state = function(state)
     this.sreg.set(state[40]);
     this.dreg.set(state[41]);
     state[42] && this.reg_pdpte.set(state[42]);
+    this.efer.fill(0);
+    state[92] && this.efer.set(state[92]);
 
     this.set_tsc(state[43][0], state[43][1]);
 

src/ide.js

@@ -129,6 +129,7 @@ const ATA_CMD_WRITE_MULTIPLE = 0x39;                  // see [ATA8-ACS] 7.64
 const ATA_CMD_WRITE_MULTIPLE_EXT = 0xC5;              // see [ATA8-ACS] 7.65
 const ATA_CMD_WRITE_SECTORS = 0x30;                   // see [ATA8-ACS] 7.67
 const ATA_CMD_WRITE_SECTORS_EXT = 0x34;               // see [ATA8-ACS] 7.68
+const ATA_CMD_READ_LOG_EXT = 0x2F;                    // see [ACS-3] 7.42
 const ATA_CMD_10h = 0x10;                             // command obsolete/unknown, see [ATA-6] Table E.2
 const ATA_CMD_F0h = 0xF0;                             // vendor-specific
 
@@ -166,6 +167,7 @@ const ATA_CMD_NAME =
     [ATA_CMD_WRITE_MULTIPLE_EXT]:           "WRITE MULTIPLE EXT",
     [ATA_CMD_WRITE_SECTORS]:                "WRITE SECTORS",
     [ATA_CMD_WRITE_SECTORS_EXT]:            "WRITE SECTORS EXT",
+    [ATA_CMD_READ_LOG_EXT]:                 "READ LOG EXT",
     [ATA_CMD_10h]:                          "<UNKNOWN 10h>",
     [ATA_CMD_F0h]:                          "<VENDOR-SPECIFIC F0h>",
 };
@@ -1327,6 +1329,20 @@ IDEInterface.prototype.ata_command = function(cmd)
             this.push_irq();
             break;
 
+        case ATA_CMD_READ_LOG_EXT:
+        {
+            // Return zeroed log page(s); sector_count_reg pages of 512 bytes each.
+            // Zero content means empty log (no errors, no self-test entries).
+            const page_count = this.sector_count_reg & 0xFF || 0x100;
+            const byte_count = page_count * 512;
+            this.data_allocate(byte_count);
+            this.data_end = this.data_length;
+            this.sector_count_reg -= page_count;  // mirror what ata_advance does for disk reads
+            this.status_reg = ATA_SR_DRDY|ATA_SR_DSC|ATA_SR_DRQ;
+            this.push_irq();
+            break;
+        }
+
         case ATA_CMD_READ_DMA:
         case ATA_CMD_READ_DMA_EXT:
             do_dbg_log = false;