more moving around, added params for hex files

boards/ice40hx8k/appleone_sbt.project

@@ -4,7 +4,7 @@ Version=Lattice Semiconductor Corporation iCEcube - Release: 2017.08.27940 - Bui
 ProjectName=appleone
 Vendor=SiliconBlue
 Synthesis=synplify
-ProjectVFiles=../../rtl/rom_wozmon.v,../../rtl/apple1.v,../../rtl/ram.v,../../rtl/boards/ice40hx8k/apple1_top.v,../../rtl/boards/ice40hx8k/clock_pll.v,../../rtl/cpu/ALU.v,../../rtl/cpu/cpu.v,../../rtl/uart/async_tx_rx.v,../../rtl/uart/uart.v
+ProjectVFiles=../../rtl/rom_wozmon.v,../../rtl/apple1.v,../../rtl/ram.v,../../rtl/boards/ice40hx8k/clock_pll.v,../../rtl/cpu/ALU.v,../../rtl/cpu/cpu.v,../../rtl/uart/async_tx_rx.v,../../rtl/uart/uart.v
 ProjectCFiles=appleone_syn.sdc
 CurImplementation=appleone_Implmnt
 Implementations=appleone_Implmnt
@@ -16,16 +16,16 @@ DeviceFamily=iCE40
 Device=HX8K
 DevicePackage=CT256
 DevicePower=
-NetlistFile=appleone_Implmnt/appleone.edf
+NetlistFile=
 AdditionalEDIFFile=
 IPEDIFFile=
 DesignLib=
 DesignView=
 DesignCell=
-SynthesisSDCFile=appleone_Implmnt/appleone.scf
+SynthesisSDCFile=
 UserPinConstraintFile=
 UserSDCFile=
-PhysicalConstraintFile=
+PhysicalConstraintFile=ice40hx8k.pcf
 BackendImplPathName=
 Devicevoltage=1.14
 DevicevoltagePerformance=+/-5%(datasheet default)

boards/ice40hx8k/appleone_syn.prd

@@ -0,0 +1,13 @@
+#--  Synopsys, Inc.
+#--  Version L-2016.09L+ice40
+#--  Project file C:\Users\Alan\Documents\GitHub\apple-one\boards\ice40hx8k\appleone_syn.prd
+#--  Written on Sat Jan 27 14:12:58 2018
+
+#
+### Watch Implementation type ###
+#
+watch_impl -all
+#
+### Watch Implementation properties ###
+#
+watch_prop -clear

boards/ice40hx8k/appleone_syn.prj

@@ -1,11 +1,16 @@
-#-- Synopsys, Inc.
+#--  Synopsys, Inc.
-#-- Project file C:\Users\Alan\Documents\GitHub\apple-one\boards\ice40hx8k\appleone_syn.prj
+#--  Version L-2016.09L+ice40
+#--  Project file C:\Users\Alan\Documents\GitHub\apple-one\boards\ice40hx8k\appleone_syn.prj
+#--  Written on Sat Jan 27 14:24:00 2018
+
+
 #project files
 
+
+
 add_file -verilog -lib work "../../rtl/rom_wozmon.v" 
 add_file -verilog -lib work "../../rtl/apple1.v" 
 add_file -verilog -lib work "../../rtl/ram.v" 
-add_file -verilog -lib work "../../rtl/boards/ice40hx8k/apple1_top.v" 
 add_file -verilog -lib work "../../rtl/boards/ice40hx8k/clock_pll.v" 
 add_file -verilog -lib work "../../rtl/cpu/ALU.v" 
 add_file -verilog -lib work "../../rtl/cpu/cpu.v" 
@@ -15,7 +20,9 @@ add_file -constraint -lib work "appleone_syn.sdc"
 #implementation: "appleone_Implmnt"
 impl -add appleone_Implmnt -type fpga
 
+#
 #implementation attributes
+
 set_option -vlog_std v2001
 set_option -project_relative_includes 1
 
@@ -28,24 +35,29 @@ set_option -part_companion ""
 
 #compilation/mapping options
 
-# mapper_options
+# hdl_compiler_options
+set_option -distributed_compile 0
+
+# mapper_without_write_options
 set_option -frequency auto
+set_option -srs_instrumentation 1
+
+# mapper_options
 set_option -write_verilog 0
 set_option -write_vhdl 0
 
-# Silicon Blue iCE40
+# Lattice iCE40
 set_option -maxfan 10000
+set_option -rw_check_on_ram 1
 set_option -disable_io_insertion 0
 set_option -pipe 1
 set_option -retiming 0
 set_option -update_models_cp 0
-set_option -fixgatedclocks 2
+set_option -fix_gated_and_generated_clocks 1
-set_option -fixgeneratedclocks 0
+set_option -run_prop_extract 1
 
 # NFilter
-set_option -popfeed 0
+set_option -no_sequential_opt 0
-set_option -constprop 0
-set_option -createhierarchy 0
 
 # sequential_optimization_options
 set_option -symbolic_fsm_compiler 1
@@ -54,12 +66,13 @@ set_option -symbolic_fsm_compiler 1
 set_option -compiler_compatible 0
 set_option -resource_sharing 1
 
+# Compiler Options
+set_option -auto_infer_blackbox 0
+
 #automatic place and route (vendor) options
 set_option -write_apr_constraint 1
 
 #set result format/file last
-project -result_format "edif"
+project -result_file "appleone_Implmnt/appleone.edf"
-project -result_file ./appleone_Implmnt/appleone.edf
-project -log_file "./appleone_Implmnt/appleone.srr"
 impl -active appleone_Implmnt
 project -run synthesis -clean

rtl/apple1.v

@@ -105,7 +105,7 @@ module apple1(
 
     // RAM
     wire [7:0] ram_dout;
-    ram my_ram (
+    ram #("../../roms/ram.hex") my_ram (
         .clk(clk25),
         .address(ab[12:0]),
         .w_en(we & ram_cs),
@@ -115,7 +115,7 @@ module apple1(
 
     // WozMon ROM
     wire [7:0] rom_dout;
-    rom_wozmon my_rom_wozmon (
+    rom_wozmon #("../../roms/wozmon.hex") my_rom_wozmon (
         .clk(clk25),
         .address(ab[7:0]),
         .dout(rom_dout)

rtl/ram.v

@@ -6,11 +6,12 @@ module ram(
     output reg [7:0] dout
     );
 
-    /* synthesis syn_ramstyle = rw_check */
+    parameter RAM_FILENAME = "../roms/ram.hex";
+
     reg [7:0] ram[0:8191];
 
     initial
-        $readmemh("../roms/ram.hex", ram, 0, 8191);
+        $readmemh(RAM_FILENAME, ram, 0, 8191);
 
     always @(posedge clk)
     begin

rtl/rom_wozmon.v

@@ -4,10 +4,12 @@ module rom_wozmon(
     output reg [7:0] dout
     );
 
+    parameter ROM_FILENAME = "../roms/wozmon.hex";
+
     reg [7:0] rom[0:255];
 
     initial
-        $readmemh("../roms/rom.hex", rom, 0, 255);
+        $readmemh(ROM_FILENAME, rom, 0, 255);
 
     always @(posedge clk)
     begin