Michel2/emularity
1
0
Fork 0
mirror of https://github.com/db48x/emularity.git synced 2026-07-27 19:56:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge in support for the v86 emulator

Browse Source
This commit is contained in:
Daniel Brooks
2023-07-15 13:04:45 -07:00
parent db41ddfc49 df39294e0e
commit c33632e1f8
3 changed files with 287 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
example_v86.html
+76
View File
@@ -0,0 +1,76 @@
<!--
The Emularity: An Example Computer Loader
For use with The Emularity, downloadable at http://www.emularity.com/
SIMPLE STEPS for trying an emulated computer (FreeDOS).
* Check out this repository in your browser-accessible directory;
this file as well as es6-promise.js, browserfs.min.js and loader.js
are required. The logo and images directories are optional, but the
splash screen looks quite a lot better when they're available.
* Clone: https://github.com/asiekierka/v86/tree/emularity
and run "make all".
* Copy bios/seabios.bin, bios/vgabios.bin, build/libv86.js,
build/v86.wasm to "emulators/v86".
* Optionally, acquire an 8x14 EGA font in WOFF format from:
https://int10h.org/oldschool-pc-fonts/fontlist/ and copy it to
"emulators/v86/ega437.woff".
* Download FreeDOS from: https://k.copy.sh/freedos722.img
* Place disk image in an "examples" subdirectory.
* Visit your example_v86.html file with a modern
Javascript-capable browser.
-->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>example computer program</title>
<style type="text/css">
@font-face {
font-family: 'Ega437';
src: url('emulators/v86/ega437.woff') format('woff');
}
.emularity-v86-screen-text {
font-family: 'Ega437', monospace !important;
}
</style>
</head>
<body>
<canvas id="canvas" style="width: 50%; height: 50%; display: block; margin: 0 auto;" />
<script type="text/javascript" src="es6-promise.js"></script>
<script type="text/javascript" src="browserfs.min.js"></script>
<script type="text/javascript" src="loader.js"></script>
<script type="text/javascript">
var emulator = new Emulator(document.querySelector("#canvas"),
null,
new V86Loader(V86Loader.nativeResolution(800, 600),
V86Loader.scale(1),
V86Loader.emulatorJS("emulators/v86/libv86.js"),
V86Loader.emulatorWASM("emulators/v86/v86.wasm"),
V86Loader.memorySize(16),
V86Loader.mountFile("seabios.bin",
V86Loader.fetchFile("BIOS",
"emulators/v86/seabios.bin")),
V86Loader.mountFile("vgabios.bin",
V86Loader.fetchFile("VGA BIOS",
"emulators/v86/vgabios.bin")),
V86Loader.mountFile("freedos.img",
V86Loader.fetchFile("FreeDOS",
"examples/freedos722.img")),
V86Loader.bios("seabios.bin"),
V86Loader.vgaBios("vgabios.bin"),
V86Loader.fda("freedos.img"),
));
emulator.start({ waitAfterDownloading: true });
</script>
</body>
</html>
loader.js
+211
View File
@@ -65,6 +65,7 @@ var Module = null;
vmac: img("/images/vmac.png"),
ruffle: img("/images/ruffle.png"),
cloudpilot: img("/images/cloudpilot.png"),
v86: img("/images/v86.png"),
};
} else {
images = { ia: img("other_logos/ia-logo-150x150.png"),
@@ -79,6 +80,7 @@ var Module = null;
vmac: img("other_logos/vmac.png"),
ruffle: img("/other_logos/ruffle.png"),
cloudpilot: img("other_logos/cloudpilot.png"),
v86: img("other_logos/v86.png"),
};
}
@@ -195,6 +197,11 @@ var Module = null;
cfgr = CloudpilotLoader;
get_files = get_cloudpilot_files;
}
else if (module && module.indexOf("v86") === 0) {
emulator_logo = images.v86;
cfgr = V86Loader;
get_files = get_v86_files;
}
else if (module) {
emulator_logo = images.mame;
cfgr = MAMELoader;
@@ -265,6 +272,11 @@ var Module = null;
} else if (module && module.indexOf("ruffle-") === 0) {
modulecfg.config = modulecfg.config || {};
modulecfg.config.base = get_cors_url(game);
} else if (module && module.indexOf("v86") === 0) {
config_args.push(cfgr.memorySize(modulecfg.memory_size),
cfgr.vgaMemorySize(modulecfg.vga_memory_size),
cfgr.acpi(modulecfg.acpi),
cfgr.bootOrder(modulecfg.boot_order));
} else if (module) { // MAME
config_args.push(cfgr.driver(modulecfg.driver),
cfgr.extraArgs(modulecfg.extra_args));
@@ -644,6 +656,49 @@ var Module = null;
return files;
}
function get_v86_files(cfgr, metadata, modulecfg, filelist) {
var files = [];
if (modulecfg['bios_filename']) {
files.push(cfgr.mountFile('/' + modulecfg['bios_filename'], cfgr.fetchFile("BIOS File", get_bios_url(modulecfg['bios_filename']))));
files.push(cfgr.bios(modulecfg['bios_filename']));
}
if (modulecfg['vga_bios_filename']) {
files.push(cfgr.mountFile('/' + modulecfg['vga_bios_filename'], cfgr.fetchFile("VGA BIOS File", get_bios_url(modulecfg['vga_bios_filename']))));
files.push(cfgr.vgaBios(modulecfg['vga_bios_filename']));
}
var meta = dict_from_xml(metadata),
game_files_counter = {};
files_with_ext_from_filelist(filelist, meta.emulator_ext).forEach(function (file, i) {
if (modulecfg.peripherals && modulecfg.peripherals[i]) {
game_files_counter[file.name] = modulecfg.peripherals[i];
}
});
meta_props_matching(meta, /^v86_drive_([a-zA-Z0-9]+)$/).forEach(function (result) {
var key = result[0], periph = result[1][1];
game_files_counter[meta[key]] = periph;
});
var game_files = Object.keys(game_files_counter),
len = game_files.length;
game_files.forEach(function (filename, i) {
var title = "Game File ("+ (i+1) +" of "+ len +")",
ext = filename.match(/\.([^.]*)$/)[1],
url = (filename.includes("/")) ? get_zip_url(filename)
: get_zip_url(filename, get_item_name(game)),
periph = game_files_counter[filename],
path = '/' + periph + '.' + ext,
periph_cfg = {};
periph_cfg[periph] = {"path": path};
files.push(cfgr.mountFile(path,
cfgr.fetchFile(title, url)));
files.push(periph_cfg);
});
return files;
}
var get_item_name = function (game_path) {
return game_path.split('/').shift();
};
@@ -1012,6 +1067,63 @@ var Module = null;
};
CloudpilotLoader.__proto__ = BaseLoader;
/**
* V86Loader
*/
function V86Loader() {
var config = Array.prototype.reduce.call(arguments, extend);
config.memory_size = config.memory_size || 32;
config.vga_memory_size = config.vga_memory_size || 2;
config.boot_order = config.boot_order || 0x213;
config.runner = V86Runner;
return config;
}
V86Loader.__proto__ = BaseLoader;
V86Loader.bios = function (filename) {
return {"bios": {"path": filename}}
};
V86Loader.vgaBios = function (filename) {
return {"vga_bios": {"path": filename}}
};
V86Loader.fda = function (filename) {
return {"fda": {"path": filename}}
};
V86Loader.fdb = function (filename) {
return {"fdb": {"path": filename}}
};
V86Loader.hda = function (filename) {
return {"hda": {"path": filename}}
};
V86Loader.hdb = function (filename) {
return {"hda": {"path": filename}}
};
V86Loader.cdrom = function (filename) {
return {"cdrom": {"path": filename}}
};
V86Loader.bootOrder = function (order) {
return {"boot_order": order}
};
V86Loader.acpi = function (enabled) {
return {"acpi": !!enabled}
};
V86Loader.memorySize = function (amount) {
return {"memory_size": amount};
};
V86Loader.vgaMemorySize = function (amount) {
return {"vga_memory_size": amount};
};
var build_mame_arguments = function (muted, driver, native_resolution, sample_rate, peripheral, autoboot, extra_args, keepaspect, scale) {
scale = scale || 1;
var args = [driver,
@@ -1339,6 +1451,104 @@ var Module = null;
getfullscreenenabler().call(this._canvas);
};
/*
* V86Runner
*/
function V86Runner(canvas, game_data) {
// v86 needs a specific DOM structure instead of a canvas
var screenContainerOuterElt = document.createElement("div");
screenContainerOuterElt.id = canvas.id;
screenContainerOuterElt.classList = canvas.classList;
screenContainerOuterElt.style = canvas.style;
var screenContainerInnerElt = document.createElement("div");
screenContainerInnerElt.classList = ["emularity-v86-screen-container"];
screenContainerInnerElt.style = "display:flex;justify-content:center;align-items:center;background-color:#000;";
var textDivElt = document.createElement("div");
textDivElt.classList = ["emularity-v86-screen-text"];
textDivElt.style = "font-size:14px;font-family:monospace;line-height:14px;white-space:pre;";
var canvasElt = document.createElement("canvas");
canvasElt.classList = ["emularity-v86-screen-canvas"];
canvasElt.style = "display:none;";
screenContainerInnerElt.appendChild(textDivElt);
screenContainerInnerElt.appendChild(canvasElt);
screenContainerOuterElt.appendChild(screenContainerInnerElt);
canvas.parentNode.replaceChild(screenContainerOuterElt, canvas);
var cfg = {};
cfg.screen_container = screenContainerInnerElt;
cfg.memory_size = Math.floor(game_data.memory_size * 1024 * 1024);
cfg.vga_memory_size = Math.floor(game_data.vga_memory_size * 1024 * 1024);
cfg.acpi = game_data.acpi;
cfg.boot_order = game_data.boot_order;
cfg.autostart = true;
cfg.wasm_fn = env => {
return new Promise(async resolve => {
const wasm = await WebAssembly.instantiate(game_data.wasmBinary, env);
resolve(wasm.instance.exports);
});
};
["bios", "vga_bios", "fda", "fdb", "cdrom", "hda", "hdb"].forEach(key => {
if (game_data[key] && game_data[key]["path"]) {
cfg[key] = {"buffer": game_data.fs.readFileSync('/'+game_data[key]["path"], null, flag_r).buffer};
}
});
var emu = new V86Starter(cfg);
this._emulator = emu;
this.ready = null;
if (game_data["scale"]) {
emu.screen_set_scale(game_data["scale"], game_data["scale"]);
}
screenContainerInnerElt.addEventListener('click', function (e) {
emu.lock_mouse();
});
}
V86Runner.prototype.start = function () {
this._emulator.run();
};
V86Runner.prototype.pause = function () {
this._emulator.stop();
};
V86Runner.prototype.stop = function () {
this._emulator.stop();
};
V86Runner.prototype.mute = function () {
if (this._emulator.is_muted) {
this._emulator.speaker_adapter.mixer.set_volume(1, undefined);
this._emulator.is_muted = false;
}
};
V86Runner.prototype.unmute = function () {
if (!this._emulator.is_muted) {
this._emulator.speaker_adapter.mixer.set_volume(0, undefined);
this._emulator.is_muted = true;
}
};
V86Runner.prototype.onStarted = function (func) {
this._emulator.add_listener("emulator-started", func);
};
V86Runner.prototype.onReset = function (func) {
// not supported
};
V86Runner.prototype.requestFullScreen = function () {
getfullscreenenabler().call(this._canvas);
};
/*
* RuffleRunner
*/
@@ -2366,6 +2576,7 @@ var Module = null;
window.PCELoader = PCELoader;
window.VICELoader = VICELoader;
window.NP2Loader = NP2Loader;
window.V86Loader = V86Loader;
window.RuffleLoader = RuffleLoader;
window.CloudpilotLoader = CloudpilotLoader;
window.Emulator = Emulator;
other_logos/v86.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 206 B