Skip to content

Merge natural alignment change to binary-0xc #322

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

Merged
merged 2 commits into from
Aug 23, 2016
Merged

Merge natural alignment change to binary-0xc #322

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
e9f5ada
Use the stored size as the natural alignment for memory operations, r…
AndrewScheidecker Aug 22, 2016
06bbea6
Merge branch 'natural-alignment-from-memory-type' into binary-0xc
AndrewScheidecker Aug 23, 2016
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
20 changes: 10 additions & 10 deletions ml-proto/spec/check.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,18 +216,18 @@ let rec check_expr c et e =
check_type None et e.at

| Load (memop, e1) ->
check_load c et memop e1 e.at
check_load c et memop (size memop.ty) e1 e.at

| Store (memop, e1, e2) ->
check_store c et memop e1 e2 e.at
check_store c et memop (size memop.ty) e1 e2 e.at

| LoadExtend (extendop, e1) ->
check_mem_type extendop.memop.ty extendop.sz e.at;
check_load c et extendop.memop e1 e.at
check_load c et extendop.memop (Memory.mem_size extendop.sz) e1 e.at

| StoreWrap (wrapop, e1, e2) ->
check_mem_type wrapop.memop.ty wrapop.sz e.at;
check_store c et wrapop.memop e1 e2 e.at
check_store c et wrapop.memop (Memory.mem_size wrapop.sz) e1 e2 e.at

| Const v ->
check_literal c et v
Expand Down Expand Up @@ -279,24 +279,24 @@ and check_expr_opt c et eo at =
and check_literal c et l =
check_type (Some (type_value l.it)) et l.at

and check_load c et memop e1 at =
and check_load c et memop mem_size e1 at =
ignore (memory c at);
check_memop memop at;
check_memop memop mem_size at;
check_expr c (some Int32Type) e1;
check_type (Some memop.ty) et at

and check_store c et memop e1 e2 at =
and check_store c et memop mem_size e1 e2 at =
ignore (memory c at);
check_memop memop at;
check_memop memop mem_size at;
check_expr c (some Int32Type) e1;
check_expr c (some memop.ty) e2;
check_type None et at

and check_memop memop at =
and check_memop memop mem_size at =
require (memop.offset >= 0L) at "negative offset";
require (memop.offset <= 0xffffffffL) at "offset too large";
require (Lib.Int.is_power_of_two memop.align) at "alignment must be a power of two";
require (memop.align <= size memop.ty) at "alignment must not be larger than natural"
require (memop.align <= mem_size) at "alignment must not be larger than natural"

and check_mem_type ty sz at =
require (ty = Int64Type || sz <> Memory.Mem32) at "memory size too big"
Expand Down
5 changes: 5 additions & 0 deletions ml-proto/spec/memory.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ exception OutOfMemory

let page_size = 0x10000L (* 64 KiB *)

let mem_size = function
| Mem8 -> 1
| Mem16 -> 2
| Mem32 -> 4

(*
* These limitations should be considered part of the host environment and not
* part of the spec defined by this file.
Expand Down
2 changes: 2 additions & 0 deletions ml-proto/spec/memory.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ exception OutOfMemory

val page_size : offset

val mem_size : mem_size -> int

val create : size -> size option -> memory (* raise SizeOverflow, OutOfMemory *)
val size : memory -> size
val grow : memory -> size -> unit (* raise SizeOverflow, OutOfMemory *)
Expand Down
22 changes: 17 additions & 5 deletions ml-proto/test/memory.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@
)

;; Test alignment annotation rules
(module (memory 0) (func (drop (i32.load8_u align=2 (i32.const 0)))))
(module (memory 0) (func (drop (i32.load16_u align=4 (i32.const 0)))))
(module (memory 0) (func (drop (i32.load8_u align=1 (i32.const 0)))))
(module (memory 0) (func (drop (i32.load16_u align=2 (i32.const 0)))))
(module (memory 0) (func (drop (i32.load align=4 (i32.const 0)))))
(module (memory 0) (func (drop (f32.load align=4 (i32.const 0)))))

Expand All @@ -112,15 +112,27 @@
)

(assert_invalid
(module (memory 0) (func (i64.load align=16 (i32.const 0))))
(module (memory 0) (func (drop (i64.load align=16 (i32.const 0)))))
"alignment must not be larger than natural"
)
(assert_invalid
(module (memory 0) (func (i64.load align=32 (i32.const 0))))
(module (memory 0) (func (drop (i64.load align=32 (i32.const 0)))))
"alignment must not be larger than natural"
)
(assert_invalid
(module (memory 0) (func (i32.load align=8 (i32.const 0))))
(module (memory 0) (func (drop (i32.load align=8 (i32.const 0)))))
"alignment must not be larger than natural"
)
(assert_invalid
(module (memory 0) (func (drop (i32.load16_u align=4 (i32.const 0)))))
"alignment must not be larger than natural"
)
(assert_invalid
(module (memory 0) (func (drop (i32.load8_u align=2 (i32.const 0)))))
"alignment must not be larger than natural"
)
(assert_invalid
(module (memory 0) (func (i32.store8 align=2 (i32.const 0) (i32.const 0))))
"alignment must not be larger than natural"
)

Expand Down