Skip to content

Commit b694192

Browse files
committed
Fix rv32ud-p-fcvt_w and -recoding being redundant with rv32uf
Resolves #614
1 parent 4bbcf2e commit b694192

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

isa/macros/scalar/test_macros.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@ test_ ## testnum: \
623623

624624
#define TEST_FP_INT_OP_D32( testnum, inst, flags, result, val1, rm ) \
625625
TEST_FP_OP_D32_INTERNAL( testnum, flags, dword result, double val1, double 0, double 0, \
626-
inst a0, f10, f11; li t2, 0)
626+
inst a0, f10, rm; li t2, ((result) << 32 >> 63) * -1)
627627

628628
#define TEST_FP_INT_OP_D( testnum, inst, flags, result, val1, rm ) \
629629
TEST_FP_OP_D_INTERNAL( testnum, flags, dword result, double val1, double 0, double 0, \

isa/rv32ud/fcvt_w.S

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,8 @@
44
#undef RVTEST_RV64UF
55
#define RVTEST_RV64UF RVTEST_RV32UF
66

7-
#include "../rv64uf/fcvt_w.S"
7+
#include "test_macros.h"
8+
#undef TEST_FP_INT_OP_D
9+
#define TEST_FP_INT_OP_D TEST_FP_INT_OP_D32
10+
11+
#include "../rv64ud/fcvt_w.S"

isa/rv32ud/recoding.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
#undef RVTEST_RV64UF
55
#define RVTEST_RV64UF RVTEST_RV32UF
66

7-
#include "../rv64uf/recoding.S"
7+
#include "../rv64ud/recoding.S"

0 commit comments

Comments
 (0)