Merge branch 'develop'

shtaxxx · shtaxxx · commit b2b4281ecfaf · 2019-05-08T18:35:16.000+09:00
diff --git a/examples/simulation_verilator/test_simulation_verilator.py b/examples/simulation_verilator/test_simulation_verilator.py
@@ -631,15 +631,15 @@
   assign myaxi_awcache = 3;
   assign myaxi_awprot = 0;
   assign myaxi_awqos = 0;
-  assign myaxi_awuser = 1;
+  assign myaxi_awuser = 0;
   assign myaxi_bready = 1;
   assign myaxi_arsize = 2;
   assign myaxi_arburst = 1;
   assign myaxi_arlock = 0;
   assign myaxi_arcache = 3;
   assign myaxi_arprot = 0;
   assign myaxi_arqos = 0;
-  assign myaxi_aruser = 1;
+  assign myaxi_aruser = 0;
   reg _myaxi_read_start;
   reg [8-1:0] _myaxi_read_op_sel;
   reg [32-1:0] _myaxi_read_local_addr;
diff --git a/examples/thread_embedded_verilog_ipcore/test_thread_embedded_verilog_ipxact.py b/examples/thread_embedded_verilog_ipcore/test_thread_embedded_verilog_ipxact.py
@@ -1198,15 +1198,15 @@
   assign maxi_awcache = 3;
   assign maxi_awprot = 0;
   assign maxi_awqos = 0;
-  assign maxi_awuser = 1;
+  assign maxi_awuser = 0;
   assign maxi_bready = 1;
   assign maxi_arsize = 2;
   assign maxi_arburst = 1;
   assign maxi_arlock = 0;
   assign maxi_arcache = 3;
   assign maxi_arprot = 0;
   assign maxi_arqos = 0;
-  assign maxi_aruser = 1;
+  assign maxi_aruser = 0;
   reg _maxi_read_start;
   reg [8-1:0] _maxi_read_op_sel;
   reg [32-1:0] _maxi_read_local_addr;
diff --git a/examples/thread_memcpy_ipxact/test_thread_memcpy_ipxact.py b/examples/thread_memcpy_ipxact/test_thread_memcpy_ipxact.py
@@ -1195,15 +1195,15 @@
   assign maxi_awcache = 3;
   assign maxi_awprot = 0;
   assign maxi_awqos = 0;
-  assign maxi_awuser = 1;
+  assign maxi_awuser = 0;
   assign maxi_bready = 1;
   assign maxi_arsize = 2;
   assign maxi_arburst = 1;
   assign maxi_arlock = 0;
   assign maxi_arcache = 3;
   assign maxi_arprot = 0;
   assign maxi_arqos = 0;
-  assign maxi_aruser = 1;
+  assign maxi_aruser = 0;
   reg _maxi_read_start;
   reg [8-1:0] _maxi_read_op_sel;
   reg [32-1:0] _maxi_read_local_addr;
diff --git a/examples/thread_verilog_submodule_ipxact/test_thread_verilog_submodule_ipxact.py b/examples/thread_verilog_submodule_ipxact/test_thread_verilog_submodule_ipxact.py
@@ -1206,15 +1206,15 @@
   assign maxi_awcache = 3;
   assign maxi_awprot = 0;
   assign maxi_awqos = 0;
-  assign maxi_awuser = 1;
+  assign maxi_awuser = 0;
   assign maxi_bready = 1;
   assign maxi_arsize = 2;
   assign maxi_arburst = 1;
   assign maxi_arlock = 0;
   assign maxi_arcache = 3;
   assign maxi_arprot = 0;
   assign maxi_arqos = 0;
-  assign maxi_aruser = 1;
+  assign maxi_aruser = 0;
   reg _maxi_read_start;
   reg [8-1:0] _maxi_read_op_sel;
   reg [32-1:0] _maxi_read_local_addr;
diff --git a/tests/extension/types_/axi_/axi_to_ram/test_types_axi_axi_to_ram.py b/tests/extension/types_/axi_/axi_to_ram/test_types_axi_axi_to_ram.py
@@ -284,15 +284,15 @@
   assign myaxi_awcache = 3;
   assign myaxi_awprot = 0;
   assign myaxi_awqos = 0;
-  assign myaxi_awuser = 1;
+  assign myaxi_awuser = 0;
   assign myaxi_bready = 1;
   assign myaxi_arsize = 2;
   assign myaxi_arburst = 1;
   assign myaxi_arlock = 0;
   assign myaxi_arcache = 3;
   assign myaxi_arprot = 0;
   assign myaxi_arqos = 0;
