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

Don't import table index offset

Browse source
This commit is contained in:
Remko Tronçon 2019-03-08 21:52:14 +01:00
parent 02a471d67c
commit ae0f0c6347
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/shell/WAForth.js
View file

@ -63,7 +63,7 @@ class WAForth {
// console.log("Load", index, new Uint8Array(data), arrayToBase64(data));
var module = new WebAssembly.Module(data);
new WebAssembly.Instance(module, {
env: { table, tableBase: index, memory, tos: -1 }
env: { table, memory, tos: -1 }
});
}
}

17
src/waforth.wat
View file

@ -49,12 +49,10 @@
"\u0060\u0000\u0001\u007F" ;; (func (result i32))
"\u0060\u0001\u007f\u0001\u007F" ;; (func (param i32) (result i32))
"\u0002" "\u0039" ;; Import section
"\u0004" ;; #Entries
"\u0002" "\u0028" ;; Import section
"\u0003" ;; #Entries
"\u0003\u0065\u006E\u0076" "\u0005\u0074\u0061\u0062\u006C\u0065" ;; 'env' . 'table'
"\u0001" "\u0070" "\u0000" "\u0004" ;; table, anyfunc, flags, initial size
"\u0003\u0065\u006E\u0076" "\u0009\u0074\u0061\u0062\u006C\u0065\u0042\u0061\u0073\u0065" ;; 'env' . 'tableBase
"\u0003" "\u007F" "\u0000" ;; global, i32, immutable
"\u0003\u0065\u006E\u0076" "\u0006\u006d\u0065\u006d\u006f\u0072\u0079" ;; 'env' . 'memory'
"\u0002" "\u0000" "\u0001" ;; memory
"\u0003\u0065\u006E\u0076" "\u0003\u0074\u006f\u0073" ;; 'env' . 'tos'
@ -65,10 +63,10 @@
"\u0001" ;; #Entries
"\u0000" ;; Type 0
"\u0009" "\u0007" ;; Element section
"\u0009" "\u000a" ;; Element section
"\u0001" ;; #Entries
"\u0000" ;; Table 0
"\u0023\u0000\u000B" ;; get_global 0, end
"\u0041\u00FC\u0000\u0000\u0000\u000B" ;; i32.const ..., end
"\u0001" ;; #elements
"\u0000" ;; function 0
@ -82,11 +80,13 @@
(define !moduleHeaderCodeSizeOffset (char-index (string->list !moduleHeader) #\u00FF 0))
(define !moduleHeaderBodySizeOffset (char-index (string->list !moduleHeader) #\u00FE 0))
(define !moduleHeaderLocalCountOffset (char-index (string->list !moduleHeader) #\u00FD 0))
(define !moduleHeaderTableIndexOffset (char-index (string->list !moduleHeader) #\u00FC 0))
(define !moduleBodyBase (+ !moduleHeaderBase !moduleHeaderSize))
(define !moduleHeaderCodeSizeBase (+ !moduleHeaderBase !moduleHeaderCodeSizeOffset))
(define !moduleHeaderBodySizeBase (+ !moduleHeaderBase !moduleHeaderBodySizeOffset))
(define !moduleHeaderLocalCountBase (+ !moduleHeaderBase !moduleHeaderLocalCountOffset))
(define !moduleHeaderTableIndexBase (+ !moduleHeaderBase !moduleHeaderTableIndexOffset))
(define !fNone #x0)
@ -416,6 +416,11 @@
(i32.const !moduleHeaderLocalCountBase)
(call $leb128-4p (i32.add (get_global $lastLocal) (i32.const 1))))
;; Update table offset
(i32.store
(i32.const !moduleHeaderTableIndexBase)
(call $leb128-4p (get_global $nextTableIndex)))
;; Write a name section
(set_local $nameLength (i32.and (i32.load8_u (i32.add (get_global $latest) (i32.const 4)))
(i32.const !lengthMask)))