Very cool woker implementation

* also, logging implemented (console.log does not work from worker (!))

Author: socketpair

block_reader.js

@@ -19,6 +19,10 @@ function BlockReader(url, block_size_kb, block_count, malloc_fun) {
     this.sector_cb = null;
     this.malloc_fun = malloc_fun;
 }
+
+BlockReader.prototype.log = function () {
+};
+
 BlockReader.prototype.get_sector_count = function () {
     return this.nb_sectors;
 };
@@ -164,5 +168,8 @@ BlockReader.prototype.preload_cb = function (block_number, data, data_len) {
     }
 };
 BlockReader.prototype.write_async = function (sector_num, buf, sector_count, callback) {
+    this.log('Attempting to write to readonly device');
     return -1;
 };
+
+self.BlockReader = BlockReader;

clipboard.js

@@ -11,6 +11,10 @@ function ClipboardDevice(pc_emulator, io_port, read_func, write_func, get_boot_t
     this.write_func = write_func;
     this.get_boot_time = get_boot_time;
 }
+
+ClipboardDevice.prototype.log = function () {
+};
+
 ClipboardDevice.prototype.ioport_writeb = function (io_port, byte_value) {
     this.doc_str += String.fromCharCode(byte_value);
 };
@@ -71,3 +75,5 @@ ClipboardDevice.prototype.ioport_readl = function (io_port) {
             }
     }
 };
+
+self.ClipboardDevice = ClipboardDevice;

cmos.js

@@ -24,6 +24,10 @@ function CMOS(pc_emulator) {
     pc_emulator.register_ioport_write(0x70, 2, 1, this.ioport_write.bind(this));
     pc_emulator.register_ioport_read(0x70, 2, 1, this.ioport_read.bind(this));
 }
