From fb0510f8495173dbebe3d0cf926bae81938fc387 Mon Sep 17 00:00:00 2001
From: Cedric Orban <53445936+cedric-orban@users.noreply.github.com>
Date: Mon, 2 Mar 2020 17:41:41 -0800
Subject: [PATCH] enable rv32e compatability by replacing reg x29 with reg x7
 (#250)

---
 isa/macros/scalar/test_macros.h | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/isa/macros/scalar/test_macros.h b/isa/macros/scalar/test_macros.h
index 7ac9a3f96..ed4cab081 100644
--- a/isa/macros/scalar/test_macros.h
+++ b/isa/macros/scalar/test_macros.h
@@ -13,9 +13,9 @@
 #define TEST_CASE( testnum, testreg, correctval, code... ) \
 test_ ## testnum: \
     code; \
-    li  x29, MASK_XLEN(correctval); \
+    li  x7, MASK_XLEN(correctval); \
     li  TESTNUM, testnum; \
-    bne testreg, x29, fail;
+    bne testreg, x7, fail;
 
 # We use a macro hack to simpify code generation for various numbers
 # of bubble cycles.
@@ -237,8 +237,8 @@ test_ ## testnum: \
     inst x14, offset(x1); \
     TEST_INSERT_NOPS_ ## nop_cycles \
     addi  x6, x14, 0; \
-    li  x29, result; \
-    bne x6, x29, fail; \
+    li  x7, result; \
+    bne x6, x7, fail; \
     addi  x4, x4, 1; \
     li  x5, 2; \
     bne x4, x5, 1b; \
@@ -250,8 +250,8 @@ test_ ## testnum: \
 1:  la  x1, base; \
     TEST_INSERT_NOPS_ ## nop_cycles \
     inst x14, offset(x1); \
-    li  x29, result; \
-    bne x14, x29, fail; \
+    li  x7, result; \
+    bne x14, x7, fail; \
     addi  x4, x4, 1; \
     li  x5, 2; \
     bne x4, x5, 1b \
@@ -266,8 +266,8 @@ test_ ## testnum: \
     TEST_INSERT_NOPS_ ## src2_nops \
     store_inst x1, offset(x2); \
     load_inst x14, offset(x2); \
-    li  x29, result; \
-    bne x14, x29, fail; \
+    li  x7, result; \
+    bne x14, x7, fail; \
     addi  x4, x4, 1; \
     li  x5, 2; \
     bne x4, x5, 1b \
@@ -282,8 +282,8 @@ test_ ## testnum: \
     TEST_INSERT_NOPS_ ## src2_nops \
     store_inst x1, offset(x2); \
     load_inst x14, offset(x2); \
-    li  x29, result; \
-    bne x14, x29, fail; \
+    li  x7, result; \
+    bne x14, x7, fail; \
     addi  x4, x4, 1; \
     li  x5, 2; \
     bne x4, x5, 1b \
@@ -615,10 +615,10 @@ test_ ## testnum: \
 test_ ## testnum: \
     code; \
     la  x15, test_ ## testnum ## _data ; \
-    lw  x29, 0(x15); \
+    lw  x7, 0(x15); \
     lw  x15, 4(x15); \
     li  TESTNUM, testnum; \
-    bne testreg1, x29, fail;\
+    bne testreg1, x7, fail;\
     bne testreg2, x15, fail;\
     .pushsection .data; \
     .align 3; \