diff options
| author | Julian Blake Kongslie | 2021-03-29 12:37:18 -0700 |
|---|---|---|
| committer | Julian Blake Kongslie | 2021-03-29 12:37:18 -0700 |
| commit | 5893895f736ac7f67c5442dfb0bc8d6e6f3302b8 (patch) | |
| tree | 6fdbda55c4b33876a5c17bf56b67922de4608137 /hdl/top.sv | |
| parent | Fix WIDTH warnings from verilator. (diff) | |
| download | noncpu-5893895f736ac7f67c5442dfb0bc8d6e6f3302b8.tar.xz | |
Convert to using $sampled instead of $past, for more uniformity.
Diffstat (limited to 'hdl/top.sv')
| -rw-r--r-- | hdl/top.sv | 16 |
1 files changed, 8 insertions, 8 deletions
| @@ -100,7 +100,7 @@ always_ff @(posedge clk) begin | |||
| 100 | mem_valid = 1; | 100 | mem_valid = 1; |
| 101 | mem_address = {2'b0, pc}; | 101 | mem_address = {2'b0, pc}; |
| 102 | mem_write = 0; | 102 | mem_write = 0; |
| 103 | if (mem_ready) begin | 103 | if (`mem_ready) begin |
| 104 | state = DECODE; | 104 | state = DECODE; |
| 105 | ++pc; | 105 | ++pc; |
| 106 | end | 106 | end |
| @@ -109,9 +109,9 @@ always_ff @(posedge clk) begin | |||
| 109 | DECODE: begin | 109 | DECODE: begin |
| 110 | mem_valid = 0; | 110 | mem_valid = 0; |
| 111 | mem_write = 0; | 111 | mem_write = 0; |
| 112 | if (mem_read_valid) begin | 112 | if (`mem_read_valid) begin |
| 113 | state = FETCH; | 113 | state = FETCH; |
| 114 | {opcode, operand} = mem_read_data; | 114 | {opcode, operand} = `mem_read_data; |
| 115 | sign_extended_operand = {{(DATA_BITS-8){operand[7]}}, operand}; | 115 | sign_extended_operand = {{(DATA_BITS-8){operand[7]}}, operand}; |
| 116 | `ifdef DEBUG $display("\tdecode %x:%x", opcode, operand); `endif | 116 | `ifdef DEBUG $display("\tdecode %x:%x", opcode, operand); `endif |
| 117 | case (opcode) | 117 | case (opcode) |
| @@ -143,20 +143,20 @@ always_ff @(posedge clk) begin | |||
| 143 | 'h1: begin | 143 | 'h1: begin |
| 144 | mem_valid = 1; | 144 | mem_valid = 1; |
| 145 | mem_address = {2'b0, idx + sign_extended_operand}; | 145 | mem_address = {2'b0, idx + sign_extended_operand}; |
| 146 | state = mem_ready ? MEMORY : AGEN; | 146 | state = `mem_ready ? MEMORY : AGEN; |
| 147 | end | 147 | end |
| 148 | 'h2: begin | 148 | 'h2: begin |
| 149 | mem_valid = 1; | 149 | mem_valid = 1; |
| 150 | mem_address = {2'b0, idx + sign_extended_operand}; | 150 | mem_address = {2'b0, idx + sign_extended_operand}; |
| 151 | mem_write = 1; | 151 | mem_write = 1; |
| 152 | mem_write_data = acc; | 152 | mem_write_data = acc; |
| 153 | state = mem_ready ? FETCH : AGEN; | 153 | state = `mem_ready ? FETCH : AGEN; |
| 154 | end | 154 | end |
| 155 | endcase | 155 | endcase |
| 156 | end | 156 | end |
| 157 | 157 | ||
| 158 | MEMORY: begin | 158 | MEMORY: begin |
| 159 | if (mem_ready) begin | 159 | if (`mem_ready) begin |
| 160 | mem_valid = 0; | 160 | mem_valid = 0; |
| 161 | mem_write = 0; | 161 | mem_write = 0; |
| 162 | end | 162 | end |
| @@ -164,8 +164,8 @@ always_ff @(posedge clk) begin | |||
| 164 | `ifdef DEBUG $display("\tstall"); `endif | 164 | `ifdef DEBUG $display("\tstall"); `endif |
| 165 | case (opcode) | 165 | case (opcode) |
| 166 | 'h1: begin | 166 | 'h1: begin |
| 167 | if (mem_read_valid) begin | 167 | if (`mem_read_valid) begin |
| 168 | acc = mem_read_data; | 168 | acc = `mem_read_data; |
| 169 | end else begin | 169 | end else begin |
| 170 | state = MEMORY; | 170 | state = MEMORY; |
| 171 | end | 171 | end |
