Fixed syntax problems

This commit is contained in:
Luca Valente 2021-05-18 19:21:35 +02:00
parent aa3e2c31d0
commit 7ffc795560
4 changed files with 7 additions and 7 deletions

View file

@ -26,7 +26,7 @@
#include "archi/riscv/priv_1_10.h" #include "archi/riscv/priv_1_10.h"
#ifdef __ibex__ #ifdef __ibex__
#include "archi/ibex/mhpm.h" #include "archi/ibex/mhpm.h"
#else #ifdef __cv32e40p__ #elif defined(__cv32e40p__)
#include "archi/cv32e40p/cv32e40p.h" #include "archi/cv32e40p/cv32e40p.h"
#else #else
#include "archi/riscv/pcer_v2.h" #include "archi/riscv/pcer_v2.h"

View file

@ -19,7 +19,7 @@
#ifdef __ibex__ #ifdef __ibex__
#include "hal/ibex/ibex.h" #include "hal/ibex/ibex.h"
#else #ifdef __cv32e40p__ #elif defined(__cv32e40p__)
#include "hal/cv32e40p/cv32e40p.h" #include "hal/cv32e40p/cv32e40p.h"
#else #else
#include "hal/riscv/riscv_v5.h" #include "hal/riscv/riscv_v5.h"

View file

@ -247,7 +247,7 @@ void illegal_insn_handler_c(void)
{ {
#ifndef __ariane__ #ifndef __ariane__
unsigned int exception_address, insn; unsigned int exception_address, insn;
#if defined( __riscv__ ) || defined( __ibex__) #if defined( __riscv__ ) || defined( __ibex__) || defined(__cv32e40p__)
asm("csrr %0, 0x341" : "=r" (exception_address) : ); asm("csrr %0, 0x341" : "=r" (exception_address) : );
#else #else
exception_address = hal_spr_read(SPR_EPCR_BASE); exception_address = hal_spr_read(SPR_EPCR_BASE);

View file

@ -5,11 +5,11 @@ PULP_ARCH_CFLAGS ?= -march=rv32imc
PULP_ARCH_LDFLAGS ?= -march=rv32imc PULP_ARCH_LDFLAGS ?= -march=rv32imc
PULP_ARCH_OBJDFLAGS ?= -Mmarch=rv32imc PULP_ARCH_OBJDFLAGS ?= -Mmarch=rv32imc
else ifdef USE_CV32E40P else ifdef USE_CV32E40P
PULP_LDFLAGS += -mhwloopalign PULP_LDFLAGS +=
PULP_CFLAGS += -D__cv32e40p__ -U__riscv__ -UARCHI_CORE_HAS_PULPV2 PULP_CFLAGS += -D__cv32e40p__ -U__riscv__ -UARCHI_CORE_HAS_PULPV2
PULP_ARCH_CFLAGS ?= -march=rv32imcxgap9 -mhwloopalign PULP_ARCH_CFLAGS ?= -march=rv32imcxgap9
PULP_ARCH_LDFLAGS ?= -march=rv32imcxgap9 -mhwloopalign PULP_ARCH_LDFLAGS ?= -march=rv32imcxgap9
PULP_ARCH_OBJDFLAGS ?= -Mmarch=rv32imcxgap9 -mhwloopalign PULP_ARCH_OBJDFLAGS ?= -Mmarch=rv32imcxgap9
else else
PULP_LDFLAGS += PULP_LDFLAGS +=
PULP_CFLAGS += -D__riscv__ PULP_CFLAGS += -D__riscv__