remove more Lattice-specific fluff

Sun, 04 Apr 2010 22:05:07 +0100

author
Philip Pemberton <philpem@philpem.me.uk>
date
Sun, 04 Apr 2010 22:05:07 +0100
changeset 3
b153470d41c5
parent 2
a61bb364ae1f
child 4
99b7b037ce82

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