Skip to content

Commit 1589d0b

Browse files
authored
Merge pull request #5281 from martin-frbg/zscal_arm64
kernel/arm64: fixed cscal and zscal
2 parents a86419f + 28f8fda commit 1589d0b

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

kernel/arm64/zscal.S

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3333
#define INC_X x4 /* X stride */
3434
#define I x5 /* loop variable */
3535
#define X_COPY x6 /* Copy of X */
36-
36+
#define FLAG x7 /* NaN handling level */
3737
/*******************************************************************************
3838
* Macro definitions
3939
*******************************************************************************/
@@ -217,11 +217,15 @@ zscal_begin:
217217
cmp N, xzr
218218
ble .Lzscal_kernel_L999
219219

220+
ldr FLAG, [sp]
221+
cmp FLAG, #1
222+
beq .Lzscal_kernel_R_non_zero
223+
220224
fcmp DA_R, #0.0
221225
bne .Lzscal_kernel_R_non_zero
222226

223-
fcmp DA_I, #0.0
224-
beq .Lzscal_kernel_RI_zero
227+
// fcmp DA_I, #0.0
228+
// beq .Lzscal_kernel_RI_zero
225229

226230
// b .Lzscal_kernel_R_zero
227231

0 commit comments

Comments
 (0)