From 37b091e5da0ec639dae452fed0939d1166eaae5f Mon Sep 17 00:00:00 2001
From: David Harris <david_harris@hmc.edu>
Date: Sat, 25 Dec 2021 06:35:36 -0800
Subject: [PATCH] Checked in Chapter 2 C and assembly examples

---
 Makefile                                      |   6 --
 examples/C/simple/Makefile                    |  14 ++++
 examples/C/simple/simple.c                    |  14 ++++
 examples/asm/example/Makefile                 |   9 ++-
 examples/asm/example/example                  | Bin 6072 -> 0 bytes
 examples/asm/example/example.S                |  64 +-----------------
 examples/asm/sumtest/Makefile                 | Bin 0 -> 570 bytes
 examples/asm/sumtest/sum.S                    | Bin 0 -> 794 bytes
 examples/asm/sumtest/sumtest.S                |  38 +++++++++++
 examples/asm/sumtest/sumtest.reference_output |   1 +
 examples/asm/test                             | Bin 6296 -> 0 bytes
 examples/asm/test.S                           |  22 ------
 examples/link/link.ld                         |  17 +++++
 examples/link/linkc.ld                        |  17 +++++
 wally-pipelined/regression/Makefile           |  16 ++++-
 15 files changed, 124 insertions(+), 94 deletions(-)
 create mode 100644 examples/C/simple/Makefile
 create mode 100644 examples/C/simple/simple.c
 delete mode 100755 examples/asm/example/example
 create mode 100644 examples/asm/sumtest/Makefile
 create mode 100644 examples/asm/sumtest/sum.S
 create mode 100644 examples/asm/sumtest/sumtest.S
 create mode 100644 examples/asm/sumtest/sumtest.reference_output
 delete mode 100755 examples/asm/test
 delete mode 100644 examples/asm/test.S
 create mode 100644 examples/link/link.ld
 create mode 100644 examples/link/linkc.ld

diff --git a/Makefile b/Makefile
index 13d18c37a..b83437833 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
 all:
 	make install
-	make compile
 	make regression
 
 # install copies over the Makefile.include from riscv-isa-sim
@@ -11,11 +10,6 @@ install:
 	sed -i '/export TARGETDIR ?=/c\export TARGETDIR ?= ${RISCV}/riscv-isa-sim/arch_test_target' addins/riscv-arch-test/Makefile.include
 	echo export RISCV_PREFIX = riscv64-unknown-elf- >> addins/riscv-arch-test/Makefile.include
 
-compile:
-	make -C addins/riscv-arch-test
-	make -C addins/riscv-arch-test XLEN=32
-	cd addins/riscv-arch-test; exe2memfile.pl work/*/*/*.elf
-
 regression:
 	make -C wally-pipelined/regression
 
diff --git a/examples/C/simple/Makefile b/examples/C/simple/Makefile
new file mode 100644
index 000000000..66fe7d7bc
--- /dev/null
+++ b/examples/C/simple/Makefile
@@ -0,0 +1,14 @@
+TARGET = simple
+
+$(TARGET).objdump: $(TARGET)
+	riscv64-unknown-elf-objdump -S -D $(TARGET) > $(TARGET).objdump
+    
+$(TARGET): $(TARGET).c
+	riscv64-unknown-elf-gcc -g -o $(TARGET) -march=rv64gc -mabi=lp64d -mcmodel=medany \
+	    -O $(TARGET).c
+#	    -O -T../../link/linkc.ld $(TARGET).c
+#	    -nostartfiles -nostdlib $(TARGET).c
+#	    -nostartfiles -nostdlib -T../../link/link.ld $(TARGET).c
+
+clean:
+	rm -f $(TARGET) $(TARGET).objdump
diff --git a/examples/C/simple/simple.c b/examples/C/simple/simple.c
new file mode 100644
index 000000000..d610f2999
--- /dev/null
+++ b/examples/C/simple/simple.c
@@ -0,0 +1,14 @@
+// simple.C
+// David_Harris@hmc.edu 24 December 2021
+// Simple illustration of compiling C code
+
+long sum(long N) {
+   long result, i;
+   result = 0;
+   for (i=1; i<=N; i++) result = result + i;
+   return result;
+}
+
+int main(void) {
+    return sum(4);
+}
\ No newline at end of file
diff --git a/examples/asm/example/Makefile b/examples/asm/example/Makefile
index 081f342c7..0cb8448fd 100644
--- a/examples/asm/example/Makefile
+++ b/examples/asm/example/Makefile
@@ -1,2 +1,9 @@
+example.objdump: example
+	riscv64-unknown-elf-objdump -D example > example.objdump
+    
 example: example.S
