    rep     stosb                   /* Store the remaining bytes */
 -  movq    r9, rax
 -  ret
-+  movl    r9d, eax
++  movl    %r9d, eax
 +  pop     r11
 +  nacljmp %r11d, r15
  

-  cmpq    $16, rdx
+  movl    esi, esi                /* Only need to do read sandboxing once */
+  addq    r15 ,rsi
+  movl    edi, r9d                /* Save return value */
+  movl    esi, eax
+  movl    edx, ecx
+  cmpl    $16, edx

 
-  movq    rdi, r8                 /* Align destination on quad word boundary */
-  andq    $7, r8
+  movl    edi, %r8d                /* Align destination on quad word boundary */
+  andl    $7, %r8d
   jz      quadword_aligned
-  movq    $8, rcx
-  subq    r8, rcx
-  subq    rcx, rdx
+  movl    $8, ecx
+  subl    %r8d, ecx
+  subl    ecx, edx
+  
+  movl    edi, edi
