From 350aa95da544cda4f9f4feb734134114593c246d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Borna=20Rajkovi=C4=87?= Date: Sun, 19 Jun 2022 20:38:24 +0200 Subject: [PATCH] Updated examples --- examples/arm/arm_library.csl | 25 ++----- examples/arm/{model2.csch => full.csch} | 4 +- examples/arm/{test2.system => full.system} | 5 +- examples/arm/minimum.comdel | 67 +++++++++++++++++ examples/arm/minimum.csch | 28 +++++++ examples/arm/model.csch | 64 ---------------- examples/arm/test.system | 75 ------------------- examples/simplified FRISC model/schema2.csch | 14 ---- examples/simplified FRISC model/schema3.csch | 29 ------- examples/simplified FRISC model/schema4.csch | 49 ------------ .../{schema5.csch => schema_2.csch} | 2 +- 11 files changed, 110 insertions(+), 252 deletions(-) rename examples/arm/{model2.csch => full.csch} (97%) rename examples/arm/{test2.system => full.system} (99%) create mode 100644 examples/arm/minimum.comdel create mode 100644 examples/arm/minimum.csch delete mode 100644 examples/arm/model.csch delete mode 100644 examples/arm/test.system delete mode 100644 examples/simplified FRISC model/schema2.csch delete mode 100644 examples/simplified FRISC model/schema3.csch delete mode 100644 examples/simplified FRISC model/schema4.csch rename examples/simplified FRISC model/{schema5.csch => schema_2.csch} (89%) diff --git a/examples/arm/arm_library.csl b/examples/arm/arm_library.csl index 1e61f9a..30b1ec3 100644 --- a/examples/arm/arm_library.csl +++ b/examples/arm/arm_library.csl @@ -1,7 +1,10 @@ @name "Jednostavni ARM" @info "Primjer ARM biblioteke" @directory "." -@header "set load_performs_init;" +@header ` +\\ Version 0.0.1 +set load_performs_init; +` @componentHeader " clock 100MHz;" // adresni prostori @@ -258,7 +261,7 @@ @displayName "LCD ekran" @instanceName lcd @count (0, 4) - @source "lcd8.signal" + @source "lcd8.comdel" @tooltip "LCD ekran" @display { @@ -369,7 +372,7 @@ @component signal { @instanceName signal - @count (1, 1) + @count (0, 1) @source "signal.comdel" @tooltip "Signal" @@ -618,7 +621,7 @@ @displayName "Bridge" @instanceName bridge @tooltip "Bridge" - @count (1, 1) + @count (0, 1) @source "bridge.comdel" @display { @@ -702,18 +705,6 @@ } } } - - @pin dmacPin inOut { - @tooltip "Pin za spajanje na DMAC" - @display { - pin { - x: 100; y: 50; w: 10; h: 10; - type: "in"; - orientation: "right"; - } - } - @wires {null, null} - } } /******************************************************************* @@ -746,7 +737,7 @@ @bus APB regular { @instanceName apb @tooltip "Spora sabirnica" - @count (1,1) + @count (0, 1) @display { bus { x: 0; y: 0; diff --git a/examples/arm/model2.csch b/examples/arm/full.csch similarity index 97% rename from examples/arm/model2.csch rename to examples/arm/full.csch index 267a28a..e771d2f 100644 --- a/examples/arm/model2.csch +++ b/examples/arm/full.csch @@ -1,5 +1,5 @@ @source "arm_library.csl" -// /home/bbr/Documents/Personal/FER/schema_editor/examples/arm/ + @schema { @instance bridge Bridge { @position (-263, -97) @@ -80,7 +80,7 @@ } @instance ui_unit UI_UNIT { - @position (-189, 25) + @position (-200, 24) @attribute type 0 @attribute name "Izlaz" @attribute width 8 diff --git a/examples/arm/test2.system b/examples/arm/full.system similarity index 99% rename from examples/arm/test2.system rename to examples/arm/full.system index 640deb3..c90ed75 100644 --- a/examples/arm/test2.system +++ b/examples/arm/full.system @@ -1,11 +1,14 @@ + +\\ Version 0.0.1 set load_performs_init; + #include ".\arm7tdmi.comdel" #include ".\bridge.comdel" #include ".\decoder.comdel" #include ".\dmac.comdel" #include ".\gpio.comdel" #include ".\interrupt_selector.comdel" -#include ".\lcd8.signal" +#include ".\lcd8.comdel" #include ".\led.comdel" #include ".\memory.comdel" #include ".\pushbutton.comdel" diff --git a/examples/arm/minimum.comdel b/examples/arm/minimum.comdel new file mode 100644 index 0000000..f01a4f9 --- /dev/null +++ b/examples/arm/minimum.comdel @@ -0,0 +1,67 @@ + +\\ Version 0.0.1 +set load_performs_init; + +#include ".\arm7tdmi.comdel" +#include ".\decoder.comdel" +#include ".\memory.comdel" + + + +component System +{ + clock 100MHz; + //ahb + wire<32> addr; + wire<32> rdata; + wire<32> wdata; + wire<3> size; + wire write; + wired_or ready; + wired_or irq; + wired_or fiq; + wired_and nmreq; + wire --sel_mem; + wire sel_bridge; + wire sel_dmac; + wire busreq; + wire grant; + + + //gpio_port + wire --xp0; + wire --xp1; + wire --xp2; + wire --xp3; + wire --xp4; + wire --xp5; + wire --xp6; + wire --xp7; + + + // components -------------------------------------------- + subcomponent Memory64KiB memorija(addr, rdata, wdata, size, write, ready, --sel_mem); + subcomponent ARM7tdmi arm(addr, rdata, wdata, size, write, ready, irq, fiq, nmreq, busreq, grant, *, *) uses memorija; + subcomponent Decoder decoder(addr, nmreq, --sel_mem, sel_bridge, sel_dmac, 1, 1); + + display { + component { x: -473; y: -283; ref: "arm"; } + component { x: -433; y: 6; ref: "memorija"; } + component { x: -537; y: -202; ref: "decoder"; } + + // ahb bus + + rectangle { + x: -514; y: -86; + w: 249; h: 20; + } + + + // gpio_port bus + + + line {x1:-428; y1:6; x2:-389; y2:-75;} + line {x1:-418; y1:-152; x2:-389; y2:-75;} + line {x1:-517; y1:-172; x2:-389; y2:-75;} + } +} \ No newline at end of file diff --git a/examples/arm/minimum.csch b/examples/arm/minimum.csch new file mode 100644 index 0000000..dbed685 --- /dev/null +++ b/examples/arm/minimum.csch @@ -0,0 +1,28 @@ +@source "arm_library.csl" + +@schema { + @instance arm ARM7tdmi { + @position (-473, -283) + @attribute _memory memorija + } + + @instance memorija Memory64KiB { + @position (-433, 6) + } + + @instance decoder Decoder { + @position (-537, -202) + } + + @instance ahb AHB { + @position (-514, -86) + @size 249 + } + + @connection (memorija.ahbPin, ahb) { + } + @connection (arm.ahbPin, ahb) { + } + @connection (decoder.ahbPin, ahb) { + } +} diff --git a/examples/arm/model.csch b/examples/arm/model.csch deleted file mode 100644 index b62236a..0000000 --- a/examples/arm/model.csch +++ /dev/null @@ -1,64 +0,0 @@ -@source "/home/bbr/Documents/Personal/FER/schema_editor/examples/arm/arm_library.csl" - -@schema { - @instance bridge Bridge { - @position (-263, -97) - } - - @instance arm ARM7tdmi { - @position (-473, -283) - @attribute _memory memorija - } - - @instance memorija Memory64KiB { - @position (-433, 6) - } - - @instance decoder Decoder { - @position (-541, -212) - } - - @instance rtc RTC_IO { - @position (-63, -190) - } - - @instance gpio GPIO { - @position (-217, 13) - @attribute title "GPIO 1" - } - - @instance temperature Temperature { - @position (-47, -12) - } - - @instance ahb AHB { - @position (-514, -86) - @size 249 - } - - @instance apb APB { - @position (-201, -87) - @size 329 - } - - @instance gpio_port gpio_port { - @position (0, 0) - @size -1 - } - - @connection (bridge.ahbPin, ahb) { - } - @connection (bridge.apbPin, apb) { - } - @connection (memorija.ahbPin, ahb) { - } - @connection (arm.ahbPin, ahb) { - } - @connection (decoder.ahbPin, ahb) { - } - @connection (rtc.apbPin, apb) { - } - @connection (gpio.apbPin, apb) { - @attribute gpioSelect sel_gpio_1 - } -} diff --git a/examples/arm/test.system b/examples/arm/test.system deleted file mode 100644 index 1a23585..0000000 --- a/examples/arm/test.system +++ /dev/null @@ -1,75 +0,0 @@ -set load_performs_init; -#include "\arm7tdmi.comdel" -#include "\bridge.comdel" -#include "\decoder.comdel" -#include "\memory.comdel" - - - -component System -{ - clock 100MHz; - //ahb - wire<32> addr; - wire<32> rdata; - wire<32> wdata; - wire<3> size; - wire write; - wired_or ready; - wired_or irq; - wired_or fiq; - wired_and nmreq; - wire --sel_mem; - wire sel_bridge; - wire sel_dmac; - - - //apb - wire<32> apb__addr; - wire<32> apb__rdata; - wire<32> apb__wdata; - wire<3> --apb__size; - wire enable; - wire apb__write; - wire sel_gpio_1; - wire sel_gpio_2; - wire sel_ui_in; - wire sel_rtc; - wire sel_ui_out; - - - // components -------------------------------------------- - subcomponent Memory64KiB memorija(addr, rdata, wdata, size, write, ready, --sel_mem); - subcomponent Bridge bridge(addr, rdata, wdata, size, write, ready, sel_bridge, apb__addr, apb__rdata, apb__wdata, --apb__size, enable, apb__write, sel_gpio_1, sel_gpio_2, sel_rtc, sel_ui_in, sel_ui_out, 1, 1, 1, 1, 1); - subcomponent ARM7tdmi arm(addr, rdata, wdata, size, write, ready, irq, fiq, nmreq, *, *) uses memorija; - subcomponent Decoder decoder(addr, nmreq, --sel_mem, sel_bridge, sel_dmac, 1, 1); - - display { - component { x: -222; y: -97; ref: "bridge"; } - component { x: -473; y: -283; ref: "arm"; } - component { x: -433; y: 6; ref: "memorija"; } - component { x: -323; y: -217; ref: "decoder"; } - - // ahb bus - - rectangle { - x: -514; y: -86; - w: 249; h: 20; - } - - - // apb bus - - rectangle { - x: -111; y: -81; - w: 329; h: 20; - } - - - line {x1:-222; y1:-77; x2:-389; y2:-75;} - line {x1:-162; y1:-77; x2:54; y2:-70;} - line {x1:-428; y1:6; x2:-389; y2:-75;} - line {x1:-418; y1:-152; x2:-389; y2:-75;} - line {x1:-303; y1:-187; x2:-389; y2:-75;} - } -} \ No newline at end of file diff --git a/examples/simplified FRISC model/schema2.csch b/examples/simplified FRISC model/schema2.csch deleted file mode 100644 index 896cc01..0000000 --- a/examples/simplified FRISC model/schema2.csch +++ /dev/null @@ -1,14 +0,0 @@ -@source "/home/bbr/Documents/Personal/FER/schema_editor/examples/simplified FRISC model/frisc_library.csl" - -@schema { - @instance procesor FRISC { - @position (-177, -122) - @attribute _memory memorija2 - } - - @instance procesor FRISC { - @position (49, -97) - @attribute _memory null - } - -} diff --git a/examples/simplified FRISC model/schema3.csch b/examples/simplified FRISC model/schema3.csch deleted file mode 100644 index 400c0fc..0000000 --- a/examples/simplified FRISC model/schema3.csch +++ /dev/null @@ -1,29 +0,0 @@ -@source "/home/bbr/Documents/Personal/FER/schema_editor/examples/simplified FRISC model/frisc_library.csl" - -@schema { - @instance procesor FRISC { - @position (-464, -314) - @attribute _memory null - } - - @instance dma DMA { - @position (-269, 46) - @attribute pocetnaAdresa 0 - } - - @instance glavnaSabirnica glavnaSabirnica { - @position (-579, -160) - @size 100 - } - - @instance PIOSabirnica PIOSabirnica { - @position (0, 0) - @size 0 - } - - @connection (dma.glavniPin, glavnaSabirnica) { - @attribute interupt INT2 - } - @connection (dma.glavniPin, PIOSabirnica, procesor.glavniPin) { - } -} diff --git a/examples/simplified FRISC model/schema4.csch b/examples/simplified FRISC model/schema4.csch deleted file mode 100644 index f65fc46..0000000 --- a/examples/simplified FRISC model/schema4.csch +++ /dev/null @@ -1,49 +0,0 @@ -@source "/home/bbr/Documents/Personal/FER/schema_editor/examples/simplified FRISC model/frisc_library.csl" - -@schema { - @instance procesor FRISC { - @position (-104, -102) - @attribute _memory null - } - - @instance memorija Memorija { - @position (39, 199) - @attribute sinkroniziran false - @attribute brzina 1 - @attribute kapacitet 1024 - @attribute size 8 - @attribute pocetnaAdresa 0 - } - - @instance dma DMA { - @position (-352, 13) - @attribute pocetnaAdresa 1024 - } - - @instance glavnaSabirnica glavnaSabirnica { - @position (-106, 80) - @size 100 - } - - @instance PIOSabirnica PIOSabirnica { - @position (0, 0) - @size -1 - } - - @instance directRam directRam { - @position (0, 0) - @size -1 - } - - @connection (procesor.glavniPin, glavnaSabirnica) { - } - @connection (memorija.glavniPin, glavnaSabirnica) { - } - @connection (dma.glavniPin, glavnaSabirnica) { - @attribute interupt INT0 - } - @connection (memorija.memDirect, directRam, procesor.memDirect) { - @attribute procConn "INT" - @attribute memConn "INT" - } -} diff --git a/examples/simplified FRISC model/schema5.csch b/examples/simplified FRISC model/schema_2.csch similarity index 89% rename from examples/simplified FRISC model/schema5.csch rename to examples/simplified FRISC model/schema_2.csch index f65fc46..d330c6f 100644 --- a/examples/simplified FRISC model/schema5.csch +++ b/examples/simplified FRISC model/schema_2.csch @@ -1,4 +1,4 @@ -@source "/home/bbr/Documents/Personal/FER/schema_editor/examples/simplified FRISC model/frisc_library.csl" +@source "frisc_library.csl" @schema { @instance procesor FRISC {