Skip to content

Commit b927f0d

Browse files
edanuffedanuff
authored
Merge pull request #5 from edanuff/main
status reg CXROM
2 parents 2251e8f + 1b63acf commit b927f0d

File tree

10 files changed

+5604
-5228
lines changed

10 files changed

+5604
-5228
lines changed

‎boards/a2n20v2-SDRAM/hdl/memory/apple_memory.sv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ module apple_memory #(
8585
end else if (!a2bus_if.rw_n && (a2bus_if.phi1_posedge) && (a2bus_if.addr == 16'hC068) && !a2bus_if.m2sel_n) begin
8686
SWITCHES_IIE[1] <= a2bus_if.data[5];
8787
SWITCHES_IIE[2] <= a2bus_if.data[4];
88+
SWITCHES_IIE[3] <= a2bus_if.data[0];
8889
end
8990
end
9091

‎boards/a2n20v2/hdl/top.sv

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,8 @@ module top #(
427427
.ENABLE(SUPERSERIAL_ENABLE),
428428
.SLOT(SUPERSERIAL_SLOT)
429429
) superserial (
430-
.a2bus_if(a2bus_if), // use system_reset_n
430+
.a2bus_if(a2bus_if),
431+
.a2mem_if(a2mem_if),
431432

432433
.data_o(ssc_d_w),
433434
.rd_en_o(ssc_rd),

‎boards/a2n20v2/impl/pnr/a2n20v2.fs

Lines changed: 1249 additions & 1249 deletions
Large diffs are not rendered by default.

‎boards/a2n20v2/impl/pnr/a2n20v2.pin.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ <h1><a name="Message">Pin Messages</a></h1>
7878
</tr>
7979
<tr>
8080
<td class="label">Created Time</td>
81-
<td>Sun Apr 14 08:00:32 2024
81+
<td>Sun Apr 14 10:10:06 2024
8282
</td>
8383
</tr>
8484
<tr>

‎boards/a2n20v2/impl/pnr/a2n20v2.power.html

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ <h1><a name="Message">Power Messages</a></h1>
8787
</tr>
8888
<tr>
8989
<td class="label">Created Time</td>
90-
<td>Sun Apr 14 08:00:32 2024
90+
<td>Sun Apr 14 10:10:06 2024
9191
</td>
9292
</tr>
9393
<tr>
@@ -100,15 +100,15 @@ <h2><a name="Power_Info">Power Information:</a></h2>
100100
<table class="summary_table">
101101
<tr>
102102
<td class="label">Total Power (mW)</td>
103-
<td>379.395</td>
103+
<td>379.402</td>
104104
</tr>
105105
<tr>
106106
<td class="label">Quiescent Power (mW)</td>
107107
<td>93.224</td>
108108
</tr>
109109
<tr>
110110
<td class="label">Dynamic Power (mW)</td>
111-
<td>286.171</td>
111+
<td>286.178</td>
112112
</tr>
113113
</table>
114114
<h2><a name="Thermal_Info">Thermal Information:</a></h2>
@@ -192,9 +192,9 @@ <h2><a name="Supply_Summary">Supply Information:</a></h2>
192192
<tr>
193193
<td>VCC</td>
194194
<td>1.000</td>
195-
<td>275.303</td>
195+
<td>275.310</td>
196196
<td>61.515</td>
197-
<td>336.819</td>
197+
<td>336.826</td>
198198
</tr>
199199
<tr>
200200
<td>VCCX</td>
@@ -222,9 +222,9 @@ <h2><a name="By_Block_Type">Power By Block Type:</a></h2>
222222
</tr>
223223
<tr>
224224
<td>Logic</td>
225-
<td>4.987</td>
225+
<td>4.994</td>
226226
<td>NA</td>
227-
<td>5.562</td>
227+
<td>5.557</td>
228228
</tr>
229229
<tr>
230230
<td>IO</td>
@@ -248,7 +248,7 @@ <h2><a name="By_Block_Type">Power By Block Type:</a></h2>
248248
<td>DSP</td>
249249
<td>1.033
250250
<td>NA</td>
251-
<td>4.065
251+
<td>4.070
252252
</tr>
253253
</table>
254254
<h2><a name="By_Hierarchy">Power By Hierarchy:</a></h2>
@@ -260,16 +260,16 @@ <h2><a name="By_Hierarchy">Power By Hierarchy:</a></h2>
260260
</tr>
261261
<tr>
262262
<td>top</td>
263-
<td>273.347</td>
264-
<td>273.347(273.021)</td>
263+
<td>273.354</td>
264+
<td>273.354(273.026)</td>
265265
<tr>
266266
<td>top/apple_bus/</td>
267-
<td>0.105</td>
268-
<td>0.105(0.000)</td>
267+
<td>0.106</td>
268+
<td>0.106(0.000)</td>
269269
<tr>
270270
<td>top/apple_memory/</td>
271-
<td>209.413</td>
272-
<td>209.413(209.325)</td>
271+
<td>209.412</td>
272+
<td>209.412(209.325)</td>
273273
<tr>
274274
<td>top/apple_memory/hires_aux_2000_5FFF/</td>
275275
<td>59.501</td>
@@ -288,8 +288,8 @@ <h2><a name="By_Hierarchy">Power By Hierarchy:</a></h2>
288288
<td>30.827(0.000)</td>
289289
<tr>
290290
<td>top/apple_video/</td>
291-
<td>0.552</td>
292-
<td>0.552(0.000)</td>
291+
<td>0.551</td>
292+
<td>0.551(0.000)</td>
293293
<tr>
294294
<td>top/cdc_phi1/</td>
295295
<td>0.001</td>
@@ -304,24 +304,24 @@ <h2><a name="By_Hierarchy">Power By Hierarchy:</a></h2>
304304
<td>5.649(0.000)</td>
305305
<tr>
306306
<td>top/hdmi/</td>
307-
<td>0.496</td>
308-
<td>0.496(0.458)</td>
307+
<td>0.501</td>
308+
<td>0.501(0.463)</td>
309309
<tr>
310310
<td>top/hdmi/tmds_gen[0].tmds_channel/</td>
311311
<td>0.053</td>
312312
<td>0.053(0.000)</td>
313313
<tr>
314314
<td>top/hdmi/tmds_gen[1].tmds_channel/</td>
315-
<td>0.050</td>
316-
<td>0.050(0.000)</td>
317-
<tr>
318-
<td>top/hdmi/tmds_gen[2].tmds_channel/</td>
319315
<td>0.051</td>
320316
<td>0.051(0.000)</td>
321317
<tr>
318+
<td>top/hdmi/tmds_gen[2].tmds_channel/</td>
319+
<td>0.052</td>
320+
<td>0.052(0.000)</td>
321+
<tr>
322322
<td>top/hdmi/true_hdmi_output.packet_assembler/</td>
323-
<td>0.108</td>
324-
<td>0.108(0.000)</td>
323+
<td>0.110</td>
324+
<td>0.110(0.000)</td>
325325
<tr>
326326
<td>top/hdmi/true_hdmi_output.packet_picker/</td>
327327
<td>0.196</td>
@@ -332,60 +332,60 @@ <h2><a name="By_Hierarchy">Power By Hierarchy:</a></h2>
332332
<td>0.048(0.000)</td>
333333
<tr>
334334
<td>top/mockingboard/</td>
335-
<td>1.061</td>
336-
<td>1.061(1.061)</td>
335+
<td>1.064</td>
336+
<td>1.064(1.064)</td>
337337
<tr>
338338
<td>top/mockingboard/m6522_left/</td>
339339
<td>0.192</td>
340340
<td>0.192(0.000)</td>
341341
<tr>
342342
<td>top/mockingboard/m6522_right/</td>
343-
<td>0.192</td>
344-
<td>0.192(0.000)</td>
343+
<td>0.194</td>
344+
<td>0.194(0.000)</td>
345345
<tr>
346346
<td>top/mockingboard/psg_left/</td>
347-
<td>0.338</td>
348-
<td>0.338(0.000)</td>
347+
<td>0.339</td>
348+
<td>0.339(0.000)</td>
349349
<tr>
350350
<td>top/mockingboard/psg_right/</td>
351351
<td>0.339</td>
352352
<td>0.339(0.000)</td>
353353
<tr>
354354
<td>top/supersprite/</td>
355-
<td>41.553</td>
356-
<td>41.553(41.474)</td>
355+
<td>41.549</td>
356+
<td>41.549(41.471)</td>
357357
<tr>
358358
<td>top/supersprite/ssp_psg/</td>
359-
<td>0.344</td>
360-
<td>0.344(0.000)</td>
359+
<td>0.343</td>
360+
<td>0.343(0.000)</td>
361361
<tr>
362362
<td>top/supersprite/vdp/</td>
363-
<td>41.129</td>
364-
<td>41.129(41.129)</td>
363+
<td>41.128</td>
364+
<td>41.128(41.128)</td>
365365
<tr>
366366
<td>top/supersprite/vdp/f18a_core/</td>
367-
<td>41.129</td>
368-
<td>41.129(41.127)</td>
367+
<td>41.128</td>
368+
<td>41.128(41.125)</td>
369369
<tr>
370370
<td>top/supersprite/vdp/f18a_core/inst_color/</td>
371371
<td>0.036</td>
372372
<td>0.036(0.000)</td>
373373
<tr>
374374
<td>top/supersprite/vdp/f18a_core/inst_counters/</td>
375-
<td>0.061</td>
376-
<td>0.061(0.000)</td>
375+
<td>0.062</td>
376+
<td>0.062(0.000)</td>
377377
<tr>
378378
<td>top/supersprite/vdp/f18a_core/inst_cpu/</td>
379-
<td>0.602</td>
380-
<td>0.602(0.000)</td>
379+
<td>0.601</td>
380+
<td>0.601(0.000)</td>
381381
<tr>
382382
<td>top/supersprite/vdp/f18a_core/inst_sprites/</td>
383-
<td>8.544</td>
384-
<td>8.544(0.000)</td>
383+
<td>8.543</td>
384+
<td>8.543(0.000)</td>
385385
<tr>
386386
<td>top/supersprite/vdp/f18a_core/inst_tiles/</td>
387-
<td>2.175</td>
388-
<td>2.175(0.314)</td>
387+
<td>2.174</td>
388+
<td>2.174(0.314)</td>
389389
<tr>
390390
<td>top/supersprite/vdp/f18a_core/inst_tiles/inst_linebuf/</td>
391391
<td>0.314</td>
@@ -396,8 +396,8 @@ <h2><a name="By_Hierarchy">Power By Hierarchy:</a></h2>
396396
<td>0.002(0.000)</td>
397397
<tr>
398398
<td>top/supersprite/vdp/f18a_core/inst_vram/</td>
399-
<td>29.706</td>
400-
<td>29.706(29.643)</td>
399+
<td>29.707</td>
400+
<td>29.707(29.643)</td>
401401
<tr>
402402
<td>top/supersprite/vdp/f18a_core/inst_vram/inst_ram/</td>
403403
<td>29.643</td>
@@ -417,12 +417,12 @@ <h2><a name="By_Clock_Domain">Power By Clock Domain:</a></h2>
417417
<tr>
418418
<td>clk_pixel</td>
419419
<td>27.000</td>
420-
<td>15.555</td>
420+
<td>15.560</td>
421421
</tr>
422422
<tr>
423423
<td>clk_logic</td>
424424
<td>54.000</td>
425-
<td>252.166</td>
425+
<td>252.167</td>
426426
</tr>
427427
<tr>
428428
<td>NO CLOCK DOMAIN</td>

‎boards/a2n20v2/impl/pnr/a2n20v2.rpt.html

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ <h1><a name="Message">PnR Messages</a></h1>
8383
</tr>
8484
<tr>
8585
<td class="label">Created Time</td>
86-
<td>Sun Apr 14 08:00:32 2024
86+
<td>Sun Apr 14 10:10:07 2024
8787
</td>
8888
</tr>
8989
<tr>
@@ -97,24 +97,24 @@ <h1><a name="PnR_Details">PnR Details</a></h1>
9797
<tr>
9898
<td class="label">Place & Route Process</td>
9999
<td>Running placement:
100-
Placement Phase 0: CPU time = 0h 0m 0.638s, Elapsed time = 0h 0m 0.638s
101-
Placement Phase 1: CPU time = 0h 0m 0.188s, Elapsed time = 0h 0m 0.189s
100+
Placement Phase 0: CPU time = 0h 0m 0.634s, Elapsed time = 0h 0m 0.634s
101+
Placement Phase 1: CPU time = 0h 0m 0.187s, Elapsed time = 0h 0m 0.187s
102102
Placement Phase 2: CPU time = 0h 0m 2s, Elapsed time = 0h 0m 2s
103-
Placement Phase 3: CPU time = 0h 0m 1s, Elapsed time = 0h 0m 1s
103+
Placement Phase 3: CPU time = 0h 0m 2s, Elapsed time = 0h 0m 2s
104104
Total Placement: CPU time = 0h 0m 4s, Elapsed time = 0h 0m 4s
105105
Running routing:
106106
Routing Phase 0: CPU time = 0h 0m 0.002s, Elapsed time = 0h 0m 0.002s
107-
Routing Phase 1: CPU time = 0h 0m 0.306s, Elapsed time = 0h 0m 0.306s
107+
Routing Phase 1: CPU time = 0h 0m 0.233s, Elapsed time = 0h 0m 0.234s
108108
Routing Phase 2: CPU time = 0h 0m 3s, Elapsed time = 0h 0m 3s
109109
Routing Phase 3: CPU time = 0h 0m 0s, Elapsed time = 0h 0m 0s
110-
Total Routing: CPU time = 0h 0m 4s, Elapsed time = 0h 0m 4s
110+
Total Routing: CPU time = 0h 0m 3s, Elapsed time = 0h 0m 3s
111111
Generate output files:
112112
CPU time = 0h 0m 3s, Elapsed time = 0h 0m 3s
113113
</td>
114114
</tr>
115115
<tr>
116116
<td class="label">Total Time and Memory Usage</td>
117-
<td>CPU time = 0h 0m 11s, Elapsed time = 0h 0m 11s, Peak memory usage = 314MB</td>
117+
<td>CPU time = 0h 0m 10s, Elapsed time = 0h 0m 10s, Peak memory usage = 316MB</td>
118118
</tr>
119119
</table>
120120
<br/>
@@ -129,12 +129,12 @@ <h2><a name="Resource_Usage_Summary">Resource Usage Summary:</a></h2>
129129
</tr>
130130
<tr>
131131
<td class="label">Logic</td>
132-
<td>6869/20736</td>
132+
<td>6893/20736</td>
133133
<td>34%</td>
134134
</tr>
135135
<tr>
136136
<td class="label">&nbsp &nbsp --LUT,ALU,ROM16</td>
137-
<td>5999(5407 LUT, 592 ALU, 0 ROM16)</td>
137+
<td>6023(5431 LUT, 592 ALU, 0 ROM16)</td>
138138
<td>-</td>
139139
</tr>
140140
<tr>
@@ -169,8 +169,8 @@ <h2><a name="Resource_Usage_Summary">Resource Usage Summary:</a></h2>
169169
</tr>
170170
<tr>
171171
<td class="label">CLS</td>
172-
<td>4765/10368</td>
173-
<td>46%</td>
172+
<td>4787/10368</td>
173+
<td>47%</td>
174174
</tr>
175175
<tr>
176176
<td class="label">I/O Port</td>
@@ -304,7 +304,7 @@ <h2><a name="Global_Clock_Usage_Summary">Global Clock Usage Summary:</a></h2>
304304
</tr>
305305
<tr>
306306
<td class="label">LW</td>
307-
<td>8/8(100%)</td>
307+
<td>7/8(88%)</td>
308308
</tr>
309309
<tr>
310310
<td class="label">GCLK_PIN</td>
@@ -367,11 +367,6 @@ <h2><a name="Global_Clock_Signals">Global Clock Signals:</a></h2>
367367
<td> -</td>
368368
</tr>
369369
<tr>
370-
<td class="label">mockingboard/timer_a_count_15_7</td>
371-
<td>LW</td>
372-
<td> -</td>
373-
</tr>
374-
<tr>
375370
<td class="label">mockingboard/pb_l_o[2]</td>
376371
<td>LW</td>
377372
<td> -</td>

0 commit comments

Comments
 (0)