v86 0.5.191 → 0.5.199

package/build/libv86-debug.js

@@ -4646,7 +4646,7 @@ $FS$$module$lib$filesystem$$.prototype.HandleEvent = function($id$jscomp$9$$) {
 $FS$$module$lib$filesystem$$.prototype.load_from_json = function($fs$jscomp$1_i$jscomp$61$$) {
   $dbg_assert$$module$src$log$$($fs$jscomp$1_i$jscomp$61$$, "Invalid fs passed to load_from_json");
   if (3 !== $fs$jscomp$1_i$jscomp$61$$.version) {
-    throw "The filesystem JSON format has changed. Please update your fs2json (https://github.com/copy/fs2json) and recreate the filesystem JSON.";
+    throw "The filesystem JSON format has changed. Please recreate the filesystem JSON.";
   }
   var $fsroot$$ = $fs$jscomp$1_i$jscomp$61$$.fsroot;
   this.used_size = $fs$jscomp$1_i$jscomp$61$$.size;
@@ -5672,20 +5672,28 @@ $V86$$module$src$browser$starter$$.prototype.continue_init = async function($emu
   $add_file_boot_order_fs_url_relay_url_screen_options$$("multiboot", $options$jscomp$41$$.multiboot);
   $add_file_boot_order_fs_url_relay_url_screen_options$$("bzimage", $options$jscomp$41$$.bzimage);
   $add_file_boot_order_fs_url_relay_url_screen_options$$("initrd", $options$jscomp$41$$.initrd);
-  if ($options$jscomp$41$$.filesystem) {
-    $add_file_boot_order_fs_url_relay_url_screen_options$$ = $options$jscomp$41$$.filesystem.basefs;
-    var $base_url$$ = $options$jscomp$41$$.filesystem.baseurl;
-    let $file_storage$jscomp$1$$ = new $MemoryFileStorage$$module$src$browser$filestorage$$;
-    $base_url$$ && ($file_storage$jscomp$1$$ = new $ServerFileStorageWrapper$$module$src$browser$filestorage$$($file_storage$jscomp$1$$, $base_url$$));
-    $settings$$.fs9p = this.fs9p = new $FS$$module$lib$filesystem$$($file_storage$jscomp$1$$);
-    if ($add_file_boot_order_fs_url_relay_url_screen_options$$) {
-      $dbg_assert$$module$src$log$$($base_url$$, "Filesystem: baseurl must be specified");
-      if ("object" === typeof $add_file_boot_order_fs_url_relay_url_screen_options$$) {
-        var $size$jscomp$35$$ = $add_file_boot_order_fs_url_relay_url_screen_options$$.size;
-        $add_file_boot_order_fs_url_relay_url_screen_options$$ = $add_file_boot_order_fs_url_relay_url_screen_options$$.url;
+  if ($options$jscomp$41$$.filesystem && $options$jscomp$41$$.filesystem.handle9p) {
+    $settings$$.handle9p = $options$jscomp$41$$.filesystem.handle9p;
+  } else {
+    if ($options$jscomp$41$$.filesystem && $options$jscomp$41$$.filesystem.proxy_url) {
+      $settings$$.proxy9p = $options$jscomp$41$$.filesystem.proxy_url;
+    } else {
+      if ($options$jscomp$41$$.filesystem) {
+        $add_file_boot_order_fs_url_relay_url_screen_options$$ = $options$jscomp$41$$.filesystem.basefs;
+        var $base_url$$ = $options$jscomp$41$$.filesystem.baseurl;
+        let $file_storage$jscomp$1$$ = new $MemoryFileStorage$$module$src$browser$filestorage$$;
+        $base_url$$ && ($file_storage$jscomp$1$$ = new $ServerFileStorageWrapper$$module$src$browser$filestorage$$($file_storage$jscomp$1$$, $base_url$$));
+        $settings$$.fs9p = this.fs9p = new $FS$$module$lib$filesystem$$($file_storage$jscomp$1$$);
+        if ($add_file_boot_order_fs_url_relay_url_screen_options$$) {
+          $dbg_assert$$module$src$log$$($base_url$$, "Filesystem: baseurl must be specified");
+          if ("object" === typeof $add_file_boot_order_fs_url_relay_url_screen_options$$) {
+            var $size$jscomp$35$$ = $add_file_boot_order_fs_url_relay_url_screen_options$$.size;
+            $add_file_boot_order_fs_url_relay_url_screen_options$$ = $add_file_boot_order_fs_url_relay_url_screen_options$$.url;
+          }
+          $dbg_assert$$module$src$log$$("string" === typeof $add_file_boot_order_fs_url_relay_url_screen_options$$);
+          $files_to_load$$.push({name:"fs9p_json", url:$add_file_boot_order_fs_url_relay_url_screen_options$$, size:$size$jscomp$35$$, as_json:!0, });
+        }
       }
-      $dbg_assert$$module$src$log$$("string" === typeof $add_file_boot_order_fs_url_relay_url_screen_options$$);
-      $files_to_load$$.push({name:"fs9p_json", url:$add_file_boot_order_fs_url_relay_url_screen_options$$, size:$size$jscomp$35$$, as_json:!0, });
     }
   }
   var $starter$$ = this, $total$jscomp$1$$ = $files_to_load$$.length, $cont$$ = function($index$jscomp$83$$) {
@@ -11571,8 +11579,8 @@ $CPU$$module$src$cpu$$.prototype.init = function($option_rom$jscomp$1_settings$j
   new $UART$$module$src$uart$$(this, 1E3, $device_bus$$)), $option_rom$jscomp$1_settings$jscomp$2$$.uart3 && (this.devices.uart3 = new $UART$$module$src$uart$$(this, 744, $device_bus$$)), this.devices.fdc = new $FloppyController$$module$src$floppy$$(this, $option_rom$jscomp$1_settings$jscomp$2$$.fda, $option_rom$jscomp$1_settings$jscomp$2$$.fdb), $ide_config$jscomp$2_io$jscomp$5$$ = [[void 0, void 0], [void 0, void 0]], $option_rom$jscomp$1_settings$jscomp$2$$.hda && ($ide_config$jscomp$2_io$jscomp$5$$[0][0] = 
   {buffer:$option_rom$jscomp$1_settings$jscomp$2$$.hda}, $ide_config$jscomp$2_io$jscomp$5$$[0][1] = {buffer:$option_rom$jscomp$1_settings$jscomp$2$$.hdb}), $ide_config$jscomp$2_io$jscomp$5$$[1][0] = {is_cdrom:!0, buffer:$option_rom$jscomp$1_settings$jscomp$2$$.cdrom}, this.devices.ide = new $IDEController$$module$src$ide$$(this, $device_bus$$, $ide_config$jscomp$2_io$jscomp$5$$), this.devices.cdrom = this.devices.ide.secondary.master, this.devices.pit = new $PIT$$module$src$pit$$(this, $device_bus$$), 
   "ne2k" === $option_rom$jscomp$1_settings$jscomp$2$$.net_device.type ? this.devices.net = new $Ne2k$$module$src$ne2k$$(this, $device_bus$$, $option_rom$jscomp$1_settings$jscomp$2$$.preserve_mac_from_state_image, $option_rom$jscomp$1_settings$jscomp$2$$.mac_address_translation) : "virtio" === $option_rom$jscomp$1_settings$jscomp$2$$.net_device.type && (this.devices.virtio_net = new $VirtioNet$$module$src$virtio_net$$(this, $device_bus$$, $option_rom$jscomp$1_settings$jscomp$2$$.preserve_mac_from_state_image)), 
-  $option_rom$jscomp$1_settings$jscomp$2$$.fs9p && (this.devices.virtio_9p = new $Virtio9p$$module$lib$9p$$($option_rom$jscomp$1_settings$jscomp$2$$.fs9p, this, $device_bus$$)), $option_rom$jscomp$1_settings$jscomp$2$$.virtio_console && (this.devices.virtio_console = new $VirtioConsole$$module$src$virtio_console$$(this, $device_bus$$)), $option_rom$jscomp$1_settings$jscomp$2$$.virtio_balloon && (this.devices.virtio_balloon = new $VirtioBalloon$$module$src$virtio_balloon$$(this, $device_bus$$)), this.devices.sb16 = 
-  new $SB16$$module$src$sb16$$(this, $device_bus$$));
+  $option_rom$jscomp$1_settings$jscomp$2$$.fs9p ? this.devices.virtio_9p = new $Virtio9p$$module$lib$9p$$($option_rom$jscomp$1_settings$jscomp$2$$.fs9p, this, $device_bus$$) : $option_rom$jscomp$1_settings$jscomp$2$$.handle9p ? this.devices.virtio_9p = new $Virtio9pHandler$$module$lib$9p$$($option_rom$jscomp$1_settings$jscomp$2$$.handle9p, this) : $option_rom$jscomp$1_settings$jscomp$2$$.proxy9p && (this.devices.virtio_9p = new $Virtio9pProxy$$module$lib$9p$$($option_rom$jscomp$1_settings$jscomp$2$$.proxy9p, 
+  this)), $option_rom$jscomp$1_settings$jscomp$2$$.virtio_console && (this.devices.virtio_console = new $VirtioConsole$$module$src$virtio_console$$(this, $device_bus$$)), $option_rom$jscomp$1_settings$jscomp$2$$.virtio_balloon && (this.devices.virtio_balloon = new $VirtioBalloon$$module$src$virtio_balloon$$(this, $device_bus$$)), this.devices.sb16 = new $SB16$$module$src$sb16$$(this, $device_bus$$));
   $option_rom$jscomp$1_settings$jscomp$2$$.multiboot && ($dbg_log$$module$src$log$$("loading multiboot", 2), $option_rom$jscomp$1_settings$jscomp$2$$ = this.load_multiboot_option_rom($option_rom$jscomp$1_settings$jscomp$2$$.multiboot, $option_rom$jscomp$1_settings$jscomp$2$$.initrd, $option_rom$jscomp$1_settings$jscomp$2$$.cmdline)) && (this.bios.main ? ($dbg_log$$module$src$log$$("adding option rom for multiboot", 2), this.option_roms.push($option_rom$jscomp$1_settings$jscomp$2$$)) : ($dbg_log$$module$src$log$$("loaded multiboot without bios", 
   2), this.reg32[0] = this.io.port_read32(244)));
   this.debug_init();
@@ -12506,30 +12514,35 @@ $VirtQueueBufferChain$$module$src$virtio$$.prototype.set_next_blob = function($s
   return $src_offset$$;
 };
 const $P9_LOCK_TYPES$$module$lib$9p$$ = ["shared", "exclusive", "unlock"];
-function $Virtio9p$$module$lib$9p$$($filesystem$jscomp$2$$, $cpu$jscomp$31$$, $bus$jscomp$27$$) {
+function $init_virtio$$module$lib$9p$$($cpu$jscomp$31$$, $configspace_taglen$$, $configspace_tagname$$, $receive$$) {
+  const $virtio$jscomp$1$$ = new $VirtIO$$module$src$virtio$$($cpu$jscomp$31$$, {name:"virtio-9p", pci_id:48, device_id:4169, subsystem_device_id:9, common:{initial_port:43008, queues:[{size_supported:32, notify_offset:0, }, ], features:[0, 32, 29, 28, ], on_driver_ok:() => {
+  }, }, notification:{initial_port:43264, single_handler:!1, handlers:[$queue_id$jscomp$15_virtqueue$jscomp$1$$ => {
+    if (0 !== $queue_id$jscomp$15_virtqueue$jscomp$1$$) {
+      $dbg_assert$$module$src$log$$(!1, "Virtio9P Notified for non-existent queue: " + $queue_id$jscomp$15_virtqueue$jscomp$1$$ + " (expected queue_id of 0)");
+    } else {
+      for ($queue_id$jscomp$15_virtqueue$jscomp$1$$ = $virtio$jscomp$1$$.queues[0]; $queue_id$jscomp$15_virtqueue$jscomp$1$$.has_request();) {
+        const $bufchain$jscomp$19$$ = $queue_id$jscomp$15_virtqueue$jscomp$1$$.pop_request();
+        $receive$$($bufchain$jscomp$19$$);
+      }
+      $queue_id$jscomp$15_virtqueue$jscomp$1$$.notify_me_after(0);
+    }
+  }, ], }, isr_status:{initial_port:42752, }, device_specific:{initial_port:42496, struct:[{bytes:2, name:"mount tag length", read:() => $configspace_taglen$$, write:() => {
+  }, }, ].concat(Array.from(Array(254).keys()).map($index$jscomp$93$$ => ({bytes:1, name:"mount tag name " + $index$jscomp$93$$, read:() => $configspace_tagname$$[$index$jscomp$93$$] || 0, write:() => {
+  }, }))), }, });
+  return $virtio$jscomp$1$$;
+}
+function $Virtio9p$$module$lib$9p$$($filesystem$jscomp$2$$, $cpu$jscomp$32$$, $bus$jscomp$27$$) {
   this.fs = $filesystem$jscomp$2$$;
   this.bus = $bus$jscomp$27$$;
   this.configspace_tagname = [104, 111, 115, 116, 57, 112];
   this.configspace_taglen = this.configspace_tagname.length;
+  this.virtio = $init_virtio$$module$lib$9p$$($cpu$jscomp$32$$, this.configspace_taglen, this.configspace_tagname, this.ReceiveRequest.bind(this));
+  this.virtqueue = this.virtio.queues[0];
   this.VERSION = "9P2000.L";
   this.msize = this.BLOCKSIZE = 8192;
   this.replybuffer = new Uint8Array(2 * this.msize);
   this.replybuffersize = 0;
   this.fids = [];
-  this.virtio = new $VirtIO$$module$src$virtio$$($cpu$jscomp$31$$, {name:"virtio-9p", pci_id:48, device_id:4169, subsystem_device_id:9, common:{initial_port:43008, queues:[{size_supported:32, notify_offset:0, }, ], features:[0, 32, 29, 28, ], on_driver_ok:() => {
-  }, }, notification:{initial_port:43264, single_handler:!1, handlers:[$bufchain$jscomp$19_queue_id$jscomp$15$$ => {
-    if (0 !== $bufchain$jscomp$19_queue_id$jscomp$15$$) {
-      $dbg_assert$$module$src$log$$(!1, "Virtio9P Notified for non-existent queue: " + $bufchain$jscomp$19_queue_id$jscomp$15$$ + " (expected queue_id of 0)");
-    } else {
-      for (; this.virtqueue.has_request();) {
-        $bufchain$jscomp$19_queue_id$jscomp$15$$ = this.virtqueue.pop_request(), this.ReceiveRequest($bufchain$jscomp$19_queue_id$jscomp$15$$);
-      }
-      this.virtqueue.notify_me_after(0);
-    }
-  }, ], }, isr_status:{initial_port:42752, }, device_specific:{initial_port:42496, struct:[{bytes:2, name:"mount tag length", read:() => this.configspace_taglen, write:() => {
-  }, }, ].concat(Array.from(Array(254).keys()).map($index$jscomp$93$$ => ({bytes:1, name:"mount tag name " + $index$jscomp$93$$, read:() => this.configspace_tagname[$index$jscomp$93$$] || 0, write:() => {
-  }, }))), }, });
-  this.virtqueue = this.virtio.queues[0];
 }
 $Virtio9p$$module$lib$9p$$.prototype.get_state = function() {
   var $state$jscomp$68$$ = [];
@@ -13011,4 +13024,133 @@ $Virtio9p$$module$lib$9p$$.prototype.ReceiveRequest = async function($bufchain$j
       $dbg_log$$module$src$log$$("Error in Virtio9p: Unknown id " + $id$jscomp$29$$ + " received", 4194304), $dbg_assert$$module$src$log$$(!1);
   }
 };
+function $Virtio9pHandler$$module$lib$9p$$($handle_fn$$, $cpu$jscomp$33$$) {
+  this.handle_fn = $handle_fn$$;
+  this.tag_bufchain = new Map;
+  this.configspace_tagname = [104, 111, 115, 116, 57, 112];
+  this.configspace_taglen = this.configspace_tagname.length;
+  this.virtio = $init_virtio$$module$lib$9p$$($cpu$jscomp$33$$, this.configspace_taglen, this.configspace_tagname, async $bufchain$jscomp$22$$ => {
+    const $reqbuf$$ = new Uint8Array($bufchain$jscomp$22$$.length_readable);
+    $bufchain$jscomp$22$$.get_next_blob($reqbuf$$);
+    var $reqtag$$ = $Unmarshall$$module$lib$marshall$$(["w", "b", "h"], $reqbuf$$, {offset:0})[2];
+    this.tag_bufchain.set($reqtag$$, $bufchain$jscomp$22$$);
+    this.handle_fn($reqbuf$$, $replybuf$$ => {
+      var $replytag$$ = $Unmarshall$$module$lib$marshall$$(["w", "b", "h"], $replybuf$$, {offset:0})[2];
+      const $bufchain$jscomp$23$$ = this.tag_bufchain.get($replytag$$);
+      $bufchain$jscomp$23$$ ? ($bufchain$jscomp$23$$.set_next_blob($replybuf$$), this.virtqueue.push_reply($bufchain$jscomp$23$$), this.virtqueue.flush_replies(), this.tag_bufchain.delete($replytag$$)) : console.error("No bufchain found for tag: " + $replytag$$);
+    });
+  });
+  this.virtqueue = this.virtio.queues[0];
+}
+$Virtio9pHandler$$module$lib$9p$$.prototype.get_state = function() {
+  var $state$jscomp$71$$ = [];
+  $state$jscomp$71$$[0] = this.configspace_tagname;
+  $state$jscomp$71$$[1] = this.configspace_taglen;
+  $state$jscomp$71$$[2] = this.virtio;
+  $state$jscomp$71$$[3] = this.tag_bufchain;
+  return $state$jscomp$71$$;
+};
+$Virtio9pHandler$$module$lib$9p$$.prototype.set_state = function($state$jscomp$72$$) {
+  this.configspace_tagname = $state$jscomp$72$$[0];
+  this.configspace_taglen = $state$jscomp$72$$[1];
+  this.virtio.set_state($state$jscomp$72$$[2]);
+  this.virtqueue = this.virtio.queues[0];
+  this.tag_bufchain = $state$jscomp$72$$[3];
+};
+$Virtio9pHandler$$module$lib$9p$$.prototype.reset = function() {
+  this.virtio.reset();
+};
+function $Virtio9pProxy$$module$lib$9p$$($url$jscomp$28$$, $cpu$jscomp$34$$) {
+  this.socket = void 0;
+  this.cpu = $cpu$jscomp$34$$;
+  this.send_queue = [];
+  this.url = $url$jscomp$28$$;
+  this.reconnect_interval = 10000;
+  this.last_connect_attempt = Date.now() - this.reconnect_interval;
+  this.send_queue_limit = 64;
+  this.destroyed = !1;
+  this.tag_bufchain = new Map;
+  this.configspace_tagname = [104, 111, 115, 116, 57, 112];
+  this.configspace_taglen = this.configspace_tagname.length;
+  this.virtio = $init_virtio$$module$lib$9p$$($cpu$jscomp$34$$, this.configspace_taglen, this.configspace_tagname, async $bufchain$jscomp$24$$ => {
+    const $reqbuf$jscomp$1$$ = new Uint8Array($bufchain$jscomp$24$$.length_readable);
+    $bufchain$jscomp$24$$.get_next_blob($reqbuf$jscomp$1$$);
+    const $reqtag$jscomp$1$$ = $Unmarshall$$module$lib$marshall$$(["w", "b", "h"], $reqbuf$jscomp$1$$, {offset:0})[2];
+    this.tag_bufchain.set($reqtag$jscomp$1$$, $bufchain$jscomp$24$$);
+    this.send($reqbuf$jscomp$1$$);
+  });
+  this.virtqueue = this.virtio.queues[0];
+}
+$Virtio9pProxy$$module$lib$9p$$.prototype.get_state = function() {
+  var $state$jscomp$73$$ = [];
+  $state$jscomp$73$$[0] = this.configspace_tagname;
+  $state$jscomp$73$$[1] = this.configspace_taglen;
+  $state$jscomp$73$$[2] = this.virtio;
+  $state$jscomp$73$$[3] = this.tag_bufchain;
+  return $state$jscomp$73$$;
+};
+$Virtio9pProxy$$module$lib$9p$$.prototype.set_state = function($state$jscomp$74$$) {
+  this.configspace_tagname = $state$jscomp$74$$[0];
+  this.configspace_taglen = $state$jscomp$74$$[1];
+  this.virtio.set_state($state$jscomp$74$$[2]);
+  this.virtqueue = this.virtio.queues[0];
+  this.tag_bufchain = $state$jscomp$74$$[3];
+};
+$Virtio9pProxy$$module$lib$9p$$.prototype.reset = function() {
+  this.virtio.reset();
+};
+$Virtio9pProxy$$module$lib$9p$$.prototype.handle_message = function($e$jscomp$52_replybuf$jscomp$1$$) {
+  $e$jscomp$52_replybuf$jscomp$1$$ = new Uint8Array($e$jscomp$52_replybuf$jscomp$1$$.data);
+  const $replytag$jscomp$1$$ = $Unmarshall$$module$lib$marshall$$(["w", "b", "h"], $e$jscomp$52_replybuf$jscomp$1$$, {offset:0})[2], $bufchain$jscomp$25$$ = this.tag_bufchain.get($replytag$jscomp$1$$);
+  $bufchain$jscomp$25$$ ? ($bufchain$jscomp$25$$.set_next_blob($e$jscomp$52_replybuf$jscomp$1$$), this.virtqueue.push_reply($bufchain$jscomp$25$$), this.virtqueue.flush_replies(), this.tag_bufchain.delete($replytag$jscomp$1$$)) : console.error("Virtio9pProxy: No bufchain found for tag: " + $replytag$jscomp$1$$);
+};
+$Virtio9pProxy$$module$lib$9p$$.prototype.handle_close = function() {
+  this.destroyed || (this.connect(), setTimeout(this.connect.bind(this), this.reconnect_interval));
+};
+$Virtio9pProxy$$module$lib$9p$$.prototype.handle_open = function() {
+  for (var $i$jscomp$130$$ = 0; $i$jscomp$130$$ < this.send_queue.length; $i$jscomp$130$$++) {
+    this.send(this.send_queue[$i$jscomp$130$$]);
+  }
+  this.send_queue = [];
+};
+$Virtio9pProxy$$module$lib$9p$$.prototype.handle_error = function() {
+};
+$Virtio9pProxy$$module$lib$9p$$.prototype.destroy = function() {
+  this.destroyed = !0;
+  this.socket && this.socket.close();
+};
+$Virtio9pProxy$$module$lib$9p$$.prototype.connect = function() {
+  if ("undefined" !== typeof WebSocket) {
+    if (this.socket) {
+      var $now$jscomp$15_state$jscomp$75$$ = this.socket.readyState;
+      if (0 === $now$jscomp$15_state$jscomp$75$$ || 1 === $now$jscomp$15_state$jscomp$75$$) {
+        return;
+      }
+    }
+    $now$jscomp$15_state$jscomp$75$$ = Date.now();
+    if (!(this.last_connect_attempt + this.reconnect_interval > $now$jscomp$15_state$jscomp$75$$)) {
+      this.last_connect_attempt = Date.now();
+      try {
+        this.socket = new WebSocket(this.url);
+      } catch ($e$jscomp$56$$) {
+        console.error($e$jscomp$56$$);
+        return;
+      }
+      this.socket.binaryType = "arraybuffer";
+      this.socket.onopen = this.handle_open.bind(this);
+      this.socket.onmessage = this.handle_message.bind(this);
+      this.socket.onclose = this.handle_close.bind(this);
+      this.socket.onerror = this.handle_error.bind(this);
+    }
+  }
+};
+$Virtio9pProxy$$module$lib$9p$$.prototype.send = function($data$jscomp$247$$) {
+  this.socket && 1 === this.socket.readyState ? this.socket.send($data$jscomp$247$$) : (this.send_queue.push($data$jscomp$247$$), this.send_queue.length > 2 * this.send_queue_limit && (this.send_queue = this.send_queue.slice(-this.send_queue_limit)), this.connect());
+};
+$Virtio9pProxy$$module$lib$9p$$.prototype.change_proxy = function($url$jscomp$29$$) {
+  this.url = $url$jscomp$29$$;
+  this.socket && (this.socket.onclose = function() {
+  }, this.socket.onerror = function() {
+  }, this.socket.close(), this.socket = void 0);
+};
 }).call(this);