aboutsummaryrefslogtreecommitdiffstats
path: root/src/opts/memset.arm.S
diff options
context:
space:
mode:
Diffstat (limited to 'src/opts/memset.arm.S')
-rw-r--r--src/opts/memset.arm.S23
1 files changed, 7 insertions, 16 deletions
diff --git a/src/opts/memset.arm.S b/src/opts/memset.arm.S
index 04a7027..bc0c060 100644
--- a/src/opts/memset.arm.S
+++ b/src/opts/memset.arm.S
@@ -1,17 +1,8 @@
/*
- * Copyright (C) 2010 The Android Open Source Project
+ * Copyright 2010 The Android Open Source Project
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
*/
/* Changes:
@@ -41,6 +32,10 @@ arm_memset16:
.fnstart
push {lr}
+ /* Multiply count by 2 - go from the number of 16-bit shorts
+ * to the number of bytes desired. */
+ mov r2, r2, lsl #1
+
/* expand the data to 32 bits */
orr r1, r1, lsl #16
@@ -49,10 +44,6 @@ arm_memset16:
strneh r1, [r0], #2
subne r2, r2, #2
- /* Multiply count by 2 - go from the number of 16-bit shorts
- * to the number of bytes desired. */
- mov r2, r2, lsl #1
-
/* Now jump into the main loop below. */
b .Lwork_32
.fnend