Merge pull request #2417 from XavierAubert/cv32e40p/dev_bnl_ww17_PR

CV32E40Pv2 Verification update Week 17 PR

cv32e40p/bsp/Makefile

@@ -3,6 +3,7 @@ RISCV            ?= $(CV_SW_TOOLCHAIN)
 RISCV_EXE_PREFIX ?= $(RISCV)/bin/riscv32-unknown-elf-
 RISCV_GCC = $(RISCV_EXE_PREFIX)gcc
 RISCV_AR = $(RISCV_EXE_PREFIX)ar
+CFG_CFLAGS = $(CFG_CFLAGS)
 SRC = crt0.S handlers.S syscalls.c vectors.S
 OBJ = crt0.o handlers.o syscalls.o vectors.o
 LIBCV-VERIF = libcv-verif.a 
@@ -14,10 +15,10 @@ $(LIBCV-VERIF): $(OBJ)
 	$(RISCV_AR) rcs $@ $(OBJ)
 
 %.o : %.c
-	$(RISCV_GCC) $(CFLAGS) -c $< -o $@
+	$(RISCV_GCC) $(CFLAGS) $(CFG_CFLAGS) -c $< -o $@
 
 %.o : %.S
-	$(RISCV_GCC) $(CFLAGS) -c $< -o $@
+	$(RISCV_GCC) $(CFLAGS) $(CFG_CFLAGS) -c $< -o $@
 
 clean:
 	rm -f $(OBJ) $(LIBCV-VERIF)

cv32e40p/bsp/handlers.S

@@ -66,158 +66,174 @@
 
 /* exception handling */
 __no_irq_handler:
-	la a0, no_exception_handler_msg
-	jal ra, puts
-	j __no_irq_handler
+  la a0, no_exception_handler_msg
+  jal ra, puts
+  j __no_irq_handler
 
 m_software_irq_handler:
-	j __no_irq_handler
+  j __no_irq_handler
 
 m_timer_irq_handler:
-	j __no_irq_handler
+  j __no_irq_handler
 
 m_external_irq_handler:
-	j __no_irq_handler
+  j __no_irq_handler
 
 m_fast0_irq_handler:
-	j __no_irq_handler
+  j __no_irq_handler
 
 m_fast1_irq_handler:
-	j __no_irq_handler
+  j __no_irq_handler
 
 m_fast2_irq_handler:
-	j __no_irq_handler
+  j __no_irq_handler
 
 m_fast3_irq_handler:
-	j __no_irq_handler
+  j __no_irq_handler
 
 m_fast4_irq_handler:
-	j __no_irq_handler
+  j __no_irq_handler
 
 m_fast5_irq_handler:
-	j __no_irq_handler
+  j __no_irq_handler
 
 m_fast6_irq_handler:
-	j __no_irq_handler
+  j __no_irq_handler
 
 m_fast7_irq_handler:
-	j __no_irq_handler
+  j __no_irq_handler
 
 m_fast8_irq_handler:
-	j __no_irq_handler
+  j __no_irq_handler
 
 m_fast9_irq_handler:
-	j __no_irq_handler
+  j __no_irq_handler
 
 m_fast10_irq_handler:
-	j __no_irq_handler
+  j __no_irq_handler
 
 m_fast11_irq_handler:
-	j __no_irq_handler
+  j __no_irq_handler
 
 m_fast12_irq_handler:
-	j __no_irq_handler
+  j __no_irq_handler
 
 m_fast13_irq_handler:
-	j __no_irq_handler
+  j __no_irq_handler
 
 m_fast14_irq_handler:
-	j __no_irq_handler
+  j __no_irq_handler
 
 m_fast15_irq_handler:
-	j __no_irq_handler
+  j __no_irq_handler
 
 u_sw_irq_handler:
-	/* While we are still using puts in handlers, save all caller saved
-	   regs.  Eventually, some of these saves could be deferred.  */
-	addi sp,sp,-64
-	sw ra, 0(sp)
-	sw a0, 4(sp)
-	sw a1, 8(sp)
-	sw a2, 12(sp)
-	sw a3, 16(sp)
-	sw a4, 20(sp)
-	sw a5, 24(sp)
-	sw a6, 28(sp)
-	sw a7, 32(sp)
-	sw t0, 36(sp)
-	sw t1, 40(sp)
-	sw t2, 44(sp)
-	sw t3, 48(sp)
-	sw t4, 52(sp)
-	sw t5, 56(sp)
-	sw t6, 60(sp)
-	csrr t0, mcause
-	li t1, EXCEPTION_ILLEGAL_INSN
-	beq t0, t1, handle_illegal_insn
-	li t1, EXCEPTION_ECALL_M
-	beq t0, t1, handle_ecall
-	li t1, EXCEPTION_BREAKPOINT
-	beq t0, t1, handle_ebreak
-	j handle_unknown
+  /* While we are still using puts in handlers, save all caller saved
+     regs.  Eventually, some of these saves could be deferred.  */
+  addi sp,sp,-76
+  sw ra, 0(sp)
+  sw a0, 4(sp)
+  sw a1, 8(sp)
+  sw a2, 12(sp)
+  sw a3, 16(sp)
+  sw a4, 20(sp)
+  sw a5, 24(sp)
+  sw a6, 28(sp)
+  sw a7, 32(sp)
+  sw t0, 36(sp)
+  sw t1, 40(sp)
+  sw t2, 44(sp)
+  sw t3, 48(sp)
+  sw t4, 52(sp)
+  sw t5, 56(sp)
+  sw t6, 60(sp)
+#ifdef PULP
+  csrr t6, 0xCC0
+  sw t6, 64(sp)
+  csrr t6, 0xCC1
+  sw t6, 68(sp)
+  csrr t6, 0xCC2
+  sw t6, 72(sp)
+#endif
+  csrr t0, mcause
+  li t1, EXCEPTION_ILLEGAL_INSN
+  beq t0, t1, handle_illegal_insn
+  li t1, EXCEPTION_ECALL_M
+  beq t0, t1, handle_ecall
+  li t1, EXCEPTION_BREAKPOINT
+  beq t0, t1, handle_ebreak
+  j handle_unknown
 
 handle_ecall:
