colin
/
abstractaccelerator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #49 from dawidzim/enum_from_diff_type 

fix for assignment to enum variable from expression of different type
This commit is contained in:
jrahmeh 2020-05-27 08:38:13 -05:00 committed by GitHub
parent ee7473ee90 cc6285eb3b
commit 27507b79a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
design/ifu/ifu_ifc_ctl.sv
View File

@ -185,11 +185,11 @@ module ifu_ifc_ctl
//11 0-10- 01 //11 0-10- 01
//11 0-00- 11 //11 0-00- 11
assign next_state[1] = (~state[1] & state[0] & ~reset_delayed & miss_f2 & ~goto_idle) | assign next_state[1] = state_t'((~state[1] & state[0] & ~reset_delayed & miss_f2 & ~goto_idle) |
(state[1] & ~reset_delayed & ~mb_empty_mod & ~goto_idle); (state[1] & ~reset_delayed & ~mb_empty_mod & ~goto_idle));
assign next_state[0] = (~goto_idle & leave_idle) | (state[0] & ~goto_idle) | assign next_state[0] = state_t'((~goto_idle & leave_idle) | (state[0] & ~goto_idle) |
(reset_delayed); (reset_delayed));
assign flush_fb = exu_flush_final; assign flush_fb = exu_flush_final;

1
tools/Makefile
View File

@ -114,7 +114,6 @@ irun-build: ${TBFILES} ${BUILD_DIR}/defines.h
riviera-build: ${TBFILES} ${BUILD_DIR}/defines.h riviera-build: ${TBFILES} ${BUILD_DIR}/defines.h
vlib work vlib work
vlog -work work \ vlog -work work \
-err VCP2694 W1 \
+incdir+${RV_ROOT}/design/lib \ +incdir+${RV_ROOT}/design/lib \
+incdir+${RV_ROOT}/design/include \ +incdir+${RV_ROOT}/design/include \
+incdir+${BUILD_DIR} +libext+.v $(defines) \ +incdir+${BUILD_DIR} +libext+.v $(defines) \