-  assign myaxi_aruser = 1;
+  assign myaxi_aruser = 0;
   reg [10-1:0] myram_0_addr;
   wire [32-1:0] myram_0_rdata;
   reg [32-1:0] myram_0_wdata;
diff --git a/tests/extension/types_/axi_/memory_model_read/test_types_memory_model_read.py b/tests/extension/types_/axi_/memory_model_read/test_types_memory_model_read.py
@@ -567,15 +567,15 @@
   assign myaxi_awcache = 3;
   assign myaxi_awprot = 0;
   assign myaxi_awqos = 0;
-  assign myaxi_awuser = 1;
+  assign myaxi_awuser = 0;
   assign myaxi_bready = 1;
   assign myaxi_arsize = 2;
   assign myaxi_arburst = 1;
   assign myaxi_arlock = 0;
   assign myaxi_arcache = 3;
   assign myaxi_arprot = 0;
   assign myaxi_arqos = 0;
-  assign myaxi_aruser = 1;
+  assign myaxi_aruser = 0;
   reg [32-1:0] fsm;
   localparam fsm_init = 0;
   reg [32-1:0] sum;
diff --git a/tests/extension/types_/axi_/memory_model_write/test_types_memory_model_write.py b/tests/extension/types_/axi_/memory_model_write/test_types_memory_model_write.py
@@ -567,15 +567,15 @@
   assign myaxi_awcache = 3;
   assign myaxi_awprot = 0;
   assign myaxi_awqos = 0;
-  assign myaxi_awuser = 1;
+  assign myaxi_awuser = 0;
   assign myaxi_bready = 1;
   assign myaxi_arsize = 2;
   assign myaxi_arburst = 1;
   assign myaxi_arlock = 0;
   assign myaxi_arcache = 3;
   assign myaxi_arprot = 0;
   assign myaxi_arqos = 0;
-  assign myaxi_aruser = 1;
+  assign myaxi_aruser = 0;
   assign myaxi_rready = 0;
   reg [32-1:0] fsm;
   localparam fsm_init = 0;
diff --git a/tests/extension/types_/axi_/ram_to_axi/test_types_axi_ram_to_axi.py b/tests/extension/types_/axi_/ram_to_axi/test_types_axi_ram_to_axi.py
@@ -342,15 +342,15 @@
   assign myaxi_awcache = 3;
   assign myaxi_awprot = 0;
   assign myaxi_awqos = 0;
-  assign myaxi_awuser = 1;
+  assign myaxi_awuser = 0;
   assign myaxi_bready = 1;
   assign myaxi_arsize = 2;
   assign myaxi_arburst = 1;
   assign myaxi_arlock = 0;
   assign myaxi_arcache = 3;
   assign myaxi_arprot = 0;
   assign myaxi_arqos = 0;
-  assign myaxi_aruser = 1;
+  assign myaxi_aruser = 0;
   reg [10-1:0] myram_0_addr;
   wire [32-1:0] myram_0_rdata;
   reg [32-1:0] myram_0_wdata;
diff --git a/tests/extension/types_/axi_/read/test_types_axi_read.py b/tests/extension/types_/axi_/read/test_types_axi_read.py
@@ -259,15 +259,15 @@
   assign myaxi_awcache = 3;
   assign myaxi_awprot = 0;
   assign myaxi_awqos = 0;
-  assign myaxi_awuser = 1;
+  assign myaxi_awuser = 0;
   assign myaxi_bready = 1;
   assign myaxi_arsize = 2;
   assign myaxi_arburst = 1;
   assign myaxi_arlock = 0;
   assign myaxi_arcache = 3;
   assign myaxi_arprot = 0;
   assign myaxi_arqos = 0;
-  assign myaxi_aruser = 1;
+  assign myaxi_aruser = 0;
   reg [32-1:0] fsm;
   localparam fsm_init = 0;
   reg [32-1:0] sum;
diff --git a/tests/extension/types_/axi_/read_dataflow/test_types_axi_read_dataflow.py b/tests/extension/types_/axi_/read_dataflow/test_types_axi_read_dataflow.py
@@ -259,15 +259,15 @@
   assign myaxi_awcache = 3;
   assign myaxi_awprot = 0;
   assign myaxi_awqos = 0;
-  assign myaxi_awuser = 1;
+  assign myaxi_awuser = 0;
   assign myaxi_bready = 1;
   assign myaxi_arsize = 2;
   assign myaxi_arburst = 1;
   assign myaxi_arlock = 0;
   assign myaxi_arcache = 3;
   assign myaxi_arprot = 0;
   assign myaxi_arqos = 0;
-  assign myaxi_aruser = 1;
+  assign myaxi_aruser = 0;
   reg [32-1:0] req_fsm;
   localparam req_fsm_init = 0;
   reg [9-1:0] _tmp_0;
