Skip to content
This repository was archived by the owner on Jan 5, 2019. It is now read-only.

Fix MSTORE8 #279

Merged
merged 1 commit into from
May 30, 2018
Merged

Fix MSTORE8 #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 wasm/MSTORE8.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
(get_local $offset2)
(get_local $offset3)))

(call $memusegas (get_local $offset) (i32.const 8))
(call $memusegas (get_local $offset) (i32.const 1))

;; pop stack
(set_local $sp (i32.sub (get_global $sp) (i32.const 32)))
Expand Down
2 changes: 1 addition & 1 deletion wasm/wast-async.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
"wast": ";; stack:\n;; 0: word\n;; -1: offset\n(func $MSTORE\n (local $sp i32)\n\n (local $offset i32)\n \n (local $offset0 i64)\n (local $offset1 i64)\n (local $offset2 i64)\n (local $offset3 i64)\n\n ;; load args from the stack\n (set_local $offset0 (i64.load (get_global $sp)))\n (set_local $offset1 (i64.load (i32.add (get_global $sp) (i32.const 8))))\n (set_local $offset2 (i64.load (i32.add (get_global $sp) (i32.const 16))))\n (set_local $offset3 (i64.load (i32.add (get_global $sp) (i32.const 24))))\n\n (set_local $offset \n (call $check_overflow (get_local $offset0)\n (get_local $offset1)\n (get_local $offset2)\n (get_local $offset3)))\n ;; subtrace gas useage\n (call $memusegas (get_local $offset) (i32.const 32))\n\n ;; pop itme from the stack\n (set_local $sp (i32.sub (get_global $sp) (i32.const 32)))\n\n ;; swap top stack item\n (drop (call $bswap_m256 (get_local $sp)))\n\n (set_local $offset (i32.add (get_local $offset) (get_global $memstart)))\n ;; store word to memory\n (i64.store (get_local $offset) (i64.load (get_local $sp)))\n (i64.store (i32.add (get_local $offset) (i32.const 8)) (i64.load (i32.add (get_local $sp) (i32.const 8))))\n (i64.store (i32.add (get_local $offset) (i32.const 16)) (i64.load (i32.add (get_local $sp) (i32.const 16))))\n (i64.store (i32.add (get_local $offset) (i32.const 24)) (i64.load (i32.add (get_local $sp) (i32.const 24))))\n)\n"
},
"MSTORE8": {
"wast": ";; stack:\n;; 0: word\n;; -1: offset\n(func $MSTORE8\n (local $sp i32)\n\n (local $offset i32)\n\n (local $offset0 i64)\n (local $offset1 i64)\n (local $offset2 i64)\n (local $offset3 i64)\n\n ;; load args from the stack\n (set_local $offset0 (i64.load (get_global $sp)))\n (set_local $offset1 (i64.load (i32.add (get_global $sp) (i32.const 8))))\n (set_local $offset2 (i64.load (i32.add (get_global $sp) (i32.const 16))))\n (set_local $offset3 (i64.load (i32.add (get_global $sp) (i32.const 24))))\n\n (set_local $offset \n (call $check_overflow (get_local $offset0)\n (get_local $offset1)\n (get_local $offset2)\n (get_local $offset3)))\n\n (call $memusegas (get_local $offset) (i32.const 8))\n\n ;; pop stack\n (set_local $sp (i32.sub (get_global $sp) (i32.const 32)))\n (set_local $offset (i32.add (get_local $offset) (get_global $memstart)))\n (i32.store8 (i32.add (get_local $offset) (i32.const 0)) (i32.load (get_local $sp)))\n)\n"
"wast": ";; stack:\n;; 0: word\n;; -1: offset\n(func $MSTORE8\n (local $sp i32)\n\n (local $offset i32)\n\n (local $offset0 i64)\n (local $offset1 i64)\n (local $offset2 i64)\n (local $offset3 i64)\n\n ;; load args from the stack\n (set_local $offset0 (i64.load (get_global $sp)))\n (set_local $offset1 (i64.load (i32.add (get_global $sp) (i32.const 8))))\n (set_local $offset2 (i64.load (i32.add (get_global $sp) (i32.const 16))))\n (set_local $offset3 (i64.load (i32.add (get_global $sp) (i32.const 24))))\n\n (set_local $offset \n (call $check_overflow (get_local $offset0)\n (get_local $offset1)\n (get_local $offset2)\n (get_local $offset3)))\n\n (call $memusegas (get_local $offset) (i32.const 1))\n\n ;; pop stack\n (set_local $sp (i32.sub (get_global $sp) (i32.const 32)))\n (set_local $offset (i32.add (get_local $offset) (get_global $memstart)))\n (i32.store8 (i32.add (get_local $offset) (i32.const 0)) (i32.load (get_local $sp)))\n)\n"
},
"MUL": {
"wast": "(func $MUL\n (call $mul_256\n (i64.load (i32.add (get_global $sp) (i32.const 24)))\n (i64.load (i32.add (get_global $sp) (i32.const 16)))\n (i64.load (i32.add (get_global $sp) (i32.const 8)))\n (i64.load (get_global $sp))\n (i64.load (i32.sub (get_global $sp) (i32.const 8)))\n (i64.load (i32.sub (get_global $sp) (i32.const 16)))\n (i64.load (i32.sub (get_global $sp) (i32.const 24)))\n (i64.load (i32.sub (get_global $sp) (i32.const 32)))\n (i32.sub (get_global $sp) (i32.const 8))\n )\n)\n"
Expand Down
2 changes: 1 addition & 1 deletion wasm/wast.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
"wast": ";; stack:\n;; 0: word\n;; -1: offset\n(func $MSTORE\n (local $sp i32)\n\n (local $offset i32)\n \n (local $offset0 i64)\n (local $offset1 i64)\n (local $offset2 i64)\n (local $offset3 i64)\n\n ;; load args from the stack\n (set_local $offset0 (i64.load (get_global $sp)))\n (set_local $offset1 (i64.load (i32.add (get_global $sp) (i32.const 8))))\n (set_local $offset2 (i64.load (i32.add (get_global $sp) (i32.const 16))))\n (set_local $offset3 (i64.load (i32.add (get_global $sp) (i32.const 24))))\n\n (set_local $offset \n (call $check_overflow (get_local $offset0)\n (get_local $offset1)\n (get_local $offset2)\n (get_local $offset3)))\n ;; subtrace gas useage\n (call $memusegas (get_local $offset) (i32.const 32))\n\n ;; pop itme from the stack\n (set_local $sp (i32.sub (get_global $sp) (i32.const 32)))\n\n ;; swap top stack item\n (drop (call $bswap_m256 (get_local $sp)))\n\n (set_local $offset (i32.add (get_local $offset) (get_global $memstart)))\n ;; store word to memory\n (i64.store (get_local $offset) (i64.load (get_local $sp)))\n (i64.store (i32.add (get_local $offset) (i32.const 8)) (i64.load (i32.add (get_local $sp) (i32.const 8))))\n (i64.store (i32.add (get_local $offset) (i32.const 16)) (i64.load (i32.add (get_local $sp) (i32.const 16))))\n (i64.store (i32.add (get_local $offset) (i32.const 24)) (i64.load (i32.add (get_local $sp) (i32.const 24))))\n)\n"
},
"MSTORE8": {
"wast": ";; stack:\n;; 0: word\n;; -1: offset\n(func $MSTORE8\n (local $sp i32)\n\n (local $offset i32)\n\n (local $offset0 i64)\n (local $offset1 i64)\n (local $offset2 i64)\n (local $offset3 i64)\n\n ;; load args from the stack\n (set_local $offset0 (i64.load (get_global $sp)))\n (set_local $offset1 (i64.load (i32.add (get_global $sp) (i32.const 8))))\n (set_local $offset2 (i64.load (i32.add (get_global $sp) (i32.const 16))))\n (set_local $offset3 (i64.load (i32.add (get_global $sp) (i32.const 24))))\n\n (set_local $offset \n (call $check_overflow (get_local $offset0)\n (get_local $offset1)\n (get_local $offset2)\n (get_local $offset3)))\n\n (call $memusegas (get_local $offset) (i32.const 8))\n\n ;; pop stack\n (set_local $sp (i32.sub (get_global $sp) (i32.const 32)))\n (set_local $offset (i32.add (get_local $offset) (get_global $memstart)))\n (i32.store8 (i32.add (get_local $offset) (i32.const 0)) (i32.load (get_local $sp)))\n)\n"
"wast": ";; stack:\n;; 0: word\n;; -1: offset\n(func $MSTORE8\n (local $sp i32)\n\n (local $offset i32)\n\n (local $offset0 i64)\n (local $offset1 i64)\n (local $offset2 i64)\n (local $offset3 i64)\n\n ;; load args from the stack\n (set_local $offset0 (i64.load (get_global $sp)))\n (set_local $offset1 (i64.load (i32.add (get_global $sp) (i32.const 8))))\n (set_local $offset2 (i64.load (i32.add (get_global $sp) (i32.const 16))))\n (set_local $offset3 (i64.load (i32.add (get_global $sp) (i32.const 24))))\n\n (set_local $offset \n (call $check_overflow (get_local $offset0)\n (get_local $offset1)\n (get_local $offset2)\n (get_local $offset3)))\n\n (call $memusegas (get_local $offset) (i32.const 1))\n\n ;; pop stack\n (set_local $sp (i32.sub (get_global $sp) (i32.const 32)))\n (set_local $offset (i32.add (get_local $offset) (get_global $memstart)))\n (i32.store8 (i32.add (get_local $offset) (i32.const 0)) (i32.load (get_local $sp)))\n)\n"
},
"MUL": {
"wast": "(func $MUL\n (call $mul_256\n (i64.load (i32.add (get_global $sp) (i32.const 24)))\n (i64.load (i32.add (get_global $sp) (i32.const 16)))\n (i64.load (i32.add (get_global $sp) (i32.const 8)))\n (i64.load (get_global $sp))\n (i64.load (i32.sub (get_global $sp) (i32.const 8)))\n (i64.load (i32.sub (get_global $sp) (i32.const 16)))\n (i64.load (i32.sub (get_global $sp) (i32.const 24)))\n (i64.load (i32.sub (get_global $sp) (i32.const 32)))\n (i32.sub (get_global $sp) (i32.const 8))\n )\n)\n"
Expand Down