Miroirs/waforth
1
0
Fork 0
mirror of https://github.com/remko/waforth synced 2025-01-13 08:01:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

shell.key->shell.getc

Browse source
This commit is contained in:
Remko Tronçon 2019-03-12 09:04:39 +01:00
parent e6a95d2aa9
commit 06dd7c12e7
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
experiments/waforth2c/waforth.c
View file

@ -8,7 +8,7 @@
#include "waforth.gen/waforth_modules.h" #include "waforth.gen/waforth_modules.h"
void (*Z_shellZ_emitZ_vi)(u32); void (*Z_shellZ_emitZ_vi)(u32);
u32 (*Z_shellZ_keyZ_iv)(void); u32 (*Z_shellZ_getcZ_iv)(void);
void (*Z_shellZ_loadZ_viii)(u32, u32, u32); void (*Z_shellZ_loadZ_viii)(u32, u32, u32);
void (*Z_shellZ_debugZ_vi)(u32); void (*Z_shellZ_debugZ_vi)(u32);
wasm_rt_table_t (*Z_envZ_table); wasm_rt_table_t (*Z_envZ_table);
@ -22,7 +22,7 @@ static void shellEmit(u32 c) {
static int bufferIndex; static int bufferIndex;
char* buffer = "main\n"; char* buffer = "main\n";
static u32 shellKey() { static u32 shellGetC() {
if (bufferIndex >= strlen(buffer)) { if (bufferIndex >= strlen(buffer)) {
return -1; return -1;
} }
@ -51,7 +51,7 @@ void waforth_init() {
} }
Z_shellZ_emitZ_vi = &shellEmit; Z_shellZ_emitZ_vi = &shellEmit;
Z_shellZ_keyZ_iv = &shellKey; Z_shellZ_getcZ_iv = &shellGetC;
Z_shellZ_loadZ_viii = &shellLoad; Z_shellZ_loadZ_viii = &shellLoad;
Z_shellZ_debugZ_vi = &shellDebug; Z_shellZ_debugZ_vi = &shellDebug;

2
experiments/waforth2c/waforth2c.js
View file

@ -44,7 +44,7 @@ WebAssembly.instantiate(coreWasm, {
process.stdout.write(String.fromCharCode(c)); process.stdout.write(String.fromCharCode(c));
}, },
key: () => { getc: () => {
if (buffer.length === 0) { if (buffer.length === 0) {
return -1; return -1;
} }

2
src/shell/WAForth.js
View file

@ -35,7 +35,7 @@ class WAForth {
emit: this.onEmit, emit: this.onEmit,
key: () => { getc: () => {
if (buffer.length === 0) { if (buffer.length === 0) {
return -1; return -1;
} }

4
src/waforth.wat
View file

@ -147,7 +147,7 @@
(module (module
(import "shell" "emit" (func $shell_emit (param i32))) (import "shell" "emit" (func $shell_emit (param i32)))
(import "shell" "key" (func $shell_key (result i32))) (import "shell" "getc" (func $shell_getc (result i32)))
(import "shell" "load" (func $shell_load (param i32 i32 i32))) (import "shell" "load" (func $shell_load (param i32 i32 i32)))
(import "shell" "debug" (func $shell_debug (param i32))) (import "shell" "debug" (func $shell_debug (param i32)))
@ -1838,7 +1838,7 @@ EOF
(set_global $inputBufferSize (i32.const 0)) (set_global $inputBufferSize (i32.const 0))
(block $endLoop (block $endLoop
(loop $loop (loop $loop
(br_if $endLoop (i32.eq (tee_local $char (call $shell_key)) (i32.const -1))) (br_if $endLoop (i32.eq (tee_local $char (call $shell_getc)) (i32.const -1)))
(i32.store8 (i32.add (i32.const !inputBufferBase) (get_global $inputBufferSize)) (i32.store8 (i32.add (i32.const !inputBufferBase) (get_global $inputBufferSize))
(get_local $char)) (get_local $char))
(set_global $inputBufferSize (i32.add (get_global $inputBufferSize) (i32.const 1))) (set_global $inputBufferSize (i32.add (get_global $inputBufferSize) (i32.const 1)))