Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split out fake networking from fetch logic. #1113

Merged
merged 3 commits into from
Aug 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ CORE_FILES=const.js config.js io.js main.js lib.js buffer.js ide.js pci.js flopp
LIB_FILES=9p.js filesystem.js jor1k.js marshall.js utf8.js
BROWSER_FILES=screen.js keyboard.js mouse.js speaker.js serial.js \
network.js starter.js worker_bus.js dummy_screen.js \
fetch_network.js print_stats.js filestorage.js
fake_network.js fetch_network.js print_stats.js filestorage.js

RUST_FILES=$(shell find src/rust/ -name '*.rs') \
src/rust/gen/interpreter.rs src/rust/gen/interpreter0f.rs \
Expand Down
2 changes: 1 addition & 1 deletion debug.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"memory.js dma.js pit.js vga.js ps2.js rtc.js uart.js acpi.js apic.js ioapic.js sb16.js " +
"ne2k.js state.js virtio.js virtio_console.js bus.js elf.js kernel.js";

var BROWSER_FILES = "main.js screen.js keyboard.js mouse.js speaker.js serial.js network.js fetch_network.js starter.js worker_bus.js print_stats.js filestorage.js";
var BROWSER_FILES = "main.js screen.js keyboard.js mouse.js speaker.js serial.js network.js fake_network.js fetch_network.js starter.js worker_bus.js print_stats.js filestorage.js";
var LIB_FILES = "";

// jor1k stuff
Expand Down
97 changes: 97 additions & 0 deletions nodejs-loader.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
import vm from "node:vm";
import url from "node:url";
import fs from "node:fs";
import path from "node:path";
import crypto from "node:crypto";
import perf_hooks from "node:perf_hooks";

const __dirname = url.fileURLToPath(new URL(".", import.meta.url));

let files = [
"src/const.js",
"src/config.js",
"src/log.js",
"src/cpu.js",
"src/debug.js",
"src/io.js",
"src/main.js",
"src/lib.js",
"src/buffer.js",
"src/ide.js",
"src/pci.js",
"src/floppy.js",
"src/memory.js",
"src/dma.js",
"src/pit.js",
"src/vga.js",
"src/ps2.js",

"src/rtc.js",
"src/uart.js",

"src/acpi.js",
"src/apic.js",
"src/ioapic.js",

"src/state.js",
"src/ne2k.js",
"src/sb16.js",
"src/virtio.js",
"src/virtio_console.js",
//"src/virtio_net.js",
//"src/virtio_balloon.js",
"src/bus.js",

"src/debug.js",
"src/elf.js",
"src/kernel.js",

"lib/9p.js",
"lib/filesystem.js",
"lib/jor1k.js",
"lib/marshall.js",
"lib/utf8.js",

"src/browser/screen.js",
"src/browser/keyboard.js",
"src/browser/mouse.js",
"src/browser/speaker.js",
"src/browser/serial.js",
"src/browser/network.js",
"src/browser/fake_network.js",
"src/browser/fetch_network.js",
"src/browser/starter.js",
"src/browser/worker_bus.js",
"src/browser/dummy_screen.js",
"src/browser/print_stats.js",
"src/browser/filestorage.js"
];


let globals = Object.create(globalThis);
let v86 = {};

let ctx = vm.createContext(globals);
globals.DEBUG = false;
globals.module = {exports:v86};
Object.defineProperty(globals, "crypto", {value: crypto});
globals.require = (what) => {
return ({
perf_hooks,
fs
})[what];
};

for( let f of files ) {
vm.runInContext(fs.readFileSync(path.join(__dirname, f), "utf8"), ctx, {
filename: f
});
}

export let {
V86,
CPU,
FetchNetworkAdapter,
MemoryFileStorage,
ServerFileStorageWrapper,
} = globals;
Loading
Loading