-	riscv64-unknown-elf-gcc -o example example.S
+	riscv64-unknown-elf-gcc -o example -march=rv32i -mabi=ilp32 -mcmodel=medany \
+	    -nostartfiles -nostdlib -T../../link/link.ld  example.S
+
+clean:
+	rm -f example example.objdump
diff --git a/examples/asm/example/example b/examples/asm/example/example
deleted file mode 100755
index a9b74047949c0c1022323eb3f86a6a5e588b2095..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6072
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
EKb_svjsO4v

diff --git a/examples/asm/example/example.S b/examples/asm/example/example.S
index f487950a5..1205fad4a 100644
--- a/examples/asm/example/example.S
+++ b/examples/asm/example/example.S
@@ -1,67 +1,7 @@
-// example.s
-// David_Harris@hmc.edu 5 December 2021
-
 .section .text.init
-//.globl rvtest_entry_point
-//rvtest_entry_point:
-
-.globl main
-main:
+.globl rvtest_entry_point
+rvtest_entry_point:
     li a0, 42
 
 self_loop:
     j self_loop
-
-.end
-
-/*
-#include "model_test.h"
-#include "arch_test.h"
-RVTEST_ISA("RV32I")
-
-.section .text.init
-.globl rvtest_entry_point
-rvtest_entry_point:
-RVMODEL_BOOT
-RVTEST_CODE_BEGIN
-
-#ifdef TEST_CASE_1
-
-RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;",add)
-
-RVTEST_SIGBASE( x3,signature_x3_1)
-
-inst_0:
-// rs2 == rd != rs1, rs1==x4, rs2==x24, rd==x24, rs1_val > 0 and rs2_val > 0, rs2_val == 1, rs1_val == (2**(xlen-1)-1), rs1_val != rs2_val, rs1_val == 2147483647
-// opcode: add ; op1:x4; op2:x24; dest:x24; op1val:0x7fffffff;  op2val:0x1
-TEST_RR_OP(add, x24, x4, x24, 0x80000000, 0x7fffffff, 0x1, x3, 0, x18)
-
-
-80000000 <rvtest_entry_point>:
-
-.section .text.init
-.globl rvtest_entry_point
-rvtest_entry_point:
-RVMODEL_BOOT
-RVTEST_CODE_BEGIN
-80000000:	feedc0b7          	lui	ra,0xfeedc
-8
-
-80003220 <rvtest_code_end>:
-#endif
-
-
-RVTEST_CODE_END
-RVMODEL_HALT
-80003220:	00408093          	addi	ra,ra,4
-80003224:	00100093          	li	ra,1
-
-80003228 <write_tohost>:
-80003228:	00001f17          	auipc	t5,0x1
-8000322c:	dc1f2c23          	sw	ra,-552(t5) # 80004000 <tohost>
-
-80003230 <self_loop>:
-80003230:	0000006f          	j	80003230 <self_loop>
-80003234:	0000                	unimp
-	...
-*/
\ No newline at end of file
diff --git a/examples/asm/sumtest/Makefile b/examples/asm/sumtest/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..40f51a7ae6530a35a9380b695e1c04427ea1b2e0
GIT binary patch
literal 570
zcmZvZO-lnY5Qe>Oe#NwSP-Nnz6e+AADBj&Y3X*1LcVqLh<U=j=$GffVrl=u=$veaI
z&Ls82%kxtWC4^)mg~-_DRejK|xm&+C$qXx)BvyD8<i~P>$!@Isv`D(eV;$gQu7vv>
zpFj-8mHB5}UhVyP^*_Ip60iew83|~FmwoBSUb-=B#9EblST4p;8rP664K>1U;guD8
zTeL1j;bW^bg`Zoa)f%wo{C3=0+0EhLy2&<EUo0rIVnrC#hTtZs&We~kmD9`cN#icX
zA;q&Q?7Xl^3$Nm~yvuY}G^%X@al|=KC`F*0{Y%Vdo?7x`CA}TZb~~Ui6<I;DcQCI`
m4T2F-_7rANB`GO{*_<({N!W23ZvfkDn4{B&ohiS^V;A2z8nO2P

literal 0
HcmV?d00001

diff --git a/examples/asm/sumtest/sum.S b/examples/asm/sumtest/sum.S
new file mode 100644
index 0000000000000000000000000000000000000000..08afefb04d35dd9c4fbe9379b99e871d1c24b2b2
GIT binary patch
literal 794
zcmY*X(M|#}5cIiUF$pga5IACtLC<L7gHQZ|DO?Y#ckQL^p^5R|-QA;zP0BUX-PxI;
ziv?oe&ZAl^@S=~ldVAF&*!Xm4cXLzqSl!^o>`c2g0juSz;KJvsLf^slj7HSKw<wT2
zHgm=I!Nk5vunuuKgOx)u!-fx<kYG|D=;-1nu?k3S+}U`yXF+2*Y$o_-6azlc65;&-
zp2n0|o`Bj1jBQ!m!#<Q7`khWESxlJ^(~EwQG0-sOk5cn}<F~qD4T|<!(QxRhvWVSG
z_H}W~*a)ruFbJN!lk=#LhTM{;3bBB9NCyIv-hBu~B$%8p$FZB70m|e~06`j>!6nR|
z*C?wdljkC8D{=vUM-*|1LXrJ7w);c^W|DK|osoO<WfNuSJJ_0vAK`?Ie91^2OQL06
zOg!aFf#qsaNYuQ~)s(T^zJt^MznH5tIw{3UhAi8oNTaC!)(BmnvQv2u9O>{%2G<wq
o<u(zTe7KBVUgBTq4gVK8W9}o$+<yKtkGunEu6wsj);o3e3#}K@yZ`_I

literal 0
HcmV?d00001

diff --git a/examples/asm/sumtest/sumtest.S b/examples/asm/sumtest/sumtest.S
new file mode 100644
index 000000000..17ef77f0a
--- /dev/null
+++ b/examples/asm/sumtest/sumtest.S
@@ -0,0 +1,38 @@
+// sumtest.S
+// David_Harris@hmc.edu 24 December 2021
+
+.global rvtest_entry_point
+rvtest_entry_point:
+    la sp, topofstack   # Initialize stack pointer
+    la t0, N            # get address of N in data
+    ld a0, 0(t0)        # load N
+    jal sum             # call sum(N)
+    la t0, begin_signature  # address of signature
+    sd a0, 0(t0)        # store sum(N) in signature
+
+write_tohost:
+    la t1, tohost
+    li t0, 1            # 1 for success, 3 for failure
+    sd t0, 0(t1)        # send success code
+
+self_loop:
+    j self_loop         # wait
+    
+.section .tohost 
+tohost:                 # write to HTIF
+    .dword 0
+fromhost:
+    .dword 0
+
+.data
+N:
+    .dword 4
+
+begin_signature:
+    .fill 2,4,0xdeadbeef
+end_signature:
+
+# Initialize stack with room for 512 bytes
+.bss
+    .space 512
+topofstack:
diff --git a/examples/asm/sumtest/sumtest.reference_output b/examples/asm/sumtest/sumtest.reference_output
new file mode 100644
index 000000000..91bf6ed77
--- /dev/null
+++ b/examples/asm/sumtest/sumtest.reference_output
@@ -0,0 +1 @@
+000000000000000A
diff --git a/examples/asm/test b/examples/asm/test
deleted file mode 100755
index fef7868c62fa8bccead16fa64818e3fd0ba85236..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6296
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
KqD8%ss{bFt@8ItM

diff --git a/examples/asm/test.S b/examples/asm/test.S
deleted file mode 100644
index 0399a456a..000000000
--- a/examples/asm/test.S
+++ /dev/null
@@ -1,22 +0,0 @@
-.globl main 
-.equ N, 5
-
-.data
-//A: .word 5, 42, −88, 2, −5033, 720, 314 
-str1: .string "RISC-V"
-.align 2
-B: .word 0x32A
-.bss
-C: .space 
-D: .space
-.balign 4 
-
-.text 
-main:
-    li a0, 42
-    jr ra
-
-.section .rodata 
-str2: .string "Hello"
-
-.end
diff --git a/examples/link/link.ld b/examples/link/link.ld
new file mode 100644
index 000000000..15d36f156
--- /dev/null
+++ b/examples/link/link.ld
@@ -0,0 +1,17 @@
+OUTPUT_ARCH( "riscv" )
+ENTRY(rvtest_entry_point)
+
+SECTIONS
+{
+  . = 0x80000000;
+  .text : { *(.text) }
+  . = ALIGN(0x1000);
+  .tohost : { *(.tohost) }
+  . = ALIGN(0x1000);
+  .data : { *(.data) }
+  .data.string : { *(.data.string)}
+  . = ALIGN(0x1000);
+  .bss : { *(.bss) }
+  _end = .;
+}
+
diff --git a/examples/link/linkc.ld b/examples/link/linkc.ld
new file mode 100644
index 000000000..7b2566785
--- /dev/null
+++ b/examples/link/linkc.ld
@@ -0,0 +1,17 @@
+OUTPUT_ARCH( "riscv" )
+ENTRY(main)
+
+SECTIONS
+{
+  . = 0x80000000;
+  .text : { *(.text) }
+  . = ALIGN(0x1000);
+  .tohost : { *(.tohost) }
+  . = ALIGN(0x1000);
+  .data : { *(.data) }
+  .data.string : { *(.data.string)}
+  . = ALIGN(0x1000);
+  .bss : { *(.bss) }
+  _end = .;
+}
+
diff --git a/wally-pipelined/regression/Makefile b/wally-pipelined/regression/Makefile
index ad6e427d7..01c5624a0 100644
--- a/wally-pipelined/regression/Makefile
+++ b/wally-pipelined/regression/Makefile
@@ -1,6 +1,16 @@
 make all:
-	make -C ../../tests/imperas-riscv-tests/
+	# Build riscv-arch-test 64 and 32-bit versions
+	make -C ../../addins/riscv-arch-test
+	make -C ../../addins/riscv-arch-test XLEN=32
+	exe2memfile.pl ../../addins/riscv-arch-test/work/*/*/*.elf
+
+	# Build wally-riscv-arch-test
 	make -C ../../tests/wally-riscv-arch-test/
-	make -C XLEN=32 ../../tests/wally-riscv-arch-test/
+	make -C ../../tests/wally-riscv-arch-test/ XLEN=32 
 	exe2memfile.pl ../../tests/wally-riscv-arch-test/work/*/*/*.elf
-	cd ../../tests/linux-testgen/linux-testvectors/;./tvLinker.sh
+
+	# Build Imperas tests (if installed)
+	make -C ../../tests/imperas-riscv-tests/
+
+	# Link Linux test vectors (fix this later***)
+	#cd ../../tests/linux-testgen/linux-testvectors/;./tvLinker.sh