Skip to content

Commit

Permalink
Adapt path
Browse files Browse the repository at this point in the history
  • Loading branch information
@copy
copy committed Sep 11, 2015
1 parent 0b2628e commit 3fdfd79
Show file tree
Hide file tree
Showing 12 changed files with 59 additions and 50 deletions.
6 changes: 3 additions & 3 deletions examples/arch.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<title>Archlinux</title>

<script src="../../build/libv86.js"></script>
<script src="../build/libv86.js"></script>
<script>
"use strict";

Expand All @@ -12,10 +12,10 @@
vga_memory_size: 8 * 1024 * 1024,
screen_container: document.getElementById("screen_container"),
bios: {
url: "../../bios/seabios.bin",
url: "../bios/seabios.bin",
},
vga_bios: {
url: "../../bios/vgabios.bin",
url: "../bios/vgabios.bin",
},
hda: {
url: "http://localhost/v86-images/arch3.img",
Expand Down
6 changes: 3 additions & 3 deletions examples/async_load.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<title>Asynchronous loading of disk images</title>

<script src="../../build/libv86.js"></script>
<script src="../build/libv86.js"></script>
<script>
"use strict";

Expand All @@ -18,10 +18,10 @@
vga_memory_size: 2 * 1024 * 1024,
screen_container: document.getElementById("screen_container"),
bios: {
url: "../../bios/seabios.bin",
url: "../bios/seabios.bin",
},
vga_bios: {
url: "../../bios/vgabios.bin",
url: "../bios/vgabios.bin",
},
cdrom: {
url: "https://dl.dropboxusercontent.com/u/61029208/dsl-4.11.rc2.iso",
Expand Down
10 changes: 5 additions & 5 deletions examples/basic.html
View file
@@ -1,24 +1,24 @@
<!doctype html>
<title>Basic Emulator</title><!-- not BASIC! -->

<script src="../../build/libv86.js"></script>
<script src="../build/libv86.js"></script>
<script>
"use strict";

window.onload = function()
{
var emulator = new V86Starter({
var emulator = window.emulator = new V86Starter({
memory_size: 32 * 1024 * 1024,
vga_memory_size: 2 * 1024 * 1024,
screen_container: document.getElementById("screen_container"),
bios: {
url: "../../bios/seabios.bin",
url: "../bios/seabios.bin",
},
vga_bios: {
url: "../../bios/vgabios.bin",
url: "../bios/vgabios.bin",
},
cdrom: {
url: "../../images/linux.iso",
url: "../images/linux.iso",
},
autostart: true,
});
Expand Down
6 changes: 3 additions & 3 deletions examples/lang.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<title>Basic Emulator</title><!-- not BASIC! -->

<script src="../../build/libv86.js"></script>
<script src="../build/libv86.js"></script>
<script>
"use strict";

Expand All @@ -19,10 +19,10 @@
vga_memory_size: 8 * 1024 * 1024,
screen_container: document.getElementById("screen_container"),
bios: {
url: "../../bios/seabios.bin",
url: "../bios/seabios.bin",
},
vga_bios: {
url: "../../bios/vgabios.bin",
url: "../bios/vgabios.bin",
},
hda: {
url: "http://localhost/v86-images/arch3.img",
Expand Down
6 changes: 3 additions & 3 deletions examples/lang2.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<title>Interpreter 2</title>

<script src="../../build/libv86.js"></script>
<script src="../build/libv86.js"></script>
<script>
"use strict";

Expand Down Expand Up @@ -30,10 +30,10 @@
vga_memory_size: 8 * 1024 * 1024,
screen_container: document.getElementById("screen_container"),
bios: {
url: "../../bios/seabios.bin",
url: "../bios/seabios.bin",
},
vga_bios: {
url: "../../bios/vgabios.bin",
url: "../bios/vgabios.bin",
},
hda: {
url: urlbase + "arch3.img",
Expand Down
12 changes: 6 additions & 6 deletions examples/lua.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<title>Lua interpreter</title>

<script src="../../build/libv86.js"></script>
<script src="../build/libv86.js"></script>
<script>
"use strict";

Expand All @@ -15,13 +15,13 @@
//screen_container: document.getElementById("screen_container"),

bios: {
url: "../../bios/seabios.bin",
url: "../bios/seabios.bin",
},
vga_bios: {
url: "../../bios/vgabios.bin",
url: "../bios/vgabios.bin",
},
cdrom: {
url: "../../images/linux.iso",
url: "../images/linux.iso",
},
autostart: true,
disable_keyboard: true,
Expand Down Expand Up @@ -52,9 +52,9 @@
emulator.add_listener("serial0-output-line", function(line)
{
// filter noise
if(!line.startsWith("/root% lua -e") &&
if(!line.startsWith("/root% lua -e") &&
!line.startsWith("> ") &&
line.indexOf("Welcome to Buildroot") === -1 &&
line.indexOf("Welcome to Buildroot") === -1 &&
line.indexOf("login:") === -1 &&
line.trim() !== "")
{
Expand Down
6 changes: 3 additions & 3 deletions examples/nodejs.js
View file
Expand Up @@ -2,7 +2,7 @@
"use strict";

var fs = require("fs");
var V86Starter = require("../../build/libv86.js").V86Starter;
var V86Starter = require("../build/libv86.js").V86Starter;

function readfile(path)
{
Expand All @@ -11,8 +11,8 @@ function readfile(path)

console.log("Use F2 to save the state and F3 to restore.");

var bios = readfile(__dirname + "/../../bios/seabios.bin");
var linux = readfile(__dirname + "/../../images/linux.iso");
var bios = readfile(__dirname + "/../bios/seabios.bin");
var linux = readfile(__dirname + "/../images/linux.iso");

process.stdin.setRawMode(true);
process.stdin.resume();
Expand Down
8 changes: 4 additions & 4 deletions examples/save_restore.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<title>Save and restore</title>

<script src="../../build/libv86.js"></script>
<script src="../build/libv86.js"></script>
<script>
"use strict";

Expand All @@ -12,13 +12,13 @@
vga_memory_size: 2 * 1024 * 1024,
screen_container: document.getElementById("screen_container"),
bios: {
url: "../../bios/seabios.bin",
url: "../bios/seabios.bin",
},
vga_bios: {
url: "../../bios/vgabios.bin",
url: "../bios/vgabios.bin",
},
cdrom: {
url: "../../images/linux.iso",
url: "../images/linux.iso",
},
autostart: true,
});
Expand Down
8 changes: 4 additions & 4 deletions examples/serial.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<title>Serial example</title>

<script src="../../build/libv86.js"></script>
<script src="../build/libv86.js"></script>
<script>
"use strict";

Expand All @@ -12,13 +12,13 @@
//screen_container: document.getElementById("screen_container"),

bios: {
url: "../../bios/seabios.bin",
url: "../bios/seabios.bin",
},
vga_bios: {
url: "../../bios/vgabios.bin",
url: "../bios/vgabios.bin",
},
cdrom: {
url: "../../images/linux.iso",
url: "../images/linux.iso",
},
autostart: true,
disable_keyboard: true,
Expand Down
14 changes: 7 additions & 7 deletions examples/two_instances.html
View file
@@ -1,7 +1,7 @@
<!doctype html>
<title>Two emulators</title>

<script src="../../build/libv86.js"></script>
<script src="../build/libv86.js"></script>
<script>
"use strict";

Expand All @@ -13,27 +13,27 @@
var emulator1 = new V86Starter({
screen_container: container1,
bios: {
url: "../../bios/seabios.bin",
url: "../bios/seabios.bin",
},
vga_bios: {
url: "../../bios/vgabios.bin",
url: "../bios/vgabios.bin",
},
cdrom: {
url: "../../images/linux.iso",
url: "../images/linux.iso",
},
autostart: true,
});

var emulator2 = new V86Starter({
screen_container: container2,
bios: {
url: "../../bios/seabios.bin",
url: "../bios/seabios.bin",
},
vga_bios: {
url: "../../bios/vgabios.bin",
url: "../bios/vgabios.bin",
},
cdrom: {
url: "../../images/linux.iso",
url: "../images/linux.iso",
},
autostart: true,
});
Expand Down
8 changes: 7 additions & 1 deletion examples/worker.html
View file
Expand Up @@ -13,6 +13,12 @@
{
terminal.textContent += e.data;
}

terminal.onkeypress = function(e)
{
e.preventDefault();
worker.postMessage(String.fromCharCode(e.which));
};
}

var start = Date.now();
Expand All @@ -24,5 +30,5 @@

<span id=time></span>s
<hr>
<textarea readonly rows=25 cols=80 id=terminal></textarea>
<textarea rows=25 cols=80 id=terminal></textarea>

19 changes: 11 additions & 8 deletions examples/worker.js
View file
@@ -1,25 +1,28 @@
importScripts("../../build/libv86.js");

var worker = this;
importScripts("../build/libv86.js");

var emulator = new V86Starter({
memory_size: 32 * 1024 * 1024,
vga_memory_size: 2 * 1024 * 1024,
bios: {
url: "../../bios/seabios.bin",
url: "../bios/seabios.bin",
},
vga_bios: {
url: "../../bios/vgabios.bin",
url: "../bios/vgabios.bin",
},
cdrom: {
url: "../../images/linux.iso",
url: "../images/linux.iso",
},
autostart: true,
});


emulator.add_listener("serial0-output-char", function(chr)
{
worker.postMessage(chr);
});
this.postMessage(chr);
}.bind(this));

this.onmessage = function(e)
{
emulator.serial0_send(e.data);
};

0 comments on commit 3fdfd79

Please sign in to comment.