Sun, 04 Apr 2010 22:05:07 +0100
remove more Lattice-specific fluff
Code now synthesizes properly on Altera Quartus 9.0 build 235
lm32_dcache.v | file | annotate | diff | revisions | |
lm32_icache.v | file | annotate | diff | revisions |
1.1 --- a/lm32_dcache.v Sun Apr 04 20:52:32 2010 +0100 1.2 +++ b/lm32_dcache.v Sun Apr 04 22:05:07 2010 +0100 1.3 @@ -195,8 +195,9 @@ 1.4 #( 1.5 // ----- Parameters ------- 1.6 .data_width (32), 1.7 - .address_width (`LM32_DC_DMEM_ADDR_WIDTH), 1.8 + .address_width (`LM32_DC_DMEM_ADDR_WIDTH) 1.9 `ifdef PLATFORM_LATTICE 1.10 + , 1.11 `ifdef CFG_DCACHE_DAT_USE_DP_TRUE 1.12 .RAM_IMPLEMENTATION ("EBR"), 1.13 .RAM_TYPE ("RAM_DP_TRUE") 1.14 @@ -232,15 +233,18 @@ 1.15 #( 1.16 // ----- Parameters ------- 1.17 .data_width (8), 1.18 - .address_width (`LM32_DC_DMEM_ADDR_WIDTH), 1.19 -`ifdef CFG_DCACHE_DAT_USE_DP_TRUE 1.20 + .address_width (`LM32_DC_DMEM_ADDR_WIDTH) 1.21 +`ifdef PLATFORM_LATTICE 1.22 + , 1.23 + `ifdef CFG_DCACHE_DAT_USE_DP_TRUE 1.24 .RAM_IMPLEMENTATION ("EBR"), 1.25 .RAM_TYPE ("RAM_DP_TRUE") 1.26 -`else 1.27 - `ifdef CFG_DCACHE_DAT_USE_SLICE 1.28 + `else 1.29 + `ifdef CFG_DCACHE_DAT_USE_SLICE 1.30 .RAM_IMPLEMENTATION ("SLICE") 1.31 - `else 1.32 + `else 1.33 .RAM_IMPLEMENTATION ("AUTO") 1.34 + `endif 1.35 `endif 1.36 `endif 1.37 ) way_0_data_ram 1.38 @@ -266,15 +270,18 @@ 1.39 #( 1.40 // ----- Parameters ------- 1.41 .data_width (`LM32_DC_TAGS_WIDTH), 1.42 - .address_width (`LM32_DC_TMEM_ADDR_WIDTH), 1.43 -`ifdef CFG_DCACHE_DAT_USE_DP_TRUE 1.44 + .address_width (`LM32_DC_TMEM_ADDR_WIDTH) 1.45 +`ifdef PLATFORM_LATTICE 1.46 + , 1.47 + `ifdef CFG_DCACHE_DAT_USE_DP_TRUE 1.48 .RAM_IMPLEMENTATION ("EBR"), 1.49 .RAM_TYPE ("RAM_DP_TRUE") 1.50 -`else 1.51 - `ifdef CFG_DCACHE_DAT_USE_SLICE 1.52 + `else 1.53 + `ifdef CFG_DCACHE_DAT_USE_SLICE 1.54 .RAM_IMPLEMENTATION ("SLICE") 1.55 - `else 1.56 + `else 1.57 .RAM_IMPLEMENTATION ("AUTO") 1.58 + `endif 1.59 `endif 1.60 `endif 1.61 ) way_0_tag_ram
2.1 --- a/lm32_icache.v Sun Apr 04 20:52:32 2010 +0100 2.2 +++ b/lm32_icache.v Sun Apr 04 22:05:07 2010 +0100 2.3 @@ -198,8 +198,9 @@ 2.4 #( 2.5 // ----- Parameters ------- 2.6 .data_width (32), 2.7 - .address_width (`LM32_IC_DMEM_ADDR_WIDTH), 2.8 + .address_width (`LM32_IC_DMEM_ADDR_WIDTH) 2.9 `ifdef PLATFORM_LATTICE 2.10 + , 2.11 `ifdef CFG_ICACHE_DAT_USE_DP_TRUE 2.12 .RAM_IMPLEMENTATION ("EBR"), 2.13 .RAM_TYPE ("RAM_DP_TRUE") 2.14 @@ -237,19 +238,22 @@ 2.15 #( 2.16 // ----- Parameters ------- 2.17 .data_width (`LM32_IC_TAGS_WIDTH), 2.18 - .address_width (`LM32_IC_TMEM_ADDR_WIDTH), 2.19 -`ifdef CFG_ICACHE_DAT_USE_DP_TRUE 2.20 + .address_width (`LM32_IC_TMEM_ADDR_WIDTH) 2.21 +`ifdef PLATFORM_LATTICE 2.22 + , 2.23 + `ifdef CFG_ICACHE_DAT_USE_DP_TRUE 2.24 .RAM_IMPLEMENTATION ("EBR"), 2.25 .RAM_TYPE ("RAM_DP_TRUE") 2.26 -`else 2.27 - `ifdef CFG_ICACHE_DAT_USE_DP 2.28 + `else 2.29 + `ifdef CFG_ICACHE_DAT_USE_DP 2.30 .RAM_IMPLEMENTATION ("EBR"), 2.31 .RAM_TYPE ("RAM_DP") 2.32 - `else 2.33 - `ifdef CFG_ICACHE_DAT_USE_SLICE 2.34 + `else 2.35 + `ifdef CFG_ICACHE_DAT_USE_SLICE 2.36 .RAM_IMPLEMENTATION ("SLICE") 2.37 - `else 2.38 + `else 2.39 .RAM_IMPLEMENTATION ("AUTO") 2.40 + `endif 2.41 `endif 2.42 `endif 2.43 `endif