Skip to content

tests\compiler\relocatable test offsets for globals #891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

tests\compiler\relocatable test offsets for globals #891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1d2778
tests\compiler\relocatable test getting a pointer
sampaioletti Oct 9, 2019
2ef003c
Added name to NOTICE
sampaioletti Oct 9, 2019
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
1 change: 1 addition & 0 deletions NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ under the licensing terms detailed in LICENSE:
* Willem Wyndham <willem@cs.umd.edu>
* Bowen Wang <bowen@nearprotocol.com>
* Emil Laine <laine.emil@gmail.com>
* Sam Paioletti <sampaioletti@gmail.com>

Portions of this software are derived from third-party works licensed under
the following terms:
Expand Down
13 changes: 11 additions & 2 deletions tests/compiler/relocatable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,16 @@ exports.preInstantiate = function(imports, exports) {
// of env.memory_base yet, hence we need to import a suitable memory as well:
imports["env"] = {
"memory": new WebAssembly.Memory({ initial: 2 }),
"memory_base": 65536,
"table_base": 100
"memory_base": 2,
"table_base": 100,
"log":(offset,length)=>{
let view=new Uint16Array(imports["env"].memory.buffer,offset,length)
let str=String.fromCharCode.apply(null,view)
assert(str==="relocatable",`expected relocatable got'${str}' at index ${offset}`)
}
};
};

exports.postInstantiate=function(instance){
instance.exports.main()
}
19 changes: 16 additions & 3 deletions tests/compiler/relocatable.optimized.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,27 @@
(module
(type $FUNCSIG$v (func))
(type $FUNCSIG$vii (func (param i32 i32)))
(import "env" "memory" (memory $0 1))
(data (global.get $__memory_base) "\00\00\00\00\00\00\00\00\04\00\00\00\01\00\00\00\00\00\00\00\04\00\00\00\00\00\00\00\00\00\00\00\10\00\00\00\01\00\00\00\03\00\00\00\10\00\00\00\18\00\00\00\18\00\00\00\04\00\00\00\01\00\00\00")
(data (global.get $__memory_base) "\00\00\00\00\00\00\00\00\04\00\00\00\01\00\00\00\00\00\00\00\04\00\00\00\00\00\00\00\00\00\00\00\10\00\00\00\01\00\00\00\03\00\00\00\10\00\00\00\18\00\00\00\18\00\00\00\04\00\00\00\01\00\00\00\16\00\00\00\01\00\00\00\01\00\00\00\16\00\00\00r\00e\00l\00o\00c\00a\00t\00a\00b\00l\00e\00")
(import "env" "memory_base" (global $__memory_base i32))
(global $__memory_size i32 (i32.const 64))
(import "env" "log" (func $relocatable/log (param i32 i32)))
(global $__memory_size i32 (i32.const 112))
(global $__table_size i32 (i32.const 1))
(export "memory" (memory $0))
(export "main" (func $relocatable/main))
(export "__memory_size" (global $__memory_size))
(export "__table_size" (global $__table_size))
(func $start (; 0 ;) (type $FUNCSIG$v)
(func $relocatable/main (; 1 ;) (type $FUNCSIG$v)
i32.const 80
global.get $__memory_base
i32.const -64
i32.sub
i32.load offset=12
i32.const 1
i32.shr_u
call $relocatable/log
)
(func $start (; 2 ;) (type $FUNCSIG$v)
nop
)
)
8 changes: 8 additions & 0 deletions tests/compiler/relocatable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
const someStaticStuff: i32[] = [0];

someStaticStuff;

@external("env","log")
declare function log(s:string,length:i32):void

export function main():void{
let s="relocatable"
log(s,s.length)
}
43 changes: 38 additions & 5 deletions tests/compiler/relocatable.untouched.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,60 @@
(module
(type $FUNCSIG$v (func))
(type $FUNCSIG$ii (func (param i32) (result i32)))
(type $FUNCSIG$vii (func (param i32 i32)))
(type $FUNCSIG$vi (func (param i32)))
(import "env" "memory" (memory $0 1))
(data (global.get $__memory_base) "\00\00\00\00\00\00\00\00\04\00\00\00\01\00\00\00\00\00\00\00\04\00\00\00\00\00\00\00\00\00\00\00\10\00\00\00\01\00\00\00\03\00\00\00\10\00\00\00\18\00\00\00\18\00\00\00\04\00\00\00\01\00\00\00")
(data (global.get $__memory_base) "\00\00\00\00\00\00\00\00\04\00\00\00\01\00\00\00\00\00\00\00\04\00\00\00\00\00\00\00\00\00\00\00\10\00\00\00\01\00\00\00\03\00\00\00\10\00\00\00\18\00\00\00\18\00\00\00\04\00\00\00\01\00\00\00\16\00\00\00\01\00\00\00\01\00\00\00\16\00\00\00r\00e\00l\00o\00c\00a\00t\00a\00b\00l\00e\00")
(import "env" "memory_base" (global $__memory_base i32))
(import "env" "table_base" (global $__table_base i32))
(import "env" "log" (func $relocatable/log (param i32 i32)))
(table $0 1 funcref)
(elem (i32.const 0) $null)
(global $relocatable/someStaticStuff i32 (i32.const 48))
(global $__memory_size i32 (i32.const 64))
(global $__memory_size i32 (i32.const 112))
(global $__table_size i32 (i32.const 1))
(export "memory" (memory $0))
(export "main" (func $relocatable/main))
(export "__memory_size" (global $__memory_size))
(export "__table_size" (global $__table_size))
(start $start)
(func $start:relocatable (; 0 ;) (type $FUNCSIG$v)
(func $start:relocatable (; 1 ;) (type $FUNCSIG$v)
(local $0 i32)
(local $1 i32)
global.get $relocatable/someStaticStuff
drop
)
(func $start (; 1 ;) (type $FUNCSIG$v)
(func $~lib/rt/stub/__retain (; 2 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
local.get $0
)
(func $~lib/string/String#get:length (; 3 ;) (type $FUNCSIG$ii) (param $0 i32) (result i32)
global.get $__memory_base
local.get $0
i32.const 16
i32.sub
i32.add
i32.load offset=12
i32.const 1
i32.shr_u
)
(func $~lib/rt/stub/__release (; 4 ;) (type $FUNCSIG$vi) (param $0 i32)
nop
)
(func $relocatable/main (; 5 ;) (type $FUNCSIG$v)
(local $0 i32)
i32.const 80
call $~lib/rt/stub/__retain
local.set $0
local.get $0
local.get $0
call $~lib/string/String#get:length
call $relocatable/log
local.get $0
call $~lib/rt/stub/__release
)
(func $start (; 6 ;) (type $FUNCSIG$v)
call $start:relocatable
)
(func $null (; 2 ;) (type $FUNCSIG$v)
(func $null (; 7 ;) (type $FUNCSIG$v)
)
)