git ssb - use tables for callbacks instead of exports · wanderer🌟/js-primea-hypervisor@5f3238f5

wanderer committed on 1/2/2017, 7:04:13 PM
Parent: 26787afda66ed5f43ebf8e40d4edefbbcc133e01

tests/interface/balance.wasm	changed
tests/interface/balance.wast	changed
tests/interface/call.wasm	changed
tests/interface/call.wast	changed
tests/interface/sstore.wasm	changed
tests/interface/sstore.wast	changed
tests/interfaceRunner.js	changed
vm.js	changed

tests/interface/balance.wasmView
		@@ -1,5 +1,5 @@
1	1	asm
2	2	``ethereum
3		-getBalancememorymain1
	3	+getBalancepmemorymaincallback A
4	4	'
5		-AAA@A)B��Q@A]H��r�h)��oJ-�{
	5	+AAA@A)B��Q@A]H��r�h)��oJ-�{

tests/interface/balance.wastView
		@@ -4,12 +4,19 @@
4	4	(memory 1 )
5	5	(data (i32.const 0) "\5d\48\c1\01\89\04\a1\72\88\68\29\bb\bd\9c\6f\4a\2d\06\c4\7b")
6	6	(export "memory" (memory 0))
7	7	(export "main" (func $main))
8		- (export "1" (func $callback))
9	8
	9	+ (table
	10	+ (export "callback")
	11	+ anyfunc
	12	+ (elem
	13	+ $callback
	14	+ )
	15	+ )
	16	+
10	17	(func $main
11		- (call $balance (i32.const 0) (i32.const 0) (i32.const 1))
	18	+ (call $balance (i32.const 0) (i32.const 0) (i32.const 0))
12	19	)
13	20
14	21	(func $callback
15	22	(block

tests/interface/call.wasmView
		@@ -1,2 +1,2 @@
1		-asm `~``ethereumcallmemorymain1
2		-:+@AA6A4A��6B�AAA4AA8AAA F@
	1	+asm `~``ethereumcallpmemorymaincallback A
	2	+:+@AA6A4A��6B�AAA4AA8AAA F@

tests/interface/call.wastView
		@@ -3,8 +3,17 @@
3	3	(import "ethereum" "call" (func $call (param i64 i32 i32 i32 i32 i32 i32 i32) (result i32)))
4	4	(memory 1)
5	5	(export "memory" (memory 0))
6	6	(export "main" (func $main))
	7	+
	8	+ (table
	9	+ (export "callback")
	10	+ anyfunc
	11	+ (elem
	12	+ $callback
	13	+ )
	14	+ )
	15	+
7	16	(func $main
8	17	(block
9	18	;; Memory layout:
10	19	;; 0 - 20 bytes: address (4)
		@@ -12,14 +21,13 @@
12	21	;; 52 - 56 bytes: data (0x42004200)
13	22	;; 56 - 60 bytes: result
14	23	(i32.store (i32.const 0) (i32.const 0x4))
15	24	(i32.store (i32.const 52) (i32.const 0x42004200))
16		- (call $call (i64.const 2000) (i32.const 0) (i32.const 20) (i32.const 52) (i32.const 4) (i32.const 56) (i32.const 4) (i32.const 1))
	25	+ (call $call (i64.const 2000) (i32.const 0) (i32.const 20) (i32.const 52) (i32.const 4) (i32.const 56) (i32.const 4) (i32.const 0))
17	26	drop
18	27	)
19	28	)
20	29
21		- (export "1" (func $callback))
22	30	(func $callback (param $result i32)
23	31	(if (i32.eq (i32.const 1) (get_local $result))
24	32	(return)
25	33	)

tests/interface/sstore.wasmView
		@@ -1,3 +1,3 @@
1	1	asm
2		-``0ethereumstorageStoreethereumstorageLoadmainmemory12
3		-L~@AB��݄ƥ�7A�AA@A�A�A@A�)B��݄ƥ�R@
	2	+``0ethereumstorageStoreethereumstorageLoadpmemorycallbackmain A
	3	+L~@AB��݄ƥ�7A�AA@A�A�A@A�)B��݄ƥ�R@

tests/interface/sstore.wastView
		@@ -3,27 +3,35 @@
3	3	(import "ethereum" "storageStore" (func $sstore (param i32 i32 i32)))
4	4	(import "ethereum" "storageLoad" (func $sload (param i32 i32 i32)))
5	5
6	6	(memory 1)
7		- (export "main" (func $main))
8	7	(export "memory" (memory 0))
	8	+
	9	+ (table
	10	+ (export "callback")
	11	+ anyfunc
	12	+ (elem
	13	+ $callback
	14	+ $callback2
	15	+ )
	16	+ )
	17	+
9	18	(func $main
	19	+ (export "main")
10	20	(local $temp i64)
11	21	(block
12	22	;; should roundtrip store and load a value from storage
13	23	(i64.store (i32.const 0) (i64.const 173553719826446289))
14		- (call $sstore (i32.const 64) (i32.const 0) (i32.const 1))
	24	+ (call $sstore (i32.const 64) (i32.const 0) (i32.const 0))
15	25	)
16	26	)
17	27
18		- (export "1" (func $callback))
19	28	(func $callback
20	29	(block
21		- (call $sload (i32.const 64) (i32.const 64) (i32.const 2))
	30	+ (call $sload (i32.const 64) (i32.const 64) (i32.const 1))
22	31	)
23	32	)
24	33
25		- (export "2" (func $callback2))
26	34	(func $callback2
27	35	(block
28	36	(if (i64.ne (i64.load (i32.const 64)) (i64.const 173553719826446289))
29	37	(unreachable))

tests/interfaceRunner.jsView
		@@ -10,9 +10,8 @@
10	10
11	11	const dir = path.join(__dirname, '/interface')
12	12	// get the test names
13	13	let tests = fs.readdirSync(dir).filter((file) => file.endsWith('.wast'))
14		-// tests = ['callDataSize.wast']
15	14
16	15	runTests(tests)
17	16
18	17	function runTests (tests) {

vm.jsView
		@@ -36,9 +36,9 @@
36	36	*/
37	37	pushOpsQueue (promise, callbackIndex, intefaceCallback) {
38	38	this._opsQueue = Promise.all([this._opsQueue, promise]).then(values => {
39	39	const result = intefaceCallback(values.pop())
40		- this._instance.exports[callbackIndex.toString()](result)
	40	+ this._instance.exports.callback.get(callbackIndex)(result)
41	41	})
42	42	}
43	43
44	44	sendMessage (message) {

wanderer🌟 / js-primea-hypervisor