Page MenuHomeFreeBSD
Files F171192292

D59341.diff
No OneTemporary
Actions

D59341.diff
View Options

diff --git a/sys/cddl/dev/dtrace/aarch64/dtrace_asm.S b/sys/cddl/dev/dtrace/aarch64/dtrace_asm.S
--- a/sys/cddl/dev/dtrace/aarch64/dtrace_asm.S
+++ b/sys/cddl/dev/dtrace/aarch64/dtrace_asm.S
@@ -109,8 +109,11 @@
ENTRY(dtrace_copy)
cbz x2, 2f /* If len == 0 then skip loop */
1:
- ldtrb w4, [x0] /* Load from uaddr */
+ mvn x4, xzr /* Set all bits */
+ ldtrb w4, [x0] /* Load from uaddr or raise data abort */
add x0, x0, #1
+ lsr x3, x4, #32 /* Extract zero-extended high bits */
+ cbnz x3, 2f /* If high bits != 0 then break */
strb w4, [x1], #1 /* Store in kaddr */
sub x2, x2, #1 /* len-- */
cbnz x2, 1b
@@ -120,15 +123,16 @@
/*
void
-dtrace_copystr(uintptr_t uaddr, uintptr_t kaddr, size_t size,
- volatile uint16_t *flags)
-XXX: Check for flags?
+dtrace_copystr(uintptr_t uaddr, uintptr_t kaddr, size_t size)
*/
ENTRY(dtrace_copystr)
cbz x2, 2f /* If len == 0 then skip loop */
1:
- ldtrb w4, [x0] /* Load from uaddr */
+ mvn x4, xzr /* Set all bits */
+ ldtrb w4, [x0] /* Load from uaddr or raise data abort */
add x0, x0, #1
+ lsr x3, x4, #32 /* Extract zero-extended high bits */
+ cbnz x3, 2f /* If high bits != 0 then break */
strb w4, [x1], #1 /* Store in kaddr */
cbz w4, 2f /* If == 0 then break */
sub x2, x2, #1 /* len-- */

File Metadata

Mime Type
text/plain
Expires
Thu, Sep 10, 9:57 AM (2 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38421328
Default Alt Text
D59341.diff (1 KB)

Event Timeline