@aptre/v86 0.5.0 → 0.6.1

package/lib/9p.ts

@@ -311,7 +311,7 @@ export class Virtio9p {
 
         const state = { offset: 0 }
         const header = marshall.Unmarshall(['w', 'b', 'h'], buffer, state)
-        let size = header[0]
+        let size
         const id = header[1]
         const tag = header[2]
 
@@ -382,7 +382,7 @@ export class Virtio9p {
                 )
 
                 if (ret < 0) {
-                    let error_message = ''
+                    let error_message: string
                     if (ret === -EPERM)
                         error_message = 'Operation not permitted'
                     else {
@@ -984,7 +984,7 @@ export class Virtio9p {
                     newname,
                 )
                 if (ret < 0) {
-                    let error_message = ''
+                    let error_message: string
                     if (ret === -ENOENT)
                         error_message = 'No such file or directory'
                     else if (ret === -EPERM)
@@ -1040,7 +1040,7 @@ export class Virtio9p {
                 }
                 const ret = this.fs.Unlink(this.fids[dirfd].inodeid, name)
                 if (ret < 0) {
-                    let error_message = ''
+                    let error_message: string
                     if (ret === -ENOTEMPTY)
                         error_message = 'Directory not empty'
                     else if (ret === -EPERM)

package/lib/filesystem.ts

@@ -1213,7 +1213,7 @@ export class FS {
         let parentid = -1
         let id = 0
         let forward_path: string | null = null
-        let i = 0
+        let i
         for (i = 0; i < n; i++) {
             parentid = id
             id = this.Search(parentid, walk[i])

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@aptre/v86",
-    "version": "0.5.0",
+    "version": "0.6.1",
     "license": "BSD-2-Clause",
     "description": "x86 PC emulator and x86-to-wasm JIT, running in the browser",
     "homepage": "https://github.com/aperturerobotics/v86",
@@ -56,20 +56,20 @@
         "./{src,lib,gen,tests}/**/*.{ts,js}": "prettier --config .prettierrc.yaml --write"
     },
     "devDependencies": {
-        "@eslint/js": "^9.27.0",
+        "@eslint/js": "^10.0.0",
         "@types/node": "^25.5.0",
         "@typescript/native-preview": "^7.0.0-dev.20250601",
-        "esbuild": "^0.25.4",
-        "eslint": "^9.27.0",
+        "esbuild": "^0.27.0",
+        "eslint": "^10.0.0",
         "eslint-config-prettier": "^10.1.5",
         "eslint-plugin-unused-imports": "^4.4.1",
-        "globals": "^16.1.0",
+        "globals": "^17.0.0",
         "husky": "^9.1.7",
         "lint-staged": "^16.0.0",
         "prettier": "^3.5.3",
         "rimraf": "^6.0.1",
-        "typescript": "^5.8.3",
+        "typescript": "^6.0.0",
         "typescript-eslint": "^8.32.1",
-        "vitest": "^3.1.4"
+        "vitest": "^4.0.0"
     }
 }

package/src/browser/starter.ts

@@ -45,21 +45,11 @@ type FileDescriptor = any
 
 type AutoStep = any
 
-class FileExistsError {
-    message: string
+class FileNotFoundError extends Error {
     constructor(message?: string) {
-        this.message = message || 'File already exists'
+        super(message || 'File not found')
     }
 }
-FileExistsError.prototype = Error.prototype
-
-class FileNotFoundError {
-    message: string
-    constructor(message?: string) {
-        this.message = message || 'File not found'
-    }
-}
-FileNotFoundError.prototype = Error.prototype
 
 /**
  * Constructor for emulator instances.
@@ -115,14 +105,31 @@ export class V86 {
 
         let cpu: any
 
-        let wasm_memory: any
+        // Reserve VA upfront so memory.grow() is fast (no realloc+copy).
+        // Without maximum, engines must reallocate on every grow which
+        // is expensive and can OOM for large guest memories.
+        const memory_size = options.memory_size || 64 * 1024 * 1024
+        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,
+            Math.min(Math.ceil(memory_max / WASM_PAGE_SIZE), 65536),
+        )
+        const wasm_memory = new WebAssembly.Memory({
+            initial: wasm_initial_pages,
+            maximum: wasm_max_pages,
+        })
 
         const wasm_table = new WebAssembly.Table({
             element: 'anyfunc',
             initial: WASM_TABLE_SIZE + WASM_TABLE_OFFSET,
         })
 
-        const wasm_shared_funcs = {
+        const wasm_shared_funcs: Record<string, any> = {
+            memory: wasm_memory,
             cpu_exception_hook: (n: number) => this.cpu_exception_hook(n),
 
             run_hardware_timers: function (a: any, t: any) {
@@ -231,8 +238,6 @@ export class V86 {
 
         if (!wasm_fn) {
             wasm_fn = (env: any) => {
-                /* global __dirname */
-
                 return new Promise((resolve) => {
                     let v86_bin = DEBUG ? 'v86-debug.wasm' : 'v86.wasm'
                     let v86_bin_fallback = 'v86-fallback.wasm'
@@ -243,12 +248,11 @@ export class V86 {
                             'v86.wasm',
                             'v86-fallback.wasm',
                         )
-                    } else if (
-                        typeof window === 'undefined' &&
-                        typeof __dirname === 'string'
-                    ) {
-                        v86_bin = __dirname + '/' + v86_bin
-                        v86_bin_fallback = __dirname + '/' + v86_bin_fallback
+                    } else if (typeof window === 'undefined') {
+                        // Node/Bun: resolve WASM relative to project root build/
+                        const root = new URL('../../', import.meta.url).pathname
+                        v86_bin = root + 'build/' + v86_bin
+                        v86_bin_fallback = root + 'build/' + v86_bin_fallback
                     } else {
                         v86_bin = 'build/' + v86_bin
                         v86_bin_fallback = 'build/' + v86_bin_fallback
@@ -293,12 +297,12 @@ export class V86 {
         }
 
         wasm_fn({ env: wasm_shared_funcs }).then((exports: WasmExports) => {
-            wasm_memory = exports.memory
             exports['rust_init']()
 
             const emulator = (this.v86 = new v86(this.emulator_bus, {
                 exports,
                 wasm_table,
+                wasm_memory,
             }))
             cpu = emulator.cpu
 
@@ -356,7 +360,9 @@ export class V86 {
         settings.mac_address_translation = options.mac_address_translation
         settings.cpuid_level = options.cpuid_level
         settings.virtio_balloon = options.virtio_balloon
+        settings.virtio_mem = options.virtio_mem
         settings.virtio_console = !!options.virtio_console
+        settings.virtio_v86fs = !!options.virtio_v86fs
 
         const relay_url =
             options.network_relay_url ||
@@ -967,6 +973,30 @@ export class V86 {
         this.v86.run()
     }
 
+    /**
+     * Grow guest memory to the specified size in bytes. Stops the VM,
+     * grows WASM linear memory, updates memory_size, clears the TLB,
+     * and resumes execution.
+     */
+    async growMemory(newSizeBytes: number): Promise<void> {
+        const cpu = this.v86.cpu
+        if (newSizeBytes <= cpu.memory_size[0]) {
+            return
+        }
+
+        const wasRunning = this.cpu_is_running
+        if (wasRunning) {
+            await this.stop()
+        }
+
+        cpu.resize_memory(newSizeBytes)
+        cpu.full_clear_tlb()
+
+        if (wasRunning) {
+            await this.run()
+        }
+    }
+
     /**
      * Stop emulation. Do nothing if emulator is not running. Can be asynchronous.
      */

package/src/const.ts

@@ -120,6 +120,8 @@ export const WASM_TABLE_SIZE = 900
 
 export const WASM_TABLE_OFFSET = 1024
 
+export const WASM_PAGE_SIZE = 65536
+
 export const MIXER_CHANNEL_LEFT = 0
 export const MIXER_CHANNEL_RIGHT = 1
 export const MIXER_CHANNEL_BOTH = 2

package/src/cpu.ts

@@ -46,6 +46,7 @@ import {
     FLAG_DIRECTION,
     FLAG_OVERFLOW,
     FLAG_PARITY,
+    WASM_PAGE_SIZE,
 } from './const.js'
 import { h, view, pads, Bitmap, dump_file } from './lib.js'
 import { dbg_assert, dbg_log } from './log.js'
@@ -67,6 +68,8 @@ import { IDEController } from './ide.js'
 import { VirtioNet } from './virtio_net.js'
 import { VGAScreen } from './vga.js'
 import { VirtioBalloon } from './virtio_balloon.js'
+import { VirtioMem } from './virtio_mem.js'
+import { VirtioV86FS } from './virtio_v86fs.js'
 import { Virtio9p, Virtio9pHandler, Virtio9pProxy } from '../lib/9p.js'
 
 import { load_kernel } from './kernel.js'
@@ -129,6 +132,8 @@ interface CPUDevices {
     virtio_console: VirtioConsole
     virtio_net: VirtioNet
     virtio_balloon: VirtioBalloon
+    virtio_mem: VirtioMem
+    virtio_v86fs: VirtioV86FS
 }
 
 interface OptionRom {
@@ -139,6 +144,7 @@ interface OptionRom {
 interface WasmModule {
     exports: Record<string, any>
     wasm_table: WebAssembly.Table
+    wasm_memory: WebAssembly.Memory
 }
 
 export class CPU {
@@ -149,6 +155,7 @@ export class CPU {
     memory_size!: Int32Array
 
     mem8: Uint8Array
+    mem8_offset: number = 0
     mem32s: Int32Array
 
     segment_is_null!: Uint8Array
@@ -268,7 +275,6 @@ export class CPU {
     get_eflags!: () => number
     handle_irqs!: () => void
     main_loop!: () => number
-    reboot_internal!: () => void
     set_jit_config!: (a: number, b: number) => void
 
     read8!: (addr: number) => number
@@ -338,153 +344,115 @@ export class CPU {
         this.name = 'cpu'
         this.stop_idling = stop_idling
         this.wm = wm
+        this.wasm_memory = wm.wasm_memory
         this.wasm_patch()
         this.create_jit_imports()
 
-        const memory = this.wm.exports['memory']
+        this.mem8 = new Uint8Array(0)
+        this.mem32s = new Int32Array(this.mem8.buffer)
 
-        this.wasm_memory = memory
+        this.rebuild_wasm_views()
 
-        this.memory_size = view(Uint32Array, memory, 812, 1)
+        // @ts-expect-error Devices are populated during init()
+        this.devices = {}
 
-        this.mem8 = new Uint8Array(0)
-        this.mem32s = new Int32Array(this.mem8.buffer)
+        // 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
+
+        this.set_tsc(0, 0)
+
+        if (DEBUG) {
+            this.seen_code = {}
+            this.seen_code_uncompiled = {}
+        }
+    }
+
+    /**
+     * 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)
-
-        // Whether or not in protected mode
         this.protected_mode = view(Int32Array, memory, 800, 1)
-
         this.idtr_size = view(Int32Array, memory, 564, 1)
         this.idtr_offset = view(Int32Array, memory, 568, 1)
-
-        // global descriptor table register
         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)
-
-        // whether or not a page fault occured
         this.page_fault = view(Uint32Array, memory, 540, 8)
-
         this.cr = view(Int32Array, memory, 580, 8)
-
-        // current privilege level
         this.cpl = view(Uint8Array, memory, 612, 1)
-
-        // current operand/address size
         this.is_32 = view(Int32Array, memory, 804, 1)
-
         this.stack_size_32 = view(Int32Array, memory, 808, 1)
-
-        // Was the last instruction a hlt?
         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)
-
-        // bitmap of flags which are not updated in the flags variable
-        // changed by arithmetic instructions, so only relevant to arithmetic flags
         this.flags_changed = view(Int32Array, memory, 100, 1)
-
-        // enough infos about the last arithmetic operation to compute eflags
         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) // 64 bit
-
-        // @ts-expect-error Devices are populated during init()
-        this.devices = {}
-
+        this.current_tsc = view(Uint32Array, memory, 960, 2)
         this.instruction_pointer = view(Int32Array, memory, 556, 1)
         this.previous_ip = view(Int32Array, memory, 560, 1)
-
-        // configured by guest
         this.apic_enabled = view(Uint8Array, memory, 548, 1)
-        // configured when the emulator starts (changes bios initialisation)
         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)
-
-        // registers
         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)
-
-        // segment registers, tr and ldtr
         this.sreg = view(Uint16Array, memory, 668, 8)
-
-        // debug registers
         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 {
@@ -576,7 +544,7 @@ export class CPU {
 
         const jit_imports = Object.create(null)
 
-        jit_imports['m'] = this.wm.exports['memory']
+        jit_imports['m'] = this.wasm_memory
 
         for (const name of Object.keys(this.wm.exports)) {
             if (
@@ -611,8 +579,6 @@ export class CPU {
 
         this.main_loop = get_import('main_loop')
 
-        this.reboot_internal = get_import('reboot_internal')
-
         this.set_jit_config = get_import('set_jit_config')
 
         this.read8 = get_import('read8')
@@ -812,6 +778,8 @@ export class CPU {
         state[86] = this.last_result
         state[87] = this.fpu_status_word
         state[88] = this.mxcsr
+        state[89] = this.devices.virtio_mem
+        state[90] = this.devices.virtio_v86fs
 
         return state
     }
@@ -882,8 +850,34 @@ 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,
+        )
+        this.memory_size[0] = new_size
+    }
+
     set_state(state: any[]): void {
-        this.memory_size[0] = state[0]
+        const saved_memory_size = state[0]
+        if (saved_memory_size > this.memory_size[0]) {
+            this.resize_memory(saved_memory_size)
+        } else {
+            this.memory_size[0] = saved_memory_size
+        }
 
         if (this.mem8.length !== this.memory_size[0]) {
             console.warn(
@@ -1007,6 +1001,10 @@ export class CPU {
             this.devices.virtio_net.set_state(state[83])
         if (this.devices.virtio_balloon)
             this.devices.virtio_balloon.set_state(state[84])
+        if (this.devices.virtio_mem && state[89])
+            this.devices.virtio_mem.set_state(state[89])
+        if (this.devices.virtio_v86fs && state[90])
+            this.devices.virtio_v86fs.set_state(state[90])
 
         this.fw_value = state[62]
 
@@ -1247,9 +1245,10 @@ export class CPU {
             'Expected uninitialised memory',
         )
 
-        this.memory_size[0] = size
-
         const memory_offset = this.allocate_memory(size)
+        this.rebuild_wasm_views()
+        this.memory_size[0] = size
+        this.mem8_offset = memory_offset
 
         this.mem8 = view(Uint8Array, this.wasm_memory, memory_offset, size)
         this.mem32s = view(
@@ -1521,6 +1520,19 @@ export class CPU {
                     device_bus,
                 )
             }
+            if (settings.virtio_mem) {
+                const mem_cfg = settings.virtio_mem
+                this.devices.virtio_mem = new VirtioMem(
+                    this,
+                    device_bus,
+                    mem_cfg.region_addr,
+                    mem_cfg.region_size,
+                    mem_cfg.block_size,
+                )
+            }
+            if (settings.virtio_v86fs) {
+                this.devices.virtio_v86fs = new VirtioV86FS(this, device_bus)
+            }
 
             this.devices.sb16 = new SB16(this, device_bus)
         }
@@ -1545,6 +1557,25 @@ 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 {
@@ -1858,7 +1889,6 @@ export class CPU {
                         cpu.write32(multiboot_data + 4, ramdisk_top) // mod_end
                         cpu.write32(multiboot_data + 8, 0) // string
                         cpu.write32(multiboot_data + 12, 0) // reserved
-                        multiboot_data += 16
 
                         dbg_assert(ramdisk_top < cpu.memory_size[0])
 

package/src/pci.ts

@@ -13,7 +13,7 @@ interface PCICpu {
     io: IO
     device_raise_irq(irq: number): void
     device_lower_irq(irq: number): void
-    reboot_internal(): void
+    reboot(): void
 }
 
 // Mirrors IOPortEntry from io.ts (not exported there).
@@ -177,7 +177,7 @@ export class PCI {
                     (out_byte & 0x06) === 0x06
                 ) {
                     dbg_log('CPU reboot via PCI')
-                    cpu.reboot_internal()
+                    cpu.reboot()
                     return
                 }
 
@@ -304,6 +304,7 @@ export class PCI {
                 0x00,
                 0x00,
                 0x00,
+                0x00,
                 PAM0,
                 0x00,
                 0x00,
@@ -711,7 +712,11 @@ export class PCI {
 
         // convert bytewise notation from lspci to double words
         const space = new Int32Array(64)
-        space.set(new Int32Array(new Uint8Array(device.pci_space).buffer))
+        const pci_bytes = new Uint8Array(device.pci_space)
+        const aligned_len = pci_bytes.length & ~3
+        if (aligned_len > 0) {
+            space.set(new Int32Array(pci_bytes.buffer, 0, aligned_len >> 2))
+        }
         this.device_spaces[device_id] = space
         this.devices[device_id] = device
 

package/src/ps2.ts

@@ -11,7 +11,7 @@ interface PS2Cpu {
     io: IO
     device_raise_irq(irq: number): void
     device_lower_irq(irq: number): void
-    reboot_internal(): void
+    reboot(): void
 }
 
 type PS2State = [
@@ -808,7 +808,7 @@ export class PS2 {
                 break
             case 0xfe:
                 dbg_log('CPU reboot via PS2')
-                this.cpu.reboot_internal()
+                this.cpu.reboot()
                 break
             default:
                 dbg_log(