git ssb - fixed memory exports · wanderer🌟/js-primea-hypervisor@35dfa547

wanderer committed on 12/28/2016, 7:37:18 PM
Parent: 276e1f2ef76f665728f308c95464327233c1ba98

tests/interface/basic_gas_ops.wasm	changed
tests/interface/basic_gas_ops.wast	changed
tests/interface/call.wasm	changed
tests/interface/call.wast	changed
tests/interface/callDataSize.wasm	changed
tests/interface/callDataSize.wast	changed
tests/interface/callValue.wasm	changed
tests/interface/callValue.wast	changed
tests/interface/caller.wasm	changed
tests/interface/caller.wast	changed
tests/interface/coinbase.wasm	changed
tests/interface/coinbase.wast	changed
tests/interface/origin.wasm	changed
tests/interface/origin.wast	changed
tests/interface/sstore.wasm	changed
tests/interface/sstore.wast	changed
tests/interfaceRunner.js	changed
vm.js	changed

tests/interface/basic_gas_ops.wasmView
		@@ -1,3 +1,3 @@
1		-asm ```)ethereumuseGasethereum
	1	+asm `~`~`)ethereumuseGasethereum
2	2	getGasLefttest
3		-(&@AA�F@@AA�F@
	3	+(&@BB�Q@@BB�Q@

tests/interface/basic_gas_ops.wastView
		@@ -1,22 +1,22 @@
1	1	;; starts with 1000 gas
2	2	(module
3		- (import "ethereum" "useGas" (func $useGas (param i32)))
4		- (import "ethereum" "getGasLeft" (func $gas(result i32)))
	3	+ (import "ethereum" "useGas" (func $useGas (param i64)))
	4	+ (import "ethereum" "getGasLeft" (func $gas (result i64)))
5	5
6	6	(export "test" (func $main))
7	7	(func $main
8	8	;; test adding gas
9	9	(block
10		- (call $useGas (i32.const 1))
11		- (if (i32.eq (call $gas) (i32.const 997))
	10	+ (call $useGas (i64.const 1))
	11	+ (if (i64.eq (call $gas) (i64.const 997))
12	12	(return)
13	13	)
14	14	(unreachable)
15	15	)
16	16	(block
17		- (call $useGas (i32.const 1))
18		- (if (i32.eq (call $gas) (i32.const 996))
	17	+ (call $useGas (i64.const 1))
	18	+ (if (i64.eq (call $gas) (i64.const 996))
19	19	(return)
20	20	)
21	21	(unreachable)
22	22	)

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

tests/interface/call.wastView
		@@ -1,9 +1,9 @@
1	1	;; starts with an address of 5d48c1018904a172886829bbbd9c6f4a2d06c47b
2	2	(module
3		- (import "ethereum" "call" (func $call (param i32 i32 i32 i32 i32 i32 i32 i32) (result i32)))
	3	+ (import "ethereum" "call" (func $call (param i64 i32 i32 i32 i32 i32 i32 i32) (result i32)))
4	4	(memory 1)
5		- (export "a" (memory 0))
	5	+ (export "memory" (memory 0))
6	6	(export "main" (func $main))
7	7	(func $main
8	8	(block
9	9	;; Memory layout:
		@@ -12,9 +12,9 @@
12	12	;; 52 - 56 bytes: data (0x42004200)
13	13	;; 56 - 60 bytes: result
14	14	(i32.store (i32.const 0) (i32.const 0x4))
15	15	(i32.store (i32.const 52) (i32.const 0x42004200))
16		- (call $call (i32.const 2000) (i32.const 0) (i32.const 20) (i32.const 52) (i32.const 4) (i32.const 56) (i32.const 4) (i32.const 1))
	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))
17	17	drop
18	18	)
19	19	)
20	20

tests/interface/callDataSize.wasmView
		@@ -1,2 +1,2 @@
1		-asm `~`ethereumgetCallDataSizemain
2		-@B�Q@
	1	+asm ``ethereumgetCallDataSizemain
	2	+@A�F@

tests/interface/callDataSize.wastView
		@@ -1,11 +1,11 @@
1	1	(module
2		- (import"ethereum" "getCallDataSize" (func $callDataSize (result i64)))
	2	+ (import"ethereum" "getCallDataSize" (func $callDataSize (result i32)))
3	3	(memory 1)
4	4	(export "main" (func $main))
5	5	(func $main
6	6	(block
7		- (if (i64.eq (call $callDataSize) (i64.const 277))
	7	+ (if (i32.eq (call $callDataSize) (i32.const 277))
8	8	(return)
9	9	)
10	10	(unreachable)
11	11	)

tests/interface/callValue.wasmView
		@@ -1,2 +1,2 @@
1		-asm ``ethereumgetCallValueamain
	1	+asm ``ethereumgetCallValuememorymain
2	2	@AA)B��Q@

tests/interface/callValue.wastView
		@@ -1,9 +1,9 @@
1	1	;; call value of 0x056bc75e2d63100000 (100 ETH)
2	2	(module
3	3	(import "ethereum" "getCallValue" (func $callValue (param i32)))
4	4	(memory 1)
5		- (export "a" (memory 0))
	5	+ (export "memory" (memory 0))
6	6	(export "main" (func $main))
7	7	(func $main
8	8	(block
9	9	(call $callValue (i32.const 0))

tests/interface/caller.wasmView
		@@ -1,2 +1,2 @@
1		-asm ``ethereum getCallermaina
	1	+asm ``ethereum getCallermainmemory
2	2	!@AA)Bݐ��Q@

tests/interface/caller.wastView
		@@ -2,9 +2,9 @@
2	2	(module
3	3	(import "ethereum" "getCaller" (func $caller (param i32)))
4	4	(memory 1)
5	5	(export "main" (func $main))
6		- (export "a" (memory 0))
	6	+ (export "memory" (memory 0))
7	7	(func $main
8	8	(block
9	9	;; loads the caller into memory
10	10	(call $caller (i32.const 0))

tests/interface/coinbase.wasmView
		@@ -1,2 +1,2 @@
1		-asm ``ethereumgetBlockCoinbasemaina
	1	+asm ``ethereumgetBlockCoinbasemainmemory
2	2	!@AA)Bݐ��Q@

tests/interface/coinbase.wastView
		@@ -2,9 +2,9 @@
2	2	(module
3	3	(import "ethereum" "getBlockCoinbase" (func $coinbase (param i32)))
4	4	(memory 1)
5	5	(export "main" (func $main))
6		- (export "a" (memory 0))
	6	+ (export "memory" (memory 0))
7	7	(func $main
8	8	(block
9	9	;; loads the coinbase into memory
10	10	(call $coinbase (i32.const 0))

tests/interface/origin.wasmView
		@@ -1,2 +1,2 @@
1		-asm ``ethereumgetTxOriginmaina
	1	+asm ``ethereumgetTxOriginmainmemory
2	2	!@AA)Bݐ��Q@

tests/interface/origin.wastView
		@@ -3,9 +3,9 @@
3	3	(import "ethereum" "getTxOrigin" (func $origin (param i32)))
4	4	(memory 1)
5	5
6	6	(export "main" (func $main))
7		- (export "a" (memory 0))
	7	+ (export "memory" (memory 0))
8	8	(func $main
9	9	(block
10	10	;; loads the address into memory
11	11	(call $origin (i32.const 0))

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

tests/interface/sstore.wastView
		@@ -4,9 +4,9 @@
4	4	(import "ethereum" "storageLoad" (func $sload (param i32 i32 i32)))
5	5
6	6	(memory 1)
7	7	(export "main" (func $main))
8		- (export "a" (memory 0))
	8	+ (export "memory" (memory 0))
9	9	(func $main
10	10	(local $temp i64)
11	11	(block
12	12	;; should roundtrip store and load a value from storage

tests/interfaceRunner.jsView
		@@ -10,18 +10,17 @@
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 = ['callDataCopy.wast']
	14	+// tests = ['callDataSize.wast']
15	15
16	16	runTests(tests)
17	17
18	18	function runTests (tests) {
19	19	for (let testName of tests) {
20	20	testName = testName.split('.')[0]
21	21	tape(testName, async (t) => {
22	22	// Compile Command
23		-
24	23	const rootVertex = new Vertex()
25	24	const code = fs.readFileSync(`${dir}/${testName}.wasm`)
26	25	const envData = JSON.parse(fs.readFileSync(`${dir}/${testName}.json`).toString())
27	26

vm.jsView
		@@ -49,7 +49,7 @@
49	49	return this._environment
50	50	}
51	51
52	52	get memory () {
53		- return this._instance.exports.memory
	53	+ return this._instance.exports.memory.buffer
54	54	}
55	55	}

wanderer🌟 / js-primea-hypervisor