+
+CMOS.prototype.log = function () {
+};
+
 CMOS.prototype.ioport_write = function (io_port, byte_value) {
     if (io_port == 0x70) {
         this.cmos_index = byte_value & 0x7f;
@@ -45,3 +49,5 @@ CMOS.prototype.ioport_read = function (io_port) {
     }
     return retval;
 };
+
+self.CMOS = CMOS;

cpux86-ta.js

@@ -57,6 +57,10 @@ function CPU_X86() {
     this.tlb_pages = new Int32Array(2048);
     this.tlb_pages_count = 0;
 }
+
+CPU_X86.prototype.log = function () {
+};
+
 CPU_X86.prototype.phys_mem_resize = function (new_size) {
     this.mem_size = new_size;
     new_size += ((15 + 3) & ~3);
@@ -172,13 +176,13 @@ function to_hex_u16(n) {
     return to_hex(n, 4);
 }
 CPU_X86.prototype.dump_short = function () {
-    console.log("" +
+    this.log("" +
         " EIP=" + to_hex_u32(this.eip) +
         " EAX=" + to_hex_u32(this.regs[0]) +
         " ECX=" + to_hex_u32(this.regs[1]) +
         " EDX=" + to_hex_u32(this.regs[2]) +
         " EBX=" + to_hex_u32(this.regs[3]));
-    console.log("" +
+    this.log("" +
         "EFL=" + to_hex_u32(this.eflags) +
         " ESP=" + to_hex_u32(this.regs[4]) +
         " EBP=" + to_hex_u32(this.regs[5]) +
@@ -189,14 +193,14 @@ CPU_X86.prototype.dump = function () {
     var i, sa, na;
     var ta = [" ES", " CS", " SS", " DS", " FS", " GS", "LDT", " TR"];
     this.dump_short();
-    console.log("" +
+    this.log("" +
         "TSC=" + to_hex_u32(this.cycle_count) +
         " OP=" + to_hex_u8(this.cc_op) +
         " SRC=" + to_hex_u32(this.cc_src) +
         " DST=" + to_hex_u32(this.cc_dst) +
         " OP2=" + to_hex_u8(this.cc_op2) +
         " DST2=" + to_hex_u32(this.cc_dst2));
-    console.log("" +
+    this.log("" +
         "CPL=" + this.cpl +
         " CR0=" + to_hex_u32(this.cr0) +
         " CR2=" + to_hex_u32(this.cr2) +
@@ -211,7 +215,7 @@ CPU_X86.prototype.dump = function () {
         else sa = this.segs[i];
         na += ta[i] + "=" + to_hex_u16(sa.selector) + " " + to_hex_u32(sa.base) + " " + to_hex_u32(sa.limit) + " " + to_hex_u16((sa.flags >> 8) & 0xf0ff);
         if (i & 1) {
-            console.log(na);
+            this.log(na);
             na = "";
         } else {
             na += " ";
@@ -221,7 +225,7 @@ CPU_X86.prototype.dump = function () {
     na = "GDT=     " + to_hex_u32(sa.base) + " " + to_hex_u32(sa.limit) + "      ";
     sa = this.idt;
     na += "IDT=     " + to_hex_u32(sa.base) + " " + to_hex_u32(sa.limit);
-    console.log(na);
+    this.log(na);
 };
 CPU_X86.prototype.exec_internal = function (ua, va) {
     var this_, fa, regs;
@@ -3524,7 +3528,7 @@ CPU_X86.prototype.exec_internal = function (ua, va) {
             if (intno == 0x0e) {
                 na += " CR2=" + to_hex_u32(this_.cr2);
             }
-            console.log(na);
+            this.log(na);
             if (intno == 0x06) {
                 var na, i, n;
                 na = "Code:";
@@ -3535,7 +3539,7 @@ CPU_X86.prototype.exec_internal = function (ua, va) {
                     fa = (Nb + i) & -1;
                     na += " " + to_hex_u8(gb());
                 }
-                console.log(na);
+                this.log(na);
             }
         }
         if (this_.cr0 & (1 << 0)) {
@@ -8895,3 +8899,5 @@ CPU_X86.prototype.load_binary = function (url, address, callback) {
 CPU_X86.prototype.malloc = function (n) {
     return new Uint8Array(n);
 };
+
+self.CPU_X86 = CPU_X86;

ide.js

@@ -1,10 +1,10 @@
 "use strict";
 
-function IDE_drive(Gh, Hh, malloc_fun) {
+function IDE_drive(ide_interface, block_reader, malloc_fun) {
     var cylinders, sectors;
-    this.ide_if = Gh;
-    this.bs = Hh;
-    sectors = Hh.get_sector_count();
+    this.ide_if = ide_interface;
+    this.bs = block_reader;
+    sectors = block_reader.get_sector_count();
     cylinders = sectors / (16 * 63);
     if (cylinders > 16383) {
         cylinders = 16383;
@@ -34,6 +34,10 @@ function IDE_drive(Gh, Hh, malloc_fun) {
     this.req_nb_sectors = 0;
     this.io_nb_sectors = 0;
 }
+
+IDE_drive.prototype.log = function () {
+};
+
 IDE_drive.prototype.identify = function () {
     function store_word(word_index, word_value) {
         io_buffer[word_index * 2] = word_value & 0xff;
@@ -293,13 +297,20 @@ IDE_drive.prototype.exec_cmd = function (byte_command) {
             break;
     }
 };
+
 function IDE_device(pc_emulator, io_port1, io_port2, set_irq_func, block_readers, malloc_fun) {
-    var i, drive;
+    var i, drive, me;
     this.set_irq_func = set_irq_func;
     this.drives = [];
+    me = this;
+    var logger = function () {
+        me.log.apply(me, arguments);
+    };
+
     for (i = 0; i < 2; i++) {
         if (block_readers[i]) {
             drive = new IDE_drive(this, block_readers[i], malloc_fun);
+            drive.log = logger;
         } else {
             drive = null;
         }
@@ -317,6 +328,10 @@ function IDE_device(pc_emulator, io_port1, io_port2, set_irq_func, block_readers
     pc_emulator.register_ioport_write(io_port1, 4, 4, this.data_writel.bind(this));
     pc_emulator.register_ioport_read(io_port1, 4, 4, this.data_readl.bind(this));
 }
+
+IDE_device.prototype.log = function () {
+};
+
 IDE_device.prototype.ioport_write = function (io_port, byte_value) {
     var current_drive = this.cur_drive;
 
@@ -504,3 +519,5 @@ IDE_device.prototype.data_readl = function (io_port) {
 
     return retval;
 };
+
+self.IDE_device = IDE_device;

index.html

@@ -3,82 +3,25 @@
 <head>
     <title>Javascript PC Emulator</title>
     <link rel="stylesheet" href="jslinux.css">
-
     <script type="text/javascript" src="utils.js"></script>
     <script type="text/javascript" src="term.js"></script>
-    <script type="text/javascript" src="cpux86-ta.js"></script>
-    <script type="text/javascript" src="clipboard.js"></script>
-    <script type="text/javascript" src="cmos.js"></script>
-    <script type="text/javascript" src="ide.js"></script>
-    <script type="text/javascript" src="keyboard.js"></script>
-    <script type="text/javascript" src="pic.js"></script>
-    <script type="text/javascript" src="pit.js"></script>
-    <script type="text/javascript" src="serial.js"></script>
-    <script type="text/javascript" src="block_reader.js"></script>
-    <script type="text/javascript" src="pcemulator.js"></script>
-    <script type="text/javascript" src="jslinux.js"></script>
+    <script type="text/javascript" src="jslinuxwithgui.js"></script>
+    <script type="text/javascript" src="pseudoworker.js"></script>
     <script type="text/javascript">
         function megastart() {
-            var clipboard_element;
-
-            if (!window.Uint8Array || !window.Uint16Array || !window.Int32Array || !window.ArrayBuffer) {
-                alert("Typed array are not supported. Please use modern browser");
-                return;
-            }
-
-            clipboard_element = document.getElementById("text_clipboard");
-
-            function clipboard_set(val) {
-                clipboard_element.value = val;
-            }
-
-            function clipboard_get() {
-                return clipboard_element.value;
-            }
-
-
-            function run_linux(name, ident) {
-
-                var keyboard2guest;
-                var pc, term, com1;
-
-
-                pc = jslinux(clipboard_get, clipboard_set, name);
-                com1 = pc.com1;
-                keyboard2guest = function (str) {
-                    // keyboard -> guest
-                    com1.send_chars(str);
-                };
-
-                term = new Term(80, 30, keyboard2guest);
-                term.open(ident);
-                com1.write_func = term.write.bind(term); // guest -> terminal
-                return pc;
-            }
-
-
-            var linux1 = run_linux('linux1', document.getElementById('terminal1'));
-            var linux2 = run_linux('linux2', document.getElementById('terminal2'));
-
-            var linux1_serial = linux1.com2;
-            var linux2_serial = linux2.com2;
-
-            linux1_serial.write_func = linux2_serial.send_chars.bind(linux2_serial);
-            linux2_serial.write_func = linux1_serial.send_chars.bind(linux1_serial);
-
-        }
+            var prefix = '/jslinux';
+            var j1 = new JSLinuxWithGUI(
+                    document.getElementById('terminal1'),
+                    'linux1',
+                    prefix,
+                    "console=ttyS0 root=/dev/hda ro init=/sbin/init notsc=1 hdb=none"
+            );
+            j1.start();
         }
     </script>
 </head>
 
 <body onload="megastart()">
-<table>
-    <tr>
-        <td id="terminal1"></td>
-        <td id="terminal2"></td>
-    </tr>
-</table>
-<br>
-<textarea rows="4" cols="16" id="text_clipboard"></textarea>
+<div id="terminal1"></div>
 </body>
 </html>

jslinux.js

@@ -8,14 +8,14 @@
  */
 "use strict";
 
-function jslinux(clipboard_get, clipboard_set, emulname) {
+function jslinux(clipboard_get, clipboard_set, emulname, bin_prefix, cmdline) {
     var pc, boot_start_time, start_addr = 0x10000, mem_size = 16 * 1024 * 1024;
 
     function start2(ret) {
         if (ret < 0) {
             throw "kernel loading failed";
         }
-        pc.load_binary("bin/linuxstart.bin", start_addr, start3);
+        pc.load_binary(bin_prefix + "/linuxstart.bin", start_addr, start4);
     }
 
     // TODO: automate calculation of preload list...
@@ -36,7 +36,7 @@ function jslinux(clipboard_get, clipboard_set, emulname) {
         }
         /* set the Linux kernel command line */
         cmdline_addr = 0xf800;
-        pc.cpu.write_string(cmdline_addr, "console=ttyS0 root=/dev/hda ro init=/sbin/init notsc=1 hdb=none");
+        pc.cpu.write_string(cmdline_addr, cmdline);
 
         pc.cpu.eip = start_addr;
         pc.cpu.regs[0] = mem_size;
@@ -61,11 +61,13 @@ function jslinux(clipboard_get, clipboard_set, emulname) {
     params.clipboard_get = clipboard_get;
     params.clipboard_set = clipboard_set;
     params.get_boot_time = get_boot_time;
-    params.hda = {  "url": "bin/hda%d", "nb_blocks": 912, "block_size": 64};
+    params.hda = {  "url": bin_prefix + "/hda%d", "nb_blocks": 120 * 1024 / 64, "block_size": 64};
     params.emulname = emulname;
     pc = new PCEmulator(params);
 
-    pc.load_binary("bin/vmlinux26.bin", 0x00100000, start2);
+    pc.load_binary(bin_prefix + "/vmlinux26.bin", 0x00100000, start2);
 
     return pc;
 }
+
+self.jslinux = jslinux;