use minimal shell
This commit is contained in:
parent
0c72525755
commit
9d30ffb69b
3
Makefile
3
Makefile
|
|
@ -58,7 +58,8 @@ ifeq ($(PLATFORM), emscripten)
|
||||||
LDFLAGS += -s USE_SDL=2\
|
LDFLAGS += -s USE_SDL=2\
|
||||||
-s ASYNCIFY \
|
-s ASYNCIFY \
|
||||||
-s ALLOW_MEMORY_GROWTH=1 \
|
-s ALLOW_MEMORY_GROWTH=1 \
|
||||||
--preload-file test/paint.rom@paint.rom
|
--preload-file test/paint.rom@paint.rom \
|
||||||
|
--shell-file $(ARCH_DIR)/shell_minimal.html
|
||||||
|
|
||||||
# For release: optimize, strip debug, minimize size
|
# For release: optimize, strip debug, minimize size
|
||||||
ifeq ($(BUILD_MODE), release)
|
ifeq ($(BUILD_MODE), release)
|
||||||
|
|
|
||||||
|
|
@ -31,94 +31,6 @@ static DeviceOps console_device_ops = {
|
||||||
static ScreenDeviceData screen_data = {0};
|
static ScreenDeviceData screen_data = {0};
|
||||||
static MouseDeviceData mouse_data = {0};
|
static MouseDeviceData mouse_data = {0};
|
||||||
|
|
||||||
const char *opcode_to_string(Opcode op) {
|
|
||||||
static const char *names[] = {[OP_HALT] = "halt",
|
|
||||||
[OP_JMP] = "jump",
|
|
||||||
[OP_JMPF] = "jump-if-flag",
|
|
||||||
[OP_CALL] = "call",
|
|
||||||
[OP_RETURN] = "return",
|
|
||||||
[OP_LOAD_IMM] = "load-immediate",
|
|
||||||
[OP_GET_8] = "get-8",
|
|
||||||
[OP_GET_16] = "get-16",
|
|
||||||
[OP_GET_32] = "get",
|
|
||||||
[OP_LOAD_8] = "load-8",
|
|
||||||
[OP_LOAD_16] = "load-16",
|
|
||||||
[OP_LOAD_32] = "load",
|
|
||||||
[OP_STORE_8] = "store-8",
|
|
||||||
[OP_STORE_16] = "store-16",
|
|
||||||
[OP_STORE_32] = "store",
|
|
||||||
[OP_PUT_8] = "put-8",
|
|
||||||
[OP_PUT_16] = "put-16",
|
|
||||||
[OP_PUT_32] = "put",
|
|
||||||
[OP_MALLOC] = "malloc",
|
|
||||||
[OP_MEMSET_8] = "memset-8",
|
|
||||||
[OP_MEMSET_16] = "memset-16",
|
|
||||||
[OP_MEMSET_32] = "memset-32",
|
|
||||||
[OP_PUSH] = "push",
|
|
||||||
[OP_POP] = "pop",
|
|
||||||
[OP_REG_MOV] = "register-move",
|
|
||||||
[OP_SYSCALL] = "syscall",
|
|
||||||
[OP_SLL] = "bit-shift-left",
|
|
||||||
[OP_SRL] = "bit-shift-right",
|
|
||||||
[OP_SRE] = "bit-shift-re",
|
|
||||||
[OP_BAND] = "bit-and",
|
|
||||||
[OP_BOR] = "bit-or",
|
|
||||||
[OP_BXOR] = "bit-xor",
|
|
||||||
[OP_ADD_INT] = "add-int",
|
|
||||||
[OP_SUB_INT] = "sub-int",
|
|
||||||
[OP_MUL_INT] = "mul-int",
|
|
||||||
[OP_DIV_INT] = "div-int",
|
|
||||||
[OP_ADD_UINT] = "add-nat",
|
|
||||||
[OP_SUB_UINT] = "sub-nat",
|
|
||||||
[OP_MUL_UINT] = "mul-nat",
|
|
||||||
[OP_DIV_UINT] = "div-nat",
|
|
||||||
[OP_ADD_REAL] = "add-real",
|
|
||||||
[OP_SUB_REAL] = "sub-real",
|
|
||||||
[OP_MUL_REAL] = "mul-real",
|
|
||||||
[OP_DIV_REAL] = "div-real",
|
|
||||||
[OP_INT_TO_REAL] = "int-to-real",
|
|
||||||
[OP_UINT_TO_REAL] = "nat-to-real",
|
|
||||||
[OP_REAL_TO_INT] = "real-to-int",
|
|
||||||
[OP_REAL_TO_UINT] = "real-to-nat",
|
|
||||||
[OP_JEQ_INT] = "jump-eq-int",
|
|
||||||
[OP_JNEQ_INT] = "jump-neq-int",
|
|
||||||
[OP_JGT_INT] = "jump-gt-int",
|
|
||||||
[OP_JLT_INT] = "jump-lt-int",
|
|
||||||
[OP_JLE_INT] = "jump-le-int",
|
|
||||||
[OP_JGE_INT] = "jump-ge-int",
|
|
||||||
[OP_JEQ_UINT] = "jump-eq-nat",
|
|
||||||
[OP_JNEQ_UINT] = "jump-neq-nat",
|
|
||||||
[OP_JGT_UINT] = "jump-gt-nat",
|
|
||||||
[OP_JLT_UINT] = "jump-lt-nat",
|
|
||||||
[OP_JLE_UINT] = "jump-le-nat",
|
|
||||||
[OP_JGE_UINT] = "jump-ge-nat",
|
|
||||||
[OP_JEQ_REAL] = "jump-eq-real",
|
|
||||||
[OP_JNEQ_REAL] = "jump-neq-real",
|
|
||||||
[OP_JGE_REAL] = "jump-ge-real",
|
|
||||||
[OP_JGT_REAL] = "jump-gt-real",
|
|
||||||
[OP_JLT_REAL] = "jump-lt-real",
|
|
||||||
[OP_JLE_REAL] = "jump-le-real",
|
|
||||||
[OP_STRLEN] = "string-length",
|
|
||||||
[OP_STREQ] = "string-eq",
|
|
||||||
[OP_STRCAT] = "string-concat",
|
|
||||||
[OP_STR_GET_CHAR] = "string-get-char",
|
|
||||||
[OP_STR_FIND_CHAR] = "string-find-char",
|
|
||||||
[OP_STR_SLICE] = "string-slice",
|
|
||||||
[OP_INT_TO_STRING] = "int-to-string",
|
|
||||||
[OP_UINT_TO_STRING] = "nat-to-string",
|
|
||||||
[OP_REAL_TO_STRING] = "real-to-string",
|
|
||||||
[OP_STRING_TO_INT] = "string-to-int",
|
|
||||||
[OP_STRING_TO_UINT] = "string-to-nat",
|
|
||||||
[OP_STRING_TO_REAL] = "string-to-real"};
|
|
||||||
|
|
||||||
if (op < 0 || op >= (int)(sizeof(names) / sizeof(names[0]))) {
|
|
||||||
return "<invalid-opcode>";
|
|
||||||
}
|
|
||||||
|
|
||||||
const char *name = names[op];
|
|
||||||
return name ? name : "<unknown-opcode>";
|
|
||||||
}
|
|
||||||
|
|
||||||
void mainloop() {
|
void mainloop() {
|
||||||
SDL_Event event;
|
SDL_Event event;
|
||||||
SDL_PumpEvents();
|
SDL_PumpEvents();
|
||||||
|
|
@ -181,7 +93,6 @@ void mainloop() {
|
||||||
int cycles_this_frame = 0;
|
int cycles_this_frame = 0;
|
||||||
int max_cycles_per_frame = 1000; // Adjust this value
|
int max_cycles_per_frame = 1000; // Adjust this value
|
||||||
while (cycles_this_frame < max_cycles_per_frame) {
|
while (cycles_this_frame < max_cycles_per_frame) {
|
||||||
// printf("%s\n", opcode_to_string(vm.code[vm.pc])); // REMOVE THIS LINE
|
|
||||||
if (!step_vm(&vm)) {
|
if (!step_vm(&vm)) {
|
||||||
emscripten_cancel_main_loop();
|
emscripten_cancel_main_loop();
|
||||||
return;
|
return;
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,141 @@
|
||||||
|
<!doctype html>
|
||||||
|
<html lang="en-us">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
||||||
|
<title>Emscripten-Generated Code</title>
|
||||||
|
<style>
|
||||||
|
.emscripten { padding-right: 0; margin-left: auto; margin-right: auto; display: block; }
|
||||||
|
textarea.emscripten { font-family: monospace; width: 80%; }
|
||||||
|
div.emscripten { text-align: center; }
|
||||||
|
div.emscripten_border { border: 1px solid black; }
|
||||||
|
/* the canvas *must not* have any border or padding, or mouse coords will be wrong */
|
||||||
|
canvas.emscripten { border: 0px none; background-color: black; }
|
||||||
|
|
||||||
|
.spinner {
|
||||||
|
height: 50px;
|
||||||
|
width: 50px;
|
||||||
|
margin: 0px auto;
|
||||||
|
-webkit-animation: rotation .8s linear infinite;
|
||||||
|
-moz-animation: rotation .8s linear infinite;
|
||||||
|
-o-animation: rotation .8s linear infinite;
|
||||||
|
animation: rotation 0.8s linear infinite;
|
||||||
|
border-left: 10px solid rgb(0,150,240);
|
||||||
|
border-right: 10px solid rgb(0,150,240);
|
||||||
|
border-bottom: 10px solid rgb(0,150,240);
|
||||||
|
border-top: 10px solid rgb(100,0,200);
|
||||||
|
border-radius: 100%;
|
||||||
|
background-color: rgb(200,100,250);
|
||||||
|
}
|
||||||
|
@-webkit-keyframes rotation {
|
||||||
|
from {-webkit-transform: rotate(0deg);}
|
||||||
|
to {-webkit-transform: rotate(360deg);}
|
||||||
|
}
|
||||||
|
@-moz-keyframes rotation {
|
||||||
|
from {-moz-transform: rotate(0deg);}
|
||||||
|
to {-moz-transform: rotate(360deg);}
|
||||||
|
}
|
||||||
|
@-o-keyframes rotation {
|
||||||
|
from {-o-transform: rotate(0deg);}
|
||||||
|
to {-o-transform: rotate(360deg);}
|
||||||
|
}
|
||||||
|
@keyframes rotation {
|
||||||
|
from {transform: rotate(0deg);}
|
||||||
|
to {transform: rotate(360deg);}
|
||||||
|
}
|
||||||
|
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<hr/>
|
||||||
|
<figure style="overflow:visible;" id="spinner"><div class="spinner"></div><center style="margin-top:0.5em"><strong>emscripten</strong></center></figure>
|
||||||
|
<div class="emscripten" id="status">Downloading...</div>
|
||||||
|
<div class="emscripten">
|
||||||
|
<progress value="0" max="100" id="progress" hidden=1></progress>
|
||||||
|
</div>
|
||||||
|
<div class="emscripten_border">
|
||||||
|
<canvas class="emscripten" id="canvas" oncontextmenu="event.preventDefault()" tabindex=-1></canvas>
|
||||||
|
</div>
|
||||||
|
<hr/>
|
||||||
|
<div class="emscripten">
|
||||||
|
<input type="checkbox" id="resize">Resize canvas
|
||||||
|
<input type="checkbox" id="pointerLock" checked>Lock/hide mouse pointer
|
||||||
|
|
||||||
|
<input type="button" value="Fullscreen" onclick="Module.requestFullscreen(document.getElementById('pointerLock').checked,
|
||||||
|
document.getElementById('resize').checked)">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<hr/>
|
||||||
|
<textarea class="emscripten" id="output" rows="8"></textarea>
|
||||||
|
<hr>
|
||||||
|
<script type='text/javascript'>
|
||||||
|
var statusElement = document.getElementById('status');
|
||||||
|
var progressElement = document.getElementById('progress');
|
||||||
|
var spinnerElement = document.getElementById('spinner');
|
||||||
|
var canvasElement = document.getElementById('canvas');
|
||||||
|
var outputElement = document.getElementById('output');
|
||||||
|
if (outputElement) outputElement.value = ''; // clear browser cache
|
||||||
|
|
||||||
|
// As a default initial behavior, pop up an alert when webgl context is lost. To make your
|
||||||
|
// application robust, you may want to override this behavior before shipping!
|
||||||
|
// See http://www.khronos.org/registry/webgl/specs/latest/1.0/#5.15.2
|
||||||
|
canvasElement.addEventListener("webglcontextlost", (e) => {
|
||||||
|
alert('WebGL context lost. You will need to reload the page.');
|
||||||
|
e.preventDefault();
|
||||||
|
}, false);
|
||||||
|
|
||||||
|
var Module = {
|
||||||
|
print(...args) {
|
||||||
|
// These replacements are necessary if you render to raw HTML
|
||||||
|
//text = text.replace(/&/g, "&");
|
||||||
|
//text = text.replace(/</g, "<");
|
||||||
|
//text = text.replace(/>/g, ">");
|
||||||
|
//text = text.replace('\n', '<br>', 'g');
|
||||||
|
console.log(...args);
|
||||||
|
if (outputElement) {
|
||||||
|
var text = args.join(' ');
|
||||||
|
outputElement.value += text + "\n";
|
||||||
|
outputElement.scrollTop = outputElement.scrollHeight; // focus on bottom
|
||||||
|
}
|
||||||
|
},
|
||||||
|
canvas: canvasElement,
|
||||||
|
setStatus(text) {
|
||||||
|
if (!Module.setStatus.last) Module.setStatus.last = { time: Date.now(), text: '' };
|
||||||
|
if (text === Module.setStatus.last.text) return;
|
||||||
|
var m = text.match(/([^(]+)\((\d+(\.\d+)?)\/(\d+)\)/);
|
||||||
|
var now = Date.now();
|
||||||
|
if (m && now - Module.setStatus.last.time < 30) return; // if this is a progress update, skip it if too soon
|
||||||
|
Module.setStatus.last.time = now;
|
||||||
|
Module.setStatus.last.text = text;
|
||||||
|
if (m) {
|
||||||
|
text = m[1];
|
||||||
|
progressElement.value = parseInt(m[2])*100;
|
||||||
|
progressElement.max = parseInt(m[4])*100;
|
||||||
|
progressElement.hidden = false;
|
||||||
|
spinnerElement.hidden = false;
|
||||||
|
} else {
|
||||||
|
progressElement.value = null;
|
||||||
|
progressElement.max = null;
|
||||||
|
progressElement.hidden = true;
|
||||||
|
if (!text) spinnerElement.hidden = true;
|
||||||
|
}
|
||||||
|
statusElement.innerHTML = text;
|
||||||
|
},
|
||||||
|
totalDependencies: 0,
|
||||||
|
monitorRunDependencies(left) {
|
||||||
|
this.totalDependencies = Math.max(this.totalDependencies, left);
|
||||||
|
Module.setStatus(left ? 'Preparing... (' + (this.totalDependencies-left) + '/' + this.totalDependencies + ')' : 'All downloads complete.');
|
||||||
|
}
|
||||||
|
};
|
||||||
|
Module.setStatus('Downloading...');
|
||||||
|
window.onerror = () => {
|
||||||
|
Module.setStatus('Exception thrown, see JavaScript console');
|
||||||
|
spinnerElement.style.display = 'none';
|
||||||
|
Module.setStatus = (text) => {
|
||||||
|
if (text) console.error('[post-exception status] ' + text);
|
||||||
|
};
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
{{{ SCRIPT }}}
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
Loading…
Reference in New Issue