@aptre/v86 0.6.1 → 0.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@aptre/v86",
-    "version": "0.6.1",
+    "version": "0.6.3",
     "license": "BSD-2-Clause",
     "description": "x86 PC emulator and x86-to-wasm JIT, running in the browser",
     "homepage": "https://github.com/aperturerobotics/v86",

package/src/browser/starter.ts

@@ -1,7 +1,12 @@
 declare let DEBUG: boolean
 
 import { v86 } from '../main.js'
-import { LOG_CPU, WASM_TABLE_OFFSET, WASM_TABLE_SIZE } from '../const.js'
+import {
+    LOG_CPU,
+    WASM_PAGE_SIZE,
+    WASM_TABLE_OFFSET,
+    WASM_TABLE_SIZE,
+} from '../const.js'
 import { get_rand_int, load_file, read_sized_string_from_mem } from '../lib.js'
 import { dbg_assert, dbg_trace, dbg_log, set_log_level } from '../log.js'
 import * as print_stats from './print_stats.js'
@@ -112,7 +117,6 @@ export class V86 {
         const vga_memory_size = options.vga_memory_size || 8 * 1024 * 1024
         const memory_max =
             options.memory_max || (memory_size + vga_memory_size) * 4
-        const WASM_PAGE_SIZE = 65536
         const wasm_initial_pages = 256
         const wasm_max_pages = Math.max(
             wasm_initial_pages,

package/src/cpu.ts

@@ -155,7 +155,6 @@ export class CPU {
     memory_size!: Int32Array
 
     mem8: Uint8Array
-    mem8_offset: number = 0
     mem32s: Int32Array
 
     segment_is_null!: Uint8Array
@@ -348,111 +347,134 @@ export class CPU {
         this.wasm_patch()
         this.create_jit_imports()
 
-        this.mem8 = new Uint8Array(0)
-        this.mem32s = new Int32Array(this.mem8.buffer)
-
-        this.rebuild_wasm_views()
-
-        // @ts-expect-error Devices are populated during init()
-        this.devices = {}
-
-        // managed in io.js
-        this.memory_map_read8 = []
-        this.memory_map_write8 = []
-        this.memory_map_read32 = []
-        this.memory_map_write32 = []
-
-        this.bios = {
-            main: null,
-            vga: null,
-        }
-
-        this.fpu_stack_empty[0] = 0xff
-        this.fpu_stack_ptr[0] = 0
-
-        this.fpu_control_word[0] = 0x37f
-        this.fpu_status_word[0] = 0
-        this.fpu_ip[0] = 0
-        this.fpu_ip_selector[0] = 0
-        this.fpu_opcode[0] = 0
-        this.fpu_dp[0] = 0
-        this.fpu_dp_selector[0] = 0
-
-        this.fw_value = []
-        this.fw_pointer = 0
-        this.option_roms = []
-
-        this.io = undefined!
-
-        this.bus = bus
+        const memory = this.wasm_memory
 
-        this.set_tsc(0, 0)
+        this.memory_size = view(Uint32Array, memory, 812, 1)
 
-        if (DEBUG) {
-            this.seen_code = {}
-            this.seen_code_uncompiled = {}
-        }
-    }
+        this.mem8 = new Uint8Array(0)
+        this.mem32s = new Int32Array(this.mem8.buffer)
 
-    /**
-     * Rebuild all TypedArray views into WASM linear memory.
-     * Must be called after any wasm_memory.grow() since growth
-     * detaches the old ArrayBuffer, invalidating all views.
-     */
-    rebuild_wasm_views(): void {
-        const memory = this.wasm_memory
-        this.memory_size = view(Uint32Array, memory, 812, 1)
         this.segment_is_null = view(Uint8Array, memory, 724, 8)
         this.segment_offsets = view(Int32Array, memory, 736, 8)
         this.segment_limits = view(Uint32Array, memory, 768, 8)
         this.segment_access_bytes = view(Uint8Array, memory, 512, 8)
+
         this.protected_mode = view(Int32Array, memory, 800, 1)
+
         this.idtr_size = view(Int32Array, memory, 564, 1)
         this.idtr_offset = view(Int32Array, memory, 568, 1)
+
         this.gdtr_size = view(Int32Array, memory, 572, 1)
         this.gdtr_offset = view(Int32Array, memory, 576, 1)
+
         this.tss_size_32 = view(Int32Array, memory, 1128, 1)
+
         this.page_fault = view(Uint32Array, memory, 540, 8)
+
         this.cr = view(Int32Array, memory, 580, 8)
+
         this.cpl = view(Uint8Array, memory, 612, 1)
+
         this.is_32 = view(Int32Array, memory, 804, 1)
+
         this.stack_size_32 = view(Int32Array, memory, 808, 1)
+
         this.in_hlt = view(Uint8Array, memory, 616, 1)
+
         this.last_virt_eip = view(Int32Array, memory, 620, 1)
         this.eip_phys = view(Int32Array, memory, 624, 1)
+
         this.sysenter_cs = view(Int32Array, memory, 636, 1)
+
         this.sysenter_esp = view(Int32Array, memory, 640, 1)
+
         this.sysenter_eip = view(Int32Array, memory, 644, 1)
+
         this.prefixes = view(Int32Array, memory, 648, 1)
+
         this.flags = view(Int32Array, memory, 120, 1)
+
         this.flags_changed = view(Int32Array, memory, 100, 1)
+
         this.last_op_size = view(Int32Array, memory, 96, 1)
         this.last_op1 = view(Int32Array, memory, 104, 1)
         this.last_result = view(Int32Array, memory, 112, 1)
+
         this.current_tsc = view(Uint32Array, memory, 960, 2)
+
+        // @ts-expect-error Devices are populated during init()
+        this.devices = {}
+
         this.instruction_pointer = view(Int32Array, memory, 556, 1)
         this.previous_ip = view(Int32Array, memory, 560, 1)
+
         this.apic_enabled = view(Uint8Array, memory, 548, 1)
         this.acpi_enabled = view(Uint8Array, memory, 552, 1)
+
+        // managed in io.js
+        this.memory_map_read8 = []
+        this.memory_map_write8 = []
+        this.memory_map_read32 = []
+        this.memory_map_write32 = []
+
+        this.bios = {
+            main: null,
+            vga: null,
+        }
+
         this.instruction_counter = view(Uint32Array, memory, 664, 1)
+
         this.reg32 = view(Int32Array, memory, 64, 8)
+
         this.fpu_st = view(Int32Array, memory, 1152, 4 * 8)
+
         this.fpu_stack_empty = view(Uint8Array, memory, 816, 1)
+        this.fpu_stack_empty[0] = 0xff
         this.fpu_stack_ptr = view(Uint8Array, memory, 1032, 1)
+        this.fpu_stack_ptr[0] = 0
+
         this.fpu_control_word = view(Uint16Array, memory, 1036, 1)
+        this.fpu_control_word[0] = 0x37f
         this.fpu_status_word = view(Uint16Array, memory, 1040, 1)
+        this.fpu_status_word[0] = 0
         this.fpu_ip = view(Int32Array, memory, 1048, 1)
+        this.fpu_ip[0] = 0
         this.fpu_ip_selector = view(Int32Array, memory, 1052, 1)
+        this.fpu_ip_selector[0] = 0
         this.fpu_opcode = view(Int32Array, memory, 1044, 1)
+        this.fpu_opcode[0] = 0
         this.fpu_dp = view(Int32Array, memory, 1056, 1)
+        this.fpu_dp[0] = 0
         this.fpu_dp_selector = view(Int32Array, memory, 1060, 1)
+        this.fpu_dp_selector[0] = 0
+
         this.reg_xmm32s = view(Int32Array, memory, 832, 8 * 4)
+
         this.mxcsr = view(Int32Array, memory, 824, 1)
+
         this.sreg = view(Uint16Array, memory, 668, 8)
+
         this.dreg = view(Int32Array, memory, 684, 8)
+
         this.reg_pdpte = view(Int32Array, memory, 968, 8)
+
         this.svga_dirty_bitmap_min_offset = view(Uint32Array, memory, 716, 1)
         this.svga_dirty_bitmap_max_offset = view(Uint32Array, memory, 720, 1)
+
+        this.fw_value = []
+        this.fw_pointer = 0
+        this.option_roms = []
+
+        this.io = undefined!
+
+        this.bus = bus
+
+        this.set_tsc(0, 0)
+
+        if (DEBUG) {
+            this.seen_code = {}
+            this.seen_code_uncompiled = {}
+        }
     }
 
     mmap_read8(addr: number): number {
@@ -704,7 +726,7 @@ export class CPU {
         state[26] = this.flags[0]
         state[27] = this.flags_changed[0]
         state[28] = this.last_op1[0]
-
+        state[29] = this.last_result[0]
         state[30] = this.last_op_size[0]
 
         state[37] = this.instruction_pointer[0]
@@ -851,23 +873,15 @@ export class CPU {
     }
 
     resize_memory(new_size: number): void {
-        const mem8_offset = this.mem8_offset
-        const needed_total = mem8_offset + new_size
-        const current_buffer = this.wasm_memory.buffer.byteLength
-        if (needed_total > current_buffer) {
-            const grow_pages = Math.ceil(
-                (needed_total - current_buffer) / WASM_PAGE_SIZE,
-            )
-            this.wasm_memory.grow(grow_pages)
-            this.rebuild_wasm_views()
-        }
-        this.mem8 = view(Uint8Array, this.wasm_memory, mem8_offset, new_size)
-        this.mem32s = view(
-            Int32Array,
-            this.wasm_memory,
-            mem8_offset,
-            new_size >> 2,
-        )
+        const offset = this.mem8.byteOffset
+        const needed = offset + new_size
+        const current = this.wasm_memory.buffer.byteLength
+        if (needed > current) {
+            const pages = Math.ceil((needed - current) / WASM_PAGE_SIZE)
+            this.wasm_memory.grow(pages)
+        }
+        this.mem8 = view(Uint8Array, this.wasm_memory, offset, new_size)
+        this.mem32s = view(Uint32Array, this.wasm_memory, offset, new_size >> 2)
         this.memory_size[0] = new_size
     }
 
@@ -931,7 +945,7 @@ export class CPU {
         this.flags[0] = state[26]
         this.flags_changed[0] = state[27]
         this.last_op1[0] = state[28]
-
+        if (state[29] !== undefined) this.last_result[0] = state[29]
         this.last_op_size[0] = state[30]
 
         this.instruction_pointer[0] = state[37]
@@ -1245,10 +1259,9 @@ export class CPU {
             'Expected uninitialised memory',
         )
 
-        const memory_offset = this.allocate_memory(size)
-        this.rebuild_wasm_views()
         this.memory_size[0] = size
-        this.mem8_offset = memory_offset
+
+        const memory_offset = this.allocate_memory(size)
 
         this.mem8 = view(Uint8Array, this.wasm_memory, memory_offset, size)
         this.mem32s = view(
@@ -1557,25 +1570,6 @@ export class CPU {
         }
 
         this.debug_init()
-
-        // Rebuild all WASM memory views. During init, allocate_memory
-        // and svga_allocate_memory may trigger memory.grow (from Rust),
-        // which detaches the old ArrayBuffer and invalidates all views.
-        this.rebuild_wasm_views()
-        if (this.mem8_offset > 0) {
-            this.mem8 = view(
-                Uint8Array,
-                this.wasm_memory,
-                this.mem8_offset,
-                this.memory_size[0],
-            )
-            this.mem32s = view(
-                Uint32Array,
-                this.wasm_memory,
-                this.mem8_offset,
-                this.memory_size[0] >> 2,
-            )
-        }
     }
 
     load_multiboot(buffer: ArrayBuffer): void {