Skip to content

Commit 9464193

Browse files
edanuffedanuff
authored
Merge pull request #3 from edanuff/main
fix IIgs STATEREG
2 parents 2caa2cd + 66cb80b commit 9464193

File tree

9 files changed

+4222
-4441
lines changed

9 files changed

+4222
-4441
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,12 @@ module apple_memory #(
7777
always @(posedge a2bus_if.clk_logic or negedge a2bus_if.system_reset_n) begin
7878
if (!a2bus_if.system_reset_n) begin
7979
SWITCHES_IIE <= '{8{1'b0}};
80-
end else if (!a2bus_if.rw_n && (a2bus_if.phi1_posedge) && (a2bus_if.addr[15:4] == 12'hC00) && !a2bus_if.m2sel_n)
80+
end else if (!a2bus_if.rw_n && (a2bus_if.phi1_posedge) && (a2bus_if.addr[15:4] == 12'hC00) && !a2bus_if.m2sel_n) begin
8181
SWITCHES_IIE[a2bus_if.addr[3:1]] <= a2bus_if.addr[0];
82+
end else if (!a2bus_if.rw_n && (a2bus_if.phi1_posedge) && (a2bus_if.addr == 16'hC068) && !a2bus_if.m2sel_n) begin
83+
SWITCHES_IIE[1] <= a2bus_if.data[5];
84+
SWITCHES_IIE[2] <= a2bus_if.data[4];
85+
end
8286
end
8387

8488
always @(posedge a2bus_if.clk_logic or negedge a2bus_if.device_reset_n) begin

‎boards/a2n20v2/hdl/top.sv

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,8 @@ module top #(
557557
);
558558

559559
always @(posedge clk_logic_w) begin
560-
if (!s2) led <= {!a2mem_if.TEXT_MODE, !a2mem_if.MIXED_MODE, !a2mem_if.HIRES_MODE, !a2mem_if.AN3, !a2mem_if.STORE80};
560+
if (!s2) led <= {!a2mem_if.TEXT_MODE, !a2mem_if.MIXED_MODE, !a2mem_if.HIRES_MODE, !a2mem_if.RAMWRT, !a2mem_if.STORE80};
561+
//if (!s2) led <= {!a2mem_if.TEXT_MODE, !a2mem_if.MIXED_MODE, !a2mem_if.HIRES_MODE, !a2mem_if.AN3, !a2mem_if.STORE80};
561562
else led <= {!vdp_unlocked_w, ~vdp_gmode_w};
562563
//else led <= {!vdp_unlocked_w, dip_switches_n_w};
563564
end

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

Lines changed: 1498 additions & 1498 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 Mar 03 10:16:04 2024
81+
<td>Sat Apr 13 20:25:18 2024
8282
</td>
8383
</tr>
8484
<tr>

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

Lines changed: 56 additions & 56 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 Mar 03 10:16:04 2024
90+
<td>Sat Apr 13 20:25:18 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.392</td>
103+
<td>379.401</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.167</td>
111+
<td>286.176</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.300</td>
195+
<td>275.309</td>
196196
<td>61.515</td>
197-
<td>336.815</td>
197+
<td>336.824</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.983</td>
225+
<td>4.993</td>
226226
<td>NA</td>
227-
<td>5.555</td>
227+
<td>5.558</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.075
251+
<td>4.070
252252
</tr>
253253
</table>
254254
<h2><a name="By_Hierarchy">Power By Hierarchy:</a></h2>
@@ -260,20 +260,20 @@ <h2><a name="By_Hierarchy">Power By Hierarchy:</a></h2>
260260
</tr>
261261
<tr>
262262
<td>top</td>
263-
<td>273.344</td>
264-
<td>273.344(273.017)</td>
263+
<td>273.353</td>
264+
<td>273.353(273.022)</td>
265265
<tr>
266266
<td>top/apple_bus/</td>
267-
<td>0.105</td>
268-
<td>0.105(0.000)</td>
267+
<td>0.108</td>
268+
<td>0.108(0.000)</td>
269269
<tr>
270270
<td>top/apple_memory/</td>
271-
<td>209.410</td>
272-
<td>209.410(209.326)</td>
271+
<td>209.415</td>
272+
<td>209.415(209.325)</td>
273273
<tr>
274274
<td>top/apple_memory/hires_aux_2000_5FFF/</td>
275-
<td>59.501</td>
276-
<td>59.501(0.000)</td>
275+
<td>59.500</td>
276+
<td>59.500(0.000)</td>
277277
<tr>
278278
<td>top/apple_memory/hires_aux_6000_9FFF/</td>
279279
<td>59.499</td>
@@ -304,16 +304,16 @@ <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.500</td>
308-
<td>0.500(0.461)</td>
307+
<td>0.504</td>
308+
<td>0.504(0.465)</td>
309309
<tr>
310310
<td>top/hdmi/tmds_gen[0].tmds_channel/</td>
311-
<td>0.053</td>
312-
<td>0.053(0.000)</td>
311+
<td>0.055</td>
312+
<td>0.055(0.000)</td>
313313
<tr>
314314
<td>top/hdmi/tmds_gen[1].tmds_channel/</td>
315-
<td>0.051</td>
316-
<td>0.051(0.000)</td>
315+
<td>0.053</td>
316+
<td>0.053(0.000)</td>
317317
<tr>
318318
<td>top/hdmi/tmds_gen[2].tmds_channel/</td>
319319
<td>0.051</td>
@@ -324,64 +324,64 @@ <h2><a name="By_Hierarchy">Power By Hierarchy:</a></h2>
324324
<td>0.110(0.000)</td>
325325
<tr>
326326
<td>top/hdmi/true_hdmi_output.packet_picker/</td>
327-
<td>0.196</td>
328-
<td>0.196(0.048)</td>
327+
<td>0.197</td>
328+
<td>0.197(0.048)</td>
329329
<tr>
330330
<td>top/hdmi/true_hdmi_output.packet_picker/audio_clock_regeneration_packet/</td>
331331
<td>0.048</td>
332332
<td>0.048(0.000)</td>
333333
<tr>
334334
<td>top/mockingboard/</td>
335-
<td>1.065</td>
336-
<td>1.065(1.065)</td>
335+
<td>1.062</td>
336+
<td>1.062(1.062)</td>
337337
<tr>
338338
<td>top/mockingboard/m6522_left/</td>
339-
<td>0.195</td>
340-
<td>0.195(0.000)</td>
339+
<td>0.192</td>
340+
<td>0.192(0.000)</td>
341341
<tr>
342342
<td>top/mockingboard/m6522_right/</td>
343-
<td>0.190</td>
344-
<td>0.190(0.000)</td>
343+
<td>0.191</td>
344+
<td>0.191(0.000)</td>
345345
<tr>
346346
<td>top/mockingboard/psg_left/</td>
347-
<td>0.339</td>
348-
<td>0.339(0.000)</td>
347+
<td>0.337</td>
348+
<td>0.337(0.000)</td>
349349
<tr>
350350
<td>top/mockingboard/psg_right/</td>
351-
<td>0.341</td>
352-
<td>0.341(0.000)</td>
351+
<td>0.342</td>
352+
<td>0.342(0.000)</td>
353353
<tr>
354354
<td>top/supersprite/</td>
355-
<td>41.543</td>
356-
<td>41.543(41.465)</td>
355+
<td>41.538</td>
356+
<td>41.538(41.459)</td>
357357
<tr>
358358
<td>top/supersprite/ssp_psg/</td>
359-
<td>0.342</td>
360-
<td>0.342(0.000)</td>
359+
<td>0.337</td>
360+
<td>0.337(0.000)</td>
361361
<tr>
362362
<td>top/supersprite/vdp/</td>
363-
<td>41.123</td>
364-
<td>41.123(41.123)</td>
363+
<td>41.122</td>
364+
<td>41.122(41.122)</td>
365365
<tr>
366366
<td>top/supersprite/vdp/f18a_core/</td>
367-
<td>41.123</td>
368-
<td>41.123(41.120)</td>
367+
<td>41.122</td>
368+
<td>41.122(41.119)</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.599</td>
380-
<td>0.599(0.000)</td>
379+
<td>0.600</td>
380+
<td>0.600(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>
387387
<td>2.170</td>
@@ -392,20 +392,20 @@ <h2><a name="By_Hierarchy">Power By Hierarchy:</a></h2>
392392
<td>0.314(0.000)</td>
393393
<tr>
394394
<td>top/supersprite/vdp/f18a_core/inst_vga_cont/</td>
395-
<td>0.001</td>
396-
<td>0.001(0.000)</td>
395+
<td>0.002</td>
396+
<td>0.002(0.000)</td>
397397
<tr>
398398
<td>top/supersprite/vdp/f18a_core/inst_vram/</td>
399-
<td>29.708</td>
400-
<td>29.708(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>
404404
<td>29.643(0.000)</td>
405405
<tr>
406406
<td>top/vgc/</td>
407-
<td>0.071</td>
408-
<td>0.071(0.000)</td>
407+
<td>0.072</td>
408+
<td>0.072(0.000)</td>
409409
</table>
410410
<h2><a name="By_Clock_Domain">Power By Clock Domain:</a></h2>
411411
<table class="detail_table">
@@ -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.560</td>
420+
<td>15.559</td>
421421
</tr>
422422
<tr>
423423
<td>clk_logic</td>
424424
<td>54.000</td>
425-
<td>252.157</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: 18 additions & 13 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 Mar 03 10:16:04 2024
86+
<td>Sat Apr 13 20:25:18 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.625s, Elapsed time = 0h 0m 0.624s
101-
Placement Phase 1: CPU time = 0h 0m 0.186s, Elapsed time = 0h 0m 0.186s
100+
Placement Phase 0: CPU time = 0h 0m 0.614s, Elapsed time = 0h 0m 0.614s
101+
Placement Phase 1: CPU time = 0h 0m 0.186s, Elapsed time = 0h 0m 0.185s
102102
Placement Phase 2: CPU time = 0h 0m 2s, Elapsed time = 0h 0m 2s
103103
Placement Phase 3: CPU time = 0h 0m 1s, Elapsed time = 0h 0m 1s
104104
Total Placement: CPU time = 0h 0m 4s, Elapsed time = 0h 0m 4s
105105
Running routing:
106-
Routing Phase 0: CPU time = 0h 0m 0.002s, Elapsed time = 0h 0m 0.002s
107-
Routing Phase 1: CPU time = 0h 0m 0.235s, Elapsed time = 0h 0m 0.235s
108-
Routing Phase 2: CPU time = 0h 0m 3s, Elapsed time = 0h 0m 3s
106+
Routing Phase 0: CPU time = 0h 0m 0.001s, Elapsed time = 0h 0m 0.002s
107+
Routing Phase 1: CPU time = 0h 0m 0.239s, Elapsed time = 0h 0m 0.238s
108+
Routing Phase 2: CPU time = 0h 0m 4s, Elapsed time = 0h 0m 4s
109109
Routing Phase 3: CPU time = 0h 0m 0s, Elapsed time = 0h 0m 0s
110-
Total Routing: CPU time = 0h 0m 3s, Elapsed time = 0h 0m 3s
110+
Total Routing: CPU time = 0h 0m 4s, Elapsed time = 0h 0m 4s
111111
Generate output files:
112112
CPU time = 0h 0m 2s, Elapsed time = 0h 0m 2s
113113
</td>
114114
</tr>
115115
<tr>
116116
<td class="label">Total Time and Memory Usage</td>
117-
<td>CPU time = 0h 0m 10s, Elapsed time = 0h 0m 10s, Peak memory usage = 314MB</td>
117+
<td>CPU time = 0h 0m 10s, Elapsed time = 0h 0m 10s, Peak memory usage = 322MB</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>6873/20736</td>
132+
<td>6889/20736</td>
133133
<td>34%</td>
134134
</tr>
135135
<tr>
136136
<td class="label">&nbsp &nbsp --LUT,ALU,ROM16</td>
137-
<td>6003(5411 LUT, 592 ALU, 0 ROM16)</td>
137+
<td>6019(5427 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>4734/10368</td>
173-
<td>46%</td>
172+
<td>4789/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>7/8(88%)</td>
307+
<td>8/8(100%)</td>
308308
</tr>
309309
<tr>
310310
<td class="label">GCLK_PIN</td>
@@ -367,6 +367,11 @@ <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>
370375
<td class="label">mockingboard/pb_l_o[2]</td>
371376
<td>LW</td>
372377
<td> -</td>

0 commit comments

Comments
 (0)