diff --git a/tests/extension/types_/axi_/read_multi/test_types_axi_read_multi.py b/tests/extension/types_/axi_/read_multi/test_types_axi_read_multi.py
@@ -259,15 +259,15 @@
   assign myaxi_awcache = 3;
   assign myaxi_awprot = 0;
   assign myaxi_awqos = 0;
-  assign myaxi_awuser = 1;
+  assign myaxi_awuser = 0;
   assign myaxi_bready = 1;
   assign myaxi_arsize = 2;
   assign myaxi_arburst = 1;
   assign myaxi_arlock = 0;
   assign myaxi_arcache = 3;
   assign myaxi_arprot = 0;
   assign myaxi_arqos = 0;
-  assign myaxi_aruser = 1;
+  assign myaxi_aruser = 0;
   reg [32-1:0] fsm;
   localparam fsm_init = 0;
   reg [32-1:0] sum;
diff --git a/tests/extension/types_/axi_/read_stall/test_types_axi_read_stall.py b/tests/extension/types_/axi_/read_stall/test_types_axi_read_stall.py
@@ -259,15 +259,15 @@
   assign myaxi_awcache = 3;
   assign myaxi_awprot = 0;
   assign myaxi_awqos = 0;
-  assign myaxi_awuser = 1;
+  assign myaxi_awuser = 0;
   assign myaxi_bready = 1;
   assign myaxi_arsize = 2;
   assign myaxi_arburst = 1;
   assign myaxi_arlock = 0;
   assign myaxi_arcache = 3;
   assign myaxi_arprot = 0;
   assign myaxi_arqos = 0;
-  assign myaxi_aruser = 1;
+  assign myaxi_aruser = 0;
   reg [32-1:0] fsm;
   localparam fsm_init = 0;
   reg [32-1:0] sum;
diff --git a/tests/extension/types_/axi_/slave_read/test_types_axi_slave_read.py b/tests/extension/types_/axi_/slave_read/test_types_axi_slave_read.py
@@ -84,15 +84,15 @@
   assign _axi_awcache = 3;
   assign _axi_awprot = 0;
   assign _axi_awqos = 0;
-  assign _axi_awuser = 1;
+  assign _axi_awuser = 0;
   assign _axi_bready = 1;
   assign _axi_arsize = 2;
   assign _axi_arburst = 1;
   assign _axi_arlock = 0;
   assign _axi_arcache = 3;
   assign _axi_arprot = 0;
   assign _axi_arqos = 0;
-  assign _axi_aruser = 1;
+  assign _axi_aruser = 0;
   wire [32-1:0] _tmp_0;
   assign _tmp_0 = _axi_awaddr;
 
diff --git a/tests/extension/types_/axi_/slave_readwrite/test_types_axi_slave_readwrite.py b/tests/extension/types_/axi_/slave_readwrite/test_types_axi_slave_readwrite.py
@@ -85,15 +85,15 @@
   assign _axi_awcache = 3;
   assign _axi_awprot = 0;
   assign _axi_awqos = 0;
-  assign _axi_awuser = 1;
+  assign _axi_awuser = 0;
   assign _axi_bready = 1;
   assign _axi_arsize = 2;
   assign _axi_arburst = 1;
   assign _axi_arlock = 0;
   assign _axi_arcache = 3;
   assign _axi_arprot = 0;
   assign _axi_arqos = 0;
-  assign _axi_aruser = 1;
+  assign _axi_aruser = 0;
   wire [32-1:0] _tmp_0;
   assign _tmp_0 = _axi_awaddr;
 
diff --git a/tests/extension/types_/axi_/slave_write/test_types_axi_slave_write.py b/tests/extension/types_/axi_/slave_write/test_types_axi_slave_write.py
@@ -85,15 +85,15 @@
   assign _axi_awcache = 3;
   assign _axi_awprot = 0;
   assign _axi_awqos = 0;
-  assign _axi_awuser = 1;
+  assign _axi_awuser = 0;
   assign _axi_bready = 1;
   assign _axi_arsize = 2;
   assign _axi_arburst = 1;
   assign _axi_arlock = 0;
   assign _axi_arcache = 3;
   assign _axi_arprot = 0;
   assign _axi_arqos = 0;
-  assign _axi_aruser = 1;
+  assign _axi_aruser = 0;
   assign _axi_rready = 0;
   wire [32-1:0] _tmp_0;
   assign _tmp_0 = _axi_awaddr;
