From 0a69fe011d2371ef06cc4be8adace817b7acf76e Mon Sep 17 00:00:00 2001 From: Nick Downing Date: Sat, 19 Jul 2025 18:14:46 +1000 Subject: [PATCH] Swap blocks and pads colours, since there are no node numbers to keep stable anymore, assign names to blocks of at least a certain size --- 8085/Makefile | 14 +-- 8085/conn_matrix.txt | 8 +- 8085/node_names.txt | 255 ++++++++++++++++++++++++++++++++++++------- 3 files changed, 225 insertions(+), 52 deletions(-) diff --git a/8085/Makefile b/8085/Makefile index fb6dc00..184f987 100644 --- a/8085/Makefile +++ b/8085/Makefile @@ -7,7 +7,7 @@ # 5: magenta, blocks + pads # 6: yellow, buried # 7: white, vias -COLOURS=0,0,5,1,2,4,6,3,7 +COLOURS=0,5,5,1,2,4,6,3,7 all: \ channels.txt \ @@ -32,10 +32,10 @@ node_sizes.txt: nodes.txt ../scripts/node_sizes.py nodes.txt >$@ node_gnd.png: nodes.txt - ../scripts/node_image.py --adjacency nodes.txt 1_2507_0147 $@ ${COLOURS} + ../scripts/node_image.py --adjacency nodes.txt 2_2507_0147 $@ ${COLOURS} node_vcc.png: nodes.txt - ../scripts/node_image.py --adjacency nodes.txt 1_3232_6986 $@ ${COLOURS} + ../scripts/node_image.py --adjacency nodes.txt 2_3232_6986 $@ ${COLOURS} node_phi0.png: nodes.txt ../scripts/node_image.py --adjacency nodes.txt 3_0455_4632 $@ ${COLOURS} @@ -44,24 +44,24 @@ node_phi1.png: nodes.txt ../scripts/node_image.py --adjacency nodes.txt 3_0304_3500 $@ ${COLOURS} nodes.txt: \ -pads.png \ blocks.png \ +pads.png \ metal.png \ poly.png \ split_diff.png \ vias.png \ conn_matrix.txt - ../scripts/nodes.py pads.png,blocks.png,metal.png,poly.png,split_diff.png,vias.png conn_matrix.txt $@ + ../scripts/nodes.py blocks.png,pads.png,metal.png,poly.png,split_diff.png,vias.png conn_matrix.txt $@ # this one follows same layering as nodes.txt and we can't see pads layer layers.png: \ -pads.png \ blocks.png \ +pads.png \ metal.png \ poly.png \ split_diff.png \ vias.png - ../scripts/image_layers.py pads.png,blocks.png,metal.png,poly.png,split_diff.png,vias.png $@ ${COLOURS} + ../scripts/image_layers.py blocks.png,pads.png,metal.png,poly.png,split_diff.png,vias.png $@ ${COLOURS} # this one has alternative layering and allows us to see pads and metal layers layers_rev.png: \ diff --git a/8085/conn_matrix.txt b/8085/conn_matrix.txt index 7b542c7..fa31b81 100644 --- a/8085/conn_matrix.txt +++ b/8085/conn_matrix.txt @@ -1,6 +1,6 @@ # 0: empty -# 1: pads -- merge if touches metal -# 2: blocks -- report if touches channel +# 1: blocks -- report if touches channel +# 2: pads -- merge if touches metal # 3: metal -- merge if touches vias # 4: poly -- merge if touches vias or buried, report if touches channel # 5: diff -- merge if touches vias or buried, report if touches channel @@ -10,9 +10,9 @@ 1 0 1 0 0 1 -0 1 0 1 +0 0 1 1 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 1 1 1 -0 0 2 0 2 2 2 1 +0 2 0 0 2 2 2 1 0 0 0 1 1 1 3 3 1 diff --git a/8085/node_names.txt b/8085/node_names.txt index 1605721..3921303 100644 --- a/8085/node_names.txt +++ b/8085/node_names.txt @@ -1,41 +1,214 @@ -1_0199_5453 INTR -1_0199_6992 SID -1_0204_5731 RST5.5 -1_0204_6012 RST6.5 -1_0204_6362 RST7.5 -1_0204_6645 TRAP -1_0239_0213 AD4 -1_0245_2969 INTAn -1_0253_1293 AD3 -1_0256_2205 AD1 -1_0256_2538 AD0 -1_0259_1640 AD2 -1_1146_0229 AD5 -1_1550_6978 SOD -1_1702_0327 AD6 -1_2033_6937 RESET_OUT -1_2046_0229 AD7 -1_2507_0147 GND -1_2517_7052 X2 -1_2839_7059 X1 -1_2946_0292 SUBSTRATE -1_3232_6986 VCC -1_3322_0333 A8 -1_3595_0329 A9 -1_3619_6926 HOLD -1_4049_0323 A10 -1_4090_6927 HLDA -1_4332_0324 A11 -1_4533_6963 CLK_OUT -1_5029_6922 RESET_INn -1_5039_2089 A15 -1_5041_1078 A13 -1_5042_1809 A14 -1_5049_3466 WRn -1_5049_3953 RDn -1_5049_4941 IO_Mn -1_5063_4416 S1 -1_5064_0271 A12 -1_5065_2576 S0 -1_5065_3034 ALE -1_5073_5176 READY +1_0058_2808 block_INTAn +1_0068_1425 block_AD2 +1_0069_0979 block_AD3 +1_0070_1883 block_AD1 +1_0070_2327 block_AD0 +1_0094_5584 block_RST5.5 +1_0113_6809 block_SID +1_0119_6182 block_TRAP +1_0140_3433 block_random0 +1_0148_5085 block_INTR +1_0181_5791 block_RST6.5 +1_0461_5986 block_RST7.5 +1_0491_3916 block_rom0t +1_0515_3451 block_rom0l0 +1_0526_2785 block_random1 +1_0559_0060 block_AD4 +1_0580_3895 block_rom0 +1_0596_5170 block_rom0r +1_0603_3690 block_rom0l1 +1_0732_6331 block_random2 +1_0738_5229 block_random3 +1_0815_3691 block_rom0l3 +1_0824_6590 block_random4 +1_0835_3600 block_rom0l2 +1_0865_2504 block_alu07 +1_0869_1157 block_alu00 +1_0873_1502 block_alu02 +1_0875_1334 block_alu01 +1_0881_1679 block_alu03 +1_0881_1977 block_alu04 +1_0882_2299 block_alu06 +1_0886_2133 block_alu05 +1_0957_6575 block_random5 +1_1005_0059 block_AD5 +1_1017_3692 block_rom0l5 +1_1021_3473 block_rom0l4 +1_1078_2906 block_alu17 +1_1106_5239 block_random6 +1_1110_5687 block_random7 +1_1130_6159 block_random8 +1_1134_2063 block_alu14 +1_1139_1392 block_alu11 +1_1139_1612 block_alu12 +1_1141_2289 block_alu15 +1_1144_2501 block_alu16 +1_1145_1140 block_alu10 +1_1146_1818 block_alu13 +1_1201_6415 block_random9 +1_1215_3693 block_rom0l7 +1_1220_3489 block_rom0l6 +1_1316_1095 block_alu20 +1_1319_1342 block_alu21 +1_1319_2683 block_alu27 +1_1320_1776 block_alu23 +1_1320_6813 block_SOD +1_1322_1562 block_alu22 +1_1326_2013 block_alu24 +1_1326_2276 block_alu25 +1_1326_2488 block_alu26 +1_1412_3372 block_random10 +1_1425_3849 block_rom1 +1_1457_0059 block_AD6 +1_1478_2899 block_random11 +1_1596_0987 block_random12 +1_1623_5551 block_random13 +1_1652_5260 block_random14 +1_1657_3507 block_random15 +1_1793_2899 block_random16 +1_1820_3384 block_random17 +1_1867_3879 block_rom1b_rom2t +1_1891_5724 block_random18 +1_1894_5308 block_random19 +1_1901_0060 block_AD7 +1_1914_5270 block_rom2r +1_1937_2898 block_random20 +1_1982_3891 block_rom2 +1_1985_3360 block_random21 +1_1996_2580 block_alu37 +1_1998_1568 block_alu32 +1_1999_2183 block_alu35 +1_2001_2406 block_alu36 +1_2002_1780 block_alu33 +1_2003_1302 block_alu31 +1_2004_1968 block_alu34 +1_2005_1075 block_alu30 +1_2063_6414 block_x1_x2_reset +1_2099_2767 block_random22 +1_2168_3400 block_random23 +1_2408_2113 block_reg0a +1_2409_1164 block_reg00 +1_2409_1261 block_reg01 +1_2409_1354 block_reg02 +1_2409_1454 block_reg03 +1_2409_1645 block_reg05 +1_2409_1734 block_reg06 +1_2409_2214 block_reg0b +1_2410_1545 block_reg04 +1_2410_1833 block_reg07 +1_2410_1923 block_reg08 +1_2410_2024 block_reg09 +1_2410_2307 block_reg0c +1_2411_2404 block_reg0d +1_2411_2495 block_reg0e +1_2411_2597 block_reg0f +1_2415_2710 block_random24 +1_2484_0451 block_SUBSTRATE +1_2495_3721 block_random25 +1_2741_2723 block_random26 +1_2939_1175 block_reg10 +1_2939_1267 block_reg11 +1_2940_1744 block_reg16 +1_2940_2602 block_reg1f +1_2941_1367 block_reg12 +1_2941_1840 block_reg17 +1_2941_2504 block_reg1e +1_2942_1935 block_reg18 +1_2942_2220 block_reg1b +1_2942_2317 block_reg1c +1_2942_2411 block_reg1d +1_2943_1459 block_reg13 +1_2943_1557 block_reg14 +1_2943_1649 block_reg15 +1_2943_2125 block_reg1a +1_2944_2030 block_reg19 +1_3028_3782 block_rom2b_rom3t +1_3101_6007 block_random27 +1_3121_0097 block_A8 +1_3121_3706 block_rom3 +1_3161_6225 block_random28 +1_3497_0097 block_A9 +1_3602_3476 block_rom4l0 +1_3602_5234 block_rom4r +1_3607_3709 block_rom4 +1_3631_6313 block_HOLD +1_3650_1171 block_reg20 +1_3651_1281 block_reg21 +1_3651_1367 block_reg22 +1_3651_1471 block_reg23 +1_3651_1558 block_reg24 +1_3652_2038 block_reg29 +1_3652_2128 block_reg2a +1_3653_1661 block_reg25 +1_3653_1747 block_reg26 +1_3653_1844 block_reg27 +1_3653_1941 block_reg28 +1_3653_2230 block_reg2b +1_3655_2320 block_reg2c +1_3655_2423 block_reg2d +1_3655_2510 block_reg2e +1_3655_2609 block_reg2f +1_3707_3642 block_rom4l1 +1_3820_3476 block_rom4l2 +1_3855_0098 block_A10 +1_3911_3473 block_rom4l3 +1_3923_2839 block_random29 +1_4009_6216 block_HLDA +1_4025_3474 block_rom4l4 +1_4108_3713 block_rom4b +1_4123_5216 block_random30 +1_4178_3274 block_random31 +1_4217_0097 block_A11 +1_4352_6242 block_CLK_OUT +1_4406_2351 block_S0 +1_4542_2837 block_ALE +1_4609_3198 block_random32 +1_4630_3441 block_WRn +1_4631_3756 block_RDn +1_4637_4224 block_S1 +1_4640_4679 block_IO_Mn +1_4642_0825 block_A12 +1_4645_1215 block_A13 +1_4645_1577 block_A14 +1_4647_1953 block_A15 +2_0199_5453 pad_INTR +2_0199_6992 pad_SID +2_0204_5731 pad_RST5.5 +2_0204_6012 pad_RST6.5 +2_0204_6362 pad_RST7.5 +2_0204_6645 pad_TRAP +2_0239_0213 pad_AD4 +2_0245_2969 pad_INTAn +2_0253_1293 pad_AD3 +2_0256_2205 pad_AD1 +2_0256_2538 pad_AD0 +2_0259_1640 pad_AD2 +2_1146_0229 pad_AD5 +2_1550_6978 pad_SOD +2_1702_0327 pad_AD6 +2_2033_6937 pad_RESET_OUT +2_2046_0229 pad_AD7 +2_2507_0147 pad_GND +2_2517_7052 pad_X2 +2_2839_7059 pad_X1 +2_2946_0292 pad_SUBSTRATE +2_3232_6986 pad_VCC +2_3322_0333 pad_A8 +2_3595_0329 pad_A9 +2_3619_6926 pad_HOLD +2_4049_0323 pad_A10 +2_4090_6927 pad_HLDA +2_4332_0324 pad_A11 +2_4533_6963 pad_CLK_OUT +2_5029_6922 pad_RESET_INn +2_5039_2089 pad_A15 +2_5041_1078 pad_A13 +2_5042_1809 pad_A14 +2_5049_3466 pad_WRn +2_5049_3953 pad_RDn +2_5049_4941 pad_IO_Mn +2_5063_4416 pad_S1 +2_5064_0271 pad_A12 +2_5065_2576 pad_S0 +2_5065_3034 pad_ALE +2_5073_5176 pad_READY -- 2.34.1