From 07d1a4104a6f838a944e5acbe4f0ae12061446f6 Mon Sep 17 00:00:00 2001
From: Rose Thompson <ross1728@gmail.com>
Date: Wed, 31 Jan 2024 14:03:27 -0600
Subject: [PATCH] Improvement to ebu coverage. Also modified object dumps to
 include data segments.

---
 tests/coverage/Makefile  | 2 +-
 tests/coverage/tlbmisc.S | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/coverage/Makefile b/tests/coverage/Makefile
index 676e77855..6e13dc000 100644
--- a/tests/coverage/Makefile
+++ b/tests/coverage/Makefile
@@ -19,7 +19,7 @@ all: $(OBJECTS)
 %.elf: $(SRCDIR)/%.$(SEXT) WALLY-init-lib.h Makefile
 	riscv64-unknown-elf-gcc -g -o $@ -march=rv64gqc_zfa_zba_zbb_zbc_zbs_zfh_zicboz_zicbop_zicbom -mabi=lp64 -mcmodel=medany \
 	    -nostartfiles -T../../examples/link/link.ld $<
-	riscv64-unknown-elf-objdump -S $@ > $@.objdump
+	riscv64-unknown-elf-objdump -S -D $@ > $@.objdump
 	riscv64-unknown-elf-elf2hex --bit-width 64 --input $@ --output $@.memfile
 	extractFunctionRadix.sh $@.objdump
     
diff --git a/tests/coverage/tlbmisc.S b/tests/coverage/tlbmisc.S
index 4bbb4958a..517f2bb4e 100644
--- a/tests/coverage/tlbmisc.S
+++ b/tests/coverage/tlbmisc.S
@@ -96,6 +96,11 @@ main:
     sw t1, 0(t0)    # write to page
     jalr ra, t0     # jump to page
 
+    # AMO at page has PBMT = 2 or 1 (uncached)
+    li t0, 0x80401000
+    li t1, 10
+    amoadd.w t1, t1, (t0)
+
     # Nonleaf PTE has PBMT != 0     causes a page fault during page walking.  H
     li t0, 0x80600000
     lw t1, 0(t0)    # read from page
@@ -409,6 +414,7 @@ pagetable:
 .align 12
     #80400000
     .8byte 0x60000000200020CF   # reserved entry
+    .8byte 0x40000000201000CF   # non-cache non-idempotent
 
 # Leaf page table at 0x80015000 with various permissions for testing CBOM and CBOZ
 .align 12