diff --git a/tests/extension/types_/axi_/write/test_types_axi_write.py b/tests/extension/types_/axi_/write/test_types_axi_write.py
@@ -251,15 +251,15 @@
   assign myaxi_awcache = 3;
   assign myaxi_awprot = 0;
   assign myaxi_awqos = 0;
-  assign myaxi_awuser = 1;
+  assign myaxi_awuser = 0;
   assign myaxi_bready = 1;
   assign myaxi_arsize = 2;
   assign myaxi_arburst = 1;
   assign myaxi_arlock = 0;
   assign myaxi_arcache = 3;
   assign myaxi_arprot = 0;
   assign myaxi_arqos = 0;
-  assign myaxi_aruser = 1;
+  assign myaxi_aruser = 0;
   assign myaxi_rready = 0;
   reg [32-1:0] fsm;
   localparam fsm_init = 0;
diff --git a/tests/extension/types_/axi_/write_dataflow/test_types_axi_write_dataflow.py b/tests/extension/types_/axi_/write_dataflow/test_types_axi_write_dataflow.py
@@ -251,15 +251,15 @@
   assign myaxi_awcache = 3;
   assign myaxi_awprot = 0;
   assign myaxi_awqos = 0;
-  assign myaxi_awuser = 1;
+  assign myaxi_awuser = 0;
   assign myaxi_bready = 1;
   assign myaxi_arsize = 2;
   assign myaxi_arburst = 1;
   assign myaxi_arlock = 0;
   assign myaxi_arcache = 3;
   assign myaxi_arprot = 0;
   assign myaxi_arqos = 0;
-  assign myaxi_aruser = 1;
+  assign myaxi_aruser = 0;
   assign myaxi_rready = 0;
   reg [32-1:0] fsm;
   localparam fsm_init = 0;
diff --git a/tests/extension/types_/axi_/write_dataflow_when/test_types_axi_write_dataflow_when.py b/tests/extension/types_/axi_/write_dataflow_when/test_types_axi_write_dataflow_when.py
@@ -251,15 +251,15 @@
   assign myaxi_awcache = 3;
   assign myaxi_awprot = 0;
   assign myaxi_awqos = 0;
-  assign myaxi_awuser = 1;
+  assign myaxi_awuser = 0;
   assign myaxi_bready = 1;
   assign myaxi_arsize = 2;
   assign myaxi_arburst = 1;
   assign myaxi_arlock = 0;
   assign myaxi_arcache = 3;
   assign myaxi_arprot = 0;
   assign myaxi_arqos = 0;
-  assign myaxi_aruser = 1;
+  assign myaxi_aruser = 0;
   assign myaxi_rready = 0;
   reg [32-1:0] fsm;
   localparam fsm_init = 0;
diff --git a/tests/extension/types_/axi_/write_multi/test_types_axi_multiwrite.py b/tests/extension/types_/axi_/write_multi/test_types_axi_multiwrite.py
@@ -251,15 +251,15 @@
   assign myaxi_awcache = 3;
   assign myaxi_awprot = 0;
   assign myaxi_awqos = 0;
-  assign myaxi_awuser = 1;
+  assign myaxi_awuser = 0;
   assign myaxi_bready = 1;
   assign myaxi_arsize = 2;
   assign myaxi_arburst = 1;
   assign myaxi_arlock = 0;
   assign myaxi_arcache = 3;
   assign myaxi_arprot = 0;
   assign myaxi_arqos = 0;
-  assign myaxi_aruser = 1;
+  assign myaxi_aruser = 0;
   assign myaxi_rready = 0;
   reg [32-1:0] fsm;
   localparam fsm_init = 0;
diff --git a/tests/extension/types_/ipxact_/master/test_types_ipxact_master.py b/tests/extension/types_/ipxact_/master/test_types_ipxact_master.py
@@ -570,15 +570,15 @@
   assign myaxi_awcache = 3;
   assign myaxi_awprot = 0;
   assign myaxi_awqos = 0;
-  assign myaxi_awuser = 1;
+  assign myaxi_awuser = 0;
   assign myaxi_bready = 1;
   assign myaxi_arsize = 2;
   assign myaxi_arburst = 1;
   assign myaxi_arlock = 0;
   assign myaxi_arcache = 3;
   assign myaxi_arprot = 0;
   assign myaxi_arqos = 0;
-  assign myaxi_aruser = 1;
+  assign myaxi_aruser = 0;
   reg [32-1:0] fsm;
   localparam fsm_init = 0;
   reg [32-1:0] sum;
diff --git a/veriloggen/thread/axi.py b/veriloggen/thread/axi.py
diff --git a/veriloggen/types/axi.py b/veriloggen/types/axi.py
diff --git a/veriloggen/utils/VERSION b/veriloggen/utils/VERSION
