[apps] Align MemPool tests runtime to new eoc address and format
li a0, MSTATUS_MPP & (MSTATUS_MPP >> 1); \
csrs mstatus, a0; \
li a0, SIP_SSIP | SIP_STIP; \
- csrs mideleg, a0; \
+ csrs mideleg, a0;
#define RVTEST_ENABLE_MACHINE \
li a0, MSTATUS_MPP; \
- csrs mstatus, a0; \
+ csrs mstatus, a0;
#define RVTEST_FP_ENABLE
@@ -89,11 +89,7 @@ reset_vector: \
//-----------------------------------------------------------------------
#define RVTEST_CODE_END \
- csrrw x0, cycle, x0; \
- .section ".eoc_address","aw",@progbits; \
- .align 6; \
- .globl eoc_address; \
- eoc_address: .dword 0;
+ csrrw x0, cycle, x0;
//-----------------------------------------------------------------------
// Pass/Fail Macro
@@ -102,13 +98,13 @@ reset_vector: \
#define RVTEST_PASS \
li TESTNUM, 0; \
-1: la t0, eoc_address; \
+1: la t0, eoc_reg; \
sw TESTNUM, 0(t0); \
jal x0, 1b;
#define RVTEST_FAIL \
1: beqz TESTNUM, 1b; \
- la t0, eoc_address; \
+ la t0, eoc_reg; \
sw TESTNUM, 0(t0);
//-----------------------------------------------------------------------
@@ -119,8 +115,13 @@ reset_vector: \
#define RVTEST_DATA_BEGIN \
EXTRA_DATA \
- .align 4; .global begin_signature; begin_signature:
-
-#define RVTEST_DATA_END .align 4; .global end_signature; end_signature:
+ .align 4; \
+ .global begin_signature; \
+begin_signature:
+
+#define RVTEST_DATA_END \
+ .align 4; \
+ .global end_signature; \
+end_signature:
#endif