-	jal ra, handle_syscall
-	j end_handler_incr_mepc
+  jal ra, handle_syscall
+  j end_handler_incr_mepc
 
 handle_ebreak:
-	/* TODO support debug handling requirements.  */
-	la a0, ebreak_msg
-	jal ra, puts
-	j end_handler_incr_mepc
+  /* TODO support debug handling requirements.  */
+  la a0, ebreak_msg
+  jal ra, puts
+  j end_handler_incr_mepc
 
 handle_illegal_insn:
-	la a0, illegal_insn_msg
-	jal ra, puts
-	j end_handler_incr_mepc
+  la a0, illegal_insn_msg
+  jal ra, puts
+  j end_handler_incr_mepc
 
 handle_unknown:
-	la a0, unknown_msg
-	jal ra, puts
-	/* We don't know what interrupt/exception is being handled, so don't
-	   increment mepc.  */
-	j end_handler_ret
+  la a0, unknown_msg
+  jal ra, puts
+  /* We don't know what interrupt/exception is being handled, so don't
+     increment mepc.  */
+  j end_handler_ret
 
 end_handler_incr_mepc:
-	csrr t0, mepc
-	lb t1, 0(t0)
-	li a0, 0x3
-	and t1, t1, a0
-	/* Increment mepc by 2 or 4 depending on whether the instruction at mepc
-	   is compressed or not.  */
-	bne t1, a0, end_handler_incr_mepc2
-	addi t0, t0, 2
+  csrr t0, mepc
+  lb t1, 0(t0)
+  li a0, 0x3
+  and t1, t1, a0
+  /* Increment mepc by 2 or 4 depending on whether the instruction at mepc
+     is compressed or not.  */
+  bne t1, a0, end_handler_incr_mepc2
+  addi t0, t0, 2
 end_handler_incr_mepc2:
-	addi t0, t0, 2
-	csrw mepc, t0
+  addi t0, t0, 2
+  csrw mepc, t0
 end_handler_ret:
-	lw ra, 0(sp)
-	lw a0, 4(sp)
-	lw a1, 8(sp)
-	lw a2, 12(sp)
-	lw a3, 16(sp)
-	lw a4, 20(sp)
-	lw a5, 24(sp)
-	lw a6, 28(sp)
-	lw a7, 32(sp)
-	lw t0, 36(sp)
-	lw t1, 40(sp)
-	lw t2, 44(sp)
-	lw t3, 48(sp)
-	lw t4, 52(sp)
-	lw t5, 56(sp)
-	lw t6, 60(sp)
-	addi sp,sp,64
-	mret
+#ifdef PULP
+  lw t6, 64(sp)
+  cv.start 0, t6
+  lw t6, 68(sp)
+  cv.end 0, t6
+  lw t6, 72(sp)
+  cv.count 0, t6
+#endif
+  lw ra, 0(sp)
+  lw a0, 4(sp)
+  lw a1, 8(sp)
+  lw a2, 12(sp)
+  lw a3, 16(sp)
+  lw a4, 20(sp)
+  lw a5, 24(sp)
+  lw a6, 28(sp)
+  lw a7, 32(sp)
+  lw t0, 36(sp)
+  lw t1, 40(sp)
+  lw t2, 44(sp)
+  lw t3, 48(sp)
+  lw t4, 52(sp)
+  lw t5, 56(sp)
+  lw t6, 60(sp)
+  addi sp,sp,76
+  mret
 
 .section .rodata
 illegal_insn_msg:
-	.string "CV32E40P BSP: illegal instruction exception handler entered\n"
+  .string "CV32E40P BSP: illegal instruction exception handler entered\n"
 ecall_msg:
-	.string "CV32E40P BSP: ecall exception handler entered\n"
+  .string "CV32E40P BSP: ecall exception handler entered\n"
 ebreak_msg:
-	.string "CV32E40P BSP: ebreak exception handler entered\n"
+  .string "CV32E40P BSP: ebreak exception handler entered\n"
 unknown_msg:
-	.string "CV32E40P BSP: unknown exception handler entered\n"
+  .string "CV32E40P BSP: unknown exception handler entered\n"
 no_exception_handler_msg:
-	.string "CV32E40P BSP: no exception handler installed\n"
+  .string "CV32E40P BSP: no exception handler installed\n"