Skip to content

Simplify check condition for memcpy path in memmove #1418

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 1 commit into from
Jul 30, 2020
Merged

Simplify check condition for memcpy path in memmove #1418

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 std/assembly/util/memory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ export function memcpy(dest: usize, src: usize, n: usize): void { // see: musl/s
export function memmove(dest: usize, src: usize, n: usize): void { // see: musl/src/string/memmove.c
if (dest === src) return;
if (ASC_SHRINK_LEVEL < 1) {
if (src + n <= dest || dest + n <= src) {
if (src - dest - n <= -(n << 1)) {
memcpy(dest, src, n);
return;
}
Expand Down
19 changes: 8 additions & 11 deletions tests/compiler/extends-baseaggregate.untouched.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2658,19 +2658,16 @@
i32.lt_s
drop
local.get $4
local.get $3
i32.add
local.get $5
i32.sub
local.get $3
i32.sub
i32.const 0
local.get $3
i32.const 1
i32.shl
i32.sub
i32.le_u
if (result i32)
i32.const 1
else
local.get $5
local.get $3
i32.add
local.get $4
i32.le_u
end
if
local.get $5
local.get $4
Expand Down
19 changes: 8 additions & 11 deletions tests/compiler/infer-array.untouched.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1192,19 +1192,16 @@
i32.lt_s
drop
local.get $4
local.get $3
i32.add
local.get $5
i32.sub
local.get $3
i32.sub
i32.const 0
local.get $3
i32.const 1
i32.shl
i32.sub
i32.le_u
if (result i32)
i32.const 1
else
local.get $5
local.get $3
i32.add
local.get $4
i32.le_u
end
if
local.get $5
local.get $4
Expand Down
19 changes: 8 additions & 11 deletions tests/compiler/number.untouched.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2498,19 +2498,16 @@
i32.lt_s
drop
local.get $4
local.get $3
i32.add
local.get $5
i32.sub
local.get $3
i32.sub
i32.const 0
local.get $3
i32.const 1
i32.shl
i32.sub
i32.le_u
if (result i32)
i32.const 1
else
local.get $5
local.get $3
i32.add
local.get $4
i32.le_u
end
if
local.get $5
local.get $4
Expand Down
19 changes: 8 additions & 11 deletions tests/compiler/object-literal.untouched.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2845,19 +2845,16 @@
i32.lt_s
drop
local.get $4
local.get $3
i32.add
local.get $5
i32.sub
local.get $3
i32.sub
i32.const 0
local.get $3
i32.const 1
i32.shl
i32.sub
i32.le_u
if (result i32)
i32.const 1
else
local.get $5
local.get $3
i32.add
local.get $4
i32.le_u
end
if
local.get $5
local.get $4
Expand Down
19 changes: 8 additions & 11 deletions tests/compiler/resolve-access.untouched.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1192,19 +1192,16 @@
i32.lt_s
drop
local.get $4
local.get $3
i32.add
local.get $5
i32.sub
local.get $3
i32.sub
i32.const 0
local.get $3
i32.const 1
i32.shl
i32.sub
i32.le_u
if (result i32)
i32.const 1
else
local.get $5
local.get $3
i32.add
local.get $4
i32.le_u
end
if
local.get $5
local.get $4
Expand Down
19 changes: 8 additions & 11 deletions tests/compiler/resolve-binary.untouched.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3498,19 +3498,16 @@
i32.lt_s
drop
local.get $4
local.get $3
i32.add
local.get $5
i32.sub
local.get $3
i32.sub
i32.const 0
local.get $3
i32.const 1
i32.shl
i32.sub
i32.le_u
if (result i32)
i32.const 1
else
local.get $5
local.get $3
i32.add
local.get $4
i32.le_u
end
if
local.get $5
local.get $4
Expand Down
19 changes: 8 additions & 11 deletions tests/compiler/resolve-elementaccess.untouched.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2126,19 +2126,16 @@
i32.lt_s
drop
local.get $4
local.get $3
i32.add
local.get $5
i32.sub
local.get $3
i32.sub
i32.const 0
local.get $3
i32.const 1
i32.shl
i32.sub
i32.le_u
if (result i32)
i32.const 1
else
local.get $5
local.get $3
i32.add
local.get $4
i32.le_u
end
if
local.get $5
local.get $4
Expand Down
19 changes: 8 additions & 11 deletions tests/compiler/resolve-ternary.untouched.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3889,19 +3889,16 @@
i32.lt_s
drop
local.get $4
local.get $3
i32.add
local.get $5
i32.sub
local.get $3
i32.sub
i32.const 0
local.get $3
i32.const 1
i32.shl
i32.sub
i32.le_u
if (result i32)
i32.const 1
else
local.get $5
local.get $3
i32.add
local.get $4
i32.le_u
end
if
local.get $5
local.get $4
Expand Down
19 changes: 8 additions & 11 deletions tests/compiler/retain-release-sanity.untouched.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2935,19 +2935,16 @@
i32.lt_s
drop
local.get $4
local.get $3
i32.add
local.get $5
i32.sub
local.get $3
i32.sub
i32.const 0
local.get $3
i32.const 1
i32.shl
i32.sub
i32.le_u
if (result i32)
i32.const 1
else
local.get $5
local.get $3
i32.add
local.get $4
i32.le_u
end
if
local.get $5
local.get $4
Expand Down
19 changes: 8 additions & 11 deletions tests/compiler/rt/finalize.untouched.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3278,19 +3278,16 @@
i32.lt_s
drop
local.get $4
local.get $3
i32.add
local.get $5
i32.sub
local.get $3
i32.sub
i32.const 0
local.get $3
i32.const 1
i32.shl
i32.sub
i32.le_u
if (result i32)
i32.const 1
else
local.get $5
local.get $3
i32.add
local.get $4
i32.le_u
end
if
local.get $5
local.get $4
Expand Down
19 changes: 8 additions & 11 deletions tests/compiler/rt/stub-realloc.untouched.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1198,19 +1198,16 @@
i32.lt_s
drop
local.get $4
local.get $3
i32.add
local.get $5
i32.sub
local.get $3
i32.sub
i32.const 0
local.get $3
i32.const 1
i32.shl
i32.sub
i32.le_u
if (result i32)
i32.const 1
else
local.get $5
local.get $3
i32.add
local.get $4
i32.le_u
end
if
local.get $5
local.get $4
Expand Down
19 changes: 8 additions & 11 deletions tests/compiler/std/array-literal.untouched.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2590,19 +2590,16 @@
i32.lt_s
drop
local.get $4
local.get $3
i32.add
local.get $5
i32.sub
local.get $3
i32.sub
i32.const 0
local.get $3
i32.const 1
i32.shl
i32.sub
i32.le_u
if (result i32)
i32.const 1
else
local.get $5
local.get $3
i32.add
local.get $4
i32.le_u
end
if
local.get $5
local.get $4
Expand Down
19 changes: 8 additions & 11 deletions tests/compiler/std/array.untouched.wat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3447,19 +3447,16 @@
i32.lt_s
drop
local.get $4
local.get $3
i32.add
local.get $5
i32.sub
local.get $3
i32.sub
i32.const 0
local.get $3
i32.const 1
i32.shl
i32.sub
i32.le_u
if (result i32)
i32.const 1
else
local.get $5
local.get $3
i32.add
local.get $4
i32.le_u
end
if
local.get $5
local.get $4
Expand Down
Loading